X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=01aa58a2de0819b520679797acd91f3864d78d6c;hb=a47d0a53652a96ca1df96fc9268757df1431ae55;hp=a6a81cef7dec11e813e67f9ac8dd5d3b23b0fd1d;hpb=f6193ad9e048c5824142d3e7feeb109f91054052;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index a6a81cef..01aa58a2 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -42,6 +42,7 @@ #include "config.h" #include "ping.h" #include "prompt.h" +#include "hooks.h" #include "gettext.h" #include "render/render.h" #include "render/theme.h" @@ -83,16 +84,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; @@ -127,6 +129,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 */ @@ -147,7 +153,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); } @@ -167,6 +173,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); @@ -222,6 +233,7 @@ gint main(gint argc, gchar **argv) /* register all the available actions */ actions_startup(reconfigure); + hooks_startup(reconfigure); /* start up config which sets up with the parser */ config_startup(i); @@ -366,6 +378,7 @@ gint main(gint argc, gchar **argv) sn_shutdown(reconfigure); event_shutdown(reconfigure); config_shutdown(); + hooks_shutdown(reconfigure); actions_shutdown(reconfigure); } while (reconfigure); } @@ -373,11 +386,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) { @@ -391,7 +405,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); } @@ -460,7 +474,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)")); @@ -472,13 +486,16 @@ 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")); + /* 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")); @@ -505,7 +522,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"); @@ -606,7 +623,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); } } @@ -637,13 +654,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); @@ -655,7 +672,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; @@ -674,7 +691,7 @@ KeyCode ob_keycode(ObKey key) return keys[key]; } -ObState ob_state() +ObState ob_state(void) { return state; }