nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the xerror stuff to trap errors instead of dupliacted the effort here

Browse source
This commit is contained in:
Dana Jansens 2003-07-10 17:11:07 +00:00
parent 85112c4d08
commit 120623d34e
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
openbox/screen.c
View file

@ -53,30 +53,22 @@ static void sn_event_func(SnMonitorEvent *event, void *data);
static void set_root_cursor(); static void set_root_cursor();
static gboolean running;
static int another_running(Display *d, XErrorEvent *e)
{
(void)d;(void)e;
g_message("A window manager is already running on screen %d",
ob_screen);
running = TRUE;
return -1;
}
gboolean screen_annex() gboolean screen_annex()
{ {
XErrorHandler old;
pid_t pid; pid_t pid;
int i, num_support; int i, num_support;
guint32 *supported; guint32 *supported;
running = FALSE; xerror_set_ignore(TRUE);
old = XSetErrorHandler(another_running); xerror_occured = FALSE;
XSelectInput(ob_display, ob_root, ROOT_EVENTMASK); XSelectInput(ob_display, ob_root, ROOT_EVENTMASK);
XSync(ob_display, FALSE); xerror_set_ignore(FALSE);
XSetErrorHandler(old); if (xerror_occured) {
if (running) g_message("A window manager is already running on screen %d",
ob_screen);
return FALSE; return FALSE;
}
g_message("Managing screen %d", ob_screen); g_message("Managing screen %d", ob_screen);