X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=291b694b90328b574e4a6f5cd7cdfa7ac37482ae;hb=163950b23bf796a39870044417ca54d667b6b470;hp=95a58198249d9dcf9ce66b33315021d0c66e6b8f;hpb=5563e251c36a1fbda703cf4bc3c8c6ae543829bd;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 95a58198..291b694b 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -41,6 +41,7 @@ #include "group.h" #include "config.h" #include "ping.h" +#include "prompt.h" #include "gettext.h" #include "render/render.h" #include "render/theme.h" @@ -82,16 +83,17 @@ #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; +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; static ObState state; static gboolean xsync = FALSE; @@ -103,6 +105,7 @@ 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 void signal_handler(gint signal, gpointer data); static void remove_args(gint *argc, gchar **argv, gint index, gint num); @@ -125,6 +128,10 @@ gint main(gint argc, gchar **argv) 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 */ @@ -145,7 +152,7 @@ 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); } @@ -165,6 +172,11 @@ gint main(gint argc, gchar **argv) 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); @@ -208,6 +220,8 @@ gint main(gint argc, gchar **argv) 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); { ObtParseInst *i; @@ -222,18 +236,29 @@ gint main(gint argc, gchar **argv) config_startup(i); /* parse/load user options */ - if (obt_parse_load_config_file(i, "openbox", "rc.xml", + if ((config_file && + obt_parse_load_file(i, config_file, "openbox_config")) || + obt_parse_load_config_file(i, "openbox", "rc.xml", "openbox_config")) { obt_parse_tree_from_root(i); obt_parse_close(i); - } else + } + else { g_message(_("Unable to find a valid config file, using some simple defaults")); + config_file = NULL; + } -/* - if (config_type != NULL) - PROP_SETS(obt_root(ob_screen), ob_config, config_type); -*/ + if (config_file) { + 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); + g_free(p); + } + else + OBT_PROP_ERASE(obt_root(ob_screen), OB_CONFIG_FILE); /* we're done with parsing now, kill it */ obt_parse_instance_unref(i); @@ -281,6 +306,7 @@ 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); @@ -337,6 +363,7 @@ 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); @@ -356,11 +383,12 @@ 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) { if (restart_path != NULL) { @@ -374,7 +402,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); } @@ -443,7 +471,7 @@ 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)")); @@ -455,13 +483,14 @@ static void print_version() 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")); + 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")); g_print(_(" --reconfigure Reload Openbox's configuration\n")); @@ -487,7 +516,7 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num) *argc -= num; } -static void parse_env() +static void parse_env(void) { /* unset this so we don't pass it on unknowingly */ unsetenv("DESKTOP_STARTUP_ID"); @@ -543,6 +572,17 @@ static void parse_args(gint *argc, gchar **argv) else if (!strcmp(argv[i], "--exit")) { remote_control = 3; } + else if (!strcmp(argv[i], "--config-file")) { + if (i == *argc - 1) /* no args left */ + g_printerr(_("--config-file requires an argument\n")); + 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); + } + } else if (!strcmp(argv[i], "--sm-save-file")) { if (i == *argc - 1) /* no args left */ /* not translated cuz it's sekret */ @@ -577,7 +617,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); } } @@ -608,13 +648,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); @@ -626,7 +666,7 @@ void ob_exit(gint code) obt_main_loop_exit(ob_main_loop); } -void ob_exit_replace() +void ob_exit_replace(void) { exitcode = 0; being_replaced = TRUE; @@ -645,7 +685,7 @@ KeyCode ob_keycode(ObKey key) return keys[key]; } -ObState ob_state() +ObState ob_state(void) { return state; }