X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=4ad1c70aeff30e758cd25f89d04ab880d3642f6a;hb=a8a93d7d39b3cc82a25d99c9c639c97a5facbfec;hp=1c4a8706cd1069ccb26978ee78115ddcf3935c06;hpb=86b809df8a5e6c3c65faaaeadcd6e0d196a74040;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 1c4a8706..4ad1c70a 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -70,6 +70,9 @@ #include #include +#if USE_XCURSOR +#include +#endif RrInstance *ob_rr_inst; RrTheme *ob_rr_theme; @@ -86,11 +89,13 @@ static gchar *restart_path = NULL; static Cursor cursors[OB_NUM_CURSORS]; static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; -static gboolean reconfigure_and_exit = FALSE; +static guint remote_control = 0; static gboolean being_replaced = FALSE; +static gchar *config_file = NULL; static void signal_handler(gint signal, gpointer data); static void parse_args(gint argc, gchar **argv); +static Cursor load_cursor(const gchar *name, guint fontval); gint main(gint argc, gchar **argv) { @@ -116,7 +121,7 @@ gint main(gint argc, gchar **argv) /* parse out command line args */ parse_args(argc, argv); - if (!reconfigure_and_exit) { + if (!remote_control) { parse_paths_startup(); session_startup(argc, argv); @@ -128,24 +133,16 @@ gint main(gint argc, gchar **argv) if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) ob_exit_with_error("Failed to set display as close-on-exec."); - if (reconfigure_and_exit) { - guint32 pid; - gboolean ret; + if (remote_control) { + prop_startup(); - prop_startup(); /* get atoms values for the display */ - ret = PROP_GET32(RootWindow(ob_display, DefaultScreen(ob_display)), - openbox_pid, cardinal, &pid); + /* Send client message telling the OB process to: + * remote_control = 1 -> reconfigure + * remote_control = 2 -> restart */ + PROP_MSG(RootWindow(ob_display, ob_screen), + ob_control, remote_control, 0, 0, 0); XCloseDisplay(ob_display); - if (!ret) { - g_print("Openbox does not appear to be running on this " - "display.\n"); - } else { - g_print("Telling the Openbox process # %u to reconfigure.\n", pid); - ret = (kill(pid, SIGUSR2) == 0); - if (!ret) - g_print("Error: %s.\n", strerror(errno)); - } - exit(ret ? EXIT_SUCCESS : EXIT_FAILURE); + exit(EXIT_SUCCESS); } ob_main_loop = ob_main_loop_new(ob_display); @@ -182,28 +179,21 @@ gint main(gint argc, gchar **argv) /* create available cursors */ cursors[OB_CURSOR_NONE] = None; - cursors[OB_CURSOR_POINTER] = - XCreateFontCursor(ob_display, XC_left_ptr); - cursors[OB_CURSOR_BUSY] = - XCreateFontCursor(ob_display, XC_watch); - cursors[OB_CURSOR_MOVE] = - XCreateFontCursor(ob_display, XC_fleur); - cursors[OB_CURSOR_NORTH] = - XCreateFontCursor(ob_display, XC_top_side); - cursors[OB_CURSOR_NORTHEAST] = - XCreateFontCursor(ob_display, XC_top_right_corner); - cursors[OB_CURSOR_EAST] = - XCreateFontCursor(ob_display, XC_right_side); - cursors[OB_CURSOR_SOUTHEAST] = - XCreateFontCursor(ob_display, XC_bottom_right_corner); - cursors[OB_CURSOR_SOUTH] = - XCreateFontCursor(ob_display, XC_bottom_side); - cursors[OB_CURSOR_SOUTHWEST] = - XCreateFontCursor(ob_display, XC_bottom_left_corner); - cursors[OB_CURSOR_WEST] = - XCreateFontCursor(ob_display, XC_left_side); - cursors[OB_CURSOR_NORTHWEST] = - XCreateFontCursor(ob_display, XC_top_left_corner); + cursors[OB_CURSOR_POINTER] = load_cursor("left_ptr", XC_left_ptr); + cursors[OB_CURSOR_BUSY] = load_cursor("left_ptr_watch", XC_watch); + cursors[OB_CURSOR_MOVE] = load_cursor("fleur", XC_fleur); + cursors[OB_CURSOR_NORTH] = load_cursor("top_side", XC_top_side); + cursors[OB_CURSOR_NORTHEAST] = load_cursor("top_right_corner", + XC_top_right_corner); + cursors[OB_CURSOR_EAST] = load_cursor("right_side", XC_right_side); + cursors[OB_CURSOR_SOUTHEAST] = load_cursor("bottom_right_corner", + XC_bottom_right_corner); + cursors[OB_CURSOR_SOUTH] = load_cursor("bottom_side", XC_bottom_side); + cursors[OB_CURSOR_SOUTHWEST] = load_cursor("bottom_left_corner", + XC_bottom_left_corner); + cursors[OB_CURSOR_WEST] = load_cursor("left_side", XC_left_side); + cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner", + XC_top_left_corner); /* create available keycodes */ keys[OB_KEY_RETURN] = @@ -235,8 +225,12 @@ gint main(gint argc, gchar **argv) config_startup(i); /* parse/load user options */ - if (parse_load_rc(&doc, &node)) + if (parse_load_rc(config_file, &doc, &node, &config_file)) { + PROP_SETS(RootWindow(ob_display, ob_screen), + openbox_rc, config_file); parse_tree(i, doc, node->xmlChildrenNode); + } else + PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc); /* we're done with parsing now, kill it */ parse_close(doc); parse_shutdown(i); @@ -282,11 +276,12 @@ gint main(gint argc, gchar **argv) keyboard_startup(reconfigure); mouse_startup(reconfigure); menu_startup(reconfigure); + menu_frame_startup(reconfigure); if (!reconfigure) { /* get all the existing windows */ client_manage_all(); - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); + focus_fallback(TRUE); } else { GList *it; @@ -311,6 +306,7 @@ gint main(gint argc, gchar **argv) client_unmanage_all(); } + menu_frame_shutdown(reconfigure); menu_shutdown(reconfigure); mouse_shutdown(reconfigure); keyboard_shutdown(reconfigure); @@ -330,6 +326,7 @@ gint main(gint argc, gchar **argv) XSync(ob_display, FALSE); + g_free(config_file); /* this is set by parse_load_rc */ RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); @@ -390,8 +387,8 @@ static void signal_handler(gint signal, gpointer data) static void print_version() { g_print("Openbox %s\n", PACKAGE_VERSION); - g_print("Copyright (c) 2006 Mikael Magnusson\n"); - g_print("Copyright (c) 2003 Ben Jansens\n\n"); + g_print("Copyright (c) 2007 Mikael Magnusson\n"); + g_print("Copyright (c) 2003-2007 Dana Jansens\n\n"); g_print("This program comes with ABSOLUTELY NO WARRANTY.\n"); g_print("This is free software, and you are welcome to redistribute it\n"); g_print("under certain conditions. See the file COPYING for details.\n\n"); @@ -404,6 +401,8 @@ static void print_help() g_print(" --reconfigure Tell the currently running instance of " "Openbox to\n" " reconfigure (and then exit immediately)\n"); + g_print(" --config-file FILE Specify the file to load for the config " + "file\n"); #ifdef USE_SM g_print(" --sm-disable Disable connection to session manager\n"); g_print(" --sm-client-id ID Specify session management ID\n"); @@ -418,6 +417,7 @@ static void print_help() "meant for\n" " debugging X routines)\n"); g_print(" --debug Display debugging output\n"); + g_print(" --debug-focus Display debugging output\n"); g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT); } @@ -440,13 +440,37 @@ static void parse_args(gint argc, gchar **argv) xsync = TRUE; } else if (!strcmp(argv[i], "--debug")) { ob_debug_show_output(TRUE); + } else if (!strcmp(argv[i], "--debug-focus")) { + ob_debug_show_output(TRUE); + ob_debug_enable(OB_DEBUG_FOCUS, TRUE); } else if (!strcmp(argv[i], "--reconfigure")) { - reconfigure_and_exit = TRUE; + remote_control = 1; + } else if (!strcmp(argv[i], "--restart")) { + remote_control = 2; + } else if (!strcmp(argv[i], "--config-file")) { + if (i == argc - 1) /* no args left */ + g_printerr(_("--config-file requires an argument\n")); + else { + config_file = g_strdup(argv[i+1]); + ++i; + } } } } -void ob_exit_with_error(gchar *msg) +static Cursor load_cursor(const gchar *name, guint fontval) +{ + Cursor c = None; + +#if USE_XCURSOR + c = XcursorLibraryLoadCursor(ob_display, name); +#endif + if (c == None) + c = XCreateFontCursor(ob_display, fontval); + return c; +} + +void ob_exit_with_error(const gchar *msg) { g_critical(msg); session_shutdown(TRUE);