X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=b9a3309ef828edc88d7700a1f3d71d95bf33af2c;hb=3b2b0998fccb395f0ed83230ac640d9fec315151;hp=424b8a14b8b7ed01bdf55cfe227eeb14c067402e;hpb=9d42df6ab4099c9365d3631ea86348a8f21752a0;p=chaz%2Fopenbox

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 424b8a14..b9a3309e 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -79,8 +79,13 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
     moveresize_client = c;
     start_cx = c->frame->area.x;
     start_cy = c->frame->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. 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_x = x;
     start_y = y;
     corner = cnr;
@@ -164,11 +169,13 @@ static void do_move(gboolean resist)
     Rect *a;
 
     if (resist)
-        resist_move(moveresize_client, &cur_x, &cur_y);
+        resist_move_windows(moveresize_client, &cur_x, &cur_y);
+    resist_move_monitors(moveresize_client, &cur_x, &cur_y);
 
     /* get where the client should be */
     frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
-    client_move(moveresize_client, cur_x, cur_y);
+    client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y,
+                     start_cw, start_ch, TRUE, FALSE);
 
     /* this would be better with a fixed width font ... XXX can do it better
        if there are 2 text boxes */
@@ -180,20 +187,20 @@ static void do_move(gboolean resist)
 
 static void do_resize(gboolean resist)
 {
-    if (resist) {
-        /* resist_size needs the frame size */
-        cur_x += moveresize_client->frame->size.left +
-            moveresize_client->frame->size.right;
-        cur_y += moveresize_client->frame->size.top +
-            moveresize_client->frame->size.bottom;
-
-        resist_size(moveresize_client, &cur_x, &cur_y, lockcorner);
-
-        cur_x -= moveresize_client->frame->size.left +
-            moveresize_client->frame->size.right;
-        cur_y -= moveresize_client->frame->size.top +
-            moveresize_client->frame->size.bottom;
-    }
+    /* resist_size_* needs the frame size */
+    cur_x += moveresize_client->frame->size.left +
+        moveresize_client->frame->size.right;
+    cur_y += moveresize_client->frame->size.top +
+        moveresize_client->frame->size.bottom;
+
+    if (resist)
+        resist_size_windows(moveresize_client, &cur_x, &cur_y, lockcorner);
+    resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner);
+
+    cur_x -= moveresize_client->frame->size.left +
+        moveresize_client->frame->size.right;
+    cur_y -= moveresize_client->frame->size.top +
+        moveresize_client->frame->size.bottom;
     
     client_configure(moveresize_client, lockcorner, 
                      moveresize_client->area.x, moveresize_client->area.y,