diff options
author | Vito Caputo <vcaputo@gnugeneration.com> | 2017-03-05 17:06:12 -0800 |
---|---|---|
committer | Vito Caputo <vcaputo@gnugeneration.com> | 2017-03-14 19:41:48 -0700 |
commit | 4c0ec19811a6192ae8c3739bd9caff7d91bb725f (patch) | |
tree | 026b567b8fb83ffdfa2c31c9113c183396b61b4b /src/screen.c | |
parent | 4dc9319239a172eb9f36ca57ea539a4a28edb50f (diff) |
vwm: utilize vwm_xserver_t, minor refactor
Diffstat (limited to 'src/screen.c')
-rw-r--r-- | src/screen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/screen.c b/src/screen.c index 8fb63a5..4136d95 100644 --- a/src/screen.c +++ b/src/screen.c @@ -58,8 +58,8 @@ const vwm_screen_t * vwm_screen_find(vwm_t *vwm, vwm_screen_rel_t rel, ...) faux.screen_number = 0; faux.x_org = 0; faux.y_org = 0; - faux.width = WidthOfScreen(DefaultScreenOfDisplay(vwm->display)); - faux.height = HeightOfScreen(DefaultScreenOfDisplay(vwm->display)); + faux.width = WidthOfScreen(DefaultScreenOfDisplay(VWM_XDISPLAY(vwm))); + faux.height = HeightOfScreen(DefaultScreenOfDisplay(VWM_XDISPLAY(vwm))); if (!vwm->xinerama_screens) goto _out; @@ -92,7 +92,7 @@ const vwm_screen_t * vwm_screen_find(vwm_t *vwm, vwm_screen_rel_t rel, ...) Window root, child; /* get the pointer coordinates and find which screen it's in */ - XQueryPointer(vwm->display, VWM_XROOT(vwm), &root, &child, &root_x, &root_y, &win_x, &win_y, &mask); + XQueryPointer(VWM_XDISPLAY(vwm), VWM_XROOT(vwm), &root, &child, &root_x, &root_y, &win_x, &win_y, &mask); for_each_screen(scr) { if (root_x >= scr->x_org && root_x < scr->x_org + scr->width && |