about summary refs log tree commit diff
path: root/xutil.c
diff options
context:
space:
mode:
authorokan <okan>2013-04-14 16:13:17 +0000
committerokan <okan>2013-04-14 16:13:17 +0000
commit6f185bb03c3ba0928ba6254485c710103379bd1a (patch)
treea1ad2c61058ca193942a4a00757ff25bd7c9a784 /xutil.c
parenta957ed7c7dcc287afcf33547326717701a0445de (diff)
parent16ed8bf8e4f561049b732b326f3d0ee475fe13f6 (diff)
downloadcwm-6f185bb03c3ba0928ba6254485c710103379bd1a.tar.gz
cwm-6f185bb03c3ba0928ba6254485c710103379bd1a.tar.xz
cwm-6f185bb03c3ba0928ba6254485c710103379bd1a.zip
cvsimport
Diffstat (limited to 'xutil.c')
-rw-r--r--xutil.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/xutil.c b/xutil.c
index cb8b3fc..108421e 100644
--- a/xutil.c
+++ b/xutil.c
@@ -72,13 +72,13 @@ xu_btn_ungrab(Window win, int mask, u_int btn)
 }
 
 void
-xu_ptr_getpos(Window rootwin, int *x, int *y)
+xu_ptr_getpos(Window win, int *x, int *y)
 {
 	Window	 w0, w1;
 	int	 tmp0, tmp1;
 	u_int	 tmp2;
 
-	XQueryPointer(X_Dpy, rootwin, &w0, &w1, &tmp0, &tmp1, x, y, &tmp2);
+	XQueryPointer(X_Dpy, win, &w0, &w1, &tmp0, &tmp1, x, y, &tmp2);
 }
 
 void
@@ -203,11 +203,11 @@ xu_getstrprop(Window win, Atom atm, char **text) {
 }
 
 int
-xu_getstate(struct client_ctx *cc, int *state)
+xu_getstate(Window win, int *state)
 {
 	long	*p = NULL;
 
-	if (xu_getprop(cc->win, cwmh[WM_STATE].atom, cwmh[WM_STATE].atom, 2L,
+	if (xu_getprop(win, cwmh[WM_STATE].atom, cwmh[WM_STATE].atom, 2L,
 	    (u_char **)&p) <= 0)
 		return (-1);
 
@@ -292,7 +292,7 @@ xu_ewmh_net_supported_wm_check(struct screen_ctx *sc)
 	XChangeProperty(X_Dpy, w, ewmh[_NET_SUPPORTING_WM_CHECK].atom,
 	    XA_WINDOW, 32, PropModeReplace, (unsigned char *)&w, 1);
 	XChangeProperty(X_Dpy, w, ewmh[_NET_WM_NAME].atom,
-	    XA_WM_NAME, 8, PropModeReplace, (unsigned char *)WMNAME,
+	    cwmh[UTF8_STRING].atom, 8, PropModeReplace, (unsigned char *)WMNAME,
 	    strlen(WMNAME));
 }