removed TLast tag enum, now tags is simple defined as char *[] array, the rest is...

[dwm.git] / main.c

diff --git a/main.c b/main.c
index db36536..9ea09bf 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,17 +4,16 @@
  */
 
 #include "dwm.h"
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/select.h>
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
-
 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
@@ -84,10 +83,9 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
-/* CUSTOMIZE */
-int tsel = Tdev; /* default tag */
-/* END CUSTOMIZE */
+int tsel = DEFTAG;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+unsigned int ntags;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
@@ -112,7 +110,7 @@ getproto(Window w)
        }
        for(i = 0; i < res; i++) {
                if(protocols[i] == wmatom[WMDelete])
-                       protos |= WM_PROTOCOL_DELWIN;
+                       protos |= PROTODELWIN;
        }
        free((char *) protocols);
        return protos;
@@ -163,7 +161,7 @@ xerror(Display *dpy, XErrorEvent *ee)
 int
 main(int argc, char *argv[])
 {
-       int i, n;
+       int i;
        unsigned int mask;
        fd_set rd;
        Bool readin = True;
@@ -213,6 +211,8 @@ main(int argc, char *argv[])
 
        grabkeys();
 
+       for(ntags = 0; tags[ntags]; ntags++);
+
        /* style */
        dc.bg = getcolor(BGCOLOR);
        dc.fg = getcolor(FGCOLOR);