X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=openbox%2Fopenbox.c;h=cba0499533573ddfc777497e79cd5bc6d8c0e41c;hp=a6a81cef7dec11e813e67f9ac8dd5d3b23b0fd1d;hb=HEAD;hpb=f6193ad9e048c5824142d3e7feeb109f91054052 diff --git a/openbox/openbox.c b/openbox/openbox.c index a6a81cef..cba04995 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -43,12 +43,14 @@ #include "ping.h" #include "prompt.h" #include "gettext.h" -#include "render/render.h" -#include "render/theme.h" +#include "obrender/render.h" +#include "obrender/theme.h" #include "obt/display.h" +#include "obt/xqueue.h" +#include "obt/signal.h" #include "obt/prop.h" #include "obt/keyboard.h" -#include "obt/parse.h" +#include "obt/xml.h" #ifdef HAVE_FCNTL_H # include @@ -80,19 +82,18 @@ #include #endif -#include -#include - -RrInstance *ob_rr_inst; -RrTheme *ob_rr_theme; -ObtMainLoop *ob_main_loop; -gint ob_screen; -gboolean ob_replace_wm = FALSE; -gboolean ob_sm_use = TRUE; -gchar *ob_sm_id = NULL; -gchar *ob_sm_save_file = NULL; -gboolean ob_sm_restore = TRUE; -gboolean ob_debug_xinerama = FALSE; +RrInstance *ob_rr_inst; +RrImageCache *ob_rr_icons; +RrTheme *ob_rr_theme; +GMainLoop *ob_main_loop; +gint ob_screen; +gboolean ob_replace_wm = FALSE; +gboolean ob_sm_use = TRUE; +gchar *ob_sm_id = NULL; +gchar *ob_sm_save_file = NULL; +gboolean ob_sm_restore = TRUE; +gboolean ob_debug_xinerama = FALSE; +const gchar *ob_locale_msg = NULL; static ObState state; static gboolean xsync = FALSE; @@ -100,33 +101,42 @@ static gboolean reconfigure = FALSE; static gboolean restart = FALSE; static gchar *restart_path = NULL; static Cursor cursors[OB_NUM_CURSORS]; -static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; static guint remote_control = 0; static gboolean being_replaced = FALSE; static gchar *config_file = NULL; +static gchar *startup_cmd = NULL; static void signal_handler(gint signal, gpointer data); static void remove_args(gint *argc, gchar **argv, gint index, gint num); static void parse_env(); static void parse_args(gint *argc, gchar **argv); static Cursor load_cursor(const gchar *name, guint fontval); +static void run_startup_cmd(void); gint main(gint argc, gchar **argv) { gchar *program_name; - state = OB_STATE_STARTING; + obt_signal_listen(); + + ob_set_state(OB_STATE_STARTING); ob_debug_startup(); /* initialize the locale */ + if (!(ob_locale_msg = setlocale(LC_MESSAGES, ""))) + g_message("Couldn't set messages locale category from environment."); if (!setlocale(LC_ALL, "")) g_message("Couldn't set locale from environment."); bindtextdomain(PACKAGE_NAME, LOCALEDIR); bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); textdomain(PACKAGE_NAME); + if (chdir(g_get_home_dir()) == -1) + g_message(_("Unable to change to home directory \"%s\": %s"), + g_get_home_dir(), g_strerror(errno)); + /* parse the command line args, which can change the argv[0] */ parse_args(&argc, argv); /* parse the environment variables */ @@ -147,26 +157,34 @@ gint main(gint argc, gchar **argv) * remote_control = 2 -> restart */ OBT_PROP_MSG(ob_screen, obt_root(ob_screen), OB_CONTROL, remote_control, 0, 0, 0, 0); - obt_display_close(obt_display); + obt_display_close(); exit(EXIT_SUCCESS); } - ob_main_loop = obt_main_loop_new(); + ob_main_loop = g_main_loop_new(NULL, FALSE); - /* set up signal handler */ - obt_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL,NULL); - obt_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL,NULL); - obt_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL,NULL); - obt_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL,NULL); - obt_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL,NULL); - obt_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL,NULL); - obt_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL,NULL); + /* set up signal handlers, they are called from the mainloop + in the main program's thread */ + obt_signal_add_callback(SIGUSR1, signal_handler, NULL); + obt_signal_add_callback(SIGUSR2, signal_handler, NULL); + obt_signal_add_callback(SIGTERM, signal_handler, NULL); + obt_signal_add_callback(SIGINT, signal_handler, NULL); + obt_signal_add_callback(SIGHUP, signal_handler, NULL); + obt_signal_add_callback(SIGPIPE, signal_handler, NULL); + obt_signal_add_callback(SIGCHLD, signal_handler, NULL); + obt_signal_add_callback(SIGTTIN, signal_handler, NULL); + obt_signal_add_callback(SIGTTOU, signal_handler, NULL); ob_screen = DefaultScreen(obt_display); ob_rr_inst = RrInstanceNew(obt_display, ob_screen); if (ob_rr_inst == NULL) ob_exit_with_error(_("Failed to initialize the obrender library.")); + /* Saving 3 resizes of an RrImage makes a lot of sense for icons, as there + are generally 3 icon sizes needed: the titlebar icon, the menu icon, + and the alt-tab icon + */ + ob_rr_icons = RrImageCacheNew(3); XSynchronize(obt_display, xsync); @@ -178,7 +196,7 @@ gint main(gint argc, gchar **argv) /* set the DISPLAY environment variable for any lauched children, to the display we're using, so they open in the right place. */ - setenv("DISPLAY", DisplayString(obt_display), TRUE); + g_setenv("DISPLAY", DisplayString(obt_display), TRUE); /* create available cursors */ cursors[OB_CURSOR_NONE] = None; @@ -200,25 +218,23 @@ gint main(gint argc, gchar **argv) XC_top_left_corner); if (screen_annex()) { /* it will be ours! */ + + /* get a timestamp from after taking over as the WM. if we use the + old timestamp to set focus it can fail when replacing another WM. */ + event_reset_time(); + do { - if (reconfigure) obt_keyboard_reload(); + gchar *xml_error_string = NULL; + ObPrompt *xmlprompt = NULL; - /* get the keycodes for keys we use */ - keys[OB_KEY_RETURN] = obt_keyboard_keysym_to_keycode(XK_Return); - keys[OB_KEY_ESCAPE] = obt_keyboard_keysym_to_keycode(XK_Escape); - keys[OB_KEY_LEFT] = obt_keyboard_keysym_to_keycode(XK_Left); - keys[OB_KEY_RIGHT] = obt_keyboard_keysym_to_keycode(XK_Right); - keys[OB_KEY_UP] = obt_keyboard_keysym_to_keycode(XK_Up); - keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down); - keys[OB_KEY_TAB] = obt_keyboard_keysym_to_keycode(XK_Tab); - keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space); + if (reconfigure) obt_keyboard_reload(); { - ObtParseInst *i; + ObtXmlInst *i; /* startup the parsing so everything can register sections of the rc */ - i = obt_parse_instance_new(); + i = obt_xml_instance_new(); /* register all the available actions */ actions_startup(reconfigure); @@ -227,12 +243,12 @@ gint main(gint argc, gchar **argv) /* parse/load user options */ if ((config_file && - obt_parse_load_file(i, config_file, "openbox_config")) || - obt_parse_load_config_file(i, "openbox", "rc.xml", - "openbox_config")) + obt_xml_load_file(i, config_file, "openbox_config")) || + obt_xml_load_config_file(i, "openbox", "rc.xml", + "openbox_config")) { - obt_parse_tree_from_root(i); - obt_parse_close(i); + obt_xml_tree_from_root(i); + obt_xml_close(i); } else { g_message(_("Unable to find a valid config file, using some simple defaults")); @@ -243,15 +259,22 @@ gint main(gint argc, gchar **argv) gchar *p = g_filename_to_utf8(config_file, -1, NULL, NULL, NULL); if (p) - OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, - utf8, p); + OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, p); g_free(p); } else OBT_PROP_ERASE(obt_root(ob_screen), OB_CONFIG_FILE); + if (obt_xml_last_error(i)) { + xml_error_string = g_strdup_printf( + _("One or more XML syntax errors were found while parsing the Openbox configuration files. See stdout for more information. The last error seen was in file \"%s\" line %d, with message: %s"), + obt_xml_last_error_file(i), + obt_xml_last_error_line(i), + obt_xml_last_error_message(i)); + } + /* we're done with parsing now, kill it */ - obt_parse_instance_unref(i); + obt_xml_instance_unref(i); } /* load the theme specified in the rc file */ @@ -262,7 +285,8 @@ gint main(gint argc, gchar **argv) config_font_inactivewindow, config_font_menutitle, config_font_menuitem, - config_font_osd))) + config_font_activeosd, + config_font_inactiveosd))) { RrThemeFree(ob_rr_theme); ob_rr_theme = theme; @@ -270,8 +294,8 @@ gint main(gint argc, gchar **argv) if (ob_rr_theme == NULL) ob_exit_with_error(_("Unable to load a theme.")); - OBT_PROP_SETS(obt_root(ob_screen), - OB_THEME, utf8, ob_rr_theme->name); + OBT_PROP_SETS(obt_root(ob_screen), OB_THEME, + ob_rr_theme->name); } if (reconfigure) { @@ -296,7 +320,6 @@ gint main(gint argc, gchar **argv) grab_startup(reconfigure); group_startup(reconfigure); ping_startup(reconfigure); - prompt_startup(reconfigure); client_startup(reconfigure); dock_startup(reconfigure); moveresize_startup(reconfigure); @@ -304,6 +327,11 @@ gint main(gint argc, gchar **argv) mouse_startup(reconfigure); menu_frame_startup(reconfigure); menu_startup(reconfigure); + prompt_startup(reconfigure); + + /* do this after everything is started so no events will get + missed */ + xqueue_listen(); if (!reconfigure) { guint32 xid; @@ -311,7 +339,6 @@ gint main(gint argc, gchar **argv) /* get all the existing windows */ window_manage_all(); - focus_nothing(); /* focus what was focused if a wm was already running */ if (OBT_PROP_GET32(obt_root(ob_screen), @@ -337,15 +364,34 @@ gint main(gint argc, gchar **argv) } } + ob_set_state(OB_STATE_RUNNING); + + if (!reconfigure && startup_cmd) run_startup_cmd(); + reconfigure = FALSE; - state = OB_STATE_RUNNING; - obt_main_loop_run(ob_main_loop); - state = OB_STATE_EXITING; + /* look for parsing errors */ + if (xml_error_string) { + xmlprompt = prompt_show_message(xml_error_string, + _("Openbox Syntax Error"), + _("Close")); + g_free(xml_error_string); + xml_error_string = NULL; + } + + g_main_loop_run(ob_main_loop); + ob_set_state(reconfigure ? + OB_STATE_RECONFIGURING : OB_STATE_EXITING); + + if (xmlprompt) { + prompt_unref(xmlprompt); + xmlprompt = NULL; + } if (!reconfigure) window_unmanage_all(); + prompt_shutdown(reconfigure); menu_shutdown(reconfigure); menu_frame_shutdown(reconfigure); mouse_shutdown(reconfigure); @@ -353,7 +399,6 @@ gint main(gint argc, gchar **argv) moveresize_shutdown(reconfigure); dock_shutdown(reconfigure); client_shutdown(reconfigure); - prompt_shutdown(reconfigure); ping_shutdown(reconfigure); group_shutdown(reconfigure); grab_shutdown(reconfigure); @@ -373,13 +418,16 @@ gint main(gint argc, gchar **argv) XSync(obt_display, FALSE); RrThemeFree(ob_rr_theme); + RrImageCacheUnref(ob_rr_icons); RrInstanceFree(ob_rr_inst); session_shutdown(being_replaced); - obt_display_close(obt_display); + obt_display_close(); if (restart) { + ob_debug_shutdown(); + obt_signal_stop(); if (restart_path != NULL) { gint argcp; gchar **argvp; @@ -391,7 +439,7 @@ gint main(gint argc, gchar **argv) g_strfreev(argvp); } else { g_message( - _("Restart failed to execute new executable '%s': %s"), + _("Restart failed to execute new executable \"%s\": %s"), restart_path, err->message); g_error_free(err); } @@ -433,7 +481,10 @@ gint main(gint argc, gchar **argv) g_free(ob_sm_id); g_free(program_name); - ob_debug_shutdown(); + if (!restart) { + ob_debug_shutdown(); + obt_signal_stop(); + } return exitcode; } @@ -453,6 +504,10 @@ static void signal_handler(gint signal, gpointer data) /* reap children */ while (waitpid(-1, NULL, WNOHANG) > 0); break; + case SIGTTIN: + case SIGTTOU: + ob_debug("Caught signal %d. Ignoring.", signal); + break; default: ob_debug("Caught signal %d. Exiting.", signal); /* TERM and INT return a 0 code */ @@ -460,25 +515,28 @@ static void signal_handler(gint signal, gpointer data) } } -static void print_version() +static void print_version(void) { g_print("Openbox %s\n", PACKAGE_VERSION); g_print(_("Copyright (c)")); - g_print(" 2008 Mikael Magnusson\n"); + g_print(" 2004 Mikael Magnusson\n"); g_print(_("Copyright (c)")); - g_print(" 2003-2006 Dana Jansens\n\n"); + g_print(" 2002 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"); } -static void print_help() +static void print_help(void) { g_print(_("Syntax: openbox [options]\n")); g_print(_("\nOptions:\n")); g_print(_(" --help Display this help and exit\n")); g_print(_(" --version Display the version and exit\n")); g_print(_(" --replace Replace the currently running window manager\n")); + /* TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." + aligned still, if you have to, make a new line with \n and 22 spaces. It's + fine to leave it as FILE though. */ g_print(_(" --config-file FILE Specify the path to the config file to use\n")); g_print(_(" --sm-disable Disable connection to the session manager\n")); g_print(_("\nPassing messages to a running Openbox instance:\n")); @@ -487,9 +545,10 @@ static void print_help() g_print(_(" --exit Exit Openbox\n")); g_print(_("\nDebugging options:\n")); g_print(_(" --sync Run in synchronous mode\n")); + g_print(_(" --startup CMD Run CMD after starting\n")); g_print(_(" --debug Display debugging output\n")); g_print(_(" --debug-focus Display debugging output for focus handling\n")); - g_print(_(" --debug-session Display debugging output for session managment\n")); + g_print(_(" --debug-session Display debugging output for session management\n")); g_print(_(" --debug-xinerama Split the display into fake xinerama screens\n")); g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT); } @@ -505,10 +564,47 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num) *argc -= num; } -static void parse_env() +static void run_startup_cmd(void) { + gchar **argv = NULL; + GError *e = NULL; + gboolean ok; + + if (!g_shell_parse_argv(startup_cmd, NULL, &argv, &e)) { + g_message("Error parsing startup command: %s", + e->message); + g_error_free(e); + e = NULL; + } + ok = g_spawn_async(NULL, argv, NULL, + G_SPAWN_SEARCH_PATH | + G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, NULL, &e); + if (!ok) { + g_message("Error launching startup command: %s", + e->message); + g_error_free(e); + e = NULL; + } +} + +static void parse_env(void) +{ + const gchar *id; + /* unset this so we don't pass it on unknowingly */ - unsetenv("DESKTOP_STARTUP_ID"); + g_unsetenv("DESKTOP_STARTUP_ID"); + + /* this is how gnome-session passes in a session client id */ + id = g_getenv("DESKTOP_AUTOSTART_ID"); + if (id) { + g_unsetenv("DESKTOP_AUTOSTART_ID"); + if (ob_sm_id) g_free(ob_sm_id); + ob_sm_id = g_strdup(id); + ob_debug_type(OB_DEBUG_SM, + "DESKTOP_AUTOSTART_ID %s supercedes --sm-client-id\n", + ob_sm_id); + } } static void parse_args(gint *argc, gchar **argv) @@ -535,18 +631,26 @@ static void parse_args(gint *argc, gchar **argv) else if (!strcmp(argv[i], "--sync")) { xsync = TRUE; } + else if (!strcmp(argv[i], "--startup")) { + if (i == *argc - 1) /* no args left */ + g_printerr(_("%s requires an argument\n"), "--startup"); + else { + /* this will be in the current locale encoding, which is + what we want */ + startup_cmd = argv[i+1]; + remove_args(argc, argv, i, 2); + --i; /* this arg was removed so go back */ + ob_debug("--startup %s", startup_cmd); + } + } else if (!strcmp(argv[i], "--debug")) { ob_debug_enable(OB_DEBUG_NORMAL, TRUE); ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); } else if (!strcmp(argv[i], "--debug-focus")) { - ob_debug_enable(OB_DEBUG_NORMAL, TRUE); - ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); ob_debug_enable(OB_DEBUG_FOCUS, TRUE); } else if (!strcmp(argv[i], "--debug-session")) { - ob_debug_enable(OB_DEBUG_NORMAL, TRUE); - ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE); ob_debug_enable(OB_DEBUG_SM, TRUE); } else if (!strcmp(argv[i], "--debug-xinerama")) { @@ -563,13 +667,13 @@ static void parse_args(gint *argc, gchar **argv) } else if (!strcmp(argv[i], "--config-file")) { if (i == *argc - 1) /* no args left */ - g_printerr(_("--config-file requires an argument\n")); + g_printerr(_("%s requires an argument\n"), "--config-file"); else { /* this will be in the current locale encoding, which is what we want */ config_file = argv[i+1]; ++i; /* skip the argument */ - ob_debug("--config-file %s\n", config_file); + ob_debug("--config-file %s", config_file); } } else if (!strcmp(argv[i], "--sm-save-file")) { @@ -606,7 +710,7 @@ static void parse_args(gint *argc, gchar **argv) else { /* this is a memleak.. oh well.. heh */ gchar *err = g_strdup_printf - (_("Invalid command line argument '%s'\n"), argv[i]); + (_("Invalid command line argument \"%s\"\n"), argv[i]); ob_exit_with_error(err); } } @@ -626,7 +730,7 @@ static Cursor load_cursor(const gchar *name, guint fontval) void ob_exit_with_error(const gchar *msg) { - g_message(msg); + g_message("%s", msg); session_shutdown(TRUE); exit(EXIT_FAILURE); } @@ -637,13 +741,13 @@ void ob_restart_other(const gchar *path) ob_restart(); } -void ob_restart() +void ob_restart(void) { restart = TRUE; ob_exit(0); } -void ob_reconfigure() +void ob_reconfigure(void) { reconfigure = TRUE; ob_exit(0); @@ -652,14 +756,14 @@ void ob_reconfigure() void ob_exit(gint code) { exitcode = code; - obt_main_loop_exit(ob_main_loop); + g_main_loop_quit(ob_main_loop); } -void ob_exit_replace() +void ob_exit_replace(void) { exitcode = 0; being_replaced = TRUE; - obt_main_loop_exit(ob_main_loop); + g_main_loop_quit(ob_main_loop); } Cursor ob_cursor(ObCursor cursor) @@ -668,13 +772,12 @@ Cursor ob_cursor(ObCursor cursor) return cursors[cursor]; } -KeyCode ob_keycode(ObKey key) +ObState ob_state(void) { - g_assert(key < OB_NUM_KEYS); - return keys[key]; + return state; } -ObState ob_state() +void ob_set_state(ObState s) { - return state; + state = s; }