From 57691160415590c63cf83db6c021e377df9f1de4 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 29 Apr 2013 00:56:47 +0000
Subject: use an int in screen_init and avoid needing to cast for screen number
 (which).

---
 calmwm.h  | 6 +++---
 screen.c  | 4 ++--
 xevents.c | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index 7e62548..f1208f2 100644
--- a/calmwm.h
+++ b/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.191 2013/04/17 13:57:06 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.192 2013/04/29 00:56:47 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -205,7 +205,7 @@ TAILQ_HEAD(autogroupwin_q, autogroupwin);
 
 struct screen_ctx {
 	TAILQ_ENTRY(screen_ctx)	 entry;
-	u_int			 which;
+	int			 which;
 	Visual			*visual;
 	Colormap		 colormap;
 	Window			 rootwin;
@@ -374,7 +374,7 @@ void			 search_print_client(struct menu *, int);
 
 struct geom		 screen_find_xinerama(struct screen_ctx *, int, int);
 struct screen_ctx	*screen_fromroot(Window);
-void			 screen_init(u_int);
+void			 screen_init(int);
 void			 screen_update_geometry(struct screen_ctx *);
 void			 screen_updatestackingorder(struct screen_ctx *);
 
diff --git a/screen.c b/screen.c
index 601d60e..b63367a 100644
--- a/screen.c
+++ b/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.46 2013/04/12 14:46:30 okan Exp $
+ * $OpenBSD: screen.c,v 1.47 2013/04/29 00:56:48 okan Exp $
  */
 
 #include <sys/param.h>
@@ -31,7 +31,7 @@
 #include "calmwm.h"
 
 void
-screen_init(u_int which)
+screen_init(int which)
 {
 	struct screen_ctx	*sc;
 	Window			*wins, w0, w1;
diff --git a/xevents.c b/xevents.c
index ce73372..5118b90 100644
--- a/xevents.c
+++ b/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.71 2013/04/05 17:07:25 okan Exp $
+ * $OpenBSD: xevents.c,v 1.72 2013/04/29 00:56:48 okan Exp $
  */
 
 /*
@@ -362,7 +362,7 @@ xev_handle_randr(XEvent *ee)
 
 	i = XRRRootToScreen(X_Dpy, rev->root);
 	TAILQ_FOREACH(sc, &Screenq, entry) {
-		if (sc->which == (u_int)i) {
+		if (sc->which == i) {
 			XRRUpdateConfiguration(ee);
 			screen_update_geometry(sc);
 		}
-- 
cgit v1.2.3-2-gb3c3