-#include "../kernel/dispatch.h"
-#include "../kernel/client.h"
-#include "../kernel/frame.h"
-#include "../kernel/stacking.h"
-#include "../kernel/screen.h"
-#include "../kernel/config.h"
+#include "kernel/dispatch.h"
+#include "kernel/client.h"
+#include "kernel/frame.h"
+#include "kernel/parse.h"
+#include "kernel/stacking.h"
+#include "kernel/screen.h"
#include <glib.h>
-#define DEFAULT_RESISTANCE 10
+static int resistance;
+static gboolean resist_windows;
+
+static void parse_assign(char *name, ParseToken *value)
+{
+ if (!g_ascii_strcasecmp(name, "strength")) {
+ if (value->type != TOKEN_INTEGER)
+ yyerror("invalid value");
+ else {
+ if (value->data.integer >= 0)
+ resistance = value->data.integer;
+ }
+ } else if (!g_ascii_strcasecmp(name, "windows")) {
+ if (value->type != TOKEN_BOOL)
+ yyerror("invalid value");
+ else
+ resist_windows = value->data.bool;
+ } else
+ yyerror("invalid option");
+ parse_free_token(value);
+}
void plugin_setup_config()
{
- ConfigValue val;
+ resistance = 10;
+ resist_windows = TRUE;
- config_def_set(config_def_new("resistance", Config_Integer,
- "Edge Resistance",
- "The amount of resistance to provide when "
- "moving windows past edges."
- "positioned."));
- config_def_set(config_def_new("resistance.windows", Config_Bool,
- "Edge Resistance On Windows",
- "Whether to provide edge resistance when "
- "moving windows past the edge of another "
- "window."));
- val.bool = TRUE;
- config_set("resistance.windows", Config_Bool, val);
+ parse_reg_section("resistance", NULL, parse_assign);
}
static void resist_move(Client *c, int *x, int *y)
int cl, ct, cr, cb; /* current edges */
int w, h; /* current size */
Client *snapx = NULL, *snapy = NULL;
- ConfigValue resist, window_resist;
-
- if (!config_get("resistance", Config_Integer, &resist) ||
- resist.integer < 0) {
- resist.integer = DEFAULT_RESISTANCE;
- config_set("resistance", Config_Integer, resist);
- }
- if (!config_get("resistance.windows", Config_Bool, &window_resist))
- g_assert_not_reached();
w = c->frame->area.width;
h = c->frame->area.height;
cb = ct + c->frame->area.height - 1;
/* snap to other clients */
- if (window_resist.bool)
+ if (resist_windows)
for (it = stacking_list; it != NULL; it = it->next) {
Client *target;
int tl, tt, tr, tb; /* 1 past the target's edges on each side */
bottom-to-top in the stacking list
*/
if (snapx == NULL) {
- if (cl >= tr && l < tr && l >= tr - resist.integer)
- *x = tr, snapx = target;
- else if (cr <= tl && r > tl && r <= tl + resist.integer)
- *x = tl - w + 1, snapx = target;
- if (snapx != NULL) {
- /* try to corner snap to the window */
- if (ct > tt && t <= tt && t > tt - resist.integer)
- *y = tt + 1, snapy = target;
- else if (cb < tb && b >= tb && b < tb + resist.integer)
- *y = tb - h, snapy = target;
+ if (ct < tb && cb > tt) {
+ if (cl >= tr && l < tr && l >= tr - resistance)
+ *x = tr, snapx = target;
+ else if (cr <= tl && r > tl && r <= tl + resistance)
+ *x = tl - w + 1, snapx = target;
+ if (snapx != NULL) {
+ /* try to corner snap to the window */
+ if (ct > tt && t <= tt && t > tt - resistance)
+ *y = tt + 1, snapy = target;
+ else if (cb < tb && b >= tb && b < tb + resistance)
+ *y = tb - h, snapy = target;
+ }
}
}
if (snapy == NULL) {
- if (ct >= tb && t < tb && t >= tb - resist.integer)
- *y = tb, snapy = target;
- else if (!cb <= tt && b > tt && b <= tt + resist.integer)
- *y = tt - h + 1, snapy = target;
- if (snapy != NULL) {
- /* try to corner snap to the window */
- if (cl > tl && l <= tl && l > tl - resist.integer)
- *x = tl + 1, snapx = target;
- else if (cr < tr && r >= tr && r < tr + resist.integer)
- *x = tr - w, snapx = target;
+ if (cl < tr && cr > tl) {
+ if (ct >= tb && t < tb && t >= tb - resistance)
+ *y = tb, snapy = target;
+ else if (cb <= tt && b > tt && b <= tt + resistance)
+ *y = tt - h + 1, snapy = target;
+ if (snapy != NULL) {
+ /* try to corner snap to the window */
+ if (cl > tl && l <= tl && l > tl - resistance)
+ *x = tl + 1, snapx = target;
+ else if (cr < tr && r >= tr && r < tr + resistance)
+ *x = tr - w, snapx = target;
+ }
}
}
ab = at + area->height - 1;
/* snap to screen edges */
- if (cl >= al && l < al && l >= al - resist.integer)
+ if (cl >= al && l < al && l >= al - resistance)
*x = al;
- else if (cr <= ar && r > ar && r <= ar + resist.integer)
+ else if (cr <= ar && r > ar && r <= ar + resistance)
*x = ar - w + 1;
- if (ct >= at && t < at && t >= at - resist.integer)
+ if (ct >= at && t < at && t >= at - resistance)
*y = at;
- else if (cb <= ab && b > ab && b < ab + resist.integer)
+ else if (cb <= ab && b > ab && b < ab + resistance)
*y = ab - h + 1;
}
static void resist_size(Client *c, int *w, int *h, Corner corn)
{
GList *it;
- Client *t; /* target */
- int lt, rb; /* my left/top and right/bottom sides */
+ Client *target; /* target */
+ int l, t, r, b; /* my left, top, right and bottom sides */
int dlt, drb; /* my destination left/top and right/bottom sides */
- int tlt, trb; /* target's left/top and right/bottom sides */
+ int tl, tt, tr, tb; /* target's left, top, right and bottom bottom sides */
Rect *area;
int al, at, ar, ab; /* screen boundaries */
Client *snapx = NULL, *snapy = NULL;
- ConfigValue resist, window_resist;
- if (!config_get("resistance", Config_Integer, &resist) ||
- resist.integer < 0) {
- resist.integer = DEFAULT_RESISTANCE;
- config_set("resistance", Config_Integer, resist);
- }
- if (!config_get("resistance.windows", Config_Bool, &window_resist))
- g_assert_not_reached();
+ l = c->frame->area.x;
+ r = l + c->frame->area.width - 1;
+ t = c->frame->area.y;
+ b = t + c->frame->area.height - 1;
/* get the screen boundaries */
area = screen_area(c->desktop);
ar = al + area->width - 1;
ab = at + area->height - 1;
- /* horizontal snapping */
-
- lt = c->frame->area.x;
- rb = lt + c->frame->area.width - 1;
-
/* snap to other windows */
- if (window_resist.bool) {
- for (it = stacking_list; !snapx && it != NULL; it = it->next) {
- t = it->data;
+ if (resist_windows) {
+ for (it = stacking_list; it != NULL; it = it->next) {
+ target = it->data;
/* don't snap to invisibles or ourself */
- if (!t->frame->visible || t == c) continue;
+ if (!target->frame->visible || target == c) continue;
- switch (corn) {
- case Corner_TopLeft:
- case Corner_BottomLeft:
- dlt = lt;
- drb = rb + *w - c->frame->area.width;
- tlt = t->frame->area.x;
- if (rb < tlt && drb >= tlt && drb < tlt + resist.integer)
- *w = tlt - lt, snapx = t;
- break;
- case Corner_TopRight:
- case Corner_BottomRight:
- dlt = lt - *w + c->frame->area.width;
- drb = rb;
- trb = t->frame->area.x + t->frame->area.width - 1;
- if (lt > trb && dlt <= trb && dlt > trb - resist.integer)
- *w = rb - trb, snapx = t;
- break;
+ 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;
+
+ if (snapx == NULL) {
+ /* horizontal snapping */
+ if (t < tb && b > tt) {
+ switch (corn) {
+ case Corner_TopLeft:
+ case Corner_BottomLeft:
+ dlt = l;
+ drb = r + *w - c->frame->area.width;
+ if (r < tl && drb >= tl && drb < tl + resistance)
+ *w = tl - l, snapx = target;
+ break;
+ case Corner_TopRight:
+ case Corner_BottomRight:
+ dlt = l - *w + c->frame->area.width;
+ drb = r;
+ if (l > tr && dlt <= tr && dlt > tr - resistance)
+ *w = r - tr, snapx = target;
+ break;
+ }
+ }
+ }
+
+ if (snapy == NULL) {
+ /* vertical snapping */
+ if (l < tr && r > tl) {
+ switch (corn) {
+ case Corner_TopLeft:
+ case Corner_TopRight:
+ dlt = t;
+ drb = b + *h - c->frame->area.height;
+ if (b < tt && drb >= tt && drb < tt + resistance)
+ *h = tt - t, snapy = target;
+ break;
+ case Corner_BottomLeft:
+ case Corner_BottomRight:
+ dlt = t - *h + c->frame->area.height;
+ drb = b;
+ if (t > tb && dlt <= tb && dlt > tb - resistance)
+ *h = b - tb, snapy = target;
+ break;
+ }
+ }
}
+
+ /* snapped both ways */
+ if (snapx && snapy) break;
}
}
/* snap to screen edges */
+
+ /* horizontal snapping */
switch (corn) {
case Corner_TopLeft:
case Corner_BottomLeft:
- dlt = lt;
- drb = rb + *w - c->frame->area.width;
- if (rb <= ar && drb > ar && drb <= ar + resist.integer)
- *w = ar - lt + 1;
+ dlt = l;
+ drb = r + *w - c->frame->area.width;
+ if (r <= ar && drb > ar && drb <= ar + resistance)
+ *w = ar - l + 1;
break;
case Corner_TopRight:
case Corner_BottomRight:
- dlt = lt - *w + c->frame->area.width;
- drb = rb;
- if (lt >= al && dlt < al && dlt >= al - resist.integer)
- *w = rb - al + 1;
+ dlt = l - *w + c->frame->area.width;
+ drb = r;
+ if (l >= al && dlt < al && dlt >= al - resistance)
+ *w = r - al + 1;
break;
}
/* vertical snapping */
-
- lt = c->frame->area.y;
- rb = lt + c->frame->area.height - 1;
-
- /* snap to other windows */
- if (window_resist.bool) {
- for (it = stacking_list; !snapy && it != NULL; it = it->next) {
- t = it->data;
-
- /* don't snap to invisibles or ourself */
- if (!t->frame->visible || t == c) continue;
-
- switch (corn) {
- case Corner_TopLeft:
- case Corner_TopRight:
- dlt = lt;
- drb = rb + *h - c->frame->area.height;
- tlt = t->frame->area.y;
- if (rb < tlt && drb >= tlt && drb < tlt + resist.integer)
- *h = tlt - lt, snapy = t;
- break;
- case Corner_BottomLeft:
- case Corner_BottomRight:
- dlt = lt - *h + c->frame->area.height;
- drb = rb;
- trb = t->frame->area.y + t->frame->area.height - 1;
- if (lt > trb && dlt <= trb && dlt > trb - resist.integer)
- *h = rb - trb, snapy = t;
- break;
- }
- }
- }
-
- /* snap to screen edges */
switch (corn) {
case Corner_TopLeft:
case Corner_TopRight:
- dlt = lt;
- drb = rb + *h - c->frame->area.height;
- if (rb <= ab && drb > ab && drb <= ab + resist.integer)
- *h = ar - lt + 1;
+ dlt = t;
+ drb = b + *h - c->frame->area.height;
+ if (b <= ab && drb > ab && drb <= ab + resistance)
+ *h = ab - t + 1;
break;
case Corner_BottomLeft:
case Corner_BottomRight:
- dlt = lt - *h + c->frame->area.height;
- drb = rb;
- if (lt >= at && dlt < at && dlt >= at - resist.integer)
- *h = rb - al + 1;
+ dlt = t - *h + c->frame->area.height;
+ drb = b;
+ if (t >= at && dlt < at && dlt >= at - resistance)
+ *h = b - at + 1;
break;
}
+
+ /* round down for size increments */
+ *w -= c->frame->area.width + c->frame->size.left + c->frame->size.right;
+ *w = *w / c->size_inc.width * c->size_inc.width;
+ *w += c->frame->area.width + c->frame->size.left + c->frame->size.right;
+
+ *h -= c->frame->area.height + c->frame->size.top + c->frame->size.bottom;
+ *h = *h / c->size_inc.height * c->size_inc.height;
+ *h += c->frame->area.height + c->frame->size.top + c->frame->size.bottom;
}
static void event(ObEvent *e, void *foo)
projects / chaz / openbox / blobdiff