X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=0abb8e8d5a8d53fbda25ec1122653b464bfabc28;hb=0f544808b8372a6c8a2cbfae214f2803dd3c6170;hp=82a9dec8d6174f2e66c9895a37b2ca83a3399f56;hpb=5e5fdb1666ac4877ca4d26f5ca565a299bc4cc42;p=chaz%2Fopenbox

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 82a9dec8..0abb8e8d 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -34,16 +34,18 @@ static void client_dest(gpointer client)
         moveresize_end(TRUE);    
 }
 
-void moveresize_startup()
+void moveresize_startup(gboolean reconfig)
 {
     popup = popup_new(FALSE);
 
-    client_add_destructor(client_dest);
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void moveresize_shutdown()
+void moveresize_shutdown(gboolean reconfig)
 {
-    client_remove_destructor(client_dest);
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
     popup_free(popup);
     popup = NULL;
@@ -69,6 +71,9 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 
     g_assert(!moveresize_in_progress);
 
+    if (!c->frame->visible)
+        return;
+
     moveresize_client = c;
     start_cx = c->frame->area.x;
     start_cy = c->frame->area.y;
@@ -77,8 +82,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;
@@ -137,7 +142,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);