small fix of initial numlockmask value

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 86cd3f9..067f383 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,9 +1,10 @@
-/* (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.
  */
 
 #include "dwm.h"
 #include <errno.h>
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -16,10 +17,10 @@
 
 /* extern */
 
-char stext[1024];
+char stext[1024], mtext[32];
 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;
@@ -39,9 +40,9 @@ static Bool otherwm, readin;
 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);
@@ -51,6 +52,9 @@ cleanup(void) {
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XDestroyWindow(dpy, barwin);
+       XFreeCursor(dpy, cursor[CurNormal]);
+       XFreeCursor(dpy, cursor[CurResize]);
+       XFreeCursor(dpy, cursor[CurMove]);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
        free(seltag);
@@ -97,6 +101,7 @@ setup(void) {
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init modifier map */
+       numlockmask = 0;
        modmap = XGetModifierMapping(dpy);
        for (i = 0; i < 8; i++) {
                for (j = 0; j < modmap->max_keypermod; j++) {
@@ -104,7 +109,7 @@ setup(void) {
                                numlockmask = (1 << i);
                }
        }
-       XFree(modmap);
+       XFreeModifiermap(modmap);
        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
                | EnterWindowMask | LeaveWindowMask;
@@ -124,11 +129,12 @@ setup(void) {
        dc.status[ColFG] = getcolor(STATUSFGCOLOR);
        setfont(FONT);
        /* geometry */
-       bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ?  textw(TILESYMBOL) : textw(FLOATSYMBOL);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        master = MASTER;
+       nmaster = NMASTER;
+       updatemodetext();
        /* bar */
        bx = sx;
        by = sy;
@@ -227,15 +233,17 @@ xerror(Display *dpy, XErrorEvent *ee) {
 
 int
 main(int argc, char *argv[]) {
+       char *p;
        int r, xfd;
        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)
                eprint("usage: dwm [-v]\n");
+       setlocale(LC_CTYPE, "");
        dpy = XOpenDisplay(0);
        if(!dpy)
                eprint("dwm: cannot open display\n");
@@ -270,22 +278,24 @@ main(int argc, char *argv[]) {
                if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
                        if(errno == EINTR)
                                continue;
-                       else
-                               eprint("select failed\n");
+                       eprint("select failed\n");
                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {
-                       switch(r = read(STDIN_FILENO, stext, sizeof(stext) - 1)) {
+                       switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
                        case -1:
-                               strncpy(stext, strerror(errno), sizeof(stext));
-                               stext[sizeof(stext) - 1] = '\0';
+                               strncpy(stext, strerror(errno), sizeof stext - 1);
+                               stext[sizeof stext - 1] = '\0';
                                readin = False;
                                break;
                        case 0:
-                               strncpy(stext, "EOF", sizeof(stext));
+                               strncpy(stext, "EOF", 4);
                                readin = False;
                                break;
                        default:
-                               stext[r - (stext[r - 1] == '\n' ? 1 : 0)] = '\0';
+                               for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
+                               for(p = stext + strlen(stext) - 1; p >= stext && *p != '\n'; --p);
+                               if(p > stext)
+                                       strncpy(stext, p + 1, sizeof stext);
                        }
                        drawstatus();
                }