X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dwm.c;h=f5f7c99ee6ab2903bc6088caa505f5a7b504607f;hb=35efafe8ac901b7764b7950d3a7c8565e53c5381;hp=5bd7221f04e2a4cffeb2f80b0476d2bc6c84fd0d;hpb=c36f7c3c5e5db297689765142c64977f6317a21c;p=dwm.git diff --git a/dwm.c b/dwm.c index 5bd7221..f5f7c99 100644 --- a/dwm.c +++ b/dwm.c @@ -17,9 +17,7 @@ * set the override_redirect flag. Clients are organized in a global * doubly-linked client list, the focus history is remembered through a global * stack list. Each client contains an array of Bools of the same size as the - * global tags array to indicate the tags of a client. For each client dwm - * creates a small title window, which is resized whenever the (_NET_)WM_NAME - * properties are updated or the client is moved/resized. + * global tags array to indicate the tags of a client. * * Keys and tagging rules are organized as arrays and defined in config.h. * @@ -245,10 +243,10 @@ applyrules(Client *c) { snprintf(buf, sizeof buf, "%s:%s:%s", ch.res_class ? ch.res_class : "", ch.res_name ? ch.res_name : "", c->name); - for(i = 0; i < NRULES; i++) + for(i = 0; i < LENGTH(rules); i++) if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) { c->isfloating = rules[i].isfloating; - for(j = 0; regs[i].tagregex && j < NTAGS; j++) { + for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) { if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) { matched = True; c->tags[j] = True; @@ -305,9 +303,9 @@ buttonpress(XEvent *e) { Client *c; XButtonPressedEvent *ev = &e->xbutton; - if(barwin == ev->window) { + if(ev->window == barwin) { x = 0; - for(i = 0; i < NTAGS; i++) { + for(i = 0; i < LENGTH(tags); i++) { x += textw(tags[i]); if(ev->x < x) { if(ev->button == Button1) { @@ -333,14 +331,14 @@ buttonpress(XEvent *e) { if(CLEANMASK(ev->state) != MODKEY) return; if(ev->button == Button1) { - if((floating == layout->arrange) || c->isfloating) + if((layout->arrange == floating) || c->isfloating) restack(); else togglefloating(NULL); movemouse(c); } else if(ev->button == Button2) { - if((floating != layout->arrange) && !c->isfixed && c->isfloating) + if((floating != layout->arrange) && c->isfloating) togglefloating(NULL); else zoom(NULL); @@ -400,8 +398,8 @@ compileregs(void) { if(regs) return; - regs = emallocz(NRULES * sizeof(Regs)); - for(i = 0; i < NRULES; i++) { + regs = emallocz(LENGTH(rules) * sizeof(Regs)); + for(i = 0; i < LENGTH(rules); i++) { if(rules[i].prop) { reg = emallocz(sizeof(regex_t)); if(regcomp(reg, rules[i].prop, REG_EXTENDED)) @@ -530,7 +528,7 @@ drawbar(void) { int i, x; dc.x = dc.y = 0; - for(i = 0; i < NTAGS; i++) { + for(i = 0; i < LENGTH(tags); i++) { dc.w = textw(tags[i]); if(seltags[i]) { drawtext(tags[i], dc.sel); @@ -664,8 +662,8 @@ void expose(XEvent *e) { XExposeEvent *ev = &e->xexpose; - if(0 == ev->count) { - if(barwin == ev->window) + if(ev->count == 0) { + if(ev->window == barwin) drawbar(); } } @@ -779,7 +777,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) { int n; XTextProperty name; - if(!text || 0 == size) + if(!text || size == 0) return False; text[0] = '\0'; XGetTextProperty(dpy, w, &name, atom); @@ -789,8 +787,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) { strncpy(text, (char *)name.value, size - 1); else { if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success - && n > 0 && *list) - { + && n > 0 && *list) { strncpy(text, *list, size - 1); XFreeStringList(list); } @@ -841,8 +838,8 @@ unsigned int idxoftag(const char *tag) { unsigned int i; - for(i = 0; (i < NTAGS) && (tags[i] != tag); i++); - return (i < NTAGS) ? i : 0; + for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++); + return (i < LENGTH(tags)) ? i : 0; } void @@ -916,7 +913,7 @@ Bool isvisible(Client *c) { unsigned int i; - for(i = 0; i < NTAGS; i++) + for(i = 0; i < LENGTH(tags); i++) if(c->tags[i] && seltags[i]) return True; return False; @@ -932,7 +929,7 @@ keypress(XEvent *e) { if(!e) { /* grabkeys */ XUngrabKey(dpy, AnyKey, AnyModifier, root); - for(i = 0; i < NKEYS; i++) { + for(i = 0; i < LENGTH(keys); i++) { code = XKeysymToKeycode(dpy, keys[i].keysym); XGrabKey(dpy, code, keys[i].mod, root, True, GrabModeAsync, GrabModeAsync); @@ -947,7 +944,7 @@ keypress(XEvent *e) { } ev = &e->xkey; keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); - for(i = 0; i < NKEYS; i++) + for(i = 0; i < LENGTH(keys); i++) if(keysym == keys[i].keysym && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)) { @@ -1125,7 +1122,7 @@ propertynotify(XEvent *e) { default: break; case XA_WM_TRANSIENT_FOR: XGetTransientForHint(dpy, c->win, &trans); - if(!c->isfloating && (c->isfloating = (NULL != getclient(trans)))) + if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL))) arrange(); break; case XA_WM_NORMAL_HINTS: @@ -1145,6 +1142,7 @@ quit(const char *arg) { readin = running = False; } + void resize(Client *c, int x, int y, int w, int h, Bool sizehints) { XWindowChanges wc; @@ -1258,9 +1256,9 @@ restack(void) { drawbar(); if(!sel) return; - if(sel->isfloating || (floating == layout->arrange)) + if(sel->isfloating || (layout->arrange == floating)) XRaiseWindow(dpy, sel->win); - if(floating != layout->arrange) { + if(layout->arrange != floating) { wc.stack_mode = Below; wc.sibling = barwin; if(!sel->isfloating) { @@ -1281,14 +1279,18 @@ restack(void) { void run(void) { char *p; - int r, xfd; fd_set rd; + int r, xfd; + unsigned int len, offset; XEvent ev; /* main event loop, also reads status text from stdin */ XSync(dpy, False); xfd = ConnectionNumber(dpy); readin = True; + offset = 0; + len = sizeof stext - 1; + stext[len] = '\0'; /* 0-terminator is never touched */ while(running) { FD_ZERO(&rd); if(readin) @@ -1300,10 +1302,9 @@ run(void) { 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 + offset, len - offset))) { case -1: - strncpy(stext, strerror(errno), sizeof stext - 1); - stext[sizeof stext - 1] = '\0'; + strncpy(stext, strerror(errno), len); readin = False; break; case 0: @@ -1311,10 +1312,14 @@ run(void) { readin = False; break; default: - for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0'); - for(; p >= stext && *p != '\n'; --p); - if(p > stext) - strncpy(stext, p + 1, sizeof stext); + 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; } drawbar(); } @@ -1366,14 +1371,14 @@ setlayout(const char *arg) { unsigned int i; if(!arg) { - if(++layout == &layouts[NLAYOUTS]) + if(++layout == &layouts[LENGTH(layouts)]) layout = &layouts[0]; } else { - for(i = 0; i < NLAYOUTS; i++) + for(i = 0; i < LENGTH(layouts); i++) if(!strcmp(arg, layouts[i].symbol)) break; - if(i == NLAYOUTS) + if(i == LENGTH(layouts)) return; layout = &layouts[i]; } @@ -1390,9 +1395,9 @@ setmwfact(const char *arg) { if(!domwfact) return; /* arg handling, manipulate mwfact */ - if(NULL == arg) + if(arg == NULL) mwfact = MWFACT; - else if(1 == sscanf(arg, "%lf", &delta)) { + else if(sscanf(arg, "%lf", &delta) == 1) { if(arg[0] == '+' || arg[0] == '-') mwfact += delta; else @@ -1469,7 +1474,7 @@ setup(void) { /* init layouts */ mwfact = MWFACT; layout = &layouts[0]; - for(blw = i = 0; i < NLAYOUTS; i++) { + for(blw = i = 0; i < LENGTH(layouts); i++) { j = textw(layouts[i].symbol); if(j > blw) blw = j; @@ -1507,8 +1512,8 @@ spawn(const char *arg) { return; /* The double-fork construct avoids zombie processes and keeps the code * clean from stupid signal handlers. */ - if(0 == fork()) { - if(0 == fork()) { + if(fork() == 0) { + if(fork() == 0) { if(dpy) close(ConnectionNumber(dpy)); setsid(); @@ -1527,7 +1532,7 @@ tag(const char *arg) { if(!sel) return; - for(i = 0; i < NTAGS; i++) + for(i = 0; i < LENGTH(tags); i++) sel->tags[i] = (NULL == arg); sel->tags[idxoftag(arg)] = True; arrange(); @@ -1569,7 +1574,7 @@ tile(void) { nw = 0; /* gcc stupidity requires this */ for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) { c->ismax = False; - if(0 == i) { /* master */ + if(i == 0) { /* master */ nw = mw - 2 * c->border; nh = wah - 2 * c->border; } @@ -1584,8 +1589,8 @@ tile(void) { else nh = th - 2 * c->border; } - resize(c, nx, ny, nw, nh, True); - if((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)) + resize(c, nx, ny, nw, nh, RESIZEHINTS); + if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))) /* client doesn't accept size constraints */ resize(c, nx, ny, nw, nh, False); if(n > 1 && th != wah) @@ -1620,7 +1625,7 @@ togglemax(const char *arg) { if(!sel || sel->isfixed) return; if((sel->ismax = !sel->ismax)) { - if((floating == layout->arrange) || sel->isfloating) + if((layout->arrange == floating) || sel->isfloating) sel->wasfloating = True; else { togglefloating(NULL); @@ -1649,8 +1654,8 @@ toggletag(const char *arg) { return; i = idxoftag(arg); sel->tags[i] = !sel->tags[i]; - for(j = 0; j < NTAGS && !sel->tags[j]; j++); - if(j == NTAGS) + for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++); + if(j == LENGTH(tags)) sel->tags[i] = True; /* at least one tag must be enabled */ arrange(); } @@ -1661,8 +1666,8 @@ toggleview(const char *arg) { i = idxoftag(arg); seltags[i] = !seltags[i]; - for(j = 0; j < NTAGS && !seltags[j]; j++); - if(j == NTAGS) + for(j = 0; j < LENGTH(tags) && !seltags[j]; j++); + if(j == LENGTH(tags)) seltags[i] = True; /* at least one tag must be viewed */ arrange(); } @@ -1828,7 +1833,7 @@ view(const char *arg) { unsigned int i; memcpy(prevtags, seltags, sizeof seltags); - for(i = 0; i < NTAGS; i++) + for(i = 0; i < LENGTH(tags); i++) seltags[i] = (NULL == arg); seltags[idxoftag(arg)] = True; arrange(); @@ -1862,7 +1867,8 @@ zoom(const char *arg) { int main(int argc, char *argv[]) { if(argc == 2 && !strcmp("-v", argv[1])) - eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n"); + eprint("dwm-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, " + "Jukka Salmi, Premysl Hruby, Szabolcs Nagy\n"); else if(argc != 1) eprint("usage: dwm [-v]\n");