X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=293f9cfb2f5c8de60ba621450388c7e064324395;hp=29157de7623815a0ba089e562a23168195f5250c;hb=02a8ca95cf22d9b1da50dffffefa31fb563c3852;hpb=9086f98068693d22321be2bdc6779e7be7e751c7 diff --git a/dwm.c b/dwm.c index 29157de..293f9cf 100644 --- a/dwm.c +++ b/dwm.c @@ -24,7 +24,6 @@ * To understand everything else, start reading main(). */ #include -#include #include #include #include @@ -44,16 +43,17 @@ #endif /* macros */ -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) -#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask)) -#define LENGTH(x) (sizeof x / sizeof x[0]) -#define MAXTAGLEN 16 -#define MOUSEMASK (BUTTONMASK|PointerMotionMask) -#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1)) -#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height) -#define ISVISIBLE(x) (x->tags & tagset[seltags]) +#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) +#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask)) +#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH)) +#define ISVISIBLE(x) (x->tags & tagset[seltags]) +#define LENGTH(x) (sizeof x / sizeof x[0]) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAXTAGLEN 16 +#define MOUSEMASK (BUTTONMASK|PointerMotionMask) +#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1)) +#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height) /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ @@ -158,9 +158,7 @@ static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); static void grabbuttons(Client *c, Bool focused); static void grabkeys(void); static void initfont(const char *fontstr); -static Bool isoccupied(unsigned int t); static Bool isprotodel(Client *c); -static Bool isurgent(unsigned int t); static void keypress(XEvent *e); static void killclient(const Arg *arg); static void manage(Window w, XWindowAttributes *wa); @@ -203,8 +201,10 @@ static void zoom(const Arg *arg); /* variables */ static char stext[256]; -static int screen, sx, sy, sw, sh; -static int by, bh, blw, wx, wy, ww, wh; +static int screen; +static int sx, sy, sw, sh; /* X display screen geometry x, y, width, height */ +static int by, bh, blw; /* bar geometry y, height and layout symbol width */ +static int wx, wy, ww, wh; /* window area geometry x, y, width, height, bar excluded */ static unsigned int seltags = 0, sellt = 0; static int (*xerrorxlib)(Display *, XErrorEvent *); static unsigned int numlockmask = 0; @@ -223,7 +223,7 @@ static void (*handler[LASTEvent]) (XEvent *) = { [UnmapNotify] = unmapnotify }; static Atom wmatom[WMLast], netatom[NetLast]; -static Bool otherwm, readin; +static Bool otherwm; static Bool running = True; static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */ static Client *clients = NULL; @@ -348,7 +348,7 @@ checkotherwm(void) { void cleanup(void) { - Arg a = {.i = ~0}; + Arg a = {.ui = ~0}; Layout foo = { "", NULL }; close(STDIN_FILENO); @@ -499,19 +499,23 @@ die(const char *errstr, ...) { void drawbar(void) { - int i, x; + int x; + unsigned int i, occ = 0, urg = 0; + unsigned long *col; + Client *c; + + for(c = clients; c; c = c->next) { + occ |= c->tags; + if(c->isurgent) + urg |= c->tags; + } dc.x = 0; for(i = 0; i < LENGTH(tags); i++) { dc.w = TEXTW(tags[i]); - if(tagset[seltags] & 1 << i) { - drawtext(tags[i], dc.sel, isurgent(i)); - drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel); - } - else { - drawtext(tags[i], dc.norm, isurgent(i)); - drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm); - } + col = tagset[seltags] & 1 << i ? dc.sel : dc.norm; + drawtext(tags[i], col, urg & 1 << i); + drawsquare(sel && sel->tags & 1 << i, occ & 1 << i, urg & 1 << i, col); dc.x += dc.w; } if(blw > 0) { @@ -564,24 +568,23 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) { void drawtext(const char *text, unsigned long col[ColLast], Bool invert) { + char buf[256]; int i, x, y, h, len, olen; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; - char buf[256]; XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); if(!text) return; olen = strlen(text); - len = MIN(olen, sizeof buf); - memcpy(buf, text, len); h = dc.font.ascent + dc.font.descent; y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; x = dc.x + (h / 2); /* shorten text if necessary */ - for(; len && (i = textnw(buf, len)) > dc.w - h; len--); + for(len = MIN(olen, sizeof buf); len && textnw(buf, len) > dc.w - h; len--); if(!len) return; + memcpy(buf, text, len); if(len < olen) for(i = len; i && i > len - 3; buf[--i] = '.'); XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]); @@ -740,7 +743,7 @@ grabbuttons(Client *c, Bool focused) { if(buttons[i].click == ClkClientWin) for(j = 0; j < LENGTH(modifiers); j++) XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); - } else + } else XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); } @@ -748,6 +751,7 @@ grabbuttons(Client *c, Bool focused) { void grabkeys(void) { unsigned int i, j; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; KeyCode code; XModifierKeymap *modmap; @@ -763,14 +767,9 @@ grabkeys(void) { 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); + for(j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True, + GrabModeAsync, GrabModeAsync); } } @@ -815,16 +814,6 @@ initfont(const char *fontstr) { } Bool -isoccupied(unsigned int t) { - Client *c; - - for(c = clients; c; c = c->next) - if(c->tags & 1 << t) - return True; - return False; -} - -Bool isprotodel(Client *c) { int i, n; Atom *protocols; @@ -839,16 +828,6 @@ isprotodel(Client *c) { return ret; } -Bool -isurgent(unsigned int t) { - Client *c; - - for(c = clients; c; c = c->next) - if(c->isurgent && c->tags & 1 << t) - return True; - return False; -} - void keypress(XEvent *e) { unsigned int i; @@ -886,8 +865,7 @@ killclient(const Arg *arg) { void manage(Window w, XWindowAttributes *wa) { Client *c, *t = NULL; - Status rettrans; - Window trans; + Window trans = None; XWindowChanges wc; if(!(c = calloc(1, sizeof(Client)))) @@ -903,7 +881,7 @@ manage(Window w, XWindowAttributes *wa) { if(c->w == sw && c->h == sh) { c->x = sx; c->y = sy; - c->bw = wa->border_width; + c->bw = 0; } else { if(c->x + c->w + 2 * c->bw > sx + sw) @@ -924,14 +902,14 @@ manage(Window w, XWindowAttributes *wa) { XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); grabbuttons(c, False); updatetitle(c); - if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) - for(t = clients; t && t->win != trans; t = t->next); + if(XGetTransientForHint(dpy, w, &trans)) + t = getclient(trans); if(t) c->tags = t->tags; else applyrules(c); if(!c->isfloating) - c->isfloating = (rettrans == Success) || c->isfixed; + c->isfloating = trans != None || c->isfixed; if(c->isfloating) XRaiseWindow(dpy, c->win); attach(c); @@ -974,7 +952,7 @@ monocle(void) { void movemouse(const Arg *arg) { - int x1, y1, ocx, ocy, di, nx, ny; + int x, y, ocx, ocy, di, nx, ny; unsigned int dui; Client *c; Window dummy; @@ -983,18 +961,15 @@ movemouse(const Arg *arg) { if(!(c = sel)) return; restack(); - ocx = nx = c->x; - ocy = ny = c->y; + ocx = c->x; + ocy = c->y; if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurMove], CurrentTime) != GrabSuccess) return; - XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); - for(;;) { + XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui); + do { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch (ev.type) { - case ButtonRelease: - XUngrabPointer(dpy, CurrentTime); - return; case ConfigureRequest: case Expose: case MapRequest: @@ -1002,8 +977,8 @@ movemouse(const Arg *arg) { break; case MotionNotify: XSync(dpy, False); - nx = ocx + (ev.xmotion.x - x1); - ny = ocy + (ev.xmotion.y - y1); + nx = ocx + (ev.xmotion.x - x); + ny = ocy + (ev.xmotion.y - y); if(snap && nx >= wx && nx <= wx + ww && ny >= wy && ny <= wy + wh) { if(abs(wx - nx) < snap) @@ -1022,6 +997,8 @@ movemouse(const Arg *arg) { break; } } + while(ev.type != ButtonRelease); + XUngrabPointer(dpy, CurrentTime); } Client * @@ -1218,7 +1195,6 @@ run(void) { /* main event loop, also reads status text from stdin */ XSync(dpy, False); xfd = ConnectionNumber(dpy); - readin = True; offset = 0; len = sizeof stext - 1; sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */ @@ -1269,10 +1245,9 @@ run(void) { void scan(void) { unsigned int i, num; - Window *wins, d1, d2; + Window d1, d2, *wins = NULL; XWindowAttributes wa; - wins = NULL; if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { for(i = 0; i < num; i++) { if(!XGetWindowAttributes(dpy, wins[i], &wa) @@ -1288,9 +1263,9 @@ scan(void) { && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)) manage(wins[i], &wa); } + if(wins) + XFree(wins); } - if(wins) - XFree(wins); } void @@ -1557,16 +1532,24 @@ updatebar(void) { void updategeom(void) { #ifdef XINERAMA - int i; + int n, i = 0; XineramaScreenInfo *info = NULL; /* window area geometry */ - if(XineramaIsActive(dpy)) { - info = XineramaQueryScreens(dpy, &i); - wx = info[xidx].x_org; - wy = showbar && topbar ? info[xidx].y_org + bh : info[xidx].y_org; - ww = info[xidx].width; - wh = showbar ? info[xidx].height - bh : info[xidx].height; + if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { + if(n > 1) { + int di, x, y; + unsigned int dui; + Window dummy; + if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) + for(i = 0; i < n; i++) + if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) + break; + } + wx = info[i].x_org; + wy = showbar && topbar ? info[i].y_org + bh : info[i].y_org; + ww = info[i].width; + wh = showbar ? info[i].height - bh : info[i].height; XFree(info); } else @@ -1654,11 +1637,11 @@ updatewmhints(Client *c) { void view(const Arg *arg) { - if(arg && (arg->i & TAGMASK) == tagset[seltags]) + if((arg->ui & TAGMASK) == tagset[seltags]) return; seltags ^= 1; /* toggle sel tagset */ - if(arg && (arg->ui & TAGMASK)) - tagset[seltags] = arg->i & TAGMASK; + if(arg->ui & TAGMASK) + tagset[seltags] = arg->ui & TAGMASK; clearurgent(); arrange(); } @@ -1718,7 +1701,7 @@ main(int argc, char *argv[]) { else if(argc != 1) die("usage: dwm [-v]\n"); - if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + if(!XSupportsLocale()) fprintf(stderr, "warning: no locale support\n"); if(!(dpy = XOpenDisplay(0)))