X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fresist.c;h=b8f24893e8ebd26d8b7d543e47770dd2817b6024;hb=098ae047f89f23d888f26425f7c5f77b75437d91;hp=56bd214dbe8e51281812f63d1852b7da5f9e729b;hpb=811fa21940629236eb15345b4034bcc278bf7ba9;p=chaz%2Fopenbox diff --git a/openbox/resist.c b/openbox/resist.c index 56bd214d..b8f24893 100644 --- a/openbox/resist.c +++ b/openbox/resist.c @@ -36,7 +36,7 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y) 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; @@ -50,20 +50,19 @@ void resist_move_windows(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); - + 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; + 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; tl = RECT_LEFT(target->frame->area) - 1; tt = RECT_TOP(target->frame->area) - 1; @@ -114,7 +113,7 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y) if (snapx && snapy) break; } - 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) @@ -126,10 +125,11 @@ 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; @@ -143,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); @@ -177,13 +183,16 @@ 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, 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) + ObDirection dir) { GList *it; ObClient *target; /* target */ @@ -206,13 +215,12 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h, 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; + 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; tl = RECT_LEFT(target->frame->area); tr = RECT_RIGHT(target->frame->area); @@ -222,17 +230,21 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h, if (snapx == NULL) { /* horizontal snapping */ if (t < tb && b > tt) { - 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 < tl && drb >= tl && drb < tl + resist) *w = tl - l, snapx = target; 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 > tr && dlt <= tr && @@ -246,17 +258,21 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h, if (snapy == NULL) { /* vertical snapping */ if (l < tr && r > tl) { - 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_EAST: + case OB_DIRECTION_WEST: 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: + case OB_DIRECTION_NORTH: + case OB_DIRECTION_NORTHWEST: + case OB_DIRECTION_NORTHEAST: dlt = t - *h + c->frame->area.height; drb = b; if (t > tb && dlt <= tb && @@ -273,15 +289,16 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h, } 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; @@ -293,12 +310,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); @@ -311,9 +334,12 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h, 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) @@ -321,8 +347,9 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h, 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) @@ -333,9 +360,12 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h, } /* 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) @@ -343,8 +373,9 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h, 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) @@ -353,5 +384,8 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h, *h = b - pt + 1; break; } + + g_free(area); + g_free(parea); } }