X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=6a0e97776514c67d9badf16242413af2e864f217;hb=dbd3e9b6b2b452e853a17352560b5a4b4c568e84;hp=722146aa9883420b8fbad0fab88baa465e6e59f2;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 722146aa..6a0e9777 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -26,7 +26,7 @@ static guint button;
 static guint32 corner;
 static ObCorner lockcorner;
 
-static Popup *popup = NULL;
+static ObPopup *popup = NULL;
 
 static void client_dest(gpointer client)
 {
@@ -44,8 +44,11 @@ void moveresize_startup(gboolean reconfig)
 
 void moveresize_shutdown(gboolean reconfig)
 {
-    if (!reconfig)
+    if (!reconfig) {
+        if (moveresize_in_progress)
+            moveresize_end(FALSE);
         client_remove_destructor(client_dest);
+    }
 
     popup_free(popup);
     popup = NULL;
@@ -61,7 +64,7 @@ static void popup_coords(ObClient *c, char *format, int a, int b)
                    c->area.width / 2,
                    c->frame->area.y + c->frame->size.top +
                    c->area.height / 2);
-    popup_show(popup, text, NULL);
+    popup_show(popup, text);
     g_free(text);
 }
 
@@ -69,7 +72,8 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 {
     ObCursor cur;
 
-    g_assert(!moveresize_in_progress);
+    if (moveresize_in_progress || !c->frame->visible)
+        return;
 
     moveresize_client = c;
     start_cx = c->frame->area.x;
@@ -79,8 +83,8 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
        increment instead of at 0, so you have to move half an increment
        either way instead of a full increment one and 1 px the other. and this
        is one large mother fucking comment. */
-    start_cw = c->area.width + (c->size_inc.width + 1) / 2;
-    start_ch = c->area.height + (c->size_inc.height + 1) / 2;
+    start_cw = c->area.width + c->size_inc.width / 2;
+    start_ch = c->area.height + c->size_inc.height / 2;
     start_x = x;
     start_y = y;
     corner = cnr;
@@ -139,7 +143,7 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 void moveresize_end(gboolean cancel)
 {
     grab_keyboard(FALSE);
-    grab_pointer(FALSE, None);
+    grab_pointer(FALSE, OB_CURSOR_NONE);
 
     popup_hide(popup);
 
@@ -168,7 +172,8 @@ 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);
+                     moveresize_client->area.width,
+                     moveresize_client->area.height, TRUE, FALSE);
 }
 
 static void do_resize(gboolean resist)