/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
openbox.c for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ 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
# 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>
+#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;
-gboolean ob_replace_wm;
+gboolean ob_replace_wm = FALSE;
static ObState state;
-static gboolean xsync;
-static gboolean reconfigure;
-static gboolean restart;
-static gchar *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 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)
{
-#ifdef DEBUG
- ob_debug_show_output(TRUE);
-#endif
-
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);
g_set_prgname(argv[0]);
if (chdir(g_get_home_dir()) == -1)
- g_warning("Unable to change to home directory (%s): %s",
+ g_message(_("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);
+ if (!remote_control) {
+ parse_paths_startup();
+
+ session_startup(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.");
+ 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);
+ }
+
ob_main_loop = ob_main_loop_new(ob_display);
/* set up signal handler */
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);
/* 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);
/* create available cursors */
cursors[OB_CURSOR_NONE] = None;
- cursors[OB_CURSOR_POINTER] =
- XCreateFontCursor(ob_display, XC_left_ptr);
- cursors[OB_CURSOR_BUSY] =
- XCreateFontCursor(ob_display, XC_watch);
- cursors[OB_CURSOR_MOVE] =
- XCreateFontCursor(ob_display, XC_fleur);
- cursors[OB_CURSOR_NORTH] =
- XCreateFontCursor(ob_display, XC_top_side);
- cursors[OB_CURSOR_NORTHEAST] =
- XCreateFontCursor(ob_display, XC_top_right_corner);
- cursors[OB_CURSOR_EAST] =
- XCreateFontCursor(ob_display, XC_right_side);
- cursors[OB_CURSOR_SOUTHEAST] =
- XCreateFontCursor(ob_display, XC_bottom_right_corner);
- cursors[OB_CURSOR_SOUTH] =
- XCreateFontCursor(ob_display, XC_bottom_side);
- cursors[OB_CURSOR_SOUTHWEST] =
- XCreateFontCursor(ob_display, XC_bottom_left_corner);
- cursors[OB_CURSOR_WEST] =
- XCreateFontCursor(ob_display, XC_left_side);
- cursors[OB_CURSOR_NORTHWEST] =
- XCreateFontCursor(ob_display, XC_top_left_corner);
+ 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 */
keys[OB_KEY_RETURN] =
config_startup(i);
/* parse/load user options */
- if (parse_load_rc(&doc, &node))
+ 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))) {
+ 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;
}
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(OB_FOCUS_FALLBACK_NOFOCUS);
+ 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);
}
}
client_unmanage_all();
}
+ menu_frame_shutdown(reconfigure);
menu_shutdown(reconfigure);
mouse_shutdown(reconfigure);
keyboard_shutdown(reconfigure);
XSync(ob_display, FALSE);
+ g_free(config_file); /* this is set by parse_load_rc */
RrThemeFree(ob_rr_theme);
RrInstanceFree(ob_rr_inst);
- session_shutdown();
+ session_shutdown(being_replaced);
XCloseDisplay(ob_display);
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])); /* last resort */
+ execlp(argv[0], g_path_get_basename(argv[0]),
+ (char *)NULL); /* last resort */
}
return exitcode;
static void signal_handler(gint signal, gpointer data)
{
- if (signal == SIGUSR1) {
+ switch (signal) {
+ case SIGUSR1:
ob_debug("Caught signal %d. Restarting.\n", signal);
ob_restart();
- } else if (signal == SIGUSR2) {
+ break;
+ case SIGUSR2:
ob_debug("Caught signal %d. Reconfiguring.\n", signal);
- ob_reconfigure();
- } else {
+ 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", PACKAGE_VERSION);
- g_print("Copyright (c) 2003 Ben Jansens, and others\n\n");
+ 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()
{
- 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-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");
+ 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(" --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("\nPlease report bugs at %s\n\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(gint argc, gchar **argv)
xsync = TRUE;
} else if (!strcmp(argv[i], "--debug")) {
ob_debug_show_output(TRUE);
- } else {
- g_printerr("Invalid option: '%s'\n\n", argv[i]);
- print_help();
- exit(1);
+ } 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(_("--config-file requires an argument\n"));
+ else {
+ config_file = g_strdup(argv[i+1]);
+ ++i;
+ }
}
}
}
-void ob_exit_with_error(gchar *msg)
+static Cursor load_cursor(const gchar *name, guint fontval)
+{
+ Cursor c = None;
+
+#if USE_XCURSOR
+ c = XcursorLibraryLoadCursor(ob_display, name);
+#endif
+ if (c == None)
+ c = XCreateFontCursor(ob_display, fontval);
+ return c;
+}
+
+void ob_exit_with_error(const gchar *msg)
{
g_critical(msg);
- session_shutdown();
+ session_shutdown(TRUE);
exit(EXIT_FAILURE);
}
ob_main_loop_exit(ob_main_loop);
}
+void ob_exit_replace()
+{
+ exitcode = 0;
+ being_replaced = TRUE;
+ ob_main_loop_exit(ob_main_loop);
+}
+
Cursor ob_cursor(ObCursor cursor)
{
g_assert(cursor < OB_NUM_CURSORS);
projects / chaz / openbox / blobdiff