+/* -*- 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-2007 Dana 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 "dock.h"
#include "event.h"
#include "menu.h"
#include "client.h"
-#include "dispatch.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 "plugin.h"
-#include "timer.h"
#include "group.h"
#include "config.h"
+#include "mainloop.h"
#include "gettext.h"
#include "parser/parse.h"
#include "render/render.h"
# include <fcntl.h>
#endif
#ifdef HAVE_SIGNAL_H
-#define __USE_UNIX98
# include <signal.h>
#endif
#ifdef HAVE_STDLIB_H
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
# include <sys/types.h>
#endif
-
-#ifdef USE_SM
-#include <X11/SM/SMlib.h>
+#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>
-
-#ifdef USE_SM
-gboolean ob_sm_use = TRUE;
-SmcConn ob_sm_conn;
-gchar *ob_sm_id;
+#if USE_XCURSOR
+#include <X11/Xcursor/Xcursor.h>
#endif
RrInstance *ob_rr_inst;
RrTheme *ob_rr_theme;
+ObMainLoop *ob_main_loop;
Display *ob_display;
gint ob_screen;
-Cursor ob_cursors[OB_NUM_CURSORS];
-KeyCode ob_keys[OB_NUM_KEYS];
+gboolean ob_replace_wm = FALSE;
static ObState state;
-static gboolean sync;
-static gboolean shutdown;
-static gboolean restart;
-static char *restart_path;
-
-static void signal_handler(const ObEvent *e, void *data);
-static void parse_args(int argc, char **argv);
-
-static void sm_startup(int argc, char **argv);
-static void sm_shutdown();
-
-#ifdef USE_SM
-static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
- Bool shutdown, int interact_style, Bool fast);
-static void sm_die(SmcConn conn, SmPointer data);
-static void sm_save_complete(SmcConn conn, SmPointer data);
-static void sm_shutdown_cancelled(SmcConn conn, SmPointer data);
-#endif
-static void exit_with_error(gchar *msg);
-
-int main(int argc, char **argv)
+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 gint exitcode = 0;
+static guint remote_control = 0;
+static gboolean being_replaced = FALSE;
+static gchar *config_file = NULL;
+
+static void signal_handler(gint signal, gpointer data);
+static void parse_args(gint argc, gchar **argv);
+static Cursor load_cursor(const gchar *name, guint fontval);
+
+gint main(gint argc, gchar **argv)
{
- struct sigaction action;
- sigset_t sigset;
- char *path;
- xmlDocPtr doc;
- xmlNodePtr node;
-
state = OB_STATE_STARTING;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
- g_warning("Couldn't set locale from environment.\n");
+ g_message(_("Couldn't set locale from environment."));
bindtextdomain(PACKAGE_NAME, LOCALEDIR);
bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
textdomain(PACKAGE_NAME);
- /* start our event dispatcher and register for signals */
- dispatch_startup();
- dispatch_register(Event_Signal, signal_handler, NULL);
-
- /* set up signal handler */
- sigemptyset(&sigset);
- action.sa_handler = dispatch_signal;
- action.sa_mask = sigset;
- action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
- sigaction(SIGUSR1, &action, (struct sigaction *) NULL);
- sigaction(SIGPIPE, &action, (struct sigaction *) NULL);
-/* sigaction(SIGSEGV, &action, (struct sigaction *) NULL);*/
- sigaction(SIGFPE, &action, (struct sigaction *) NULL);
- sigaction(SIGTERM, &action, (struct sigaction *) NULL);
- sigaction(SIGINT, &action, (struct sigaction *) NULL);
- sigaction(SIGHUP, &action, (struct sigaction *) NULL);
-
- /* 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);
-
g_set_prgname(argv[0]);
+
+ if (chdir(g_get_home_dir()) == -1)
+ g_message(_("Unable to change to home directory (%s): %s"),
+ g_get_home_dir(), g_strerror(errno));
/* parse out command line args */
parse_args(argc, argv);
+ if (!remote_control) {
+ parse_paths_startup();
+
+ session_startup(argc, argv);
+ }
+
ob_display = XOpenDisplay(NULL);
if (ob_display == NULL)
- 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)
- exit_with_error("Failed to set display as close-on-exec.");
+ ob_exit_with_error("Failed to set display as close-on-exec.");
+
+ if (remote_control) {
+ prop_startup();
+
+ /* Send client message telling the OB process to:
+ * remote_control = 1 -> reconfigure
+ * remote_control = 2 -> restart */
+ PROP_MSG(RootWindow(ob_display, ob_screen),
+ ob_control, remote_control, 0, 0, 0);
+ XCloseDisplay(ob_display);
+ exit(EXIT_SUCCESS);
+ }
- sm_startup(argc, argv);
+ ob_main_loop = ob_main_loop_new(ob_display);
-#ifdef USE_LIBSN
- ob_sn_display = sn_display_new(ob_display, NULL, NULL);
-#endif
+ /* 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);
+ ob_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL, NULL);
ob_screen = DefaultScreen(ob_display);
ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
if (ob_rr_inst == NULL)
- exit_with_error("Failed to initialize the render library.");
+ ob_exit_with_error("Failed to initialize the render library.");
- /* XXX fork self onto other screens */
-
- XSynchronize(ob_display, sync);
+ XSynchronize(ob_display, xsync);
/* check for locale support */
if (!XSupportsLocale())
- g_warning("X server does not support locale.");
+ g_message(_("X server does not support locale."));
if (!XSetLocaleModifiers(""))
- g_warning("Cannot set locale modifiers for the X server.");
+ g_message(_("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 */
- ob_cursors[OB_CURSOR_POINTER] =
- XCreateFontCursor(ob_display, XC_left_ptr);
- ob_cursors[OB_CURSOR_BUSY] =
- XCreateFontCursor(ob_display, XC_watch);
- ob_cursors[OB_CURSOR_MOVE] =
- XCreateFontCursor(ob_display, XC_fleur);
- ob_cursors[OB_CURSOR_NORTH] =
- XCreateFontCursor(ob_display, XC_top_side);
- ob_cursors[OB_CURSOR_NORTHEAST] =
- XCreateFontCursor(ob_display, XC_top_right_corner);
- ob_cursors[OB_CURSOR_EAST] =
- XCreateFontCursor(ob_display, XC_right_side);
- ob_cursors[OB_CURSOR_SOUTHEAST] =
- XCreateFontCursor(ob_display, XC_bottom_right_corner);
- ob_cursors[OB_CURSOR_SOUTH] =
- XCreateFontCursor(ob_display, XC_bottom_side);
- ob_cursors[OB_CURSOR_SOUTHWEST] =
- XCreateFontCursor(ob_display, XC_bottom_left_corner);
- ob_cursors[OB_CURSOR_WEST] =
- XCreateFontCursor(ob_display, XC_left_side);
- ob_cursors[OB_CURSOR_NORTHWEST] =
- XCreateFontCursor(ob_display, XC_top_left_corner);
+ cursors[OB_CURSOR_NONE] = None;
+ cursors[OB_CURSOR_POINTER] = load_cursor("left_ptr", XC_left_ptr);
+ cursors[OB_CURSOR_BUSY] = load_cursor("left_ptr_watch", XC_watch);
+ cursors[OB_CURSOR_MOVE] = load_cursor("fleur", XC_fleur);
+ cursors[OB_CURSOR_NORTH] = load_cursor("top_side", XC_top_side);
+ cursors[OB_CURSOR_NORTHEAST] = load_cursor("top_right_corner",
+ XC_top_right_corner);
+ cursors[OB_CURSOR_EAST] = load_cursor("right_side", XC_right_side);
+ cursors[OB_CURSOR_SOUTHEAST] = load_cursor("bottom_right_corner",
+ XC_bottom_right_corner);
+ cursors[OB_CURSOR_SOUTH] = load_cursor("bottom_side", XC_bottom_side);
+ cursors[OB_CURSOR_SOUTHWEST] = load_cursor("bottom_left_corner",
+ XC_bottom_left_corner);
+ cursors[OB_CURSOR_WEST] = load_cursor("left_side", XC_left_side);
+ cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
+ XC_top_left_corner);
/* create available keycodes */
- ob_keys[OB_KEY_RETURN] =
+ keys[OB_KEY_RETURN] =
XKeysymToKeycode(ob_display, XStringToKeysym("Return"));
- ob_keys[OB_KEY_ESCAPE] =
+ keys[OB_KEY_ESCAPE] =
XKeysymToKeycode(ob_display, XStringToKeysym("Escape"));
- ob_keys[OB_KEY_LEFT] =
+ keys[OB_KEY_LEFT] =
XKeysymToKeycode(ob_display, XStringToKeysym("Left"));
- ob_keys[OB_KEY_RIGHT] =
+ keys[OB_KEY_RIGHT] =
XKeysymToKeycode(ob_display, XStringToKeysym("Right"));
- ob_keys[OB_KEY_UP] =
+ keys[OB_KEY_UP] =
XKeysymToKeycode(ob_display, XStringToKeysym("Up"));
- ob_keys[OB_KEY_DOWN] =
+ keys[OB_KEY_DOWN] =
XKeysymToKeycode(ob_display, XStringToKeysym("Down"));
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! */
- /* startup the parsing so everything can register sections of the rc */
- parse_startup();
-
- /* anything that is going to read data from the rc file needs to be
- in this group */
- timer_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();
- plugin_startup();
- /* load the plugins specified in the pluginrc */
- plugin_loadall();
-
- /* set up the kernel config shit */
- config_startup();
- menu_startup();
- /* parse/load user options */
- if (parse_load_rc(&doc, &node))
- parse_tree(doc, node->xmlChildrenNode, NULL);
- /* we're done with parsing now, kill it */
- parse_shutdown();
-
- /* load the theme specified in the rc file */
- ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
- if (ob_rr_theme == NULL)
- exit_with_error("Unable to load a theme.");
-
- frame_startup();
- moveresize_startup();
- screen_startup();
- group_startup();
- client_startup();
- dock_startup();
-
- /* call startup for all the plugins */
- plugin_startall();
-
- /* get all the existing windows */
- client_manage_all();
-
- state = OB_STATE_RUNNING;
- while (!shutdown)
- event_loop();
- state = OB_STATE_EXITING;
-
- dock_remove_all();
- client_unmanage_all();
-
- plugin_shutdown(); /* calls all the plugins' shutdown functions */
- dock_shutdown();
- client_shutdown();
- group_shutdown();
- screen_shutdown();
- focus_shutdown();
- moveresize_shutdown();
- frame_shutdown();
- menu_shutdown();
- window_shutdown();
- grab_shutdown();
- event_shutdown();
- timer_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(config_file, &doc, &node, &config_file)) {
+ PROP_SETS(RootWindow(ob_display, ob_screen),
+ openbox_rc, config_file);
+ parse_tree(i, doc, node->xmlChildrenNode);
+ } else {
+ g_message(_("Unable to find a valid config file, using "
+ "some simple defaults"));
+ PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc);
+ }
+ /* 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,
+ config_font_activewindow,
+ config_font_inactivewindow,
+ config_font_menutitle,
+ config_font_menuitem)))
+ {
+ 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);
+ menu_frame_startup(reconfigure);
+
+ if (!reconfigure) {
+ /* get all the existing windows */
+ client_manage_all();
+ focus_fallback(TRUE);
+ } else {
+ GList *it;
+
+ /* redecorate all existing windows */
+ for (it = client_list; it; it = g_list_next(it)) {
+ ObClient *c = it->data;
+ /* the new config can change the window's decorations */
+ client_setup_decor_and_functions(c);
+ /* redraw the frames */
+ 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_frame_shutdown(reconfigure);
+ 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);
}
- dispatch_shutdown();
+ XSync(ob_display, FALSE);
+ g_free(config_file); /* this is set by parse_load_rc */
RrThemeFree(ob_rr_theme);
RrInstanceFree(ob_rr_inst);
- sm_shutdown();
+ session_shutdown(being_replaced);
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_message(_("Restart failed to execute new executable "
+ "'%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;
-}
-
-static void sm_startup(int argc, char **argv)
-{
-#ifdef USE_SM
-
-#define SM_ERR_LEN 1024
-
- SmcCallbacks cb;
- char sm_err[SM_ERR_LEN];
-
- cb.save_yourself.callback = sm_save_yourself;
- cb.save_yourself.client_data = NULL;
-
- cb.die.callback = sm_die;
- cb.die.client_data = NULL;
-
- cb.save_complete.callback = sm_save_complete;
- cb.save_complete.client_data = NULL;
-
- cb.shutdown_cancelled.callback = sm_shutdown_cancelled;
- cb.shutdown_cancelled.client_data = NULL;
-
- ob_sm_conn = SmcOpenConnection(NULL, NULL, 1, 0,
- SmcSaveYourselfProcMask |
- SmcDieProcMask |
- SmcSaveCompleteProcMask |
- SmcShutdownCancelledProcMask,
- &cb, ob_sm_id, &ob_sm_id,
- SM_ERR_LEN, sm_err);
- if (ob_sm_conn == NULL)
- g_warning("Failed to connect to session manager: %s", sm_err);
- else {
- SmPropValue val_prog;
- SmPropValue val_uid;
- SmPropValue val_hint;
- SmPropValue val_pri;
- SmPropValue val_pid;
- SmProp prop_cmd = { SmCloneCommand, SmLISTofARRAY8, 1, };
- SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8, };
- SmProp prop_prog = { SmProgram, SmARRAY8, 1, };
- SmProp prop_uid = { SmUserID, SmARRAY8, 1, };
- SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
- SmProp prop_pid = { SmProcessID, SmARRAY8, 1, };
- SmProp prop_pri = { "_GSM_Priority", SmCARD8, 1, };
- SmProp *props[7];
- gulong hint, pri;
- gchar pid[32];
- gint i, j;
- gboolean has_id;
-
- for (i = 1; i < argc - 1; ++i)
- if (strcmp(argv[i], "--sm-client-id") == 0)
- break;
- has_id = (i < argc - 1);
-
- prop_cmd.vals = g_new(SmPropValue, (has_id ? argc-2 : argc));
- prop_cmd.num_vals = (has_id ? argc-2 : argc);
- for (i = 0, j = 0; i < argc; ++i, ++j) {
- if (strcmp (argv[i], "--sm-client-id") == 0) {
- ++i, --j; /* skip the next as well, keep j where it is */
- } else {
- prop_cmd.vals[j].value = argv[i];
- prop_cmd.vals[j].length = strlen(argv[i]);
- }
- }
-
- prop_res.vals = g_new(SmPropValue, (has_id ? argc : argc+2));
- prop_res.num_vals = (has_id ? argc : argc+2);
- for (i = 0, j = 0; i < argc; ++i, ++j) {
- if (strcmp (argv[i], "--sm-client-id") == 0) {
- ++i, --j; /* skip the next as well, keep j where it is */
- } else {
- prop_res.vals[j].value = argv[i];
- prop_res.vals[j].length = strlen(argv[i]);
- }
- }
- prop_res.vals[j].value = "--sm-client-id";
- prop_res.vals[j++].length = strlen("--sm-client-id");
- prop_res.vals[j].value = ob_sm_id;
- prop_res.vals[j++].length = strlen(ob_sm_id);
-
- val_prog.value = argv[0];
- val_prog.length = strlen(argv[0]);
-
- val_uid.value = g_strdup(g_get_user_name());
- val_uid.length = strlen(val_uid.value);
-
- hint = SmRestartImmediately;
- val_hint.value = &hint;
- val_hint.length = 1;
-
- sprintf(pid, "%ld", (long)getpid());
- val_pid.value = pid;
- val_pid.length = strlen(pid);
-
- /* priority with gnome-session-manager, low to run before other apps */
- pri = 20;
- val_pri.value = &pri;
- val_pri.length = 1;
-
- prop_prog.vals = &val_prog;
- prop_uid.vals = &val_uid;
- prop_hint.vals = &val_hint;
- prop_pid.vals = &val_pid;
- prop_pri.vals = &val_pri;
-
- props[0] = &prop_prog;
- props[1] = &prop_cmd;
- props[2] = &prop_res;
- props[3] = &prop_uid;
- props[4] = &prop_hint;
- props[5] = &prop_pid;
- props[6] = &prop_pri;
-
- SmcSetProperties(ob_sm_conn, 7, props);
-
- g_free(val_uid.value);
- g_free(prop_cmd.vals);
- g_free(prop_res.vals);
-
- g_message("Connected to session manager with id %s", ob_sm_id);
- }
- g_free (ob_sm_id);
-#endif
+ return exitcode;
}
-static void sm_shutdown()
+static void signal_handler(gint signal, gpointer data)
{
-#ifdef USE_SM
- if (ob_sm_conn) {
- SmPropValue val_hint;
- SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
- SmProp *props[1];
- gulong hint;
-
- /* when we exit, we want to reset this to a more friendly state */
- hint = SmRestartIfRunning;
- val_hint.value = &hint;
- val_hint.length = 1;
-
- prop_hint.vals = &val_hint;
-
- props[0] = &prop_hint;
-
- SmcSetProperties(ob_sm_conn, 1, props);
-
- SmcCloseConnection(ob_sm_conn, 0, NULL);
- }
-#endif
-}
-
-static void signal_handler(const ObEvent *e, void *data)
-{
- int s;
-
- s = e->data.s.signal;
- switch (s) {
+ switch (signal) {
case SIGUSR1:
- fprintf(stderr, "Caught SIGUSR1 signal. Restarting.");
+ ob_debug("Caught signal %d. Restarting.\n", signal);
ob_restart();
- break;
-
- case SIGHUP:
- case SIGINT:
- case SIGTERM:
- case SIGPIPE:
- fprintf(stderr, "Caught signal %d. Exiting.", s);
- ob_exit();
- break;
-
- case SIGFPE:
- case SIGSEGV:
- fprintf(stderr, "Caught signal %d. Aborting and dumping core.", s);
- abort();
+ 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)"));
+ g_print(" 2007 Mikael Magnusson\n");
+ g_print(_("Copyright (c)"));
+ g_print(" 2003-2007 Dana 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");
+ g_print(_("Syntax: openbox [options]\n\n"));
+ g_print(_("Options:\n\n"));
+ g_print(_(" --reconfigure Tell the currently running instance of "
+ "Openbox to\n"
+ " reconfigure (and then exit "
+ "immediately)\n"));
+ g_print(_(" --config-file FILE Specify the file to load for the config "
+ "file\n"));
#ifdef USE_SM
- g_print(" --sm-client-id ID Specify session management ID\n");
- g_print(" --sm-disable Disable connection to session manager\n");
+ 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"
+ "from\n"));
#endif
- 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("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
+ 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"
+ " meant for\n"
+ " debugging X routines)\n"));
+ g_print(_(" --debug Display debugging output\n"));
+ g_print(_(" --debug-focus 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")) {
} else if (!strcmp(argv[i], "--help")) {
print_help();
exit(0);
+ } else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+ g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+ } else if (!strcmp(argv[i], "--replace")) {
+ ob_replace_wm = TRUE;
} else if (!strcmp(argv[i], "--sync")) {
- sync = TRUE;
-#ifdef USE_SM
- } else if (!strcmp(argv[i], "--sm-client-id")) {
+ xsync = TRUE;
+ } else if (!strcmp(argv[i], "--debug")) {
+ ob_debug_show_output(TRUE);
+ } else if (!strcmp(argv[i], "--debug-focus")) {
+ ob_debug_show_output(TRUE);
+ ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
+ } else if (!strcmp(argv[i], "--reconfigure")) {
+ remote_control = 1;
+ } else if (!strcmp(argv[i], "--restart")) {
+ remote_control = 2;
+ } else if (!strcmp(argv[i], "--config-file")) {
if (i == argc - 1) /* no args left */
- g_printerr(_("--sm-client-id requires an argument\n"));
- else
- ob_sm_id = 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();
- exit(1);
+ g_printerr(_("--config-file requires an argument\n"));
+ else {
+ config_file = g_strdup(argv[i+1]);
+ ++i;
+ }
}
}
}
-gboolean ob_pointer_pos(int *x, int *y)
+static Cursor load_cursor(const gchar *name, guint fontval)
{
- Window w;
- int i;
- guint u;
-
- return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),
- &w, &w, x, y, &i, &i, &u);
-}
-
-#ifdef USE_SM
-static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
- Bool shutdown, int interact_style, Bool fast)
-{
- g_message("got SAVE YOURSELF from session manager");
- SmcSaveYourselfDone(conn, TRUE);
-}
-
-static void sm_die(SmcConn conn, SmPointer data)
-{
- ob_exit();
- g_message("got DIE from session manager");
-}
+ Cursor c = None;
-static void sm_save_complete(SmcConn conn, SmPointer data)
-{
- g_message("got SAVE COMPLETE from session manager");
-}
-
-static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
-{
- g_message("got SHUTDOWN CANCELLED from session manager");
-}
+#if USE_XCURSOR
+ c = XcursorLibraryLoadCursor(ob_display, name);
#endif
+ if (c == None)
+ c = XCreateFontCursor(ob_display, fontval);
+ return c;
+}
-static void exit_with_error(gchar *msg)
+void ob_exit_with_error(const gchar *msg)
{
g_critical(msg);
- sm_shutdown();
+ session_shutdown(TRUE);
exit(EXIT_FAILURE);
}
void ob_restart()
{
restart = TRUE;
- ob_exit();
+ ob_exit(0);
+}
+
+void ob_reconfigure()
+{
+ reconfigure = TRUE;
+ ob_exit(0);
+}
+
+void ob_exit(gint code)
+{
+ exitcode = code;
+ ob_main_loop_exit(ob_main_loop);
}
-void ob_exit()
+void ob_exit_replace()
{
- shutdown = TRUE;
+ exitcode = 0;
+ being_replaced = TRUE;
+ ob_main_loop_exit(ob_main_loop);
}
Cursor ob_cursor(ObCursor cursor)
{
g_assert(cursor < OB_NUM_CURSORS);
- return ob_cursors[cursor];
+ return cursors[cursor];
}
KeyCode ob_keycode(ObKey key)
{
g_assert(key < OB_NUM_KEYS);
- return ob_keys[key];
+ return keys[key];
}
ObState ob_state()
projects / chaz / openbox / blobdiff