X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=6da3ccd57495ed2a2eef005fb205793dd9da28d7;hb=8b4bc8270a975a14c1fb7db0a94d83f4ba4d2734;hp=a51ba887136d54b96deac231526127aa6275efc1;hpb=595028614bc94c1733b28725dcf9777b0a47ad24;p=dwm.git

diff --git a/main.c b/main.c
index a51ba88..6da3ccd 100644
--- a/main.c
+++ b/main.c
@@ -62,25 +62,6 @@ scan()
 		XFree(wins);
 }
 
-static int
-winprop(Window w, Atom a, Atom t, long l, unsigned char **prop)
-{
-	int status, format;
-	unsigned long res, extra;
-	Atom real;
-
-	status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
-			&res, &extra, prop);
-
-	if(status != Success || *prop == 0) {
-		return 0;
-	}
-	if(res == 0) {
-		free((void *) *prop);
-	}
-	return res;
-}
-
 /*
  * Startup Error handler to check if another window manager
  * is already running.
@@ -111,21 +92,19 @@ Window root, barwin;
 int
 getproto(Window w)
 {
-	int protos = 0;
-	int i;
-	long res;
-	Atom *protocols;
-
-	res = winprop(w, wmatom[WMProtocols], XA_ATOM, 20L,
-			((unsigned char **)&protocols));
-	if(res <= 0) {
+	int i, format, protos, status;
+	unsigned long extra, res;
+	Atom *protocols, real;
+
+	protos = 0;
+	status = XGetWindowProperty(dpy, w, wmatom[WMProtocols], 0L, 20L, False,
+			XA_ATOM, &real, &format, &res, &extra, (unsigned char **)&protocols);
+	if(status != Success || protocols == 0)
 		return protos;
-	}
-	for(i = 0; i < res; i++) {
+	for(i = 0; i < res; i++)
 		if(protocols[i] == wmatom[WMDelete])
 			protos |= PROTODELWIN;
-	}
-	free((char *) protocols);
+	free(protocols);
 	return protos;
 }