RrInstance *ob_rr_inst;
RrTheme *ob_rr_theme;
Display *ob_display;
-int ob_screen;
-Window ob_root;
+gint ob_screen;
ObState ob_state;
-gboolean ob_sync;
Cursor ob_cursors[OB_NUM_CURSORS];
KeyCode ob_keys[OB_NUM_KEYS];
+static gboolean sync;
static gboolean shutdown;
static gboolean restart;
static char *restart_path;
#endif
ob_screen = DefaultScreen(ob_display);
- ob_root = RootWindow(ob_display, ob_screen);
ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
if (ob_rr_inst == NULL)
/* XXX fork self onto other screens */
- XSynchronize(ob_display, ob_sync);
+ XSynchronize(ob_display, sync);
/* check for locale support */
if (!XSupportsLocale())
print_help();
exit(0);
} else if (!strcmp(argv[i], "--sync")) {
- ob_sync = TRUE;
+ sync = TRUE;
#ifdef USE_SM
} else if (!strcmp(argv[i], "--sm-client-id")) {
if (i == argc - 1) /* no args left */
int i;
guint u;
- return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
+ return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),
+ &w, &w, x, y, &i, &i, &u);
}
#ifdef USE_SM