X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=9f1a9b04bbc787ff7e4de927d28a97f033a8946a;hb=c6f2875d61ce038bcc3b28e28aa26a0648efd752;hp=29f82cf062f05da19d92e146aaff26420cf61b89;hpb=9eed441c42d21049cc0621ec1fd920423875ff44;p=chaz%2Fopenbox

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 29f82cf0..9f1a9b04 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -167,14 +167,14 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
     moveresize_client = c;
     start_cx = c->area.x;
     start_cy = c->area.y;
+    start_cw = c->area.width;
+    start_ch = c->area.height;
     /* these adjustments for the size_inc make resizing a terminal more
        friendly. you essentially start the resize in the middle of the
        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. */
-    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;
+    start_x = x - c->size_inc.width / 2;
+    start_y = y - c->size_inc.height / 2;
     corner = cnr;
     button = b;
     key_resize_edge = -1;
@@ -195,7 +195,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
     moveresize_in_progress = TRUE;
 
 #ifdef SYNC
-    if (config_resize_redraw && !moving && extensions_shape &&
+    if (config_resize_redraw && !moving && extensions_sync &&
         moveresize_client->sync_request && moveresize_client->sync_counter)
     {
         /* Initialize values for the resize syncing, and create an alarm for
@@ -341,7 +341,7 @@ static void do_resize()
         waiting_for_sync = TRUE;
 
         ob_main_loop_timeout_remove(ob_main_loop, sync_timeout_func);
-        ob_main_loop_timeout_add(ob_main_loop, G_USEC_PER_SEC,
+        ob_main_loop_timeout_add(ob_main_loop, G_USEC_PER_SEC * 2,
                                  sync_timeout_func,
                                  NULL, NULL, NULL);
     }
@@ -716,7 +716,7 @@ gboolean moveresize_event(XEvent *e)
                 lockcorner = OB_CORNER_BOTTOMRIGHT;
             } else if (corner == prop_atoms.net_wm_moveresize_size_top) {
                 dw = 0;
-                dh = (e->xmotion.y_root - start_y);
+                dh = -(e->xmotion.y_root - start_y);
                 lockcorner = OB_CORNER_BOTTOMRIGHT;
             } else if (corner == prop_atoms.net_wm_moveresize_size_topright) {
                 dw = (e->xmotion.x_root - start_x);
@@ -753,7 +753,6 @@ gboolean moveresize_event(XEvent *e)
 
             dw -= cur_w - start_cw;
             dh -= cur_h - start_ch;
-            ob_debug("dw %d\n", dw);
 
             calc_resize(FALSE, 0, &dw, &dh, lockcorner);
             cur_w += dw;