+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ openbox.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
+ 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"
#include "client.h"
#include "xerror.h"
#include "prop.h"
-#include "startup.h"
#include "screen.h"
+#include "startupnotify.h"
#include "focus.h"
#include "moveresize.h"
#include "frame.h"
#include "keyboard.h"
#include "mouse.h"
#include "extensions.h"
+#include "menuframe.h"
#include "grab.h"
#include "group.h"
#include "config.h"
# include <fcntl.h>
#endif
#ifdef HAVE_SIGNAL_H
-#define __USE_UNIX98
# include <signal.h>
#endif
#ifdef HAVE_STDLIB_H
# include <sys/stat.h>
# include <sys/types.h>
#endif
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/types.h>
+# include <sys/wait.h>
+#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <errno.h>
#include <X11/cursorfont.h>
ObMainLoop *ob_main_loop;
Display *ob_display;
gint ob_screen;
-gboolean ob_sm_use = TRUE;
-gchar *ob_sm_id;
-gboolean ob_replace_wm;
+gboolean ob_replace_wm = FALSE;
static ObState state;
-static gboolean xsync;
-static gboolean restart;
-static char *restart_path;
+static gboolean xsync = FALSE;
+static gboolean reconfigure = FALSE;
+static gboolean restart = FALSE;
+static gchar *restart_path = NULL;
static Cursor cursors[OB_NUM_CURSORS];
static KeyCode keys[OB_NUM_KEYS];
-static gchar *sm_save_file;
+static gint exitcode = 0;
+static gboolean reconfigure_and_exit = FALSE;
-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;
- xmlDocPtr doc;
- xmlNodePtr node;
-
#ifdef DEBUG
ob_debug_show_output(TRUE);
#endif
/* 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);
- /* 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 */
parse_args(argc, 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.");
/* set up signal handler */
ob_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL, NULL);
+ ob_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL, NULL);
ob_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL, NULL);
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);
-
- if (sm_save_file)
- session_load(sm_save_file);
- session_startup(argc, argv);
-
-#ifdef USE_LIBSN
- ob_sn_display = sn_display_new(ob_display, NULL, NULL);
-#endif
+ ob_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL, NULL);
ob_screen = DefaultScreen(ob_display);
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);
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
/* create available cursors */
+ cursors[OB_CURSOR_NONE] = None;
cursors[OB_CURSOR_POINTER] =
XCreateFontCursor(ob_display, XC_left_ptr);
cursors[OB_CURSOR_BUSY] =
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
- /* save stuff that we can use to restore state */
- startup_save();
-
if (screen_annex()) { /* it will be ours! */
- ObParseInst *i;
-
- /* startup the parsing so everything can register sections of the rc */
- i = parse_startup();
-
- event_startup();
- grab_startup();
- /* focus_backup is used for stacking, so this needs to come before
- anything that calls stacking_add */
- focus_startup();
- window_startup();
-
- /* set up the kernel config shit */
- config_startup(i);
- /* parse/load user options */
- if (parse_load_rc(&doc, &node))
- parse_tree(i, doc, node->xmlChildrenNode);
- /* we're done with parsing now, kill it */
- xmlFreeDoc(doc);
- parse_shutdown(i);
-
- /* load the theme specified in the rc file */
- ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
- if (ob_rr_theme == NULL)
- ob_exit_with_error("Unable to load a theme.");
-
- moveresize_startup();
- screen_startup();
- group_startup();
- client_startup();
- dock_startup();
- keyboard_startup();
- mouse_startup();
- menu_startup();
-
- /* get all the existing windows */
- client_manage_all();
-
- state = OB_STATE_RUNNING;
- ob_main_loop_run(ob_main_loop);
- state = OB_STATE_EXITING;
-
- dock_remove_all();
- client_unmanage_all();
-
- menu_shutdown();
- mouse_shutdown();
- keyboard_shutdown();
- dock_shutdown();
- client_shutdown();
- group_shutdown();
- screen_shutdown();
- focus_shutdown();
- moveresize_shutdown();
- window_shutdown();
- grab_shutdown();
- event_shutdown();
- config_shutdown();
+ do {
+ {
+ ObParseInst *i;
+ xmlDocPtr doc;
+ xmlNodePtr node;
+
+ /* startup the parsing so everything can register sections
+ of the rc */
+ i = parse_startup();
+
+ config_startup(i);
+ /* parse/load user options */
+ if (parse_load_rc(&doc, &node))
+ parse_tree(i, doc, node->xmlChildrenNode);
+ /* we're done with parsing now, kill it */
+ parse_close(doc);
+ parse_shutdown(i);
+ }
+
+ /* load the theme specified in the rc file */
+ {
+ RrTheme *theme;
+ if ((theme = RrThemeNew(ob_rr_inst, config_theme))) {
+ RrThemeFree(ob_rr_theme);
+ ob_rr_theme = theme;
+ }
+ if (ob_rr_theme == NULL)
+ 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);
+ /* 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);
+ moveresize_startup(reconfigure);
+ keyboard_startup(reconfigure);
+ mouse_startup(reconfigure);
+ menu_startup(reconfigure);
+
+ 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_area(c->frame, TRUE, TRUE, FALSE);
+ }
+ }
+
+ reconfigure = FALSE;
+
+ state = OB_STATE_RUNNING;
+ ob_main_loop_run(ob_main_loop);
+ state = OB_STATE_EXITING;
+
+ if (!reconfigure) {
+ dock_remove_all();
+ client_unmanage_all();
+ }
+
+ 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);
+ sn_shutdown(reconfigure);
+ window_shutdown(reconfigure);
+ event_shutdown(reconfigure);
+ config_shutdown();
+ } while (reconfigure);
}
+ XSync(ob_display, FALSE);
+
RrThemeFree(ob_rr_theme);
RrInstanceFree(ob_rr_inst);
session_shutdown();
- g_free(ob_sm_id);
-
-#ifdef USE_LIBSN
- sn_display_unref(ob_sn_display);
-#endif
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 */
+ /* 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);
}
}
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
+ execlp(argv[0], g_path_get_basename(argv[0]),
+ (char *)NULL); /* 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);
+ switch (signal) {
+ case SIGUSR1:
+ ob_debug("Caught signal %d. Restarting.\n", signal);
ob_restart();
- } else {
- fprintf(stderr, "Caught signal %d. Exiting.\n", signal);
- ob_exit();
+ 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));
}
}
static void print_version()
{
- g_print("Openbox %s\n\n", PACKAGE_VERSION);
+ g_print("Openbox %s\n", PACKAGE_VERSION);
+ g_print("Copyright (c) 2006 Mikael Magnusson\n");
+ g_print("Copyright (c) 2003 Ben Jansens\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)
+static void parse_args(gint argc, gchar **argv)
{
- int i;
+ gint i;
for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "--version")) {
xsync = TRUE;
} else if (!strcmp(argv[i], "--debug")) {
ob_debug_show_output(TRUE);
-#ifdef USE_SM
- } else if (!strcmp(argv[i], "--sm-client-id")) {
- if (i == argc - 1) /* no args left */
- g_printerr(_("--sm-client-id requires an argument\n"));
- else
- ob_sm_id = g_strdup(argv[++i]);
- } else if (!strcmp(argv[i], "--sm-save-file")) {
- if (i == argc - 1) /* no args left */
- g_printerr(_("--sm-save-file requires an argument\n"));
- else
- sm_save_file = argv[++i];
- } else if (!strcmp(argv[i], "--sm-disable")) {
- ob_sm_use = FALSE;
-#endif
} else {
g_printerr("Invalid option: '%s'\n\n", argv[i]);
print_help();
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);
}
{
return state;
}
-
-gchar *ob_expand_tilde(const gchar *f)
-{
- if (!f)
- return NULL;
- else if (f[0] != '~')
- return g_strdup(f);
- else
- return g_strconcat(g_get_home_dir(), f+1, NULL);
-}
projects / chaz / openbox / blobdiff