restoring tip to be a working dwm again (switching FONT to terminus in config.arg.h)

.hgtags

@@ -43,3 +43,5 @@ baee494346e520f8dee2cee9491b8350064770d2 3.7
 2ea201354cf016407ea93e1e390d1422940d29b0 3.8
 55478328b2422c700c5404a774c85e77322f41a3 3.9
 018c3846842291cb6c009dc087e7fe2f0ef53bea 4.0
+00f4180df72b49aadb2933804fde4bfb33e5666d 4.1
+c13cb8c6b7a56af74cc88346e71d2490470b546f 4.2

LICENSE

@@ -2,6 +2,9 @@ MIT/X Consortium License
 
 © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
 © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+© 2006-2007 Jukka Salmi <jukka at salmi dot ch>
+© 2007 Premysl Hruby <dfenze at gmail dot com>
+© 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

client.c

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>
 #include <string.h>
@@ -98,6 +96,14 @@ attach(Client *c) {
 	clients = c;
 }
 
+void
+ban(Client *c) {
+	if (c->isbanned)
+		return;
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	c->isbanned = True;
+}
+
 void
 configure(Client *c) {
 	XConfigureEvent ce;
@@ -129,8 +135,8 @@ detach(Client *c) {
 
 void
 focus(Client *c) {
-	if(c && !isvisible(c))
+	if((!c && selscreen)|| (c && !isvisible(c)))
-		return;
+		for(c = stack; c && !isvisible(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -152,14 +158,6 @@ focus(Client *c) {
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
-void
-focustopvisible(void) {
-	Client *c;
-
-	for(c = stack; c && !isvisible(c); c = c->snext);
-	focus(c);
-}
-
 void
 killclient(const char *arg) {
 	XEvent ev;
@@ -226,12 +224,10 @@ manage(Window w, XWindowAttributes *wa) {
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
 	attachstack(c);
-	c->isbanned = True;
+	ban(c);
-	XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
 	XMapWindow(dpy, w);
 	setclientstate(c, NormalState);
-	if(isvisible(c))
+	focus(c);
-		focus(c);
 	lt->arrange();
 }
 
@@ -305,6 +301,39 @@ togglefloating(const char *arg) {
 	if(!sel || lt->arrange == floating)
 		return;
 	sel->isfloating = !sel->isfloating;
+	if(sel->isfloating)
+		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+	lt->arrange();
+}
+
+void
+unban(Client *c) {
+	if (!c->isbanned)
+		return;
+	XMoveWindow(dpy, c->win, c->x, c->y);
+	c->isbanned = False;
+}
+
+void
+unmanage(Client *c) {
+	XWindowChanges wc;
+
+	wc.border_width = c->oldborder;
+	/* The server grab construct avoids race conditions. */
+	XGrabServer(dpy);
+	XSetErrorHandler(xerrordummy);
+	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+	detach(c);
+	detachstack(c);
+	if(sel == c)
+		focus(NULL);
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+	setclientstate(c, WithdrawnState);
+	free(c->tags);
+	free(c);
+	XSync(dpy, False);
+	XSetErrorHandler(xerror);
+	XUngrabServer(dpy);
 	lt->arrange();
 }
 
@@ -386,26 +415,3 @@ updatetitle(Client *c) {
 	c->name[sizeof c->name - 1] = '\0';
 	XFree(name.value);
 }
-
-void
-unmanage(Client *c) {
-	XWindowChanges wc;
-
-	wc.border_width = c->oldborder;
-	/* The server grab construct avoids race conditions. */
-	XGrabServer(dpy);
-	XSetErrorHandler(xerrordummy);
-	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
-	detach(c);
-	detachstack(c);
-	if(sel == c)
-		focustopvisible();
-	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	setclientstate(c, WithdrawnState);
-	free(c->tags);
-	free(c);
-	XSync(dpy, False);
-	XSetErrorHandler(xerror);
-	XUngrabServer(dpy);
-	lt->arrange();
-}

config.arg.h

@@ -1,11 +1,9 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 
 /* appearance */
 #define BARPOS			BarTop /* BarBot, BarOff */
 #define BORDERPX		1
-#define FONT			"-*-pixelcarnage monospace-*-r-*-*-14-*-*-*-*-*-*-*"
+#define FONT			"-*-terminus-medium-r-*-*-14-*-*-*-*-*-iso10646-*"
 #define NORMBORDERCOLOR		"#333"
 #define NORMBGCOLOR		"#222"
 #define NORMFGCOLOR		"#ccc"

config.default.h

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 
 /* appearance */
 #define BARPOS			BarTop /* BarBot, BarOff */

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 4.1
+VERSION = 4.3
 
 # Customize below to fit your system
 

draw.c

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 #include "dwm.h"
 #include <string.h>
 

dwm.h

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details.
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details.
  *
  * dynamic window manager is designed like any other X client as well. It is
  * driven through handling X events. In contrast to other X clients, a window
@@ -80,36 +78,37 @@ typedef struct {
 	void (*arrange)(void);
 } Layout;
 
-extern const char *tags[];		/* all tags */
+extern const char *tags[];			/* all tags */
-char stext[256];			/* status text */
+extern char stext[256];				/* status text */
-int screen, sx, sy, sw, sh;		/* screen geometry */
+extern int screen, sx, sy, sw, sh;		/* screen geometry */
-int wax, way, wah, waw;			/* windowarea geometry */
+extern int wax, way, wah, waw;			/* windowarea geometry */
-unsigned int bh, blw, bpos;		/* bar height, bar layout label width, bar position */
+extern unsigned int bh, blw, bpos;		/* bar height, bar layout label width, bar position */
-unsigned int ntags, numlockmask;	/* number of tags, dynamic lock mask */
+extern unsigned int ntags, numlockmask;		/* number of tags, numlock mask */
-void (*handler[LASTEvent])(XEvent *);	/* event handler */
+extern void (*handler[LASTEvent])(XEvent *);	/* event handler */
-Atom wmatom[WMLast], netatom[NetLast];
+extern Atom wmatom[WMLast], netatom[NetLast];
-Bool selscreen, *seltag;		/* seltag is array of Bool */
+extern Bool selscreen, *seltag;			/* seltag is array of Bool */
-Client *clients, *sel, *stack;		/* global client list and stack */
+extern Client *clients, *sel, *stack;		/* global client list and stack */
-Cursor cursor[CurLast];
+extern Cursor cursor[CurLast];
-DC dc;					/* global draw context */
+extern DC dc;					/* global draw context */
-Display *dpy;
+extern Display *dpy;
-Layout *lt;
+extern Layout *lt;
-Window root, barwin;
+extern Window root, barwin;
 
 /* client.c */
 void attach(Client *c);			/* attaches c to global client list */
+void ban(Client *c);			/* bans c */
 void configure(Client *c);		/* send synthetic configure event */
 void detach(Client *c);			/* detaches c from global client list */
-void focus(Client *c);			/* focus c, c may be NULL */
+void focus(Client *c);			/* focus c if visible && !NULL, or focus top visible */
-void focustopvisible(void);		/* focus top visible window on stack */
 void killclient(const char *arg);	/* kill sel  nicely */
 void manage(Window w, XWindowAttributes *wa);	/* manage new client */
 void resize(Client *c, int x, int y,
 		int w, int h, Bool sizehints);	/* resize with given coordinates c*/
 void togglefloating(const char *arg);	/* toggles sel between floating/tiled state */
+void unban(Client *c);			/* unbans c */
+void unmanage(Client *c);		/* destroy c */
 void updatesizehints(Client *c);	/* update the size hint variables of c */
 void updatetitle(Client *c);		/* update the name of c */
-void unmanage(Client *c);		/* destroy c */
 
 /* draw.c */
 void drawstatus(void);			/* draw the bar */
@@ -127,7 +126,7 @@ void incnmaster(const char *arg);	/* increments nmaster with arg's index value *
 void initlayouts(void);			/* initialize layout array */
 Client *nexttiled(Client *c);		/* returns tiled successor of c */
 void restack(void);			/* restores z layers of all clients */
-void setlayout(const char *arg);	/* sets layout, -1 toggles */
+void setlayout(const char *arg);	/* sets layout, NULL means next layout */
 void togglebar(const char *arg);	/* shows/hides the bar */
 void togglemax(const char *arg);	/* toggles maximization of floating client */
 void zoom(const char *arg);		/* zooms the focused client to master area, arg is ignored */

event.c

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -218,11 +216,10 @@ configurenotify(XEvent *e) {
 	if (ev->window == root && (ev->width != sw || ev->height != sh)) {
 		sw = ev->width;
 		sh = ev->height;
-		wah = sh - bh;
-		waw = sw;
 		XFreePixmap(dpy, dc.drawable);
 		dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 		XResizeWindow(dpy, barwin, sw, bh);
+		updatebarpos();
 		lt->arrange();
 	}
 }
@@ -243,11 +240,11 @@ enternotify(XEvent *e) {
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-	if((c = getclient(ev->window)) && isvisible(c))
+	if((c = getclient(ev->window)))
 		focus(c);
 	else if(ev->window == root) {
 		selscreen = True;
-		focustopvisible();
+		focus(NULL);
 	}
 }
 

layout.c

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>
 
@@ -15,7 +13,7 @@ static unsigned int nmaster = NMASTER;
 
 static void
 tile(void) {
-	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th, remainder;
+	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
 	Client *c;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
@@ -24,14 +22,11 @@ tile(void) {
 	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
 	mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
 	th = (n > nmaster) ? wah / (n - nmaster) : 0;
-	remainder = (n > nmaster) ? wah - th * (n - nmaster) : 0;
 	tw = waw - mw;
 
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
-			if(c->isbanned)
+			unban(c);
-				XMoveWindow(dpy, c->win, c->x, c->y);
-			c->isbanned = False;
 			if(c->isfloating)
 				continue;
 			c->ismax = False;
@@ -40,16 +35,20 @@ tile(void) {
 			if(i < nmaster) {
 				ny += i * mh;
 				nw = mw - 2 * c->border;
-				nh = mh - 2 * c->border;
+				nh = mh;
+				if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */
+					nh = wah - mh * i;
+				nh -= 2 * c->border;
 			}
 			else {  /* tile window */
 				nx += mw;
 				nw = tw - 2 * c->border;
 				if(th > 2 * c->border) {
 					ny += (i - nmaster) * th;
-					nh = th - 2 * c->border;
+					nh = th;
-					if (i == n - 1)
+					if(i + 1 == n) /* remainder */
-						nh += remainder;
+						nh = wah - th * (i - nmaster);
+					nh -= 2 * c->border;
 				}
 				else /* fallback if th <= 2 * c->border */
 					nh = wah - 2 * c->border;
@@ -57,12 +56,9 @@ tile(void) {
 			resize(c, nx, ny, nw, nh, False);
 			i++;
 		}
-		else {
+		else
-			c->isbanned = True;
+			ban(c);
-			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	focus(NULL);
-		}
-	if(!sel || !isvisible(sel)) 
-		focustopvisible();
 	restack();
 }
 
@@ -74,20 +70,14 @@ void
 floating(void) {
 	Client *c;
 
-	for(c = clients; c; c = c->next) {
+	for(c = clients; c; c = c->next)
 		if(isvisible(c)) {
-			if(c->isbanned)
+			unban(c);
-				XMoveWindow(dpy, c->win, c->x, c->y);
-			c->isbanned = False;
 			resize(c, c->x, c->y, c->w, c->h, True);
 		}
-		else {
+		else
-			c->isbanned = True;
+			ban(c);
-			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	focus(NULL);
-		}
-	}
-	if(!sel || !isvisible(sel))
-		focustopvisible();
 	restack();
 }
 
@@ -174,6 +164,7 @@ void
 restack(void) {
 	Client *c;
 	XEvent ev;
+	XWindowChanges wc;
 
 	drawstatus();
 	if(!sel)
@@ -181,12 +172,17 @@ restack(void) {
 	if(sel->isfloating || lt->arrange == floating)
 		XRaiseWindow(dpy, sel->win);
 	if(lt->arrange != floating) {
-		if(!sel->isfloating)
+		wc.stack_mode = Below;
-			XLowerWindow(dpy, sel->win);
+		wc.sibling = barwin;
+		if(!sel->isfloating) {
+			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+			wc.sibling = sel->win;
+		}
 		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
 			if(c == sel)
 				continue;
-			XLowerWindow(dpy, c->win);
+			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+			wc.sibling = c->win;
 		}
 	}
 	XSync(dpy, False);
@@ -198,11 +194,9 @@ setlayout(const char *arg) {
 	int i;
 
 	if(!arg) {
-		for(i = 0; i < nlayouts && lt != &layout[i]; i++);
+		lt++;
-		if(i == nlayouts - 1)
+		if(lt == layout + nlayouts)
-			lt = &layout[0];
+			lt = layout;
-		else
-			lt = &layout[++i];
 	}
 	else {
 		i = atoi(arg);
@@ -237,7 +231,7 @@ togglemax(const char *arg) {
 		sel->ry = sel->y;
 		sel->rw = sel->w;
 		sel->rh = sel->h;
-		resize(sel, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
+		resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
 	}
 	else
 		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
@@ -249,7 +243,7 @@ void
 zoom(const char *arg) {
 	Client *c;
 
-	if(!sel || lt->arrange != tile || sel->isfloating)
+	if(!sel || lt->arrange == floating || sel->isfloating)
 		return;
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))

main.c

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 #include "dwm.h"
 #include <errno.h>
 #include <locale.h>
@@ -18,7 +16,9 @@
 
 char stext[256];
 int screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int bh, bpos, ntags, numlockmask;
+unsigned int bh, ntags;
+unsigned int bpos = BARPOS;
+unsigned int numlockmask = 0;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool *seltag;
 Bool selscreen = True;
@@ -40,8 +40,7 @@ static void
 cleanup(void) {
 	close(STDIN_FILENO);
 	while(stack) {
-		if(stack->isbanned)
+		unban(stack);
-			XMoveWindow(dpy, stack->win, stack->x, stack->y);
 		unmanage(stack);
 	}
 	if(dc.font.set)
@@ -152,7 +151,6 @@ setup(void) {
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 	/* init modifier map */
-	numlockmask = 0;
 	modmap = XGetModifierMapping(dpy);
 	for (i = 0; i < 8; i++)
 		for (j = 0; j < modmap->max_keypermod; j++) {
@@ -194,7 +192,6 @@ setup(void) {
 			DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
-	bpos = BARPOS;
 	updatebarpos();
 	XMapRaised(dpy, barwin);
 	strcpy(stext, "dwm-"VERSION);
@@ -278,8 +275,8 @@ main(int argc, char *argv[]) {
 	fd_set rd;
 	XEvent ev;
 
-	if(argc == 2 && !strncmp("-v", argv[1], 3))
+	if(argc == 2 && !strcmp("-v", argv[1]))
-		eprint("dwm-"VERSION", © 2004-2007 Anselm R. Garbe, Sander van Dijk\n");
+		eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
 	setlocale(LC_CTYPE, "");

tag.c

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>

util.c

@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdarg.h>
 #include <stdio.h>