+#include "debug.h"
#include "openbox.h"
#include "dock.h"
#include "event.h"
#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;
-Window ob_root;
-ObState ob_state;
-gboolean ob_shutdown = FALSE;
-gboolean ob_restart = FALSE;
-char *ob_restart_path = NULL;
-gboolean ob_remote = TRUE;
-gboolean ob_sync = FALSE;
-Cursor ob_cursors[OB_NUM_CURSORS];
-KeyCode ob_keys[OB_NUM_KEYS];
-char *ob_rc_path = NULL;
+RrInstance *ob_rr_inst;
+RrTheme *ob_rr_theme;
+Display *ob_display;
+gint ob_screen;
+gboolean ob_replace_wm;
+
+static ObState state;
+static gboolean xsync;
+static gboolean shutdown;
+static gboolean restart;
+static char *restart_path;
+static Cursor cursors[OB_NUM_CURSORS];
+static KeyCode keys[OB_NUM_KEYS];
static void signal_handler(const ObEvent *e, void *data);
static void parse_args(int argc, char **argv);
xmlDocPtr doc;
xmlNodePtr node;
- ob_state = OB_STATE_STARTING;
+#ifdef DEBUG
+ ob_debug_show_output(TRUE);
+#endif
+
+ state = OB_STATE_STARTING;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
#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, xsync);
/* check for locale support */
if (!XSupportsLocale())
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
/* create available cursors */
- ob_cursors[OB_CURSOR_POINTER] =
+ cursors[OB_CURSOR_POINTER] =
XCreateFontCursor(ob_display, XC_left_ptr);
- ob_cursors[OB_CURSOR_BUSY] =
+ cursors[OB_CURSOR_BUSY] =
XCreateFontCursor(ob_display, XC_watch);
- ob_cursors[OB_CURSOR_MOVE] =
+ cursors[OB_CURSOR_MOVE] =
XCreateFontCursor(ob_display, XC_fleur);
- ob_cursors[OB_CURSOR_NORTH] =
+ cursors[OB_CURSOR_NORTH] =
XCreateFontCursor(ob_display, XC_top_side);
- ob_cursors[OB_CURSOR_NORTHEAST] =
+ cursors[OB_CURSOR_NORTHEAST] =
XCreateFontCursor(ob_display, XC_top_right_corner);
- ob_cursors[OB_CURSOR_EAST] =
+ cursors[OB_CURSOR_EAST] =
XCreateFontCursor(ob_display, XC_right_side);
- ob_cursors[OB_CURSOR_SOUTHEAST] =
+ cursors[OB_CURSOR_SOUTHEAST] =
XCreateFontCursor(ob_display, XC_bottom_right_corner);
- ob_cursors[OB_CURSOR_SOUTH] =
+ cursors[OB_CURSOR_SOUTH] =
XCreateFontCursor(ob_display, XC_bottom_side);
- ob_cursors[OB_CURSOR_SOUTHWEST] =
+ cursors[OB_CURSOR_SOUTHWEST] =
XCreateFontCursor(ob_display, XC_bottom_left_corner);
- ob_cursors[OB_CURSOR_WEST] =
+ cursors[OB_CURSOR_WEST] =
XCreateFontCursor(ob_display, XC_left_side);
- ob_cursors[OB_CURSOR_NORTHWEST] =
+ cursors[OB_CURSOR_NORTHWEST] =
XCreateFontCursor(ob_display, XC_top_left_corner);
/* create available keycodes */
- ob_keys[OB_KEY_RETURN] =
+ keys[OB_KEY_RETURN] =
XKeysymToKeycode(ob_display, XStringToKeysym("Return"));
- ob_keys[OB_KEY_ESCAPE] =
+ keys[OB_KEY_ESCAPE] =
XKeysymToKeycode(ob_display, XStringToKeysym("Escape"));
- ob_keys[OB_KEY_LEFT] =
+ keys[OB_KEY_LEFT] =
XKeysymToKeycode(ob_display, XStringToKeysym("Left"));
- ob_keys[OB_KEY_RIGHT] =
+ keys[OB_KEY_RIGHT] =
XKeysymToKeycode(ob_display, XStringToKeysym("Right"));
- ob_keys[OB_KEY_UP] =
+ keys[OB_KEY_UP] =
XKeysymToKeycode(ob_display, XStringToKeysym("Up"));
- ob_keys[OB_KEY_DOWN] =
+ keys[OB_KEY_DOWN] =
XKeysymToKeycode(ob_display, XStringToKeysym("Down"));
prop_startup(); /* get atoms values for the display */
if (ob_rr_theme == NULL)
exit_with_error("Unable to load a theme.");
- frame_startup();
moveresize_startup();
screen_startup();
group_startup();
/* get all the existing windows */
client_manage_all();
- ob_state = OB_STATE_RUNNING;
- while (!ob_shutdown)
+ state = OB_STATE_RUNNING;
+ while (!shutdown)
event_loop();
- ob_state = OB_STATE_EXITING;
+ state = OB_STATE_EXITING;
dock_remove_all();
client_unmanage_all();
screen_shutdown();
focus_shutdown();
moveresize_shutdown();
- frame_shutdown();
menu_shutdown();
window_shutdown();
grab_shutdown();
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);
}
}
g_free(prop_cmd.vals);
g_free(prop_res.vals);
- g_message("Connected to session manager with id %s", ob_sm_id);
+ ob_debug("Connected to session manager with id %s\n", ob_sm_id);
}
g_free (ob_sm_id);
#endif
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:
print_version();
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");
#endif
+ g_print(" --replace Replace the currently running window "
+ "manager\n");
g_print(" --help Display this help and exit\n");
g_print(" --version Display the version and exit\n");
g_print(" --sync Run in synchronous mode (this is slow and\n"
" meant for debugging X routines)\n");
+ g_print(" --debug Display debugging output\n");
g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
}
} else if (!strcmp(argv[i], "--help")) {
print_help();
exit(0);
+ } else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+ g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+ } else if (!strcmp(argv[i], "--replace")) {
+ ob_replace_wm = TRUE;
} 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];
+ xsync = TRUE;
+ } else if (!strcmp(argv[i], "--debug")) {
+ ob_debug_show_output(TRUE);
#ifdef USE_SM
} else if (!strcmp(argv[i], "--sm-client-id")) {
if (i == argc - 1) /* no args left */
}
}
-gboolean ob_pointer_pos(int *x, int *y)
-{
- Window w;
- int i;
- guint u;
-
- return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
-}
-
#ifdef USE_SM
static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
Bool shutdown, int interact_style, Bool fast)
{
- g_message("got SAVE YOURSELF from session manager");
+ ob_debug("got SAVE YOURSELF from session manager\n");
SmcSaveYourselfDone(conn, TRUE);
}
static void sm_die(SmcConn conn, SmPointer data)
{
- ob_shutdown = TRUE;
- g_message("got DIE from session manager");
+ ob_exit();
+ ob_debug("got DIE from session manager\n");
}
static void sm_save_complete(SmcConn conn, SmPointer data)
{
- g_message("got SAVE COMPLETE from session manager");
+ ob_debug("got SAVE COMPLETE from session manager\n");
}
static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
{
- g_message("got SHUTDOWN CANCELLED from session manager");
+ ob_debug("got SHUTDOWN CANCELLED from session manager\n");
}
#endif
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];
+ return cursors[cursor];
}
KeyCode ob_keycode(ObKey key)
{
g_assert(key < OB_NUM_KEYS);
- return ob_keys[key];
+ return keys[key];
+}
+
+ObState ob_state()
+{
+ return state;
}
projects / chaz / openbox / blobdiff