+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ resist.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
+ Copyright (c) 2003-2007 Dana Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "client.h"
#include "frame.h"
#include "stacking.h"
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);
if (config_resist_win)
- for (it = stacking_list; it != NULL; it = it->next) {
+ for (it = stacking_list; it; it = g_list_next(it)) {
ObClient *target;
- int tl, tt, tr, tb; /* 1 past the target's edges on each side */
+ gint tl, tt, tr, tb; /* 1 past the target's edges on each side */
if (!WINDOW_IS_CLIENT(it->data))
continue;
target = it->data;
+
/* 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;
+ /* don't snap to windows in layers beneath */
+ if(target->layer < c->layer && !config_resist_layers_below)
+ 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
void resist_move_monitors(ObClient *c, gint *x, gint *y)
{
- Rect *area;
+ Rect *area, *parea;
guint i;
gint l, t, r, b; /* requested edges */
gint al, at, ar, ab; /* screen area edges */
+ gint pl, pt, pr, pb; /* physical screen area edges */
gint cl, ct, cr, cb; /* current edges */
gint w, h; /* current size */
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);
if (config_resist_edge) {
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(*area, c->frame->area))
+ if (!RECT_INTERSECTS_RECT(*parea, 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);
+ pl = RECT_LEFT(*parea);
+ pt = RECT_TOP(*parea);
+ pr = RECT_RIGHT(*parea);
+ pb = RECT_BOTTOM(*parea);
if (cl >= al && l < al && l >= al - config_resist_edge)
*x = al;
else if (cr <= ar && r > ar && r <= ar + config_resist_edge)
*x = ar - w + 1;
+ else if (cl >= pl && l < pl && l >= pl - config_resist_edge)
+ *x = pl;
+ else if (cr <= pr && r > pr && r <= pr + config_resist_edge)
+ *x = pr - w + 1;
+
if (ct >= at && t < at && t >= at - config_resist_edge)
*y = at;
else if (cb <= ab && b > ab && b < ab + config_resist_edge)
*y = ab - h + 1;
+ else if (ct >= pt && t < pt && t >= pt - config_resist_edge)
+ *y = pt;
+ else if (cb <= pb && b > pb && b < pb + config_resist_edge)
+ *y = pb - h + 1;
}
}
}
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);
if (config_resist_win) {
- for (it = stacking_list; it != NULL; it = it->next) {
+ for (it = stacking_list; it; it = g_list_next(it)) {
if (!WINDOW_IS_CLIENT(it->data))
continue;
target = it->data;
/* 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;
+ /* don't snap to windows in layers beneath */
+ if(target->layer < c->layer && !config_resist_layers_below)
+ 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 */
{
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 */
+ Rect *area, *parea;
+ gint al, at, ar, ab; /* screen boundaries */
+ gint pl, pt, pr, pb; /* physical screen boundaries */
gint incw, inch;
+ guint i;
- 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);
incw = c->size_inc.width;
inch = c->size_inc.height;
- /* 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;
+ for (i = 0; i < screen_num_monitors; ++i) {
+ area = screen_area_monitor(c->desktop, i);
+ parea = screen_physical_area_monitor(i);
- if (config_resist_edge) {
- /* horizontal snapping */
- switch (corn) {
- case OB_CORNER_TOPLEFT:
- case OB_CORNER_BOTTOMLEFT:
- dlt = l;
- drb = r + *w - c->frame->area.width;
- g_message("r %d drb %d ar %d res %d",
- r, drb, ar, config_resist_edge);
- if (r <= ar && drb > ar && drb <= ar + config_resist_edge)
- *w = ar - l + 1;
- break;
- case OB_CORNER_TOPRIGHT:
- case OB_CORNER_BOTTOMRIGHT:
- dlt = l - *w + c->frame->area.width;
- drb = r;
- if (l >= al && dlt < al && dlt >= al - config_resist_edge)
- *w = r - al + 1;
- break;
- }
+ if (!RECT_INTERSECTS_RECT(*parea, c->frame->area))
+ continue;
- /* vertical snapping */
- switch (corn) {
- case OB_CORNER_TOPLEFT:
- case OB_CORNER_TOPRIGHT:
- dlt = t;
- drb = b + *h - c->frame->area.height;
- if (b <= ab && drb > ab && drb <= ab + config_resist_edge)
- *h = ab - t + 1;
- break;
- case OB_CORNER_BOTTOMLEFT:
- case OB_CORNER_BOTTOMRIGHT:
- dlt = t - *h + c->frame->area.height;
- drb = b;
- if (t >= at && dlt < at && dlt >= at - config_resist_edge)
- *h = b - at + 1;
- break;
+ /* get the screen boundaries */
+ al = RECT_LEFT(*area);
+ at = RECT_TOP(*area);
+ ar = RECT_RIGHT(*area);
+ ab = RECT_BOTTOM(*area);
+ pl = RECT_LEFT(*parea);
+ pt = RECT_TOP(*parea);
+ pr = RECT_RIGHT(*parea);
+ pb = RECT_BOTTOM(*parea);
+
+ if (config_resist_edge) {
+ /* horizontal snapping */
+ switch (corn) {
+ case OB_CORNER_TOPLEFT:
+ case OB_CORNER_BOTTOMLEFT:
+ dlt = l;
+ drb = r + *w - c->frame->area.width;
+ if (r <= ar && drb > ar && drb <= ar + config_resist_edge)
+ *w = ar - l + 1;
+ else if (r <= pr && drb > pr && drb <= pr + config_resist_edge)
+ *w = pr - l + 1;
+ break;
+ case OB_CORNER_TOPRIGHT:
+ case OB_CORNER_BOTTOMRIGHT:
+ dlt = l - *w + c->frame->area.width;
+ drb = r;
+ if (l >= al && dlt < al && dlt >= al - config_resist_edge)
+ *w = r - al + 1;
+ else if (l >= pl && dlt < pl && dlt >= pl - config_resist_edge)
+ *w = r - pl + 1;
+ break;
+ }
+
+ /* vertical snapping */
+ switch (corn) {
+ case OB_CORNER_TOPLEFT:
+ case OB_CORNER_TOPRIGHT:
+ dlt = t;
+ drb = b + *h - c->frame->area.height;
+ if (b <= ab && drb > ab && drb <= ab + config_resist_edge)
+ *h = ab - t + 1;
+ else if (b <= pb && drb > pb && drb <= pb + config_resist_edge)
+ *h = pb - t + 1;
+ break;
+ case OB_CORNER_BOTTOMLEFT:
+ case OB_CORNER_BOTTOMRIGHT:
+ dlt = t - *h + c->frame->area.height;
+ drb = b;
+ if (t >= at && dlt < at && dlt >= at - config_resist_edge)
+ *h = b - at + 1;
+ else if (t >= pt && dlt < pt && dlt >= pt - config_resist_edge)
+ *h = b - pt + 1;
+ break;
+ }
}
}
}
projects / chaz / openbox / blobdiff