X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=3f764f2b639e671970463a702fdb9c1d5cd31670;hb=b2b8ad92bfbc60392737fe9945e719b238d34933;hp=84b9fbebe8fc12ffd6a6aba1bbb67bcc671c1460;hpb=16f46c296d1fcd3f27fc62a18e71c55fb3fd3e88;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 84b9fbeb..3f764f2b 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,6 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- openbox.c for the Openbox window manager + Copyright (c) 2004 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -59,9 +60,14 @@ # include # include #endif +#ifdef HAVE_SYS_WAIT_H +# include +# include +#endif #ifdef HAVE_UNISTD_H # include #endif +#include #include @@ -76,15 +82,15 @@ static ObState state; static gboolean xsync; static gboolean reconfigure; static gboolean restart; -static char *restart_path; +static gchar *restart_path; static Cursor cursors[OB_NUM_CURSORS]; static KeyCode keys[OB_NUM_KEYS]; static gint exitcode = 0; -static void signal_handler(int signal, gpointer data); -static void parse_args(int argc, char **argv); +static void signal_handler(gint signal, gpointer data); +static void parse_args(gint argc, gchar **argv); -int main(int argc, char **argv) +gint main(gint argc, gchar **argv) { #ifdef DEBUG ob_debug_show_output(TRUE); @@ -94,12 +100,16 @@ int main(int argc, char **argv) /* initialize the locale */ if (!setlocale(LC_ALL, "")) - g_warning("Couldn't set locale from environment.\n"); + g_warning("Couldn't set locale from environment.\n"); bindtextdomain(PACKAGE_NAME, LOCALEDIR); bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); textdomain(PACKAGE_NAME); g_set_prgname(argv[0]); + + if (chdir(g_get_home_dir()) == -1) + g_warning("Unable to change to home directory (%s): %s", + g_get_home_dir(), g_strerror(errno)); parse_paths_startup(); @@ -110,7 +120,7 @@ int main(int argc, char **argv) ob_display = XOpenDisplay(NULL); if (ob_display == NULL) - ob_exit_with_error("Failed to open the display."); + ob_exit_with_error("Failed to open the display."); if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) ob_exit_with_error("Failed to set display as close-on-exec."); @@ -123,6 +133,7 @@ int main(int argc, char **argv) ob_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL, NULL); ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL); ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL); + ob_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL, NULL); ob_screen = DefaultScreen(ob_display); @@ -130,15 +141,13 @@ int main(int argc, char **argv) if (ob_rr_inst == NULL) ob_exit_with_error("Failed to initialize the render library."); - /* XXX fork self onto other screens */ - XSynchronize(ob_display, xsync); /* check for locale support */ if (!XSupportsLocale()) - g_warning("X server does not support locale."); + g_warning("X server does not support locale."); if (!XSetLocaleModifiers("")) - g_warning("Cannot set locale modifiers for the X server."); + g_warning("Cannot set locale modifiers for the X server."); /* set our error handler */ XSetErrorHandler(xerror_handler); @@ -205,7 +214,7 @@ int main(int argc, char **argv) if (parse_load_rc(&doc, &node)) parse_tree(i, doc, node->xmlChildrenNode); /* we're done with parsing now, kill it */ - xmlFreeDoc(doc); + parse_close(doc); parse_shutdown(i); } @@ -248,6 +257,7 @@ int main(int argc, char **argv) if (!reconfigure) { /* get all the existing windows */ client_manage_all(); + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } else { GList *it; @@ -286,6 +296,8 @@ int main(int argc, char **argv) } while (reconfigure); } + XSync(ob_display, FALSE); + RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); @@ -297,17 +309,18 @@ int main(int argc, char **argv) if (restart) { if (restart_path != NULL) { - int argcp; - char **argvp; + gint argcp; + gchar **argvp; GError *err = NULL; - /* run other shit */ + /* run other window manager */ if (g_shell_parse_argv(restart_path, &argcp, &argvp, &err)) { execvp(argvp[0], argvp); g_strfreev(argvp); } else { g_warning("failed to execute '%s': %s", restart_path, err->message); + g_error_free(err); } } @@ -319,16 +332,23 @@ int main(int argc, char **argv) return exitcode; } -static void signal_handler(int signal, gpointer data) +static void signal_handler(gint signal, gpointer data) { - if (signal == SIGUSR1) { - fprintf(stderr, "Caught signal %d. Restarting.\n", signal); + switch (signal) { + case SIGUSR1: + ob_debug("Caught signal %d. Restarting.\n", signal); ob_restart(); - } else if (signal == SIGUSR2) { - fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal); - ob_reconfigure(); - } else { - fprintf(stderr, "Caught signal %d. Exiting.\n", signal); + break; + case SIGUSR2: + ob_debug("Caught signal %d. Reconfiguring.\n", signal); + ob_reconfigure(); + break; + case SIGCHLD: + /* reap children */ + while (waitpid(-1, NULL, WNOHANG) > 0); + break; + default: + ob_debug("Caught signal %d. Exiting.\n", signal); /* TERM and INT return a 0 code */ ob_exit(!(signal == SIGTERM || signal == SIGINT)); } @@ -337,7 +357,8 @@ static void signal_handler(int signal, gpointer data) static void print_version() { g_print("Openbox %s\n", PACKAGE_VERSION); - g_print("Copyright (c) 2003 Ben Jansens, and others\n\n"); + g_print("Copyright (c) 2004 Mikael Magnusson, and others\n"); + g_print("Copyright (c) 2003 Ben Jansens, and others\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"); @@ -359,14 +380,14 @@ static void print_help() g_print(" --version Display the version and exit\n"); g_print(" --sync Run in synchronous mode (this is slow and " "meant for\n" - " debugging X routines)\n"); + " debugging X routines)\n"); g_print(" --debug Display debugging output\n"); g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT); } -static void parse_args(int argc, char **argv) +static void parse_args(gint argc, gchar **argv) { - int i; + gint i; for (i = 1; i < argc; ++i) { if (!strcmp(argv[i], "--version")) {