diff options
| author | okan <okan> | 2012-07-05 17:35:13 +0000 |
|---|---|---|
| committer | okan <okan> | 2012-07-05 17:35:13 +0000 |
| commit | 1124ee5cc1342d62ccdcb6d163809434184b9301 (patch) | |
| tree | f298ab86fa7b8bea65695832a43c62d4cc528222 | |
| parent | 287a5b2aad2fb54fbe7016fc90f8a62b1433547b (diff) | |
| download | cwm-1124ee5cc1342d62ccdcb6d163809434184b9301.tar.gz cwm-1124ee5cc1342d62ccdcb6d163809434184b9301.tar.xz cwm-1124ee5cc1342d62ccdcb6d163809434184b9301.zip | |
the display's width and height are updated after an XRandR event so we
don't need to pass down the new values to screen_update_geometry(); so just read the width/height values directly for both uses of screen_update_geometry(). prep for further changes in this area.
| -rw-r--r-- | calmwm.c | 4 | ||||
| -rw-r--r-- | calmwm.h | 2 | ||||
| -rw-r--r-- | screen.c | 6 | ||||
| -rw-r--r-- | xevents.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/calmwm.c b/calmwm.c index 2a52f6a..6254781 100644 --- a/calmwm.c +++ b/calmwm.c @@ -167,8 +167,8 @@ x_setupscreen(struct screen_ctx *sc, u_int which) xu_ewmh_net_supported_wm_check(sc); conf_gap(&Conf, sc); - screen_update_geometry(sc, DisplayWidth(X_Dpy, sc->which), - DisplayHeight(X_Dpy, sc->which)); + + screen_update_geometry(sc); conf_color(&Conf, sc); diff --git a/calmwm.h b/calmwm.h index 2d2064e..301f21f 100644 --- a/calmwm.h +++ b/calmwm.h @@ -361,7 +361,7 @@ void search_print_client(struct menu *, int); XineramaScreenInfo *screen_find_xinerama(struct screen_ctx *, int, int); struct screen_ctx *screen_fromroot(Window); void screen_init_xinerama(struct screen_ctx *); -void screen_update_geometry(struct screen_ctx *, int, int); +void screen_update_geometry(struct screen_ctx *); void screen_updatestackingorder(struct screen_ctx *); void kbfunc_client_cycle(struct client_ctx *, union arg *); diff --git a/screen.c b/screen.c index 6711073..2285257 100644 --- a/screen.c +++ b/screen.c @@ -109,10 +109,10 @@ screen_find_xinerama(struct screen_ctx *sc, int x, int y) } void -screen_update_geometry(struct screen_ctx *sc, int width, int height) +screen_update_geometry(struct screen_ctx *sc) { - sc->xmax = width; - sc->ymax = height; + sc->xmax = DisplayWidth(X_Dpy, sc->which); + sc->ymax = DisplayHeight(X_Dpy, sc->which); xu_ewmh_net_desktop_geometry(sc); xu_ewmh_net_workarea(sc); diff --git a/xevents.c b/xevents.c index db6450e..57983cd 100644 --- a/xevents.c +++ b/xevents.c @@ -365,7 +365,7 @@ xev_handle_randr(XEvent *ee) TAILQ_FOREACH(sc, &Screenq, entry) { if (sc->which == (u_int)i) { XRRUpdateConfiguration(ee); - screen_update_geometry(sc, rev->width, rev->height); + screen_update_geometry(sc); screen_init_xinerama(sc); } } |