removed DEFTAG

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 50fb9d7..a51ba88 100644 (file)
--- a/main.c
+++ b/main.c
@@ -33,9 +33,9 @@ cleanup()
        else
                XFreeFont(dpy, dc.font.xfont);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        else
                XFreeFont(dpy, dc.font.xfont);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);

-       XDestroyWindow(dpy, barwin);

        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);

+       XDestroyWindow(dpy, barwin);

        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
 }
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
 }


@@ -63,7 +63,7 @@ scan()
 }
 
 static int
 }
 
 static int

-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
+winprop(Window w, Atom a, Atom t, long l, unsigned char **prop)

 {
        int status, format;
        unsigned long res, extra;
 {
        int status, format;
        unsigned long res, extra;


@@ -116,7 +116,7 @@ getproto(Window w)
        long res;
        Atom *protocols;
 
        long res;
        Atom *protocols;
 

-       res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+       res = winprop(w, wmatom[WMProtocols], XA_ATOM, 20L,

                        ((unsigned char **)&protocols));
        if(res <= 0) {
                return protos;
                        ((unsigned char **)&protocols));
        if(res <= 0) {
                return protos;


@@ -241,7 +241,7 @@ main(int argc, char *argv[])
 
        for(ntags = 0; tags[ntags]; ntags++);
        seltag = emallocz(sizeof(Bool) * ntags);
 
        for(ntags = 0; tags[ntags]; ntags++);
        seltag = emallocz(sizeof(Bool) * ntags);

-       seltag[DEFTAG] = True;
+       seltag[0] = True;

 
        /* style */
        dc.bg = getcolor(BGCOLOR);
 
        /* style */
        dc.bg = getcolor(BGCOLOR);


@@ -286,11 +286,9 @@ main(int argc, char *argv[])
                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(xfd, &rd);
                i = select(xfd + 1, &rd, NULL, NULL, NULL);
                        FD_SET(STDIN_FILENO, &rd);
                FD_SET(xfd, &rd);
                i = select(xfd + 1, &rd, NULL, NULL, NULL);

-               if(i == -1 && errno == EINTR)
+               if((i == -1) && (errno == EINTR))

                        continue;
                        continue;

-               if(i < 0)
-                       eprint("select failed\n");
-               else if(i > 0) {
+               if(i > 0) {

                        if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
                                readin = NULL != fgets(stext, sizeof(stext), stdin);
                                if(readin)
                        if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
                                readin = NULL != fgets(stext, sizeof(stext), stdin);
                                if(readin)


@@ -300,6 +298,8 @@ main(int argc, char *argv[])
                                drawstatus();
                        }
                }
                                drawstatus();
                        }
                }

+               else if(i < 0)
+                       eprint("select failed\n");

                procevent();
        }
        cleanup();
                procevent();
        }
        cleanup();