#include "xerror.h"
#include "prop.h"
#include "screen.h"
+#include "actions.h"
#include "startupnotify.h"
#include "focus.h"
+#include "focus_cycle.h"
+#include "focus_cycle_indicator.h"
+#include "focus_cycle_popup.h"
#include "moveresize.h"
#include "frame.h"
#include "keyboard.h"
gboolean ob_sm_use = TRUE;
gchar *ob_sm_id = NULL;
gchar *ob_sm_save_file = NULL;
+gboolean ob_sm_restore = TRUE;
+gboolean ob_debug_xinerama = FALSE;
static ObState state;
static gboolean xsync = FALSE;
static gint exitcode = 0;
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 remove_args(gint *argc, gchar **argv, gint index, gint num);
+static void parse_env();
static void parse_args(gint *argc, gchar **argv);
static Cursor load_cursor(const gchar *name, guint fontval);
/* parse the command line args, which can change the argv[0] */
parse_args(&argc, argv);
+ /* parse the environment variables */
+ parse_env();
program_name = g_path_get_basename(argv[0]);
g_set_prgname(program_name);
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 from the DISPLAY environment variable."));
if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
- ob_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();
* remote_control = 1 -> reconfigure
* remote_control = 2 -> restart */
PROP_MSG(RootWindow(ob_display, ob_screen),
- openbox_control, remote_control, 0, 0, 0);
+ ob_control, remote_control, 0, 0, 0);
XCloseDisplay(ob_display);
exit(EXIT_SUCCESS);
}
ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
if (ob_rr_inst == NULL)
- ob_exit_with_error("Failed to initialize the render library.");
+ ob_exit_with_error(_("Failed to initialize the obrender library."));
XSynchronize(ob_display, xsync);
/* create available cursors */
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_BUSYPOINTER] = load_cursor("left_ptr_watch",XC_left_ptr);
+ cursors[OB_CURSOR_BUSY] = load_cursor("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",
cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
XC_top_left_corner);
- /* create available keycodes */
- keys[OB_KEY_RETURN] =
- XKeysymToKeycode(ob_display, XK_Return);
- keys[OB_KEY_ESCAPE] =
- XKeysymToKeycode(ob_display, XK_Escape);
- keys[OB_KEY_LEFT] =
- XKeysymToKeycode(ob_display, XK_Left);
- keys[OB_KEY_RIGHT] =
- XKeysymToKeycode(ob_display, XK_Right);
- keys[OB_KEY_UP] =
- XKeysymToKeycode(ob_display, XK_Up);
- keys[OB_KEY_DOWN] =
- XKeysymToKeycode(ob_display, XK_Down);
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
- if (screen_annex(program_name)) { /* it will be ours! */
+ if (screen_annex()) { /* it will be ours! */
do {
+ modkeys_startup(reconfigure);
+
+ /* get the keycodes for keys we use */
+ keys[OB_KEY_RETURN] = modkeys_sym_to_code(XK_Return);
+ keys[OB_KEY_ESCAPE] = modkeys_sym_to_code(XK_Escape);
+ keys[OB_KEY_LEFT] = modkeys_sym_to_code(XK_Left);
+ keys[OB_KEY_RIGHT] = modkeys_sym_to_code(XK_Right);
+ keys[OB_KEY_UP] = modkeys_sym_to_code(XK_Up);
+ keys[OB_KEY_DOWN] = modkeys_sym_to_code(XK_Down);
+
{
ObParseInst *i;
xmlDocPtr doc;
xmlNodePtr node;
- modkeys_startup(reconfigure);
-
/* startup the parsing so everything can register sections
of the rc */
i = parse_startup();
+ /* register all the available actions */
+ actions_startup(reconfigure);
/* start up config which sets up with the parser */
config_startup(i);
/* parse/load user options */
- if (parse_load_rc(config_type, &doc, &node)) {
+ if (parse_load_rc(NULL, &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);
+ ob_config, config_type);
+*/
/* we're done with parsing now, kill it */
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, TRUE,
config_font_activewindow,
config_font_inactivewindow,
config_font_menutitle,
ob_rr_theme = theme;
}
if (ob_rr_theme == NULL)
- ob_exit_with_error("Unable to load a theme.");
+ ob_exit_with_error(_("Unable to load a theme."));
+
+ PROP_SETS(RootWindow(ob_display, ob_screen),
+ ob_theme, ob_rr_theme->name);
}
if (reconfigure) {
/* focus_backup is used for stacking, so this needs to come before
anything that calls stacking_add */
focus_startup(reconfigure);
+ focus_cycle_startup(reconfigure);
+ focus_cycle_indicator_startup(reconfigure);
+ focus_cycle_popup_startup(reconfigure);
window_startup(reconfigure);
sn_startup(reconfigure);
screen_startup(reconfigure);
moveresize_startup(reconfigure);
keyboard_startup(reconfigure);
mouse_startup(reconfigure);
- menu_startup(reconfigure);
menu_frame_startup(reconfigure);
+ menu_startup(reconfigure);
if (!reconfigure) {
guint32 xid;
/* 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);
+ client_setup_decor_and_functions(c, FALSE);
/* redraw the frames */
frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
+ /* the decor sizes may have changed, so the windows may
+ end up in new positions */
+ client_reconfigure(c, FALSE);
}
}
client_unmanage_all();
}
- menu_frame_shutdown(reconfigure);
menu_shutdown(reconfigure);
+ menu_frame_shutdown(reconfigure);
mouse_shutdown(reconfigure);
keyboard_shutdown(reconfigure);
moveresize_shutdown(reconfigure);
propwin_shutdown(reconfigure);
grab_shutdown(reconfigure);
screen_shutdown(reconfigure);
+ focus_cycle_popup_shutdown(reconfigure);
+ focus_cycle_indicator_shutdown(reconfigure);
+ focus_cycle_shutdown(reconfigure);
focus_shutdown(reconfigure);
sn_shutdown(reconfigure);
window_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
+ actions_shutdown(reconfigure);
modkeys_shutdown(reconfigure);
} while (reconfigure);
}
}
}
- /* we remove the session arguments from argv, so put them back */
+ /* we remove the session arguments from argv, so put them back,
+ also don't restore the session on restart */
if (ob_sm_save_file != NULL || ob_sm_id != NULL) {
gchar **nargv;
gint i, l;
- l = argc +
+ l = argc + 1 +
(ob_sm_save_file != NULL ? 2 : 0) +
(ob_sm_id != NULL ? 2 : 0);
nargv = g_new0(gchar*, l+1);
nargv[i++] = g_strdup("--sm-client-id");
nargv[i++] = ob_sm_id;
}
+ nargv[i++] = g_strdup("--sm-no-load");
g_assert(i == l);
argv = nargv;
}
/* 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);
g_free(program_name);
return exitcode;
{
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 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(_(" --replace Replace the currently running window manager\n"));
+ g_print(_(" --sm-disable Disable connection to the session manager\n"));
g_print(_("\nPassing messages to a running Openbox instance:\n"));
g_print(_(" --reconfigure Reload Openbox's configuration\n"));
+ g_print(_(" --restart Restart Openbox\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(_(" --debug-xinerama Split the display into fake xinerama screens\n"));
g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT);
}
{
gint i;
- for (i = index; i < index + num; ++i)
+ for (i = index; i < *argc - num; ++i)
argv[i] = argv[i+num];
for (; i < *argc; ++i)
argv[i] = NULL;
*argc -= num;
}
+static void parse_env()
+{
+ /* unset this so we don't pass it on unknowingly */
+ unsetenv("DESKTOP_STARTUP_ID");
+}
+
static void parse_args(gint *argc, gchar **argv)
{
gint i;
if (!strcmp(argv[i], "--version")) {
print_version();
exit(0);
- } else if (!strcmp(argv[i], "--help")) {
+ }
+ else if (!strcmp(argv[i], "--help")) {
print_help();
exit(0);
- } else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+ }
+ else if (!strcmp(argv[i], "--g-fatal-warnings")) {
g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
- } else if (!strcmp(argv[i], "--replace")) {
+ }
+ else if (!strcmp(argv[i], "--replace")) {
ob_replace_wm = TRUE;
- } else if (!strcmp(argv[i], "--sync")) {
+ remove_args(argc, argv, i, 1);
+ --i; /* this arg was removed so go back */
+ }
+ else if (!strcmp(argv[i], "--sync")) {
xsync = TRUE;
- } else if (!strcmp(argv[i], "--debug")) {
+ }
+ 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")) {
+ }
+ 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")) {
+ }
+ else if (!strcmp(argv[i], "--debug-xinerama")) {
+ ob_debug_xinerama = TRUE;
+ }
+ else if (!strcmp(argv[i], "--reconfigure")) {
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 */
/* not translated cuz it's sekret */
ob_sm_save_file = g_strdup(argv[i+1]);
remove_args(argc, argv, i, 2);
--i; /* this arg was removed so go back */
+ ob_debug_type(OB_DEBUG_SM, "--sm-save-file %s\n",
+ ob_sm_save_file);
}
- } else if (!strcmp(argv[i], "--sm-client-id")) {
+ }
+ else if (!strcmp(argv[i], "--sm-client-id")) {
if (i == *argc - 1) /* no args left */
/* not translated cuz it's sekret */
g_printerr("--sm-client-id requires an argument\n");
ob_sm_id = g_strdup(argv[i+1]);
remove_args(argc, argv, i, 2);
--i; /* this arg was removed so go back */
+ ob_debug_type(OB_DEBUG_SM, "--sm-client-id %s\n", ob_sm_id);
}
- } else if (!strcmp(argv[i], "--sm-disable")) {
+ }
+ else if (!strcmp(argv[i], "--sm-disable")) {
ob_sm_use = FALSE;
}
-#endif
- else if (!strcmp(argv[i], "--restart-binary")) {
- if (i == *argc - 1) /* no args left */
- /* not translated cuz it's sekret */
- g_printerr("--restart-binary requires an argument\n");
- else {
- argv[0] = g_strdup(argv[i+1]);
- remove_args(argc, argv, i, 2);
- --i; /* this arg was removed so go back */
- }
- } else {
+ else if (!strcmp(argv[i], "--sm-no-load")) {
+ ob_sm_restore = FALSE;
+ remove_args(argc, argv, i, 1);
+ --i; /* this arg was removed so go back */
+ }
+ else {
/* this is a memleak.. oh well.. heh */
gchar *err = g_strdup_printf
- ("Invalid command line argument '%s'\n", argv[i]);
+ (_("Invalid command line argument '%s'\n"), argv[i]);
ob_exit_with_error(err);
}
}
void ob_exit_with_error(const gchar *msg)
{
- g_critical(msg);
+ g_message(msg);
session_shutdown(TRUE);
exit(EXIT_FAILURE);
}
projects / chaz / openbox / blobdiff