X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=3ad198664b74021b6ae26d4b27f9c1309093b2e7;hb=c4e4760c41f10aae6af19a4363cb247c71edee4b;hp=a3adb1028237857d8e565271e14fcb521bef2eba;hpb=0a220fb6a1756191e7865e20ff399676c7f2041f;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index a3adb102..3ad19866 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -1,3 +1,21 @@ +/* -*- indent-tabs-mode: t; 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 @@ -62,14 +79,13 @@ static gboolean restart; static char *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); int main(int argc, char **argv) { - char *path; - #ifdef DEBUG ob_debug_show_output(TRUE); #endif @@ -83,24 +99,10 @@ 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]); + parse_paths_startup(); + session_startup(&argc, &argv); /* parse out command line args */ @@ -228,13 +230,13 @@ int main(int argc, char **argv) } } 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); screen_startup(reconfigure); + grab_startup(reconfigure); group_startup(reconfigure); client_startup(reconfigure); dock_startup(reconfigure); @@ -274,11 +276,11 @@ int main(int argc, char **argv) dock_shutdown(reconfigure); client_shutdown(reconfigure); group_shutdown(reconfigure); + grab_shutdown(reconfigure); screen_shutdown(reconfigure); focus_shutdown(reconfigure); sn_shutdown(reconfigure); window_shutdown(reconfigure); - grab_shutdown(reconfigure); event_shutdown(reconfigure); config_shutdown(); } while (reconfigure); @@ -291,6 +293,8 @@ int main(int argc, char **argv) XCloseDisplay(ob_display); + parse_paths_shutdown(); + if (restart) { if (restart_path != NULL) { int argcp; @@ -312,7 +316,7 @@ 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) @@ -325,13 +329,15 @@ static void signal_handler(int signal, gpointer data) ob_reconfigure(); } else { fprintf(stderr, "Caught signal %d. Exiting.\n", signal); - ob_exit(); + /* 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"); @@ -339,23 +345,23 @@ 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) @@ -401,11 +407,18 @@ void ob_restart_other(const gchar *path) void ob_restart() { restart = TRUE; - ob_exit(); + ob_exit(0); } -void ob_exit() +void ob_reconfigure() { + reconfigure = TRUE; + ob_exit(0); +} + +void ob_exit(gint code) +{ + exitcode = code; ob_main_loop_exit(ob_main_loop); } @@ -425,22 +438,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(); -}