corrections

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 86cd3f9..c3526aa 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>
  * See LICENSE file for license details.
  */
 
 #include "dwm.h"
 #include <errno.h>

+#include <locale.h>

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


@@ -39,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(clients) {
+               resize(clients, True, TopLeft);
+               unmanage(clients);

        }
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        }
        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);
        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);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
        free(seltag);


@@ -104,7 +108,7 @@ setup(void) {
                                numlockmask = (1 << i);
                }
        }
                                numlockmask = (1 << i);
                }
        }

-       XFree(modmap);
+       XFreeModifiermap(modmap);

        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
                | EnterWindowMask | LeaveWindowMask;
        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
                | EnterWindowMask | LeaveWindowMask;


@@ -227,15 +231,17 @@ xerror(Display *dpy, XErrorEvent *ee) {
 
 int
 main(int argc, char *argv[]) {
 
 int
 main(int argc, char *argv[]) {

+       char *p;

        int r, xfd;
        fd_set rd;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3)) {
        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");
                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");
        dpy = XOpenDisplay(0);
        if(!dpy)
                eprint("dwm: cannot open display\n");


@@ -270,22 +276,24 @@ main(int argc, char *argv[]) {
                if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
                        if(errno == EINTR)
                                continue;
                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)) {
                }
                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:
                        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:
                                readin = False;
                                break;
                        case 0:

-                               strncpy(stext, "EOF", sizeof(stext));
+                               strncpy(stext, "EOF", 4);

                                readin = False;
                                break;
                        default:
                                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();
                }
                        }
                        drawstatus();
                }