X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=b688296516911f2afee8254577a00635c3d60d4c;hb=4cb183401cc42f61a759b02f1210a3528f7869e5;hp=feeb19d97916ed0ddc14ab47a1564a055e57a1ad;hpb=4be58bf13719fd22cb08a7f016eaf757640ccd05;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index feeb19d9..b6882965 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,3 +1,21 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + openbox.c for the Openbox window manager + Copyright (c) 2003 Ben Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "debug.h" #include "openbox.h" #include "session.h" @@ -29,7 +47,6 @@ # include #endif #ifdef HAVE_SIGNAL_H -#define __USE_UNIX98 # include #endif #ifdef HAVE_STDLIB_H @@ -45,6 +62,7 @@ #ifdef HAVE_UNISTD_H # include #endif +#include #include @@ -59,17 +77,16 @@ 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) { - char *path; - #ifdef DEBUG ob_debug_show_output(TRUE); #endif @@ -83,24 +100,14 @@ int main(int argc, char **argv) bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); textdomain(PACKAGE_NAME); - /* create the ~/.openbox dir */ - path = g_build_filename(g_get_home_dir(), ".openbox", NULL); - mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | - S_IROTH | S_IWOTH | S_IXOTH)); - g_free(path); - /* create the ~/.openbox/themes dir */ - path = g_build_filename(g_get_home_dir(), ".openbox", "themes", NULL); - mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | - S_IROTH | S_IWOTH | S_IXOTH)); - g_free(path); - /* create the ~/.openbox/sessions dir */ - path = g_build_filename(g_get_home_dir(), ".openbox", "sessions", NULL); - mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | - S_IROTH | S_IWOTH | S_IXOTH)); - g_free(path); - 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(); + session_startup(&argc, &argv); /* parse out command line args */ @@ -128,8 +135,6 @@ 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 */ @@ -203,7 +208,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); } @@ -218,18 +223,27 @@ int main(int argc, char **argv) ob_exit_with_error("Unable to load a theme."); } + if (reconfigure) { + GList *it; + + /* update all existing windows for the new theme */ + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + frame_adjust_theme(c->frame); + } + } event_startup(reconfigure); - grab_startup(reconfigure); /* focus_backup is used for stacking, so this needs to come before anything that calls stacking_add */ focus_startup(reconfigure); window_startup(reconfigure); sn_startup(reconfigure); - moveresize_startup(reconfigure); screen_startup(reconfigure); + grab_startup(reconfigure); group_startup(reconfigure); client_startup(reconfigure); dock_startup(reconfigure); + moveresize_startup(reconfigure); keyboard_startup(reconfigure); mouse_startup(reconfigure); menu_startup(reconfigure); @@ -237,13 +251,14 @@ 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; /* redecorate all existing windows */ for (it = client_list; it; it = g_list_next(it)) { ObClient *c = it->data; - frame_adjust_theme(c->frame); + frame_adjust_area(c->frame, TRUE, TRUE, FALSE); } } @@ -261,20 +276,22 @@ int main(int argc, char **argv) menu_shutdown(reconfigure); mouse_shutdown(reconfigure); keyboard_shutdown(reconfigure); + moveresize_shutdown(reconfigure); dock_shutdown(reconfigure); client_shutdown(reconfigure); group_shutdown(reconfigure); + grab_shutdown(reconfigure); screen_shutdown(reconfigure); focus_shutdown(reconfigure); - moveresize_shutdown(reconfigure); sn_shutdown(reconfigure); window_shutdown(reconfigure); - grab_shutdown(reconfigure); event_shutdown(reconfigure); config_shutdown(); } while (reconfigure); } + XSync(ob_display, FALSE); + RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); @@ -282,10 +299,12 @@ int main(int argc, char **argv) XCloseDisplay(ob_display); + parse_paths_shutdown(); + if (restart) { if (restart_path != NULL) { - int argcp; - char **argvp; + gint argcp; + gchar **argvp; GError *err = NULL; /* run other shit */ @@ -295,6 +314,7 @@ int main(int argc, char **argv) } else { g_warning("failed to execute '%s': %s", restart_path, err->message); + g_error_free(err); } } @@ -303,26 +323,28 @@ int main(int argc, char **argv) execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */ } - return 0; + 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); + ob_debug("Caught signal %d. Restarting.\n", signal); ob_restart(); } else if (signal == SIGUSR2) { - fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal); + ob_debug("Caught signal %d. Reconfiguring.\n", signal); ob_reconfigure(); } else { - fprintf(stderr, "Caught signal %d. Exiting.\n", signal); - ob_exit(); + ob_debug("Caught signal %d. Exiting.\n", signal); + /* TERM and INT return a 0 code */ + ob_exit(!(signal == SIGTERM || signal == SIGINT)); } } static void print_version() { - g_print("Openbox %s\n\n", PACKAGE_VERSION); + g_print("Openbox %s\n", PACKAGE_VERSION); + 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"); @@ -330,28 +352,28 @@ static void print_version() static void print_help() { - print_version(); g_print("Syntax: openbox [options]\n\n"); g_print("Options:\n\n"); #ifdef USE_SM g_print(" --sm-disable Disable connection to session manager\n"); g_print(" --sm-client-id ID Specify session management ID\n"); - g_print(" --sm-save-file FILE Specify file to load a saved session\n" - " from\n"); + g_print(" --sm-save-file FILE Specify file to load a saved session" + "from\n"); #endif g_print(" --replace Replace the currently running window " "manager\n"); g_print(" --help Display this help and exit\n"); g_print(" --version Display the version and exit\n"); - g_print(" --sync Run in synchronous mode (this is slow and\n" - " meant for debugging X routines)\n"); + g_print(" --sync Run in synchronous mode (this is slow and " + "meant for\n" + " debugging X routines)\n"); g_print(" --debug Display debugging output\n"); - g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT); + 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")) { @@ -392,11 +414,18 @@ void ob_restart_other(const gchar *path) void ob_restart() { restart = TRUE; - ob_exit(); + ob_exit(0); +} + +void ob_reconfigure() +{ + reconfigure = TRUE; + ob_exit(0); } -void ob_exit() +void ob_exit(gint code) { + exitcode = code; ob_main_loop_exit(ob_main_loop); } @@ -416,22 +445,3 @@ ObState ob_state() { return state; } - -gchar *ob_expand_tilde(const gchar *f) -{ - gchar **spl; - gchar *ret; - - if (!f) - return NULL; - spl = g_strsplit(f, "~", 0); - ret = g_strjoinv(g_get_home_dir(), spl); - g_strfreev(spl); - return ret; -} - -void ob_reconfigure() -{ - reconfigure = TRUE; - ob_exit(); -}