X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=5c4905ee3609cc2de7ab4773ccffc6c47afd9975;hb=d20f84f5ded581c57df5904c6fa550dac05ad036;hp=a8b445d89942ef3d655614d65fa3b23ea659d808;hpb=e979b388d83a48e45a6a36869f2bc87161e8a720;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index a8b445d8..5c4905ee 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,12 +89,12 @@ static gchar *restart_path = NULL; static Cursor cursors[OB_NUM_CURSORS]; static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; -static gboolean message_and_exit = FALSE; -static Atom *message; +static guint remote_control = 0; static gboolean being_replaced = FALSE; 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) { @@ -117,7 +120,7 @@ gint main(gint argc, gchar **argv) /* parse out command line args */ parse_args(argc, argv); - if (!message_and_exit) { + if (!remote_control) { parse_paths_startup(); session_startup(argc, argv); @@ -129,14 +132,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 (message_and_exit) { + if (remote_control) { prop_startup(); - /* Send client message telling the OB process to reconfigure */ - prop_message(RootWindow(ob_display, ob_screen), prop_atoms.ob_control, - *message, 0, 0, 0, SubstructureNotifyMask); + /* 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); - exit(0); + exit(EXIT_SUCCESS); } ob_main_loop = ob_main_loop_new(ob_display); @@ -173,28 +178,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] = @@ -277,7 +275,7 @@ gint main(gint argc, gchar **argv) if (!reconfigure) { /* get all the existing windows */ client_manage_all(); - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); + focus_fallback(TRUE); } else { GList *it; @@ -381,8 +379,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) 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"); @@ -432,16 +430,26 @@ static void parse_args(gint argc, gchar **argv) } else if (!strcmp(argv[i], "--debug")) { ob_debug_show_output(TRUE); } else if (!strcmp(argv[i], "--reconfigure")) { - message_and_exit = TRUE; - message = &prop_atoms.ob_reconfigure; + remote_control = 1; } else if (!strcmp(argv[i], "--restart")) { - message_and_exit = TRUE; - message = &prop_atoms.ob_restart; + remote_control = 2; } } } -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);