applied Ritesh's patch to stext handling with some minor modifications

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index f0dd14b..1529372 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -44,8 +44,9 @@
 /* macros */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
 #define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
-#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 #define LENGTH(x)              (sizeof x / sizeof x[0])
+#define MAXTAGLEN              16
+#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 
 /* enums */
@@ -143,6 +144,7 @@ unsigned long getcolor(const char *colstr);
 long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);
+void grabkeys(void);
 unsigned int idxoftag(const char *tag);
 void initfont(const char *fontstr);
 Bool isoccupied(unsigned int t);
@@ -231,7 +233,7 @@ Regs *regs = NULL;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-Bool prevtags[LENGTH(tags)] = {[0] = True};
+Bool prevtags[LENGTH(tags)];
 
 /* function implementations */
 void
@@ -838,6 +840,25 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
+void
+grabkeys(void)  {
+       unsigned int i;
+       KeyCode code;
+
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       for(i = 0; i < LENGTH(keys); i++) {
+               code = XKeysymToKeycode(dpy, keys[i].keysym);
+               XGrabKey(dpy, code, keys[i].mod, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+       }
+}
+
 unsigned int
 idxoftag(const char *tag) {
        unsigned int i;
@@ -925,27 +946,10 @@ isvisible(Client *c) {
 
 void
 keypress(XEvent *e) {
-       KEYS
        unsigned int i;
-       KeyCode code;
        KeySym keysym;
        XKeyEvent *ev;
 
-       if(!e) { /* grabkeys */
-               XUngrabKey(dpy, AnyKey, AnyModifier, root);
-               for(i = 0; i < LENGTH(keys); i++) {
-                       code = XKeysymToKeycode(dpy, keys[i].keysym);
-                       XGrabKey(dpy, code, keys[i].mod, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-               }
-               return;
-       }
        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
@@ -1048,7 +1052,7 @@ mappingnotify(XEvent *e) {
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)
-               keypress(NULL);
+               grabkeys();
 }
 
 void
@@ -1283,6 +1287,7 @@ restack(void) {
 void
 run(void) {
        char *p;
+       char buf[sizeof stext];
        fd_set rd;
        int r, xfd;
        unsigned int len, offset;
@@ -1294,7 +1299,7 @@ run(void) {
        readin = True;
        offset = 0;
        len = sizeof stext - 1;
-       stext[len] = '\0'; /* 0-terminator is never touched */
+       buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
        while(running) {
                FD_ZERO(&rd);
                if(readin)
@@ -1306,7 +1311,7 @@ run(void) {
                        eprint("select failed\n");
                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {
-                       switch((r = read(STDIN_FILENO, stext + offset, len - offset))) {
+                       switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
                        case -1:
                                strncpy(stext, strerror(errno), len);
                                readin = False;
@@ -1316,14 +1321,18 @@ run(void) {
                                readin = False;
                                break;
                        default:
-                               stext[offset + r] = '\0';
-                               for(p = stext; *p && *p != '\n'; p++);
-                               if(*p == '\n') {
-                                       *p = '\0';
-                                       offset = 0;
-                               }
-                               else
-                                       offset = (offset + r < len - 1) ? offset + r : 0;
+                               for(p = buf + offset; r > 0; p++, r--, offset++)
+                                       if(*p == '\n' || *p == '\0') {
+                                               *p = '\0';
+                                               strncpy(stext, buf, len);
+                                               p += r - 1; /* p is buf + offset + r - 1 */
+                                               for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
+                                               offset = r;
+                                               if(r)
+                                                       memmove(buf, p - r + 1, r);
+                                               break;
+                                       }
+                               break;
                        }
                        drawbar();
                }
@@ -1460,9 +1469,10 @@ setup(void) {
        XSelectInput(dpy, root, wa.event_mask);
 
        /* grab keys */
-       keypress(NULL);
+       grabkeys();
 
        /* init tags */
+       memcpy(prevtags, seltags, sizeof seltags);
        compileregs();
 
        /* init appearance */
@@ -1845,11 +1855,11 @@ view(const char *arg) {
 
 void
 viewprevtag(const char *arg) {
-       static Bool tmptags[sizeof tags / sizeof tags[0]];
+       static Bool tmp[LENGTH(tags)];
 
-       memcpy(tmptags, seltags, sizeof seltags);
+       memcpy(tmp, seltags, sizeof seltags);
        memcpy(seltags, prevtags, sizeof seltags);
-       memcpy(prevtags, tmptags, sizeof seltags);
+       memcpy(prevtags, tmp, sizeof seltags);
        arrange();
 }