Partial revert of replacing screen_area() with region_find(); until a

fix for a regression is found; this bug has been around for a long time
it seems, but this change exposed it. Likely need to track clients in to
and out of regions.
This commit is contained in:
okan
2015-11-11 14:22:01 +00:00
parent 09565bc423
commit 00bdd48b1d
6 changed files with 87 additions and 62 deletions

View File

@@ -138,6 +138,24 @@ region_find(struct screen_ctx *sc, int x, int y)
return(rc);
}
struct geom
screen_area(struct screen_ctx *sc, int x, int y, int flags)
{
struct region_ctx *rc;
struct geom area = sc->work;
TAILQ_FOREACH(rc, &sc->regionq, entry) {
if ((x >= rc->area.x) && (x < (rc->area.x + rc->area.w)) &&
(y >= rc->area.y) && (y < (rc->area.y + rc->area.h))) {
area = rc->area;
break;
}
}
if (flags & CWM_GAP)
area = screen_apply_gap(sc, area);
return(area);
}
void
screen_update_geometry(struct screen_ctx *sc)
{
@@ -171,6 +189,10 @@ screen_update_geometry(struct screen_ctx *sc)
rc = xmalloc(sizeof(*rc));
rc->num = i;
rc->area.x = ci->x;
rc->area.y = ci->y;
rc->area.w = ci->width;
rc->area.h = ci->height;
rc->view.x = ci->x;
rc->view.y = ci->y;
rc->view.w = ci->width;