#include <errno.h>
#include <locale.h>
#include <stdarg.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <sys/signal.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <X11/cursorfont.h>
/* function declarations */
static void applyrules(Client *c);
+static void applysizehints(Client *c, int *w, int *h);
static void arrange(void);
static void attach(Client *c);
static void attachstack(Client *c);
static Client *nexttiled(Client *c);
static void propertynotify(XEvent *e);
static void quit(const Arg *arg);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resize(Client *c, int x, int y, int w, int h);
static void resizemouse(const Arg *arg);
static void restack(void);
static void run(void);
static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setup(void);
-static void showhide(Client *c);
+static void showhide(Client *c, unsigned int ntiled);
static void sigchld(int signal);
static void spawn(const Arg *arg);
static void tag(const Arg *arg);
&& (!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;
+ c->tags |= r->tags & TAGMASK ? r->tags & TAGMASK : tagset[seltags];
}
}
if(ch.res_class)
}
void
+applysizehints(Client *c, int *w, int *h) {
+ Bool baseismin;
+
+ if(!resizehints && !c->isfloating)
+ return;
+
+ /* see last two sentences in ICCCM 4.1.2.3 */
+ baseismin = c->basew == c->minw && c->baseh == c->minh;
+
+ /* set minimum possible */
+ *w = MAX(1, *w);
+ *h = MAX(1, *h);
+
+ if(!baseismin) { /* temporarily remove base dimensions */
+ *w -= c->basew;
+ *h -= c->baseh;
+ }
+
+ /* adjust for aspect limits */
+ if(c->mina > 0 && c->maxa > 0) {
+ if(c->maxa < (float)*w / *h)
+ *w = *h * c->maxa;
+ else if(c->mina < (float)*h / *w)
+ *h = *w * c->mina;
+ }
+
+ if(baseismin) { /* increment calculation requires this */
+ *w -= c->basew;
+ *h -= c->baseh;
+ }
+
+ /* adjust for increment value */
+ if(c->incw)
+ *w -= *w % c->incw;
+ if(c->inch)
+ *h -= *h % c->inch;
+
+ /* restore base dimensions */
+ *w += c->basew;
+ *h += c->baseh;
+
+ *w = MAX(*w, c->minw);
+ *h = MAX(*h, c->minh);
+
+ if(c->maxw)
+ *w = MIN(*w, c->maxw);
+
+ if(c->maxh)
+ *h = MIN(*h, c->maxh);
+}
+
+void
arrange(void) {
- showhide(stack);
+ unsigned int nt;
+ Client *c;
+
+ for(nt = 0, c = nexttiled(clients); c; c = nexttiled(c->next), nt++);
+ showhide(stack, nt);
focus(NULL);
if(lt[sellt]->arrange)
lt[sellt]->arrange();
Arg a = {.ui = ~0};
Layout foo = { "", NULL };
- close(STDIN_FILENO);
view(&a);
lt[sellt] = &foo;
while(stack)
monocle(void) {
Client *c;
- for(c = nexttiled(clients); c; c = nexttiled(c->next))
- resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
+ for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+ resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+ }
}
void
togglefloating(NULL);
}
if(!lt[sellt]->arrange || c->isfloating)
- resize(c, nx, ny, c->w, c->h, False);
+ resize(c, nx, ny, c->w, c->h);
break;
}
}
Window trans;
XPropertyEvent *ev = &e->xproperty;
- if((ev->window == root) && (ev->atom = XA_WM_NAME))
+ if((ev->window == root) && (ev->atom == XA_WM_NAME))
updatestatus();
else if(ev->state == PropertyDelete)
return; /* ignore */
}
void
-resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+resize(Client *c, int x, int y, int w, int h) {
XWindowChanges wc;
- if(sizehints) {
- /* see last two sentences in ICCCM 4.1.2.3 */
- Bool baseismin = c->basew == c->minw && c->baseh == c->minh;
-
- /* set minimum possible */
- w = MAX(1, w);
- h = MAX(1, h);
-
- if(!baseismin) { /* temporarily remove base dimensions */
- w -= c->basew;
- h -= c->baseh;
- }
-
- /* adjust for aspect limits */
- if(c->mina > 0 && c->maxa > 0) {
- if(c->maxa < (float)w / h)
- w = h * c->maxa;
- else if(c->mina < (float)h / w)
- h = w * c->mina;
- }
-
- if(baseismin) { /* increment calculation requires this */
- w -= c->basew;
- h -= c->baseh;
- }
-
- /* adjust for increment value */
- if(c->incw)
- w -= w % c->incw;
- if(c->inch)
- h -= h % c->inch;
-
- /* restore base dimensions */
- w += c->basew;
- h += c->baseh;
-
- w = MAX(w, c->minw);
- h = MAX(h, c->minh);
-
- if(c->maxw)
- w = MIN(w, c->maxw);
-
- if(c->maxh)
- h = MIN(h, c->maxh);
- }
+ applysizehints(c, &w, &h);
if(w <= 0 || h <= 0)
return;
if(x > sx + sw)
handler[ev.type](&ev);
break;
case MotionNotify:
- nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1);
- nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 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) {
togglefloating(NULL);
}
if(!lt[sellt]->arrange || c->isfloating)
- resize(c, c->x, c->y, nw, nh, True);
+ resize(c, c->x, c->y, nw, nh);
break;
}
}
dc.sel[ColBG] = getcolor(selbgcolor);
dc.sel[ColFG] = getcolor(selfgcolor);
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, root, 0, 0);
+ dc.gc = XCreateGC(dpy, root, 0, NULL);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
blw = MAX(blw, w);
}
- wa.override_redirect = 1;
+ wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
}
void
-showhide(Client *c) {
+showhide(Client *c, unsigned int ntiled) {
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);
+ resize(c, c->x, c->y, c->w, c->h);
+ showhide(c->snext, ntiled);
}
else { /* hide clients bottom up */
- showhide(c->snext);
+ showhide(c->snext, ntiled);
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
}
}
/* master */
c = nexttiled(clients);
mw = mfact * ww;
- resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+ resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw);
if(--n == 0)
return;
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
- ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
+ ? wy + wh - y - 2 * c->bw : h - 2 * c->bw));
if(h != wh)
y = c->y + HEIGHT(c);
}
return;
sel->isfloating = !sel->isfloating || sel->isfixed;
if(sel->isfloating)
- resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+ resize(sel, sel->x, sel->y, sel->w, sel->h);
arrange();
}
return;
mask = sel->tags ^ (arg->ui & TAGMASK);
- if(sel && mask) {
+ if(mask) {
sel->tags = mask;
arrange();
}
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))
- die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+ die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
else if(argc != 1)
die("usage: dwm [-v]\n");
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
- fprintf(stderr, "warning: no locale support\n");
+ fputs("warning: no locale support\n", stderr);
- if(!(dpy = XOpenDisplay(0)))
+ if(!(dpy = XOpenDisplay(NULL)))
die("dwm: cannot open display\n");
checkotherwm();
Got questions, comments, patches, etc.? Contact Jason Woofenden