#include "xerror.h"
#include "prop.h"
#include "screen.h"
+#include "actions.h"
#include "startupnotify.h"
#include "focus.h"
#include "focus_cycle.h"
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 the command line args, which can change the argv[0] */
parse_args(&argc, argv);
/* parse the environment variables */
prop_startup();
/* Send client message telling the OB process to:
- * remote_control = 1 -> reconfigure
+ * remote_control = 1 -> reconfigure
* remote_control = 2 -> restart */
PROP_MSG(RootWindow(ob_display, ob_screen),
ob_control, remote_control, 0, 0, 0);
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);
/* 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, TRUE);
+ client_setup_decor_and_functions(c, FALSE);
/* 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);
+ /* the decor sizes may have changed, so the windows may
+ end up in new positions */
+ client_reconfigure(c, FALSE);
}
}
window_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
+ actions_shutdown(reconfigure);
modkeys_shutdown(reconfigure);
} while (reconfigure);
}
g_free(ob_sm_save_file);
g_free(ob_sm_id);
g_free(program_name);
-
+
return exitcode;
}
break;
case SIGUSR2:
ob_debug("Caught signal %d. Reconfiguring.\n", signal);
- ob_reconfigure();
+ ob_reconfigure();
break;
case SIGCHLD:
/* reap children */