some more refactoring

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 5ed8981..20450db 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,7 +19,7 @@
 
 char stext[256];
 int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
 
 char stext[256];
 int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;

-unsigned int master, nmaster, ntags, numlockmask;
+unsigned int ntags, numlockmask;

 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool *seltag;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool *seltag;


@@ -117,7 +117,7 @@ setup(void) {
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
        grabkeys();
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
        grabkeys();

-       initrregs();
+       compileregexps();

        for(ntags = 0; tags[ntags]; ntags++);
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
        for(ntags = 0; tags[ntags]; ntags++);
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;


@@ -133,8 +133,6 @@ setup(void) {
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

-       master = MASTER;
-       nmaster = NMASTER;

        bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
        /* bar */
        dc.h = bh = dc.font.height + 2;
        bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
        /* bar */
        dc.h = bh = dc.font.height + 2;