X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=lib%2Fswm_hack.c;h=c5f5b5b8945d7a0c8f114197ede767f436e4d7f8;hb=f8e5a1cf72a70dd2ca375c94a63fd269990ea633;hp=34550d81a8215001aed91db57a2c977402a679d2;hpb=8d74b4359e4bb6a3891f30f27cbb47b47e8a6ccb;p=spectrwm.git

diff --git a/lib/swm_hack.c b/lib/swm_hack.c
index 34550d8..c5f5b5b 100644
--- a/lib/swm_hack.c
+++ b/lib/swm_hack.c
@@ -1,4 +1,3 @@
-/* $scrotwm$ */
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
@@ -56,7 +55,9 @@ static void		*lib_xtlib = NULL;
 
 static Window		root = None;
 static int		xterm = 0;
-static Display		*dpy = NULL;
+static Display		*display = NULL;
+
+void	set_property(Display *, Window, char *, char *);
 
 /* Find our root window */
 static              Window
@@ -91,9 +92,8 @@ set_property(Display *dpy, Window id, char *name, char *val)
 {
 	Atom			atom = 0;
 	char			prop[SWM_PROPLEN];
-
-	static XIA         	*xia = NULL;
-	static XCP         	*xcp = NULL;
+	static XIA		*xia = NULL;
+	static XCP		*xcp = NULL;
 
 	/* find the real Xlib and the real X function */
 	if (!lib_xlib)
@@ -105,10 +105,11 @@ set_property(Display *dpy, Window id, char *name, char *val)
 
 	/* Try to update the window's workspace property */
 	atom = (*xia)(dpy, name, False);
-	if (atom) 
+	if (atom)
 		if (snprintf(prop, SWM_PROPLEN, "%s", val) < SWM_PROPLEN)
 			(*xcp)(dpy, id, atom, XA_STRING,
-			    8, PropModeReplace, prop, SWM_PROPLEN);
+			    8, PropModeReplace, (unsigned char *)prop,
+			    strlen((char *)prop));
 }
 
 typedef             Window(CWF) (Display * _display, Window _parent, int _x,
@@ -121,7 +122,7 @@ typedef             Window(CWF) (Display * _display, Window _parent, int _x,
 
 /* XCreateWindow intercept hack */
 Window
-XCreateWindow(Display * display, Window parent, int x, int y,
+XCreateWindow(Display *dpy, Window parent, int x, int y,
    unsigned int width, unsigned int height,
    unsigned int border_width,
    int depth, unsigned int clss, Visual * visual,
@@ -136,20 +137,20 @@ XCreateWindow(Display * display, Window parent, int x, int y,
 		lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
 	if (!func) {
 		func = (CWF *) dlsym(lib_xlib, "XCreateWindow");
-		dpy = display;
+		display = dpy;
 	}
 
-	if (parent == DefaultRootWindow(display))
-		parent = MyRoot(display);
+	if (parent == DefaultRootWindow(dpy))
+		parent = MyRoot(dpy);
 	
-	id = (*func) (display, parent, x, y, width, height, border_width,
+	id = (*func) (dpy, parent, x, y, width, height, border_width,
 	    depth, clss, visual, valuemask, attributes);
 
 	if (id) {
 		if ((env = getenv("_SWM_WS")) != NULL) 
-			set_property(display, id, "_SWM_WS", env);
+			set_property(dpy, id, "_SWM_WS", env);
 		if ((env = getenv("_SWM_PID")) != NULL)
-			set_property(display, id, "_SWM_PID", env);
+			set_property(dpy, id, "_SWM_PID", env);
 		if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
 			unsetenv("_SWM_XTERM_FONTADJ");
 			xterm = 1;
@@ -167,7 +168,7 @@ typedef             Window(CSWF) (Display * _display, Window _parent, int _x,
 
 /* XCreateSimpleWindow intercept hack */
 Window
-XCreateSimpleWindow(Display * display, Window parent, int x, int y,
+XCreateSimpleWindow(Display *dpy, Window parent, int x, int y,
     unsigned int width, unsigned int height,
     unsigned int border_width,
     unsigned long border, unsigned long background)
@@ -182,17 +183,17 @@ XCreateSimpleWindow(Display * display, Window parent, int x, int y,
 	if (!func)
 		func = (CSWF *) dlsym(lib_xlib, "XCreateSimpleWindow");
 
-	if (parent == DefaultRootWindow(display))
-		parent = MyRoot(display);
+	if (parent == DefaultRootWindow(dpy))
+		parent = MyRoot(dpy);
 
-	id = (*func) (display, parent, x, y, width, height,
+	id = (*func) (dpy, parent, x, y, width, height,
 	    border_width, border, background);
 
 	if (id) {
 		if ((env = getenv("_SWM_WS")) != NULL) 
-			set_property(display, id, "_SWM_WS", env);
+			set_property(dpy, id, "_SWM_WS", env);
 		if ((env = getenv("_SWM_PID")) != NULL)
-			set_property(display, id, "_SWM_PID", env);
+			set_property(dpy, id, "_SWM_PID", env);
 		if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
 			unsetenv("_SWM_XTERM_FONTADJ");
 			xterm = 1;
@@ -206,7 +207,7 @@ typedef int         (RWF) (Display * _display, Window _window, Window _parent,
 
 /* XReparentWindow intercept hack */
 int
-XReparentWindow(Display * display, Window window, Window parent, int x, int y)
+XReparentWindow(Display *dpy, Window window, Window parent, int x, int y)
 {
 	static RWF         *func = NULL;
 
@@ -216,10 +217,10 @@ XReparentWindow(Display * display, Window window, Window parent, int x, int y)
 	if (!func)
 		func = (RWF *) dlsym(lib_xlib, "XReparentWindow");
 
-	if (parent == DefaultRootWindow(display))
-		parent = MyRoot(display);
+	if (parent == DefaultRootWindow(dpy))
+		parent = MyRoot(dpy);
 
-	return (*func) (display, window, parent, x, y);
+	return (*func) (dpy, window, parent, x, y);
 }
 
 typedef		void (ANEF) (XtAppContext app_context, XEvent *event_return);
@@ -235,16 +236,16 @@ void
 XtAppNextEvent(XtAppContext app_context, XEvent *event_return)
 {
 	static ANEF	*func = NULL;
-	static int	kp_add = 0, kp_subtract = 0;
+	static KeyCode	kp_add = 0, kp_subtract = 0;
 
 	/* find the real Xlib and the real X function */
 	if (!lib_xtlib)
 		lib_xtlib = dlopen("libXt.so", RTLD_GLOBAL | RTLD_LAZY);
 	if (!func) {
 		func = (ANEF *) dlsym(lib_xtlib, "XtAppNextEvent");
-		if (dpy != NULL) {
-			kp_add = XKeysymToKeycode(dpy, XK_KP_Add);
-			kp_subtract = XKeysymToKeycode(dpy, XK_KP_Subtract);
+		if (display != NULL) {
+			kp_add = XKeysymToKeycode(display, XK_KP_Add);
+			kp_subtract = XKeysymToKeycode(display, XK_KP_Subtract);
 		}
 	}