Refactor callbacks to take a void * so as to not try and generalize into

client_ctx in keypress and buttonpress event handlers; pass appropriate *ctx's
based on context.

While here, limit some globals, replace defines with appropriate variables and
fix some naming.
This commit is contained in:
okan
2016-10-18 17:03:30 +00:00
parent 38eac7d7e9
commit 0bb1be86c6
10 changed files with 512 additions and 509 deletions

View File

@ -84,7 +84,7 @@ screen_init(int which)
}
screen_updatestackingorder(sc);
if (HasRandr)
if (Conf.xrandr)
XRRSelectInput(X_Dpy, sc->rootwin, RRScreenChangeNotifyMask);
TAILQ_INSERT_TAIL(&Screenq, sc, entry);
@ -140,7 +140,7 @@ region_find(struct screen_ctx *sc, int x, int y)
}
struct geom
screen_area(struct screen_ctx *sc, int x, int y, int flags)
screen_area(struct screen_ctx *sc, int x, int y, enum apply_gap apply_gap)
{
struct region_ctx *rc;
struct geom area = sc->work;
@ -152,7 +152,7 @@ screen_area(struct screen_ctx *sc, int x, int y, int flags)
break;
}
}
if (flags & CWM_GAP)
if (apply_gap)
area = screen_apply_gap(sc, area);
return(area);
}
@ -173,7 +173,7 @@ screen_update_geometry(struct screen_ctx *sc)
free(rc);
}
if (HasRandr) {
if (Conf.xrandr) {
XRRScreenResources *sr;
XRRCrtcInfo *ci;
int i;