X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fresistance%2Fresistance.c;h=f5e68052051e795a5cee139729ebfab6c57ece98;hb=1045079482453424f8320de99639390e3020eb72;hp=318447527ef0500fe2888e8f5c90a4cc4f03c888;hpb=6357583c396382dd6ed8ac42004177f204fabe62;p=chaz%2Fopenbox diff --git a/plugins/resistance/resistance.c b/plugins/resistance/resistance.c index 31844752..f5e68052 100644 --- a/plugins/resistance/resistance.c +++ b/plugins/resistance/resistance.c @@ -7,28 +7,28 @@ #include "resistance.h" #include -static int resistance; -static gboolean resist_windows; +static int win_resistance; +static int edge_resistance; -static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d) +static void parse_xml(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) { xmlNodePtr n; + node = node->xmlChildrenNode; if ((n = parse_find_node("strength", node))) - resistance = parse_int(doc, n); - if ((n = parse_find_node("windows", node))) - resist_windows = parse_bool(doc, n); + win_resistance = parse_int(doc, n); + if ((n = parse_find_node("screen_edge_strength", node))) + edge_resistance = parse_int(doc, n); } -void plugin_setup_config() +void plugin_setup_config(ObParseInst *i) { - resistance = DEFAULT_RESISTANCE; - resist_windows = DEFAULT_RESIST_WINDOWS; + win_resistance = edge_resistance = DEFAULT_RESISTANCE; - parse_register("resistance", parse_xml, NULL); + parse_register(i, "resistance", parse_xml, NULL); } -static void resist_move(Client *c, int *x, int *y) +static void resist_move(ObClient *c, int *x, int *y) { GList *it; Rect *area; @@ -37,7 +37,7 @@ static void resist_move(Client *c, int *x, int *y) int al, at, ar, ab; /* screen area edges */ int cl, ct, cr, cb; /* current edges */ int w, h; /* current size */ - Client *snapx = NULL, *snapy = NULL; + ObClient *snapx = NULL, *snapy = NULL; w = c->frame->area.width; h = c->frame->area.height; @@ -53,9 +53,9 @@ static void resist_move(Client *c, int *x, int *y) cb = ct + c->frame->area.height - 1; /* snap to other clients */ - if (resist_windows) + if (win_resistance) for (it = stacking_list; it != NULL; it = it->next) { - Client *target; + ObClient *target; int tl, tt, tr, tb; /* 1 past the target's edges on each side */ if (!WINDOW_IS_CLIENT(it->data)) @@ -75,30 +75,30 @@ static void resist_move(Client *c, int *x, int *y) */ if (snapx == NULL) { 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; - 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; if (snapx != NULL) { /* 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; - else if (cb < tb && b >= tb && b < tb + resistance) + else if (cb < tb && b >= tb && b < tb + win_resistance) *y = tb - h, snapy = target; } } } if (snapy == NULL) { 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; - 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; if (snapy != NULL) { /* 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; - else if (cr < tr && r >= tr && r < tr + resistance) + else if (cr < tr && r >= tr && r < tr + win_resistance) *x = tr - w, snapx = target; } } @@ -108,39 +108,41 @@ static void resist_move(Client *c, int *x, int *y) } /* get the screen boundaries */ - for (i = 0; i < screen_num_monitors; ++i) { - area = screen_area_monitor(c->desktop, i); - - if (!RECT_INTERSECTS_RECT(*area, c->frame->area)) - continue; - - al = area->x; - at = area->y; - ar = al + area->width - 1; - ab = at + area->height - 1; - - /* snap to screen edges */ - if (cl >= al && l < al && l >= al - resistance) - *x = al; - else if (cr <= ar && r > ar && r <= ar + resistance) - *x = ar - w + 1; - if (ct >= at && t < at && t >= at - resistance) - *y = at; - else if (cb <= ab && b > ab && b < ab + resistance) - *y = ab - h + 1; + if (edge_resistance) { + for (i = 0; i < screen_num_monitors; ++i) { + area = screen_area_monitor(c->desktop, i); + + if (!RECT_INTERSECTS_RECT(*area, c->frame->area)) + continue; + + al = area->x; + at = area->y; + ar = al + area->width - 1; + ab = at + area->height - 1; + + /* snap to screen edges */ + if (cl >= al && l < al && l >= al - edge_resistance) + *x = al; + else if (cr <= ar && r > ar && r <= ar + edge_resistance) + *x = ar - w + 1; + if (ct >= at && t < at && t >= at - edge_resistance) + *y = at; + else if (cb <= ab && b > ab && b < ab + edge_resistance) + *y = ab - h + 1; + } } } -static void resist_size(Client *c, int *w, int *h, Corner corn) +static void resist_size(ObClient *c, int *w, int *h, ObCorner corn) { GList *it; - Client *target; /* target */ + ObClient *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 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; + ObClient *snapx = NULL, *snapy = NULL; /* don't snap windows with size increments */ if (c->size_inc.width > 1 || c->size_inc.height > 1) @@ -159,7 +161,7 @@ static void resist_size(Client *c, int *w, int *h, Corner corn) ab = at + area->height - 1; /* snap to other windows */ - if (resist_windows) { + if (win_resistance) { for (it = stacking_list; it != NULL; it = it->next) { if (!WINDOW_IS_CLIENT(it->data)) continue; @@ -177,18 +179,18 @@ static void resist_size(Client *c, int *w, int *h, Corner corn) /* horizontal snapping */ if (t < tb && b > tt) { switch (corn) { - case Corner_TopLeft: - case Corner_BottomLeft: + case OB_CORNER_TOPLEFT: + case OB_CORNER_BOTTOMLEFT: dlt = l; 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; break; - case Corner_TopRight: - case Corner_BottomRight: + case OB_CORNER_TOPRIGHT: + case OB_CORNER_BOTTOMRIGHT: dlt = l - *w + c->frame->area.width; drb = r; - if (l > tr && dlt <= tr && dlt > tr - resistance) + if (l > tr && dlt <= tr && dlt > tr - win_resistance) *w = r - tr, snapx = target; break; } @@ -199,18 +201,18 @@ static void resist_size(Client *c, int *w, int *h, Corner corn) /* vertical snapping */ if (l < tr && r > tl) { switch (corn) { - case Corner_TopLeft: - case Corner_TopRight: + case OB_CORNER_TOPLEFT: + case OB_CORNER_TOPRIGHT: dlt = t; 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; break; - case Corner_BottomLeft: - case Corner_BottomRight: + case OB_CORNER_BOTTOMLEFT: + case OB_CORNER_BOTTOMRIGHT: dlt = t - *h + c->frame->area.height; drb = b; - if (t > tb && dlt <= tb && dlt > tb - resistance) + if (t > tb && dlt <= tb && dlt > tb - win_resistance) *h = b - tb, snapy = target; break; } @@ -223,41 +225,43 @@ static void resist_size(Client *c, int *w, int *h, Corner corn) } /* snap to screen edges */ - - /* horizontal snapping */ - switch (corn) { - case Corner_TopLeft: - case Corner_BottomLeft: - 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 = l - *w + c->frame->area.width; - drb = r; - if (l >= al && dlt < al && dlt >= al - resistance) - *w = r - al + 1; - break; - } - /* vertical snapping */ - switch (corn) { - case Corner_TopLeft: - case Corner_TopRight: - 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 = t - *h + c->frame->area.height; - drb = b; - if (t >= at && dlt < at && dlt >= at - resistance) - *h = b - at + 1; - break; + if (edge_resistance) { + /* 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 + edge_resistance) + *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 - edge_resistance) + *w = r - al + 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 + edge_resistance) + *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 - edge_resistance) + *h = b - at + 1; + break; + } } }