add some interesection shit, and RECT_LEFT/RIGHT/TOP/BOTTOM

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index feeb19d97916ed0ddc14ab47a1564a055e57a1ad..a3adb1028237857d8e565271e14fcb521bef2eba 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -218,6 +218,15 @@ int main(int argc, char **argv)
                     ob_exit_with_error("Unable to load a theme.");
             }
 
+            if (reconfigure) {
+                GList *it;
+
+                /* update all existing windows for the new theme */
+                for (it = client_list; it; it = g_list_next(it)) {
+                    ObClient *c = it->data;
+                    frame_adjust_theme(c->frame);
+                }
+            }
             event_startup(reconfigure);
             grab_startup(reconfigure);
             /* focus_backup is used for stacking, so this needs to come before
@@ -225,11 +234,11 @@ int main(int argc, char **argv)
             focus_startup(reconfigure);
             window_startup(reconfigure);
             sn_startup(reconfigure);
-            moveresize_startup(reconfigure);
             screen_startup(reconfigure);
             group_startup(reconfigure);
             client_startup(reconfigure);
             dock_startup(reconfigure);
+            moveresize_startup(reconfigure);
             keyboard_startup(reconfigure);
             mouse_startup(reconfigure);
             menu_startup(reconfigure);
@@ -243,7 +252,7 @@ int main(int argc, char **argv)
                 /* redecorate all existing windows */
                 for (it = client_list; it; it = g_list_next(it)) {
                     ObClient *c = it->data;
-                    frame_adjust_theme(c->frame);
+                    frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
                 }
             }
 
@@ -261,12 +270,12 @@ int main(int argc, char **argv)
             menu_shutdown(reconfigure);
             mouse_shutdown(reconfigure);
             keyboard_shutdown(reconfigure);
+            moveresize_shutdown(reconfigure);
             dock_shutdown(reconfigure);
             client_shutdown(reconfigure);
             group_shutdown(reconfigure);
             screen_shutdown(reconfigure);
             focus_shutdown(reconfigure);
-            moveresize_shutdown(reconfigure);
             sn_shutdown(reconfigure);
             window_shutdown(reconfigure);
             grab_shutdown(reconfigure);