switched to regexp matching for Rules

[dwm.git] / main.c

diff --git a/main.c b/main.c
index dffa4ba..633966b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,7 +4,6 @@
  */
 
 #include "dwm.h"
  */
 
 #include "dwm.h"

-

 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -15,7 +14,6 @@
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 

-

 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 /* static */
 
 static int (*xerrorxlib)(Display *, XErrorEvent *);


@@ -85,10 +83,9 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 char stext[1024];
 /* 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;
 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;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;


@@ -113,7 +110,7 @@ getproto(Window w)
        }
        for(i = 0; i < res; i++) {
                if(protocols[i] == wmatom[WMDelete])
        }
        for(i = 0; i < res; i++) {
                if(protocols[i] == wmatom[WMDelete])

-                       protos |= WM_PROTOCOL_DELWIN;
+                       protos |= PROTODELWIN;

        }
        free((char *) protocols);
        return protos;
        }
        free((char *) protocols);
        return protos;


@@ -213,6 +210,9 @@ main(int argc, char *argv[])
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        grabkeys();
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        grabkeys();

+       initrregs();
+
+       for(ntags = 0; tags[ntags]; ntags++);

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