Added tag 2.9 for changeset 3a5910fac3cc

[dwm.git] / main.c

diff --git a/main.c b/main.c
index c42d1ff..da209a9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 


@@ -20,7 +20,7 @@
 char stext[1024];
 Bool *seltag;
 int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
 char stext[1024];
 Bool *seltag;
 int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;

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

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


@@ -40,9 +40,9 @@ static Bool otherwm, readin;
 static void
 cleanup(void) {
        close(STDIN_FILENO);
 static void
 cleanup(void) {
        close(STDIN_FILENO);

-       while(sel) {
-               resize(sel, True, TopLeft);
-               unmanage(sel);
+       while(stack) {
+               resize(stack, True, TopLeft);
+               unmanage(stack);

        }
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        }
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);


@@ -133,6 +133,7 @@ setup(void) {
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        master = MASTER;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        master = MASTER;

+       nmaster = NMASTER;

        /* bar */
        bx = sx;
        by = sy;
        /* bar */
        bx = sx;
        by = sy;


@@ -236,7 +237,7 @@ main(int argc, char *argv[]) {
        fd_set rd;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {
        fd_set rd;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {

-               fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+               fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);

                exit(EXIT_SUCCESS);
        }
        else if(argc != 1)
                exit(EXIT_SUCCESS);
        }
        else if(argc != 1)