See the COPYING file for a copy of the GNU General Public License.
*/
+#include "resist.h"
#include "client.h"
#include "frame.h"
#include "stacking.h"
#include "screen.h"
+#include "dock.h"
#include "config.h"
-#include "parser/parse.h"
#include <glib.h>
-void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
+static gboolean resist_move_window(Rect window,
+ Rect target, gint resist,
+ gint *x, gint *y)
{
- GList *it;
gint l, t, r, b; /* requested edges */
gint cl, ct, cr, cb; /* current edges */
gint w, h; /* current size */
- ObClient *snapx = NULL, *snapy = NULL;
-
- if (!resist) return;
+ gint tl, tt, tr, tb; /* 1 past the target's edges on each side */
+ gboolean snapx = 0, snapy = 0;
- frame_client_gravity(c->frame, x, y, c->area.width, c->area.height);
-
- w = c->frame->area.width;
- h = c->frame->area.height;
+ w = window.width;
+ h = window.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);
-
+ cl = RECT_LEFT(window);
+ ct = RECT_TOP(window);
+ cr = RECT_RIGHT(window);
+ cb = RECT_BOTTOM(window);
+
+ tl = RECT_LEFT(target) - 1;
+ tt = RECT_TOP(target) - 1;
+ tr = RECT_RIGHT(target) + 1;
+ tb = RECT_BOTTOM(target) + 1;
+
+ /* snapx and snapy ensure that the window snaps to the top-most
+ window edge available, without going all the way from
+ bottom-to-top in the stacking list
+ */
+ if (!snapx) {
+ if (ct < tb && cb > tt) {
+ if (cl >= tr && l < tr && l >= tr - resist)
+ *x = tr, snapx = TRUE;
+ else if (cr <= tl && r > tl &&
+ r <= tl + resist)
+ *x = tl - w + 1, snapx = TRUE;
+ if (snapx) {
+ /* try to corner snap to the window */
+ if (ct > tt && t <= tt &&
+ t > tt - resist)
+ *y = tt + 1, snapy = TRUE;
+ else if (cb < tb && b >= tb &&
+ b < tb + resist)
+ *y = tb - h, snapy = TRUE;
+ }
+ }
+ }
+ if (!snapy) {
+ if (cl < tr && cr > tl) {
+ if (ct >= tb && t < tb && t >= tb - resist)
+ *y = tb, snapy = TRUE;
+ else if (cb <= tt && b > tt &&
+ b <= tt + resist)
+ *y = tt - h + 1, snapy = TRUE;
+ if (snapy) {
+ /* try to corner snap to the window */
+ if (cl > tl && l <= tl &&
+ l > tl - resist)
+ *x = tl + 1, snapx = TRUE;
+ else if (cr < tr && r >= tr &&
+ r < tr + resist)
+ *x = tr - w, snapx = TRUE;
+ }
+ }
+ }
+
+ return snapx && snapy;
+}
+
+void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
+{
+ GList *it;
+ Rect dock_area;
+
+ if (!resist) return;
+
+ frame_client_gravity(c->frame, x, y);
+
+
for (it = stacking_list; it; it = g_list_next(it)) {
ObClient *target;
- gint tl, tt, tr, tb; /* 1 past the target's edges on each side */
if (!WINDOW_IS_CLIENT(it->data))
continue;
- /* only snap in the same layer */
- if (window_layer(it->data) != c->layer)
- continue;
target = it->data;
/* don't snap to self or non-visibles */
- if (!target->frame->visible || target == c) continue;
-
- tl = RECT_LEFT(target->frame->area) - 1;
- tt = RECT_TOP(target->frame->area) - 1;
- tr = RECT_RIGHT(target->frame->area) + 1;
- tb = RECT_BOTTOM(target->frame->area) + 1;
-
- /* snapx and snapy ensure that the window snaps to the top-most
- window edge available, without going all the way from
- bottom-to-top in the stacking list
- */
- if (snapx == NULL) {
- if (ct < tb && cb > tt) {
- if (cl >= tr && l < tr && l >= tr - resist)
- *x = tr, snapx = target;
- else if (cr <= tl && r > tl &&
- r <= tl + resist)
- *x = tl - w + 1, snapx = target;
- if (snapx != NULL) {
- /* try to corner snap to the window */
- if (ct > tt && t <= tt &&
- t > tt - resist)
- *y = tt + 1, snapy = target;
- else if (cb < tb && b >= tb &&
- b < tb + resist)
- *y = tb - h, snapy = target;
- }
- }
- }
- if (snapy == NULL) {
- if (cl < tr && cr > tl) {
- if (ct >= tb && t < tb && t >= tb - resist)
- *y = tb, snapy = target;
- else if (cb <= tt && b > tt &&
- b <= tt + resist)
- *y = tt - h + 1, snapy = target;
- if (snapy != NULL) {
- /* try to corner snap to the window */
- if (cl > tl && l <= tl &&
- l > tl - resist)
- *x = tl + 1, snapx = target;
- else if (cr < tr && r >= tr &&
- r < tr + resist)
- *x = tr - w, snapx = target;
- }
- }
- }
+ if (!target->frame->visible || target == c)
+ continue;
+ /* don't snap to windows set to below and skip_taskbar (desklets) */
+ if (target->below && !c->below && target->skip_taskbar)
+ continue;
- if (snapx && snapy) break;
+ if (resist_move_window(c->frame->area, target->frame->area,
+ resist, x, y))
+ break;
}
+ dock_get_area(&dock_area);
+ resist_move_window(c->frame->area, dock_area, resist, x, y);
- frame_frame_gravity(c->frame, x, y, c->area.width, c->area.height);
+ frame_frame_gravity(c->frame, x, y);
}
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, c->area.width, c->area.height);
+ frame_client_gravity(c->frame, x, y);
w = c->frame->area.width;
h = c->frame->area.height;
ct = RECT_TOP(c->frame->area);
cr = RECT_RIGHT(c->frame->area);
cb = RECT_BOTTOM(c->frame->area);
-
+
+ RECT_SET(desired_area, c->frame->area.x, c->frame->area.y,
+ c->frame->area.width, c->frame->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);
*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, c->area.width, c->area.height);
+ frame_frame_gravity(c->frame, x, y);
}
-void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
- ObCorner corn)
+static gboolean resist_size_window(Rect window, Rect target, gint resist,
+ gint *w, gint *h, ObDirection dir)
{
- 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*/
- gint incw, inch;
- ObClient *snapx = NULL, *snapy = NULL;
+ gint dlt, drb; /* my destination left/top and right/bottom sides */
+ gboolean snapx = 0, snapy = 0;
+ gint orgw, orgh;
- if (!resist) return;
+ l = RECT_LEFT(window);
+ t = RECT_TOP(window);
+ r = RECT_RIGHT(window);
+ b = RECT_BOTTOM(window);
- incw = c->size_inc.width;
- inch = c->size_inc.height;
+ orgw = window.width;
+ orgh = window.height;
- l = RECT_LEFT(c->frame->area);
- r = RECT_RIGHT(c->frame->area);
- t = RECT_TOP(c->frame->area);
- b = RECT_BOTTOM(c->frame->area);
+ tl = RECT_LEFT(target);
+ tt = RECT_TOP(target);
+ tr = RECT_RIGHT(target);
+ tb = RECT_BOTTOM(target);
+
+ if (!snapx) {
+ /* horizontal snapping */
+ if (t < tb && b > tt) {
+ switch (dir) {
+ case OB_DIRECTION_EAST:
+ case OB_DIRECTION_NORTHEAST:
+ case OB_DIRECTION_SOUTHEAST:
+ case OB_DIRECTION_NORTH:
+ case OB_DIRECTION_SOUTH:
+ dlt = l;
+ drb = r + *w - orgw;
+ if (r < tl && drb >= tl &&
+ drb < tl + resist)
+ *w = tl - l, snapx = TRUE;
+ break;
+ case OB_DIRECTION_WEST:
+ case OB_DIRECTION_NORTHWEST:
+ case OB_DIRECTION_SOUTHWEST:
+ dlt = l - *w + orgw;
+ drb = r;
+ if (l > tr && dlt <= tr &&
+ dlt > tr - resist)
+ *w = r - tr, snapx = TRUE;
+ break;
+ }
+ }
+ }
+
+ if (!snapy) {
+ /* vertical snapping */
+ if (l < tr && r > tl) {
+ switch (dir) {
+ case OB_DIRECTION_SOUTH:
+ case OB_DIRECTION_SOUTHWEST:
+ case OB_DIRECTION_SOUTHEAST:
+ case OB_DIRECTION_EAST:
+ case OB_DIRECTION_WEST:
+ dlt = t;
+ drb = b + *h - orgh;
+ if (b < tt && drb >= tt &&
+ drb < tt + resist)
+ *h = tt - t, snapy = TRUE;
+ break;
+ case OB_DIRECTION_NORTH:
+ case OB_DIRECTION_NORTHWEST:
+ case OB_DIRECTION_NORTHEAST:
+ dlt = t - *h + orgh;
+ drb = b;
+ if (t > tb && dlt <= tb &&
+ dlt > tb - resist)
+ *h = b - tb, snapy = TRUE;
+ break;
+ }
+ }
+ }
+
+ /* snapped both ways */
+ return snapx && snapy;
+}
+
+void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
+ ObDirection dir)
+{
+ GList *it;
+ ObClient *target; /* target */
+ Rect dock_area;
+
+ if (!resist) return;
for (it = stacking_list; it; it = g_list_next(it)) {
if (!WINDOW_IS_CLIENT(it->data))
continue;
- /* only snap in the same layer */
- if (window_layer(it->data) != c->layer)
- continue;
target = it->data;
/* don't snap to invisibles or ourself */
- if (!target->frame->visible || target == c) continue;
-
- 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 */
- if (t < tb && b > tt) {
- switch (corn) {
- case OB_CORNER_TOPLEFT:
- case OB_CORNER_BOTTOMLEFT:
- dlt = l;
- drb = r + *w - c->frame->area.width;
- if (r < tl && drb >= tl &&
- drb < tl + resist)
- *w = tl - l, snapx = target;
- break;
- case OB_CORNER_TOPRIGHT:
- case OB_CORNER_BOTTOMRIGHT:
- dlt = l - *w + c->frame->area.width;
- drb = r;
- if (l > tr && dlt <= tr &&
- dlt > tr - resist)
- *w = r - tr, snapx = target;
- break;
- }
- }
- }
-
- if (snapy == NULL) {
- /* vertical snapping */
- if (l < tr && r > tl) {
- switch (corn) {
- case OB_CORNER_TOPLEFT:
- case OB_CORNER_TOPRIGHT:
- dlt = t;
- drb = b + *h - c->frame->area.height;
- if (b < tt && drb >= tt &&
- drb < tt + resist)
- *h = tt - t, snapy = target;
- break;
- case OB_CORNER_BOTTOMLEFT:
- case OB_CORNER_BOTTOMRIGHT:
- dlt = t - *h + c->frame->area.height;
- drb = b;
- if (t > tb && dlt <= tb &&
- dlt > tb - resist)
- *h = b - tb, snapy = target;
- break;
- }
- }
- }
+ if (!target->frame->visible || target == c)
+ continue;
+ /* don't snap to windows set to below and skip_taskbar (desklets) */
+ if (target->below && !c->below && target->skip_taskbar)
+ continue;
- /* snapped both ways */
- if (snapx && snapy) break;
+ if (resist_size_window(c->frame->area, target->frame->area,
+ resist, w, h, dir))
+ break;
}
+ dock_get_area(&dock_area);
+ resist_size_window(c->frame->area, dock_area,
+ resist, w, h, dir);
}
void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
- ObCorner corn)
+ ObDirection dir)
{
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, *parea;
- gint al, at, ar, ab; /* screen boundaries */
+ gint al, at, ar, ab; /* screen boundaries */
gint pl, pt, pr, pb; /* physical screen boundaries */
- gint incw, inch;
guint i;
+ Rect desired_area;
if (!resist) return;
t = RECT_TOP(c->frame->area);
b = RECT_BOTTOM(c->frame->area);
- 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);
pb = RECT_BOTTOM(*parea);
/* horizontal snapping */
- switch (corn) {
- case OB_CORNER_TOPLEFT:
- case OB_CORNER_BOTTOMLEFT:
+ switch (dir) {
+ case OB_DIRECTION_EAST:
+ case OB_DIRECTION_NORTHEAST:
+ case OB_DIRECTION_SOUTHEAST:
+ case OB_DIRECTION_NORTH:
+ case OB_DIRECTION_SOUTH:
dlt = l;
drb = r + *w - c->frame->area.width;
if (r <= ar && drb > ar && drb <= ar + resist)
else if (r <= pr && drb > pr && drb <= pr + resist)
*w = pr - l + 1;
break;
- case OB_CORNER_TOPRIGHT:
- case OB_CORNER_BOTTOMRIGHT:
+ case OB_DIRECTION_WEST:
+ case OB_DIRECTION_NORTHWEST:
+ case OB_DIRECTION_SOUTHWEST:
dlt = l - *w + c->frame->area.width;
drb = r;
if (l >= al && dlt < al && dlt >= al - resist)
}
/* vertical snapping */
- switch (corn) {
- case OB_CORNER_TOPLEFT:
- case OB_CORNER_TOPRIGHT:
+ switch (dir) {
+ case OB_DIRECTION_SOUTH:
+ case OB_DIRECTION_SOUTHWEST:
+ case OB_DIRECTION_SOUTHEAST:
+ case OB_DIRECTION_WEST:
+ case OB_DIRECTION_EAST:
dlt = t;
drb = b + *h - c->frame->area.height;
if (b <= ab && drb > ab && drb <= ab + resist)
else if (b <= pb && drb > pb && drb <= pb + resist)
*h = pb - t + 1;
break;
- case OB_CORNER_BOTTOMLEFT:
- case OB_CORNER_BOTTOMRIGHT:
+ case OB_DIRECTION_NORTH:
+ case OB_DIRECTION_NORTHWEST:
+ case OB_DIRECTION_NORTHEAST:
dlt = t - *h + c->frame->area.height;
drb = b;
if (t >= at && dlt < at && dlt >= at - resist)
*h = b - pt + 1;
break;
}
+
+ g_free(area);
+ g_free(parea);
}
}
projects / mikachu / openbox.git / blobdiff