implement multi-tag selection through button3 click on the specific tag

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 633966b..fec7ea8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -83,7 +83,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
-int tsel = DEFTAG;
+Bool *tsel;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 unsigned int ntags;
 Atom wmatom[WMLast], netatom[NetLast];
@@ -102,9 +102,10 @@ getproto(Window w)
        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;
        }
@@ -178,15 +179,14 @@ main(int argc, char *argv[])
 
        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);
 
-       /* check if another WM is already running */
        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);
 
@@ -213,6 +213,8 @@ main(int argc, char *argv[])
        initrregs();
 
        for(ntags = 0; tags[ntags]; ntags++);
+       tsel = emallocz(sizeof(Bool) * ntags);
+       tsel[DEFTAG] = True;
 
        /* style */
        dc.bg = getcolor(BGCOLOR);
@@ -240,6 +242,8 @@ main(int argc, char *argv[])
 
        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
+
+       strcpy(stext, "dwm-"VERSION);
        drawstatus();
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
@@ -248,10 +252,10 @@ main(int argc, char *argv[])
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
-       strcpy(stext, "dwm-"VERSION);
        scan();
 
-       /* main event loop, reads status text from stdin as well */
+       /* main event loop, also reads status text from stdin */
+       XSync(dpy, False);
        while(running) {
                FD_ZERO(&rd);
                if(readin)