Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
changed getproto, maybe that might fix the killclient issue reported on the list
[dwm.git]
/
main.c
diff --git
a/main.c
b/main.c
index
633966b
..
4c7a1a4
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-102,9
+102,10
@@
getproto(Window w)
int protos = 0;
int i;
long res;
int protos = 0;
int i;
long res;
-
unsigned char
*protocols;
+
Atom
*protocols;
- res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
+ res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+ ((unsigned char **)&protocols));
if(res <= 0) {
return protos;
}
if(res <= 0) {
return protos;
}
@@
-178,15
+179,14
@@
main(int argc, char *argv[])
dpy = XOpenDisplay(0);
if(!dpy)
dpy = XOpenDisplay(0);
if(!dpy)
- eprint("dwm: cannot
connect X server
\n");
+ eprint("dwm: cannot
open display
\n");
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- /* check if another WM is already running */
otherwm = False;
XSetErrorHandler(xerrorstart);
otherwm = False;
XSetErrorHandler(xerrorstart);
- /* this causes an error if some other
WM
is running */
+ /* this causes an error if some other
window manager
is running */
XSelectInput(dpy, root, SubstructureRedirectMask);
XSync(dpy, False);
XSelectInput(dpy, root, SubstructureRedirectMask);
XSync(dpy, False);