openbox.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ 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 "openbox.h"
#include "session.h"
#include "dock.h"
+#include "modkeys.h"
#include "event.h"
#include "menu.h"
#include "client.h"
#include <errno.h>
#include <X11/cursorfont.h>
+#if USE_XCURSOR
+#include <X11/Xcursor/Xcursor.h>
+#endif
RrInstance *ob_rr_inst;
RrTheme *ob_rr_theme;
Display *ob_display;
gint ob_screen;
gboolean ob_replace_wm = FALSE;
+gboolean ob_sm_use = TRUE;
+gchar *ob_sm_id = NULL;
+gchar *ob_sm_save_file = NULL;
static ObState state;
static gboolean xsync = FALSE;
static Cursor cursors[OB_NUM_CURSORS];
static KeyCode keys[OB_NUM_KEYS];
static gint exitcode = 0;
-static gboolean reconfigure_and_exit = FALSE;
+static guint remote_control = 0;
+static gboolean being_replaced = FALSE;
+static gchar *config_type = NULL;
static void signal_handler(gint signal, gpointer data);
-static void parse_args(gint argc, gchar **argv);
+static void parse_env(char **argv0);
+static void remove_args(gint *argc, gchar **argv, gint index, gint num);
+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 out command line args */
- parse_args(argc, argv);
+ /* parse out environment and command line args */
+ parse_env(&argv[0]);
+ parse_args(&argc, argv);
- if (!reconfigure_and_exit) {
+ 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.");
if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
ob_exit_with_error("Failed to set display as close-on-exec.");
- if (reconfigure_and_exit) {
- guint32 pid;
- gboolean ret;
+ if (remote_control) {
+ prop_startup();
- prop_startup(); /* get atoms values for the display */
- ret = PROP_GET32(RootWindow(ob_display, DefaultScreen(ob_display)),
- openbox_pid, cardinal, &pid);
+ /* Send client message telling the OB process to:
+ * remote_control = 1 -> reconfigure
+ * remote_control = 2 -> restart */
+ PROP_MSG(RootWindow(ob_display, ob_screen),
+ openbox_control, remote_control, 0, 0, 0);
XCloseDisplay(ob_display);
- if (!ret) {
- g_print("Openbox does not appear to be running on this "
- "display.\n");
- } else {
- g_print("Telling the Openbox process # %u to reconfigure.\n", pid);
- ret = (kill(pid, SIGUSR2) == 0);
- if (!ret)
- g_print("Error: %s.\n", strerror(errno));
- }
- exit(ret ? EXIT_SUCCESS : EXIT_FAILURE);
+ exit(EXIT_SUCCESS);
}
ob_main_loop = ob_main_loop_new(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] =
xmlDocPtr doc;
xmlNodePtr node;
+ modkeys_startup(reconfigure);
+
/* startup the parsing so everything can register sections
of the rc */
i = parse_startup();
+ /* start up config which sets up with the parser */
config_startup(i);
+
/* parse/load user options */
- if (parse_load_rc(&doc, &node))
+ if (parse_load_rc(config_type, &doc, &node)) {
parse_tree(i, doc, node->xmlChildrenNode);
+ parse_close(doc);
+ } else
+ g_message(_("Unable to find a valid config file, using some simple defaults"));
+
+ if (config_type != NULL)
+ PROP_SETS(RootWindow(ob_display, ob_screen),
+ openbox_config, config_type);
+
/* we're done with parsing now, kill it */
- parse_close(doc);
parse_shutdown(i);
}
config_font_activewindow,
config_font_inactivewindow,
config_font_menutitle,
- config_font_menuitem)))
+ config_font_menuitem,
+ config_font_osd)))
{
RrThemeFree(ob_rr_theme);
ob_rr_theme = theme;
keyboard_startup(reconfigure);
mouse_startup(reconfigure);
menu_startup(reconfigure);
+ menu_frame_startup(reconfigure);
if (!reconfigure) {
+ guint32 xid;
+ ObWindow *w;
+
/* get all the existing windows */
client_manage_all();
- focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+ focus_nothing();
+
+ /* focus what was focused if a wm was already running */
+ if (PROP_GET32(RootWindow(ob_display, ob_screen),
+ net_active_window, window, &xid) &&
+ (w = g_hash_table_lookup(window_map, &xid)) &&
+ WINDOW_IS_CLIENT(w))
+ {
+ client_focus(WINDOW_AS_CLIENT(w));
+ }
} else {
GList *it;
client_unmanage_all();
}
+ menu_frame_shutdown(reconfigure);
menu_shutdown(reconfigure);
mouse_shutdown(reconfigure);
keyboard_shutdown(reconfigure);
window_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
+ modkeys_shutdown(reconfigure);
} while (reconfigure);
}
RrThemeFree(ob_rr_theme);
RrInstanceFree(ob_rr_inst);
- session_shutdown();
+ session_shutdown(being_replaced);
XCloseDisplay(ob_display);
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);
}
}
+ /* we remove the session arguments from argv, so put them back */
+ if (ob_sm_save_file != NULL) {
+ guint l = g_strv_length(argv);
+ argv = g_renew(gchar*, argv, l+2);
+ argv[l] = g_strdup("--sm-save-file");
+ argv[l+1] = ob_sm_save_file;
+ argv[l+2] = NULL;
+ }
+ if (ob_sm_id != NULL) {
+ guint l = g_strv_length(argv);
+ argv = g_renew(gchar*, argv, l+2);
+ argv[l] = g_strdup("--sm-client-id");
+ argv[l+1] = ob_sm_id;
+ argv[l+2] = NULL;
+ }
+
/* 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 */
}
+
+ /* free stuff passed in from the command line or environment */
+ g_free(ob_sm_save_file);
+ g_free(ob_sm_id);
+ g_free(config_type);
return exitcode;
}
static void print_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(_("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(" --reconfigure Tell the currently running instance of "
- "Openbox to\n"
- " reconfigure (and then exit immediately)\n");
+ g_print(_("Syntax: openbox [options]\n"));
+ g_print(_("\nOptions:\n"));
+ g_print(_(" --config TYPE Specify the configuration profile to use\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 the session manager\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(_("\nPassing messages to a running Openbox instance:\n"));
+ g_print(_(" --reconfigure Reload Openbox's configuration\n"));
+ g_print(_("\nOptions for internal use:\n"));
+ g_print(_(" --sm-save-file FILE Specify file to load a saved session from\n"));
+ g_print(_(" --sm-client-id ID Specify session management ID\n"));
+ g_print(_("\nDebugging options:\n"));
+ g_print(_(" --sync Run in synchronous mode\n"));
+ g_print(_(" --debug Display debugging output\n"));
+ g_print(_(" --debug-focus Display debugging output for focus handling\n"));
+ g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT);
+}
+
+static void parse_env(gchar **argv0)
+{
+ const char *c;
+
+ /* pretend we are this other application */
+ if ((c = getenv("OPENBOX_RESTART_BINARY")))
+ *argv0 = g_strdup(c);
+ unsetenv("OPENBOX_RESTART_BINARY");
+}
+
+static void remove_args(gint *argc, gchar **argv, gint index, gint num)
+{
+ gint i;
+
+ for (i = index; i < index + num; ++i)
+ argv[i] = argv[i+num];
+ for (; i < *argc; ++i)
+ argv[i] = NULL;
+ *argc -= num;
}
-static void parse_args(gint argc, gchar **argv)
+static void parse_args(gint *argc, gchar **argv)
{
gint i;
- for (i = 1; i < argc; ++i) {
+ for (i = 1; i < *argc; ++i) {
if (!strcmp(argv[i], "--version")) {
print_version();
exit(0);
xsync = TRUE;
} else if (!strcmp(argv[i], "--debug")) {
ob_debug_show_output(TRUE);
+ ob_debug_enable(OB_DEBUG_SM, TRUE);
+ ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
+ } else if (!strcmp(argv[i], "--debug-focus")) {
+ ob_debug_show_output(TRUE);
+ ob_debug_enable(OB_DEBUG_SM, TRUE);
+ ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
+ ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
} else if (!strcmp(argv[i], "--reconfigure")) {
- reconfigure_and_exit = TRUE;
+ remote_control = 1;
+/* don't make this do anything if it's not in --help ..
+ } else if (!strcmp(argv[i], "--restart")) {
+ remote_control = 2;
+*/
+ } else if (!strcmp(argv[i], "--config")) {
+ if (i == *argc - 1) /* no args left */
+ g_printerr(_("--config requires an argument\n"));
+ else {
+ config_type = g_strdup(argv[i+1]);
+ ++i;
+ }
+ }
+#ifdef USE_SM
+ 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 {
+ ob_sm_save_file = g_strdup(argv[i+1]);
+ remove_args(argc, argv, i, 2);
+ --i; /* this arg was removed so go back */
+ }
+ } 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+1]);
+ remove_args(argc, argv, i, 2);
+ --i; /* this arg was removed so go back */
+ }
+ } else if (!strcmp(argv[i], "--sm-disable")) {
+ ob_sm_use = FALSE;
+ }
+#endif
+ else {
+ /* this is a memleak.. oh well.. heh */
+ gchar *err = g_strdup_printf
+ ("Invalid command line argument '%s'\n", argv[i]);
+ ob_exit_with_error(err);
}
}
}
-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