+/* -*- 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"
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);
if (!reconfigure) {
/* get all the existing windows */
client_manage_all();
+ focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
} else {
GList *it;
execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */
}
- return 0;
+ return exitcode;
}
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");
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)
void ob_restart()
{
restart = TRUE;
- ob_exit();
+ ob_exit(0);
}
void ob_reconfigure()
{
reconfigure = TRUE;
- ob_exit();
+ ob_exit(0);
}
-void ob_exit()
+void ob_exit(gint code)
{
+ exitcode = code;
ob_main_loop_exit(ob_main_loop);
}