#include "screen.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);
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",
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);
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),
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,
}
if (ob_rr_theme == NULL)
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;
+ Strut oldsize, newsize;
+ gint dx, dy;
+
+ oldsize = c->frame->size;
+ dx = dy = 0;
+
/* the new config can change the window's decorations */
- client_setup_decor_and_functions(c);
+ client_setup_decor_and_functions(c, TRUE);
/* redraw the frames */
frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
+
+ /* move windows if their decorations are a new size, based
+ on their gravity */
+ newsize = c->frame->size;
+
+ /* x coord */
+ switch (c->gravity) {
+ case NorthWestGravity:
+ case WestGravity:
+ case SouthWestGravity:
+ break;
+ case NorthGravity:
+ case CenterGravity:
+ case SouthGravity:
+ dx = (newsize.left - oldsize.left +
+ oldsize.right - newsize.right) / 2;
+ break;
+ case NorthEastGravity:
+ case EastGravity:
+ case SouthEastGravity:
+ dx = -(newsize.left - oldsize.left +
+ newsize.right - oldsize.right);
+
+ break;
+ case StaticGravity:
+ dx = -(newsize.left - oldsize.left);
+ break;
+ }
+
+ /* y coord */
+ switch (c->gravity) {
+ case NorthWestGravity:
+ case NorthGravity:
+ case NorthEastGravity:
+ break;
+ case WestGravity:
+ case CenterGravity:
+ case EastGravity:
+ dy = (newsize.top - oldsize.top +
+ oldsize.bottom - newsize.bottom) / 2;
+ break;
+ case SouthWestGravity:
+ case SouthGravity:
+ case SouthEastGravity:
+ dy = -(newsize.top - oldsize.top +
+ newsize.bottom - oldsize.bottom);
+
+ break;
+ case StaticGravity:
+ dx = -(newsize.top - oldsize.top);
+ break;
+ }
+
+ if (dx || dy)
+ client_move(c, c->area.x + dx, c->area.y + dy);
}
}
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);
}
}
- /* 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;
}
- /* we also remove some environment variables, so put them back */
- if (config_type)
- setenv("OPENBOX_CONFIG_NAMESPACE", config_type, 1);
-
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
execlp(argv[0], program_name, (gchar*)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);
g_free(program_name);
return exitcode;
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);
}
{
/* unset this so we don't pass it on unknowingly */
unsetenv("DESKTOP_STARTUP_ID");
-
- if (getenv("OPENBOX_CONFIG_NAMESPACE")) {
- config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
- /* don't pass it on except if we restart */
- unsetenv("OPENBOX_CONFIG_NAMESPACE");
- }
}
static void parse_args(gint *argc, gchar **argv)
ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
}
+ 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], "--sm-save-file")) {
if (i == *argc - 1) /* no args left */
else if (!strcmp(argv[i], "--sm-disable")) {
ob_sm_use = FALSE;
}
+ 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