mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Consolidate region 'view' and 'area'.

Browse Source
This commit is contained in:
okan 2018-02-13 15:06:22 +00:00
parent e6bf7429b3
commit 13763662c9
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calmwm.h
View File

@ -204,7 +204,6 @@ TAILQ_HEAD(autogroup_q, autogroup);
struct region_ctx { struct region_ctx {
TAILQ_ENTRY(region_ctx) entry; TAILQ_ENTRY(region_ctx) entry;
int num; int num;
struct geom area;
struct geom view; /* viewable area */ struct geom view; /* viewable area */
struct geom work; /* workable area, gap-applied */ struct geom work; /* workable area, gap-applied */
}; };

12
screen.c
View File

@ -146,12 +146,12 @@ struct geom
screen_area(struct screen_ctx *sc, int x, int y, enum apply_gap apply_gap) screen_area(struct screen_ctx *sc, int x, int y, enum apply_gap apply_gap)
{ {
struct region_ctx *rc; struct region_ctx *rc;
struct geom area = sc->work; struct geom area = sc->view;
TAILQ_FOREACH(rc, &sc->regionq, entry) { TAILQ_FOREACH(rc, &sc->regionq, entry) {
if ((x >= rc->area.x) && (x < (rc->area.x + rc->area.w)) && if ((x >= rc->view.x) && (x < (rc->view.x + rc->view.w)) &&
(y >= rc->area.y) && (y < (rc->area.y + rc->area.h))) { (y >= rc->view.y) && (y < (rc->view.y + rc->view.h))) {
area = rc->area; area = rc->view;
break; break;
} }
} }
@ -193,10 +193,6 @@ screen_update_geometry(struct screen_ctx *sc)
rc = xmalloc(sizeof(*rc)); rc = xmalloc(sizeof(*rc));
rc->num = i; 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.x = ci->x;
rc->view.y = ci->y; rc->view.y = ci->y;
rc->view.w = ci->width; rc->view.w = ci->width;