#ifdef USE_SM
gboolean ob_sm_use = TRUE;
SmcConn ob_sm_conn;
-gchar *ob_sm_id = NULL;
+gchar *ob_sm_id;
#endif
-RrInstance *ob_rr_inst = NULL;
-RrTheme *ob_rr_theme = NULL;
-Display *ob_display = NULL;
-int ob_screen;
+RrInstance *ob_rr_inst;
+RrTheme *ob_rr_theme;
+Display *ob_display;
+gint ob_screen;
Window ob_root;
-State ob_state;
-gboolean ob_shutdown = FALSE;
-gboolean ob_restart = FALSE;
-char *ob_restart_path = NULL;
-gboolean ob_remote = TRUE;
-gboolean ob_sync = FALSE;
-Cursors ob_cursors;
-char *ob_rc_path = NULL;
+ObState ob_state;
+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;
static void signal_handler(const ObEvent *e, void *data);
static void parse_args(int argc, char **argv);
xmlDocPtr doc;
xmlNodePtr node;
- ob_state = State_Starting;
+ ob_state = OB_STATE_STARTING;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
/* XXX fork self onto other screens */
- XSynchronize(ob_display, ob_sync);
+ XSynchronize(ob_display, sync);
/* check for locale support */
if (!XSupportsLocale())
display we're using, so they open in the right place. */
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
- ob_cursors.ptr = XCreateFontCursor(ob_display, XC_left_ptr);
- ob_cursors.busy = XCreateFontCursor(ob_display, XC_watch);
- ob_cursors.move = XCreateFontCursor(ob_display, XC_fleur);
- ob_cursors.tl = XCreateFontCursor(ob_display, XC_top_left_corner);
- ob_cursors.tr = XCreateFontCursor(ob_display, XC_top_right_corner);
- ob_cursors.bl = XCreateFontCursor(ob_display, XC_bottom_left_corner);
- ob_cursors.br = XCreateFontCursor(ob_display, XC_bottom_right_corner);
- ob_cursors.t = XCreateFontCursor(ob_display, XC_top_side);
- ob_cursors.r = XCreateFontCursor(ob_display, XC_right_side);
- ob_cursors.b = XCreateFontCursor(ob_display, XC_bottom_side);
- ob_cursors.l = XCreateFontCursor(ob_display, XC_left_side);
+ /* create available cursors */
+ ob_cursors[OB_CURSOR_POINTER] =
+ XCreateFontCursor(ob_display, XC_left_ptr);
+ ob_cursors[OB_CURSOR_BUSY] =
+ XCreateFontCursor(ob_display, XC_watch);
+ ob_cursors[OB_CURSOR_MOVE] =
+ XCreateFontCursor(ob_display, XC_fleur);
+ ob_cursors[OB_CURSOR_NORTH] =
+ XCreateFontCursor(ob_display, XC_top_side);
+ ob_cursors[OB_CURSOR_NORTHEAST] =
+ XCreateFontCursor(ob_display, XC_top_right_corner);
+ ob_cursors[OB_CURSOR_EAST] =
+ XCreateFontCursor(ob_display, XC_right_side);
+ ob_cursors[OB_CURSOR_SOUTHEAST] =
+ XCreateFontCursor(ob_display, XC_bottom_right_corner);
+ ob_cursors[OB_CURSOR_SOUTH] =
+ XCreateFontCursor(ob_display, XC_bottom_side);
+ ob_cursors[OB_CURSOR_SOUTHWEST] =
+ XCreateFontCursor(ob_display, XC_bottom_left_corner);
+ ob_cursors[OB_CURSOR_WEST] =
+ XCreateFontCursor(ob_display, XC_left_side);
+ ob_cursors[OB_CURSOR_NORTHWEST] =
+ XCreateFontCursor(ob_display, XC_top_left_corner);
+
+ /* create available keycodes */
+ ob_keys[OB_KEY_RETURN] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Return"));
+ ob_keys[OB_KEY_ESCAPE] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Escape"));
+ ob_keys[OB_KEY_LEFT] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Left"));
+ ob_keys[OB_KEY_RIGHT] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Right"));
+ ob_keys[OB_KEY_UP] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Up"));
+ ob_keys[OB_KEY_DOWN] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Down"));
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
/* get all the existing windows */
client_manage_all();
- ob_state = State_Running;
- while (!ob_shutdown)
+ ob_state = OB_STATE_RUNNING;
+ while (!shutdown)
event_loop();
- ob_state = State_Exiting;
+ ob_state = OB_STATE_EXITING;
dock_remove_all();
client_unmanage_all();
XCloseDisplay(ob_display);
- if (ob_restart) {
- if (ob_restart_path != NULL) {
+ if (restart) {
+ if (restart_path != NULL) {
int argcp;
char **argvp;
GError *err = NULL;
/* run other shit */
- if (g_shell_parse_argv(ob_restart_path, &argcp, &argvp, &err)) {
+ if (g_shell_parse_argv(restart_path, &argcp, &argvp, &err)) {
execvp(argvp[0], argvp);
g_strfreev(argvp);
} else {
- g_warning("failed to execute '%s': %s", ob_restart_path,
+ g_warning("failed to execute '%s': %s", restart_path,
err->message);
}
}
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
- execlp(BINARY, BINARY, NULL); /* try this as a last resort */
}
return 0;
val_prog.value = argv[0];
val_prog.length = strlen(argv[0]);
- val_uid.value = g_get_user_name();
+ val_uid.value = g_strdup(g_get_user_name());
val_uid.length = strlen(val_uid.value);
hint = SmRestartImmediately;
SmcSetProperties(ob_sm_conn, 7, props);
+ g_free(val_uid.value);
g_free(prop_cmd.vals);
g_free(prop_res.vals);
switch (s) {
case SIGUSR1:
fprintf(stderr, "Caught SIGUSR1 signal. Restarting.");
- ob_shutdown = ob_restart = TRUE;
+ ob_restart();
break;
case SIGHUP:
case SIGTERM:
case SIGPIPE:
fprintf(stderr, "Caught signal %d. Exiting.", s);
- ob_shutdown = TRUE;
+ ob_exit();
break;
case SIGFPE:
static void print_help()
{
print_version();
- g_print("Syntax: %s [options]\n\n", BINARY);
+ g_print("Syntax: openbox [options]\n\n");
g_print("Options:\n\n");
- g_print(" --rc PATH Specify the path to the rc file to use\n");
#ifdef USE_SM
g_print(" --sm-client-id ID Specify session management ID\n");
g_print(" --sm-disable Disable connection to session manager\n");
print_help();
exit(0);
} else if (!strcmp(argv[i], "--sync")) {
- ob_sync = TRUE;
- } else if (!strcmp(argv[i], "--rc")) {
- if (i == argc - 1) /* no args left */
- g_printerr(_("--rc requires an argument\n"));
- else
- ob_rc_path = argv[++i];
+ sync = TRUE;
#ifdef USE_SM
} else if (!strcmp(argv[i], "--sm-client-id")) {
if (i == argc - 1) /* no args left */
static void sm_die(SmcConn conn, SmPointer data)
{
- ob_shutdown = TRUE;
+ ob_exit();
g_message("got DIE from session manager");
}
sm_shutdown();
exit(EXIT_FAILURE);
}
+
+void ob_restart_other(const gchar *path)
+{
+ restart_path = g_strdup(path);
+ ob_restart();
+}
+
+void ob_restart()
+{
+ restart = TRUE;
+ ob_exit();
+}
+
+void ob_exit()
+{
+ shutdown = TRUE;
+}
+
+Cursor ob_cursor(ObCursor cursor)
+{
+ g_assert(cursor < OB_NUM_CURSORS);
+ return ob_cursors[cursor];
+}
+
+KeyCode ob_keycode(ObKey key)
+{
+ g_assert(key < OB_NUM_KEYS);
+ return ob_keys[key];
+}
projects / chaz / openbox / blobdiff