X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=77bb036305c58f9b535b5e822cfd01795aa294f3;hb=dc6564619fdc9940a3d9db8528483c27f6bcb894;hp=c73e47dafa48de531a4c97a367d34cf93484d4de;hpb=50a0bf090b76a8fa6f9528365a3854a7657f96ff;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index c73e47da..77bb0363 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -28,6 +28,7 @@
 #include "xerror.h"
 #include "prop.h"
 #include "screen.h"
+#include "actions.h"
 #include "startupnotify.h"
 #include "focus.h"
 #include "focus_cycle.h"
@@ -41,7 +42,6 @@
 #include "menuframe.h"
 #include "grab.h"
 #include "group.h"
-#include "propwin.h"
 #include "config.h"
 #include "mainloop.h"
 #include "gettext.h"
@@ -128,7 +128,7 @@ gint main(gint argc, gchar **argv)
     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 */
@@ -154,7 +154,7 @@ gint main(gint argc, gchar **argv)
         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);
@@ -238,6 +238,8 @@ gint main(gint argc, gchar **argv)
                    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);
 
@@ -298,7 +300,6 @@ gint main(gint argc, gchar **argv)
             sn_startup(reconfigure);
             screen_startup(reconfigure);
             grab_startup(reconfigure);
-            propwin_startup(reconfigure);
             group_startup(reconfigure);
             client_startup(reconfigure);
             dock_startup(reconfigure);
@@ -330,72 +331,14 @@ gint main(gint argc, gchar **argv)
                 /* 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);
                 }
             }
 
@@ -418,7 +361,6 @@ gint main(gint argc, gchar **argv)
             dock_shutdown(reconfigure);
             client_shutdown(reconfigure);
             group_shutdown(reconfigure);
-            propwin_shutdown(reconfigure);
             grab_shutdown(reconfigure);
             screen_shutdown(reconfigure);
             focus_cycle_popup_shutdown(reconfigure);
@@ -429,6 +371,7 @@ gint main(gint argc, gchar **argv)
             window_shutdown(reconfigure);
             event_shutdown(reconfigure);
             config_shutdown();
+            actions_shutdown(reconfigure);
             modkeys_shutdown(reconfigure);
         } while (reconfigure);
     }
@@ -497,7 +440,7 @@ gint main(gint argc, gchar **argv)
     g_free(ob_sm_save_file);
     g_free(ob_sm_id);
     g_free(program_name);
-     
+
     return exitcode;
 }
 
@@ -510,7 +453,7 @@ static void signal_handler(gint signal, gpointer data)
         break;
     case SIGUSR2:
         ob_debug("Caught signal %d. Reconfiguring.\n", signal);
-        ob_reconfigure(); 
+        ob_reconfigure();
         break;
     case SIGCHLD:
         /* reap children */
@@ -568,7 +511,7 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num)
 static void parse_env()
 {
     /* unset this so we don't pass it on unknowingly */
-    unsetenv("DESKTOP_STARTUP_ID");
+    putenv("DESKTOP_STARTUP_ID");
 }
 
 static void parse_args(gint *argc, gchar **argv)