#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 "composite.h"
#include "frame.h"
#include "keyboard.h"
#include "mouse.h"
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);
window_startup(reconfigure);
sn_startup(reconfigure);
screen_startup(reconfigure);
+ composite_startup(reconfigure);
grab_startup(reconfigure);
propwin_startup(reconfigure);
group_startup(reconfigure);
/* redecorate all existing windows */
for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
- Strut oldsize, newsize;
- gint x, y;
-
- oldsize = c->frame->size;
- x = c->area.x;
- y = c->area.y;
/* 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:
- x += (newsize.left - oldsize.left +
- oldsize.right - newsize.right) / 2;
- break;
- case NorthEastGravity:
- case EastGravity:
- case SouthEastGravity:
- x -= (newsize.left - oldsize.left +
- newsize.right - oldsize.right);
-
- break;
- case StaticGravity:
- x -= newsize.left - oldsize.left;
- break;
- }
-
- /* y coord */
- switch (c->gravity) {
- case NorthWestGravity:
- case NorthGravity:
- case NorthEastGravity:
- break;
- case WestGravity:
- case CenterGravity:
- case EastGravity:
- y += (newsize.top - oldsize.top +
- oldsize.bottom - newsize.bottom) / 2;
- break;
- case SouthWestGravity:
- case SouthGravity:
- case SouthEastGravity:
- y -= (newsize.top - oldsize.top +
- newsize.bottom - oldsize.bottom);
-
- break;
- case StaticGravity:
- x -= newsize.top - oldsize.top;
- break;
- }
-
- if (x != c->area.x || y != c->area.y)
- client_move(c, x, y);
+ /* the decor sizes may have changed, so the windows may
+ end up in new positions */
+ client_reconfigure(c, FALSE);
}
}
group_shutdown(reconfigure);
propwin_shutdown(reconfigure);
grab_shutdown(reconfigure);
+ composite_shutdown(reconfigure);
screen_shutdown(reconfigure);
focus_cycle_popup_shutdown(reconfigure);
focus_cycle_indicator_shutdown(reconfigure);
window_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
+ actions_shutdown(reconfigure);
modkeys_shutdown(reconfigure);
} while (reconfigure);
}