X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=4730a0f20143a61460ef0dce3034803e981c9464;hb=af1157519cecb67d3039e1861d99bf070f0cfba0;hp=70cb810c31dab05cc9c595123d989f9bdbf0cb67;hpb=d1c7dc33a6a2fd9bea33d53deace0d1c0ebfae9f;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 70cb810..4730a0f 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -55,7 +55,7 @@
 static const char	*cvstag =
     "$scrotwm$";
 
-#define	SWM_VERSION	"0.9.33"
+#define	SWM_VERSION	"0.9.34"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -614,12 +614,11 @@ void
 ewmh_autoquirk(struct ws_win *win)
 {
 	int			success, i;
-	unsigned long		*data = NULL;
-	unsigned long		n;
+	unsigned long		*data = NULL, n;
 	Atom			type;
 
 	success = get_property(win->id, ewmh[_NET_WM_WINDOW_TYPE].atom, (~0L),
-	    XA_ATOM, &n, (unsigned char **)&data);
+	    XA_ATOM, &n, (void *)&data);
 
 	if (!success) {
 		XFree(data);
@@ -808,7 +807,7 @@ ewmh_get_win_state(struct ws_win *win)
 		win->ewmh_flags |= SWM_F_MANUAL;
 
 	success = get_property(win->id, ewmh[_NET_WM_STATE].atom,
-	    (~0L), XA_ATOM, &n, (unsigned char **)&states);
+	    (~0L), XA_ATOM, &n, (void *)&states);
 
 	if (!success)
 		return;
@@ -1167,8 +1166,8 @@ custom_region(char *val)
 	if (w < 1 || h < 1)
 		errx(1, "region %ux%u+%u+%u too small\n", w, h, x, y);
 
-	if (x  < 0 || x > DisplayWidth(display, sidx) ||
-	    y < 0 || y > DisplayHeight(display, sidx) ||
+	if (x > DisplayWidth(display, sidx) ||
+	    y > DisplayHeight(display, sidx) ||
 	    w + x > DisplayWidth(display, sidx) ||
 	    h + y > DisplayHeight(display, sidx)) {
 		fprintf(stderr, "ignoring region %ux%u+%u+%u "
@@ -3058,7 +3057,8 @@ send_to_ws(struct swm_region *r, union arg *args)
 	/* Try to update the window's workspace property */
 	ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
 	if (ws_idx_atom &&
-	    snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) {
+	    snprintf((char *)ws_idx_str, SWM_PROPLEN, "%d", nws->idx) <
+	        SWM_PROPLEN) {
 		DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n",
 		    ws_idx_str);
 		XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
@@ -3139,7 +3139,7 @@ uniconify(struct swm_region *r, union arg *args)
 {
 	struct ws_win		*win;
 	FILE			*lfile;
-	char			*name;
+	unsigned char		*name;
 	int			count = 0;
 	unsigned long		len;
 
@@ -3190,7 +3190,8 @@ search_do_resp(void)
 {
 	ssize_t			rbytes;
 	struct ws_win		*win;
-	char			*name, *resp, *s;
+	unsigned char		*name;
+	char			*resp, *s;
 	unsigned long		len;
 
 	DNPRINTF(SWM_D_MISC, "search_do_resp:\n");
@@ -4988,7 +4989,7 @@ tryharder:
 	if (prop == NULL)
 		return (0);
 
-	ret = strtonum(prop, 0, UINT_MAX, &errstr);
+	ret = strtonum((const char *)prop, 0, UINT_MAX, &errstr);
 	/* ignore error because strtonum returns 0 anyway */
 	XFree(prop);
 
@@ -5082,7 +5083,7 @@ manage_window(Window id)
 		p = NULL;
 	} else if (prop && win->transient == 0) {
 		DNPRINTF(SWM_D_PROP, "got property _SWM_WS=%s\n", prop);
-		ws_idx = strtonum(prop, 0, 9, &errstr);
+		ws_idx = strtonum((const char *)prop, 0, 9, &errstr);
 		if (errstr) {
 			DNPRINTF(SWM_D_EVENT, "window idx is %s: %s",
 			    errstr, prop);
@@ -5123,7 +5124,8 @@ manage_window(Window id)
 
 	/* Set window properties so we can remember this after reincarnation */
 	if (ws_idx_atom && prop == NULL &&
-	    snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) < SWM_PROPLEN) {
+	    snprintf((char *)ws_idx_str, SWM_PROPLEN, "%d", ws->idx) <
+	        SWM_PROPLEN) {
 		DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n",
 		    ws_idx_str);
 		XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,