nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

split resistance strengths for screen edges and windows. also a fix for parsing changes,

Browse source
This commit is contained in:
Dana Jansens 2003-07-26 06:50:21 +00:00
parent 364dfe10ab
commit 5d58b4fff0
2 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/rc3
View file

@ -7,6 +7,7 @@
<resistance> <resistance>
<strength>10</strength> <strength>10</strength>
<screen_edge_strength>10</screen_edge_strength>
<windows>yes</windows> <windows>yes</windows>
</resistance> </resistance>

50
plugins/resistance/resistance.c
View file

@ -7,22 +7,26 @@
#include "resistance.h" #include "resistance.h"
#include <glib.h> #include <glib.h>
static int resistance; static int win_resistance;
static int edge_resistance;
static gboolean resist_windows; static gboolean resist_windows;
static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d) static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
{ {
xmlNodePtr n; xmlNodePtr n;
node = node->xmlChildrenNode;
if ((n = parse_find_node("strength", node))) if ((n = parse_find_node("strength", node)))
resistance = parse_int(doc, n); win_resistance = parse_int(doc, n);
if ((n = parse_find_node("screen_edge_strength", node)))
edge_resistance = parse_int(doc, n);
if ((n = parse_find_node("windows", node))) if ((n = parse_find_node("windows", node)))
resist_windows = parse_bool(doc, n); resist_windows = parse_bool(doc, n);
} }
void plugin_setup_config() void plugin_setup_config()
{ {
resistance = DEFAULT_RESISTANCE; win_resistance = edge_resistance = DEFAULT_RESISTANCE;
resist_windows = DEFAULT_RESIST_WINDOWS; resist_windows = DEFAULT_RESIST_WINDOWS;
parse_register("resistance", parse_xml, NULL); parse_register("resistance", parse_xml, NULL);
@ -75,30 +79,30 @@ static void resist_move(ObClient *c, int *x, int *y)
*/ */
if (snapx == NULL) { if (snapx == NULL) {
if (ct < tb && cb > tt) { if (ct < tb && cb > tt) {
if (cl >= tr && l < tr && l >= tr - resistance) if (cl >= tr && l < tr && l >= tr - win_resistance)
*x = tr, snapx = target; *x = tr, snapx = target;
else if (cr <= tl && r > tl && r <= tl + resistance) else if (cr <= tl && r > tl && r <= tl + win_resistance)
*x = tl - w + 1, snapx = target; *x = tl - w + 1, snapx = target;
if (snapx != NULL) { if (snapx != NULL) {
/* try to corner snap to the window */ /* try to corner snap to the window */
if (ct > tt && t <= tt && t > tt - resistance) if (ct > tt && t <= tt && t > tt - win_resistance)
*y = tt + 1, snapy = target; *y = tt + 1, snapy = target;
else if (cb < tb && b >= tb && b < tb + resistance) else if (cb < tb && b >= tb && b < tb + win_resistance)
*y = tb - h, snapy = target; *y = tb - h, snapy = target;
} }
} }
} }
if (snapy == NULL) { if (snapy == NULL) {
if (cl < tr && cr > tl) { if (cl < tr && cr > tl) {
if (ct >= tb && t < tb && t >= tb - resistance) if (ct >= tb && t < tb && t >= tb - win_resistance)
*y = tb, snapy = target; *y = tb, snapy = target;
else if (cb <= tt && b > tt && b <= tt + resistance) else if (cb <= tt && b > tt && b <= tt + win_resistance)
*y = tt - h + 1, snapy = target; *y = tt - h + 1, snapy = target;
if (snapy != NULL) { if (snapy != NULL) {
/* try to corner snap to the window */ /* try to corner snap to the window */
if (cl > tl && l <= tl && l > tl - resistance) if (cl > tl && l <= tl && l > tl - win_resistance)
*x = tl + 1, snapx = target; *x = tl + 1, snapx = target;
else if (cr < tr && r >= tr && r < tr + resistance) else if (cr < tr && r >= tr && r < tr + win_resistance)
*x = tr - w, snapx = target; *x = tr - w, snapx = target;
} }
} }
@ -120,13 +124,13 @@ static void resist_move(ObClient *c, int *x, int *y)
ab = at + area->height - 1; ab = at + area->height - 1;
/* snap to screen edges */ /* snap to screen edges */
if (cl >= al && l < al && l >= al - resistance) if (cl >= al && l < al && l >= al - edge_resistance)
*x = al; *x = al;
else if (cr <= ar && r > ar && r <= ar + resistance) else if (cr <= ar && r > ar && r <= ar + edge_resistance)
*x = ar - w + 1; *x = ar - w + 1;
if (ct >= at && t < at && t >= at - resistance) if (ct >= at && t < at && t >= at - edge_resistance)
*y = at; *y = at;
else if (cb <= ab && b > ab && b < ab + resistance) else if (cb <= ab && b > ab && b < ab + edge_resistance)
*y = ab - h + 1; *y = ab - h + 1;
} }
} }
@ -181,14 +185,14 @@ static void resist_size(ObClient *c, int *w, int *h, ObCorner corn)
case OB_CORNER_BOTTOMLEFT: case OB_CORNER_BOTTOMLEFT:
dlt = l; dlt = l;
drb = r + *w - c->frame->area.width; drb = r + *w - c->frame->area.width;
if (r < tl && drb >= tl && drb < tl + resistance) if (r < tl && drb >= tl && drb < tl + win_resistance)
*w = tl - l, snapx = target; *w = tl - l, snapx = target;
break; break;
case OB_CORNER_TOPRIGHT: case OB_CORNER_TOPRIGHT:
case OB_CORNER_BOTTOMRIGHT: case OB_CORNER_BOTTOMRIGHT:
dlt = l - *w + c->frame->area.width; dlt = l - *w + c->frame->area.width;
drb = r; drb = r;
if (l > tr && dlt <= tr && dlt > tr - resistance) if (l > tr && dlt <= tr && dlt > tr - win_resistance)
*w = r - tr, snapx = target; *w = r - tr, snapx = target;
break; break;
} }
@ -203,14 +207,14 @@ static void resist_size(ObClient *c, int *w, int *h, ObCorner corn)
case OB_CORNER_TOPRIGHT: case OB_CORNER_TOPRIGHT:
dlt = t; dlt = t;
drb = b + *h - c->frame->area.height; drb = b + *h - c->frame->area.height;
if (b < tt && drb >= tt && drb < tt + resistance) if (b < tt && drb >= tt && drb < tt + win_resistance)
*h = tt - t, snapy = target; *h = tt - t, snapy = target;
break; break;
case OB_CORNER_BOTTOMLEFT: case OB_CORNER_BOTTOMLEFT:
case OB_CORNER_BOTTOMRIGHT: case OB_CORNER_BOTTOMRIGHT:
dlt = t - *h + c->frame->area.height; dlt = t - *h + c->frame->area.height;
drb = b; drb = b;
if (t > tb && dlt <= tb && dlt > tb - resistance) if (t > tb && dlt <= tb && dlt > tb - win_resistance)
*h = b - tb, snapy = target; *h = b - tb, snapy = target;
break; break;
} }
@ -230,14 +234,14 @@ static void resist_size(ObClient *c, int *w, int *h, ObCorner corn)
case OB_CORNER_BOTTOMLEFT: case OB_CORNER_BOTTOMLEFT:
dlt = l; dlt = l;
drb = r + *w - c->frame->area.width; drb = r + *w - c->frame->area.width;
if (r <= ar && drb > ar && drb <= ar + resistance) if (r <= ar && drb > ar && drb <= ar + edge_resistance)
*w = ar - l + 1; *w = ar - l + 1;
break; break;
case OB_CORNER_TOPRIGHT: case OB_CORNER_TOPRIGHT:
case OB_CORNER_BOTTOMRIGHT: case OB_CORNER_BOTTOMRIGHT:
dlt = l - *w + c->frame->area.width; dlt = l - *w + c->frame->area.width;
drb = r; drb = r;
if (l >= al && dlt < al && dlt >= al - resistance) if (l >= al && dlt < al && dlt >= al - edge_resistance)
*w = r - al + 1; *w = r - al + 1;
break; break;
} }
@ -248,14 +252,14 @@ static void resist_size(ObClient *c, int *w, int *h, ObCorner corn)
case OB_CORNER_TOPRIGHT: case OB_CORNER_TOPRIGHT:
dlt = t; dlt = t;
drb = b + *h - c->frame->area.height; drb = b + *h - c->frame->area.height;
if (b <= ab && drb > ab && drb <= ab + resistance) if (b <= ab && drb > ab && drb <= ab + edge_resistance)
*h = ab - t + 1; *h = ab - t + 1;
break; break;
case OB_CORNER_BOTTOMLEFT: case OB_CORNER_BOTTOMLEFT:
case OB_CORNER_BOTTOMRIGHT: case OB_CORNER_BOTTOMRIGHT:
dlt = t - *h + c->frame->area.height; dlt = t - *h + c->frame->area.height;
drb = b; drb = b;
if (t >= at && dlt < at && dlt >= at - resistance) if (t >= at && dlt < at && dlt >= at - edge_resistance)
*h = b - at + 1; *h = b - at + 1;
break; break;
} }