X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=bded0c5def4e8650b3f99468db1bdc726a391c44;hp=7faad2216f6ed82e8ec2301362ebdcaa0a1ee9b1;hb=ea8a4ca46a9577997e0a3f30e211c644477c6a00;hpb=73ec124ae94a699e74212cc1a2e21b30f9d4ad7c diff --git a/dwm.c b/dwm.c index 7faad22..bded0c5 100644 --- a/dwm.c +++ b/dwm.c @@ -53,7 +53,8 @@ #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAXTAGLEN 16 #define MOUSEMASK (BUTTONMASK|PointerMotionMask) -#define NOBORDER(x) ((x) - 2 * c->bw) +#define WIDTH(x) ((x)->w + 2 * (x)->bw) +#define HEIGHT(x) ((x)->h + 2 * (x)->bw) #define TAGMASK ((int)((1LL << LENGTH(tags)) - 1)) #define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height) @@ -180,6 +181,7 @@ static void setclientstate(Client *c, long state); static void setlayout(const Arg *arg); static void setmfact(const Arg *arg); static void setup(void); +static void showhide(Client *c); static void spawn(const Arg *arg); static void tag(const Arg *arg); static int textnw(const char *text, unsigned int len); @@ -233,7 +235,7 @@ static Client *sel = NULL; static Client *stack = NULL; static Cursor cursor[CurLast]; static Display *dpy; -static DC dc = {0}; +static DC dc; static Layout *lt[] = { NULL, NULL }; static Window root, barwin; /* configuration, allows nested code to access above variables */ @@ -250,38 +252,28 @@ applyrules(Client *c) { XClassHint ch = { 0 }; /* rule matching */ - XGetClassHint(dpy, c->win, &ch); - for(i = 0; i < LENGTH(rules); i++) { - r = &rules[i]; - if((!r->title || strstr(c->name, r->title)) - && (!r->class || (ch.res_class && strstr(ch.res_class, r->class))) - && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) { - c->isfloating = r->isfloating; - c->tags |= r->tags & TAGMASK; + if(XGetClassHint(dpy, c->win, &ch)) { + for(i = 0; i < LENGTH(rules); i++) { + r = &rules[i]; + if((!r->title || strstr(c->name, r->title)) + && (!r->class || (ch.res_class && strstr(ch.res_class, r->class))) + && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) { + c->isfloating = r->isfloating; + c->tags |= r->tags & TAGMASK; + } } + if(ch.res_class) + XFree(ch.res_class); + if(ch.res_name) + XFree(ch.res_name); } - if(ch.res_class) - XFree(ch.res_class); - if(ch.res_name) - XFree(ch.res_name); if(!c->tags) c->tags = tagset[seltags]; } void arrange(void) { - Client *c; - - for(c = clients; c; c = c->next) - if(ISVISIBLE(c)) { - XMoveWindow(dpy, c->win, c->x, c->y); - if(!lt[sellt]->arrange || c->isfloating) - resize(c, c->x, c->y, c->w, c->h, True); - } - else { - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - } - + showhide(stack); focus(NULL); if(lt[sellt]->arrange) lt[sellt]->arrange(); @@ -330,21 +322,20 @@ buttonpress(XEvent *e) { for(i = 0; i < LENGTH(buttons); i++) if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) - buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg); + buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); } void checkotherwm(void) { otherwm = False; - XSetErrorHandler(xerrorstart); + xerrorxlib = XSetErrorHandler(xerrorstart); /* this causes an error if some other window manager is running */ XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask); XSync(dpy, False); if(otherwm) die("dwm: another window manager is already running\n"); - XSetErrorHandler(NULL); - xerrorxlib = XSetErrorHandler(xerror); + XSetErrorHandler(xerror); XSync(dpy, False); } @@ -762,10 +753,10 @@ grabkeys(void) { XUngrabKey(dpy, AnyKey, AnyModifier, root); for(i = 0; i < LENGTH(keys); i++) { - code = XKeysymToKeycode(dpy, keys[i].keysym); - for(j = 0; j < LENGTH(modifiers); j++) - XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True, - GrabModeAsync, GrabModeAsync); + if((code = XKeysymToKeycode(dpy, keys[i].keysym))) + for(j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, + True, GrabModeAsync, GrabModeAsync); } } } @@ -796,9 +787,6 @@ initfont(const char *fontstr) { } } else { - if(dc.font.xfont) - XFreeFont(dpy, dc.font.xfont); - dc.font.xfont = NULL; if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)) && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) die("error, cannot load font: '%s'\n", fontstr); @@ -859,12 +847,14 @@ killclient(const Arg *arg) { void manage(Window w, XWindowAttributes *wa) { + static Client cz; Client *c, *t = NULL; Window trans = None; XWindowChanges wc; - if(!(c = calloc(1, sizeof(Client)))) - die("fatal: could not calloc() %u bytes\n", sizeof(Client)); + if(!(c = malloc(sizeof(Client)))) + die("fatal: could not malloc() %u bytes\n", sizeof(Client)); + *c = cz; c->win = w; /* geometry */ @@ -879,10 +869,10 @@ manage(Window w, XWindowAttributes *wa) { c->bw = 0; } else { - if(c->x + c->w + 2 * c->bw > sx + sw) - c->x = sx + sw - NOBORDER(c->w); - if(c->y + c->h + 2 * c->bw > sy + sh) - c->y = sy + sh - NOBORDER(c->h); + if(c->x + WIDTH(c) > sx + sw) + c->x = sx + sw - WIDTH(c); + if(c->y + HEIGHT(c) > sy + sh) + c->y = sy + sh - HEIGHT(c); c->x = MAX(c->x, sx); /* only fix client y-offset, if the client center might cover the bar */ c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy); @@ -942,7 +932,7 @@ monocle(void) { Client *c; for(c = nexttiled(clients); c; c = nexttiled(c->next)) - resize(c, wx, wy, NOBORDER(ww), NOBORDER(wh), resizehints); + resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints); } void @@ -962,6 +952,8 @@ movemouse(const Arg *arg) { None, cursor[CurMove], CurrentTime) != GrabSuccess) return; XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui); + if(usegrab) + XGrabServer(dpy); do { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch (ev.type) { @@ -971,19 +963,18 @@ movemouse(const Arg *arg) { handler[ev.type](&ev); break; case MotionNotify: - XSync(dpy, False); 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) nx = wx; - else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap) - nx = wx + ww - NOBORDER(c->w); + else if(abs((wx + ww) - (nx + WIDTH(c))) < snap) + nx = wx + ww - WIDTH(c); if(abs(wy - ny) < snap) ny = wy; - else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap) - ny = wy + wh - NOBORDER(c->h); + else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap) + ny = wy + wh - HEIGHT(c); if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) togglefloating(NULL); } @@ -993,6 +984,8 @@ movemouse(const Arg *arg) { } } while(ev.type != ButtonRelease); + if(usegrab) + XUngrabServer(dpy); XUngrabPointer(dpy, CurrentTime); } @@ -1058,9 +1051,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { /* adjust for aspect limits */ if(c->mina > 0 && c->maxa > 0) { - if(c->maxa < (float)(w / h)) + if(c->maxa < (float)w / h) w = h * c->maxa; - else if(c->mina < (float)(h / w)) + else if(c->mina < (float)h / w) h = w * c->mina; } @@ -1091,9 +1084,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { if(w <= 0 || h <= 0) return; if(x > sx + sw) - x = sw - NOBORDER(w); + x = sw - WIDTH(c); if(y > sy + sh) - y = sh - NOBORDER(h); + y = sh - HEIGHT(c); if(x + w + 2 * c->bw < sx) x = sx; if(y + h + 2 * c->bw < sy) @@ -1131,6 +1124,8 @@ resizemouse(const Arg *arg) { None, cursor[CurResize], CurrentTime) != GrabSuccess) return; XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); + if(usegrab) + XGrabServer(dpy); do { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch(ev.type) { @@ -1140,9 +1135,8 @@ resizemouse(const Arg *arg) { handler[ev.type](&ev); break; case MotionNotify: - XSync(dpy, False); - nw = MAX(ev.xmotion.x - NOBORDER(ocx) + 1, 1); - nh = MAX(ev.xmotion.y - NOBORDER(ocy) + 1, 1); + nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1); + nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1); if(snap && nw >= wx && nw <= wx + ww && nh >= wy && nh <= wy + wh) { @@ -1156,6 +1150,8 @@ resizemouse(const Arg *arg) { } } while(ev.type != ButtonRelease); + if(usegrab) + XUngrabServer(dpy); XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); XUngrabPointer(dpy, CurrentTime); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); @@ -1380,6 +1376,22 @@ setup(void) { } void +showhide(Client *c) { + if(!c) + return; + if(ISVISIBLE(c)) { /* show clients top down */ + XMoveWindow(dpy, c->win, c->x, c->y); + if(!lt[sellt]->arrange || c->isfloating) + resize(c, c->x, c->y, c->w, c->h, True); + showhide(c->snext); + } + else { /* hide clients bottom up */ + showhide(c->snext); + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); + } +} + +void spawn(const Arg *arg) { /* The double-fork construct avoids zombie processes and keeps the code * clean from stupid signal handlers. */ @@ -1429,7 +1441,7 @@ tile(void) { /* master */ c = nexttiled(clients); mw = mfact * ww; - resize(c, wx, wy, NOBORDER(n == 1 ? ww : mw), NOBORDER(wh), resizehints); + resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints); if(--n == 0) return; @@ -1443,10 +1455,16 @@ tile(void) { h = wh; for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { - resize(c, x, y, NOBORDER(w), /* remainder */ ((i + 1 == n) - ? NOBORDER(wy + wh) - y : h), resizehints); + if(i + 1 == n) { /* remainder */ + if(wy + wh - y < bh) + resize(c, x, y, w - 2 * c->bw, wy + wh - y - 2 * c->bw, False); + else + resize(c, x, y, w - 2 * c->bw, wy + wh - y - 2 * c->bw, resizehints); + } + else + resize(c, x, y, w - 2 * c->bw, h - 2 * c->bw, resizehints); if(h != wh) - y = c->y + c->h + 2 * c->bw; + y = c->y + HEIGHT(c); } } @@ -1587,7 +1605,9 @@ updatesizehints(Client *c) { long msize; XSizeHints size; - XGetWMNormalHints(dpy, c->win, &size, &msize); + if(!XGetWMNormalHints(dpy, c->win, &size, &msize)) + /* size is uninitialized, ensure that size.flags aren't used */ + size.flags = PSize; if(size.flags & PBaseSize) { c->basew = size.base_width; c->baseh = size.base_height; @@ -1627,7 +1647,7 @@ updatesizehints(Client *c) { else c->maxa = c->mina = 0.0; c->isfixed = (c->maxw && c->minw && c->maxh && c->minh - && c->maxw == c->minw && c->maxh == c->minh); + && c->maxw == c->minw && c->maxh == c->minh); } void