X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=openbox%2Fresist.c;h=49875fbb7ca02153b7f2d9c8dfbb75af20e298d3;hb=97792a403a52c12c2601a7b2caebdea197f0b5f0;hp=077c46677413f45db27e0f75917d5b479557a98c;hpb=8ae589465fc2d89857a8a9e5782cb297e8dc58aa;p=chaz%2Fopenbox

diff --git a/openbox/resist.c b/openbox/resist.c
index 077c4667..49875fbb 100644
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -36,6 +36,8 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
 
     if (!resist) return;
 
+    frame_client_gravity(c->frame, x, y);
+
     w = c->frame->area.width;
     h = c->frame->area.height;
 
@@ -59,10 +61,8 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
 
         /* don't snap to self or non-visibles */
         if (!target->frame->visible || target == c) continue; 
-
-        /* don't snap to windows in layers beneath */
-        if(target->layer < c->layer && !config_resist_layers_below)
-            continue;
+        /* don't snap to windows set to below and skip_taskbar (desklets) */
+        if (target->below && !c->below && target->skip_taskbar) continue;
 
         tl = RECT_LEFT(target->frame->area) - 1;
         tt = RECT_TOP(target->frame->area) - 1;
@@ -112,6 +112,8 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
 
         if (snapx && snapy) break;
     }
+
+    frame_frame_gravity(c->frame, x, y);
 }
 
 void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
@@ -123,9 +125,12 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
     gint pl, pt, pr, pb; /* physical screen area edges */
     gint cl, ct, cr, cb; /* current edges */
     gint w, h; /* current size */
+    Rect desired_area;
 
     if (!resist) return;
 
+    frame_client_gravity(c->frame, x, y);
+
     w = c->frame->area.width;
     h = c->frame->area.height;
 
@@ -138,13 +143,19 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
     ct = RECT_TOP(c->frame->area);
     cr = RECT_RIGHT(c->frame->area);
     cb = RECT_BOTTOM(c->frame->area);
+
+    RECT_SET(desired_area, *x, *y, c->area.width, c->area.height);
     
     for (i = 0; i < screen_num_monitors; ++i) {
-        area = screen_area_monitor(c->desktop, i);
         parea = screen_physical_area_monitor(i);
 
-        if (!RECT_INTERSECTS_RECT(*parea, c->frame->area))
+        if (!RECT_INTERSECTS_RECT(*parea, c->frame->area)) {
+            g_free(parea);
             continue;
+        }
+
+        area = screen_area(c->desktop, SCREEN_AREA_ALL_MONITORS,
+                           &desired_area);
 
         al = RECT_LEFT(*area);
         at = RECT_TOP(*area);
@@ -172,7 +183,12 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
             *y = pt;
         else if (cb <= pb && b > pb && b < pb + resist)
             *y = pb - h + 1;
+
+        g_free(area);
+        g_free(parea);
     }
+
+    frame_frame_gravity(c->frame, x, y);
 }
 
 void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
@@ -203,10 +219,8 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
 
         /* don't snap to invisibles or ourself */
         if (!target->frame->visible || target == c) continue; 
-
-        /* don't snap to windows in layers beneath */
-        if(target->layer < c->layer && !config_resist_layers_below)
-            continue;
+        /* don't snap to windows set to below and skip_taskbar (desklets) */
+        if (target->below && !c->below && target->skip_taskbar) continue;
 
         tl = RECT_LEFT(target->frame->area);
         tr = RECT_RIGHT(target->frame->area);
@@ -276,6 +290,7 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
     gint pl, pt, pr, pb; /* physical screen boundaries */
     gint incw, inch;
     guint i;
+    Rect desired_area;
 
     if (!resist) return;
 
@@ -287,12 +302,18 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
     incw = c->size_inc.width;
     inch = c->size_inc.height;
 
+    RECT_SET(desired_area, c->area.x, c->area.y, *w, *h);
+
     for (i = 0; i < screen_num_monitors; ++i) {
-        area = screen_area_monitor(c->desktop, i);
         parea = screen_physical_area_monitor(i);
 
-        if (!RECT_INTERSECTS_RECT(*parea, c->frame->area))
+        if (!RECT_INTERSECTS_RECT(*parea, c->frame->area)) {
+            g_free(parea);
             continue;
+        }
+
+        area = screen_area(c->desktop, SCREEN_AREA_ALL_MONITORS,
+                           &desired_area);
 
         /* get the screen boundaries */
         al = RECT_LEFT(*area);
@@ -347,5 +368,8 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
                 *h = b - pt + 1;
             break;
         }
+
+        g_free(area);
+        g_free(parea);
     }
 }