X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fresist.c;h=33281d6a38daefff2ade2585fee8bb95718f53da;hb=e8c1967aa21b69582f8679525543bed49007fc58;hp=a41c5a9d8b5da509857d83ae9aee7f1d866d34aa;hpb=35ed95fe18e9b8d7a79f79f4fd7466a2b46435e3;p=chaz%2Fopenbox

diff --git a/openbox/resist.c b/openbox/resist.c
index a41c5a9d..33281d6a 100644
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -1,4 +1,3 @@
-#include "dispatch.h"
 #include "client.h"
 #include "frame.h"
 #include "stacking.h"
@@ -8,13 +7,10 @@
 
 #include <glib.h>
 
-void resist_move(ObClient *c, gint *x, gint *y)
+void resist_move_windows(ObClient *c, gint *x, gint *y)
 {
     GList *it;
-    Rect *area;
-    guint i;
     gint l, t, r, b; /* requested edges */
-    gint al, at, ar, ab; /* screen area edges */
     gint cl, ct, cr, cb; /* current edges */
     gint w, h; /* current size */
     ObClient *snapx = NULL, *snapy = NULL;
@@ -27,12 +23,11 @@ void resist_move(ObClient *c, gint *x, gint *y)
     r = l + w - 1;
     b = t + h - 1;
 
-    cl = c->frame->area.x;
-    ct = c->frame->area.y;
-    cr = cl + c->frame->area.width - 1;
-    cb = ct + c->frame->area.height - 1;
+    cl = RECT_LEFT(c->frame->area);
+    ct = RECT_TOP(c->frame->area);
+    cr = RECT_RIGHT(c->frame->area);
+    cb = RECT_BOTTOM(c->frame->area);
     
-    /* snap to other clients */
     if (config_resist_win)
         for (it = stacking_list; it != NULL; it = it->next) {
             ObClient *target;
@@ -44,10 +39,10 @@ void resist_move(ObClient *c, gint *x, gint *y)
             /* don't snap to self or non-visibles */
             if (!target->frame->visible || target == c) continue; 
 
-            tl = target->frame->area.x - 1;
-            tt = target->frame->area.y - 1;
-            tr = tl + target->frame->area.width + 1;
-            tb = tt + target->frame->area.height + 1;
+            tl = RECT_LEFT(target->frame->area) - 1;
+            tt = RECT_TOP(target->frame->area) - 1;
+            tr = RECT_RIGHT(target->frame->area)+ 2;
+            tb = RECT_BOTTOM(target->frame->area) + 2;
 
             /* snapx and snapy ensure that the window snaps to the top-most
                window edge available, without going all the way from
@@ -92,8 +87,30 @@ void resist_move(ObClient *c, gint *x, gint *y)
 
             if (snapx && snapy) break;
         }
+}
 
-    /* get the screen boundaries */
+void resist_move_monitors(ObClient *c, gint *x, gint *y)
+{
+    Rect *area;
+    guint i;
+    gint l, t, r, b; /* requested edges */
+    gint al, at, ar, ab; /* screen area edges */
+    gint cl, ct, cr, cb; /* current edges */
+    gint w, h; /* current size */
+
+    w = c->frame->area.width;
+    h = c->frame->area.height;
+
+    l = *x;
+    t = *y;
+    r = l + w - 1;
+    b = t + h - 1;
+
+    cl = RECT_LEFT(c->frame->area);
+    ct = RECT_TOP(c->frame->area);
+    cr = RECT_RIGHT(c->frame->area);
+    cb = RECT_BOTTOM(c->frame->area);
+    
     if (config_resist_edge) {
         for (i = 0; i < screen_num_monitors; ++i) {
             area = screen_area_monitor(c->desktop, i);
@@ -101,12 +118,11 @@ void resist_move(ObClient *c, gint *x, gint *y)
             if (!RECT_INTERSECTS_RECT(*area, c->frame->area))
                 continue;
 
-            al = area->x;
-            at = area->y;
-            ar = al + area->width - 1;
-            ab = at + area->height - 1;
+            al = RECT_LEFT(*area);
+            at = RECT_TOP(*area);
+            ar = RECT_RIGHT(*area);
+            ab = RECT_BOTTOM(*area);
 
-            /* snap to screen edges */
             if (cl >= al && l < al && l >= al - config_resist_edge)
                 *x = al;
             else if (cr <= ar && r > ar && r <= ar + config_resist_edge)
@@ -119,34 +135,24 @@ void resist_move(ObClient *c, gint *x, gint *y)
     }
 }
 
-void resist_size(ObClient *c, gint *w, gint *h, ObCorner corn)
+void resist_size_windows(ObClient *c, gint *w, gint *h, ObCorner corn)
 {
     GList *it;
     ObClient *target; /* target */
     gint l, t, r, b; /* my left, top, right and bottom sides */
     gint dlt, drb; /* my destination left/top and right/bottom sides */
     gint tl, tt, tr, tb; /* target's left, top, right and bottom bottom sides*/
-    Rect *area;
-    gint al, at, ar, ab; /* screen boundaries */
+    gint incw, inch;
     ObClient *snapx = NULL, *snapy = NULL;
 
-    /* don't snap windows with size increments */
-    if (c->size_inc.width > 1 || c->size_inc.height > 1)
-        return;
+    incw = c->size_inc.width;
+    inch = c->size_inc.height;
 
-    l = c->frame->area.x;
-    r = l + c->frame->area.width - 1;
-    t = c->frame->area.y;
-    b = t + c->frame->area.height - 1;
+    l = RECT_LEFT(c->frame->area);
+    r = RECT_RIGHT(c->frame->area);
+    t = RECT_TOP(c->frame->area);
+    b = RECT_BOTTOM(c->frame->area);
 
-    /* get the screen boundaries */
-    area = screen_area(c->desktop);
-    al = area->x;
-    at = area->y;
-    ar = al + area->width - 1;
-    ab = at + area->height - 1;
-
-    /* snap to other windows */
     if (config_resist_win) {
         for (it = stacking_list; it != NULL; it = it->next) {
             if (!WINDOW_IS_CLIENT(it->data))
@@ -156,10 +162,10 @@ void resist_size(ObClient *c, gint *w, gint *h, ObCorner corn)
             /* don't snap to invisibles or ourself */
             if (!target->frame->visible || target == c) continue;
 
-            tl = target->frame->area.x;
-            tr = target->frame->area.x + target->frame->area.width - 1;
-            tt = target->frame->area.y;
-            tb = target->frame->area.y + target->frame->area.height - 1;
+            tl = RECT_LEFT(target->frame->area);
+            tr = RECT_RIGHT(target->frame->area);
+            tt = RECT_TOP(target->frame->area);
+            tb = RECT_BOTTOM(target->frame->area);
 
             if (snapx == NULL) {
                 /* horizontal snapping */
@@ -213,8 +219,30 @@ void resist_size(ObClient *c, gint *w, gint *h, ObCorner corn)
             if (snapx && snapy) break;
         }
     }
+}
 
-    /* snap to screen edges */
+void resist_size_monitors(ObClient *c, gint *w, gint *h, ObCorner corn)
+{
+    gint l, t, r, b; /* my left, top, right and bottom sides */
+    gint dlt, drb; /* my destination left/top and right/bottom sides */
+    Rect *area;
+    gint al, at, ar, ab; /* screen boundaries */
+    gint incw, inch;
+
+    l = RECT_LEFT(c->frame->area);
+    r = RECT_RIGHT(c->frame->area);
+    t = RECT_TOP(c->frame->area);
+    b = RECT_BOTTOM(c->frame->area);
+
+    incw = c->size_inc.width;
+    inch = c->size_inc.height;
+
+    /* get the screen boundaries */
+    area = screen_area(c->desktop);
+    al = RECT_LEFT(*area);
+    at = RECT_TOP(*area);
+    ar = RECT_RIGHT(*area);
+    ab = RECT_BOTTOM(*area);
 
     if (config_resist_edge) {
         /* horizontal snapping */