remove an old plugin call

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 9916c12d3af1d26ef4b46d770ffea0e2ca4a690c..424b8a14b8b7ed01bdf55cfe227eeb14c067402e 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -7,6 +7,7 @@
 #include "openbox.h"
 #include "resist.h"
 #include "popup.h"
+#include "moveresize.h"
 #include "config.h"
 #include "render/render.h"
 #include "render/theme.h"
@@ -30,6 +31,12 @@ static Popup *popup = NULL;
 #define POPUP_X (10)
 #define POPUP_Y (10)
 
+static void client_dest(ObClient *c)
+{
+    if (moveresize_client == c)
+        moveresize_end(TRUE);    
+}
+
 void moveresize_startup()
 {
     XSetWindowAttributes attrib;
@@ -38,10 +45,14 @@ void moveresize_startup()
     popup_size_to_string(popup, "W:  0000  W:  0000");
 
     attrib.save_under = True;
+
+    client_add_destructor(client_dest);
 }
 
 void moveresize_shutdown()
 {
+    client_remove_destructor(client_dest);
+
     popup_free(popup);
     popup = NULL;
 }
@@ -133,10 +144,9 @@ void moveresize_end(gboolean cancel)
     popup_hide(popup);
 
     if (moving) {
-        client_configure(moveresize_client, OB_CORNER_TOPLEFT,
-                         (cancel ? start_cx : cur_x),
-                         (cancel ? start_cy : cur_y),
-                         start_cw, start_ch, TRUE, TRUE);
+        client_move(moveresize_client,
+                    (cancel ? start_cx : cur_x),
+                    (cancel ? start_cy : cur_y));
     } else {
         client_configure(moveresize_client, lockcorner,
                          moveresize_client->area.x,
@@ -158,8 +168,7 @@ static void do_move(gboolean resist)
 
     /* get where the client should be */
     frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
-    client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y,
-                     start_cw, start_ch, TRUE, FALSE);
+    client_move(moveresize_client, cur_x, cur_y);
 
     /* this would be better with a fixed width font ... XXX can do it better
        if there are 2 text boxes */