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.

4 files changed, 11 insertions, 11 deletions

diff --git a/app/cwm/calmwm.c b/app/cwm/calmwm.c
index 30cf99f6f..77af7a8f1 100644
--- a/app/cwm/calmwm.c
+++ b/app/cwm/calmwm.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.c,v 1.61 2012/05/16 01:17:14 okan Exp $
+ * $OpenBSD: calmwm.c,v 1.62 2012/07/05 17:35:13 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 4c6c90f73..db595fe41 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.147 2012/07/03 13:49:03 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.148 2012/07/05 17:35:13 okan Exp $
  */
 
 #ifndef _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/app/cwm/screen.c b/app/cwm/screen.c
index 815acb58d..71c337270 100644
--- a/app/cwm/screen.c
+++ b/app/cwm/screen.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: screen.c,v 1.29 2012/07/03 13:49:03 okan Exp $
+ * $OpenBSD: screen.c,v 1.30 2012/07/05 17:35:13 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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/app/cwm/xevents.c b/app/cwm/xevents.c
index 56a200dbb..4c2c84842 100644
--- a/app/cwm/xevents.c
+++ b/app/cwm/xevents.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: xevents.c,v 1.61 2012/07/03 13:49:03 okan Exp $
+ * $OpenBSD: xevents.c,v 1.62 2012/07/05 17:35:13 okan Exp $
  */
 
 /*
@@ -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);
 		}
 	}