update README

Thanks to Alexis Hildebrandt for testing.

Makefile

@@ -1,24 +1,53 @@
-# $OpenBSD$
-
-.include <bsd.xconf.mk>
+# cwm makefile for BSD make and GNU make
+# uses pkg-config, DESTDIR and PREFIX
 
 PROG=		cwm
 
+PREFIX?=	/usr/local
+
 SRCS=		calmwm.c screen.c xmalloc.c client.c menu.c \
 		search.c util.c xutil.c conf.c xevents.c group.c \
-		kbfunc.c parse.y
+		kbfunc.c mousefunc.c parse.y
 
-CPPFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${.CURDIR}
+OBJS=		calmwm.o screen.o xmalloc.o client.o menu.o \
+		search.o util.o xutil.o conf.o xevents.o group.o \
+		kbfunc.o mousefunc.o strlcpy.o strlcat.o y.tab.o \
+		strtonum.o fgetln.o
 
-CFLAGS+=	-Wall
-YFLAGS=
-LDADD+=		-L${X11BASE}/lib -lXft -lXrender -lX11 -lxcb -lXau -lXdmcp \
-		-lfontconfig -lexpat -lfreetype -lz -lXrandr -lXext
+CPPFLAGS+=	`pkg-config --cflags fontconfig x11 xft xinerama xrandr`
 
-MANDIR=		${X11BASE}/man/man
-MAN=		cwm.1 cwmrc.5
+CFLAGS?=	-Wall -O2 -g -D_GNU_SOURCE
 
-obj: _xenocara_obj
+LDFLAGS+=	`pkg-config --libs fontconfig x11 xft xinerama xrandr`
 
-.include <bsd.prog.mk>
-.include <bsd.xorg.mk>
+MANPREFIX?=	${PREFIX}/share/man
+
+all: ${PROG}
+
+clean:
+	rm -f ${OBJS} ${PROG} y.tab.c
+
+y.tab.c: parse.y
+	yacc parse.y
+
+${PROG}: ${OBJS} y.tab.o
+	${CC} ${OBJS} ${LDFLAGS} -o ${PROG}
+
+.c.o:
+	${CC} -c ${CFLAGS} ${CPPFLAGS} $<
+
+install: ${PROG}
+	install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANPREFIX}/man1 ${DESTDIR}${MANPREFIX}/man5
+	install -m 755 cwm ${DESTDIR}${PREFIX}/bin
+	install -m 644 cwm.1 ${DESTDIR}${MANPREFIX}/man1
+	install -m 644 cwmrc.5 ${DESTDIR}${MANPREFIX}/man5
+
+release:
+	VERSION=$$(git describe --tags | sed 's/^v//;s/-[^.]*$$//') && \
+	git archive --prefix=cwm-$$VERSION/ -o cwm-$$VERSION.tar.gz HEAD
+
+sign:
+	VERSION=$$(git describe --tags | sed 's/^v//;s/-[^.]*$$//') && \
+	gpg --armor --detach-sign cwm-$$VERSION.tar.gz && \
+	signify -S -s ~/.signify/cwm.sec -m cwm-$$VERSION.tar.gz && \
+	sed -i '1cuntrusted comment: verify with cwm.pub' cwm-$$VERSION.tar.gz.sig

README

@@ -0,0 +1,94 @@
+This is a port of OpenBSD's excellent cwm[0] to Linux and other
+Unices.
+
+    cwm is a window manager for X11 which contains many features that
+    concentrate on the efficiency and transparency of window
+    management.  cwm also aims to maintain the simplest and most
+    pleasant aesthetic.
+
+This port requires pkg-config, Xft, Xinerama and Xrandr.  The included Makefile
+should work with both GNU make and BSD make.  It has been built successfully on
+OpenBSD, FreeBSD, NetBSD, OS X 10.9 and Linux.
+
+This version actively tracks changes in the OpenBSD CVS repository.
+Releases are roughly coordinated.
+
+The revision controlled version is at https://github.com/chneukirchen/cwm
+Releases can be found at http://chneukirchen.org/releases
+
+You are welcome to join the IRC channel ##cwm on Freenode to talk about cwm.
+
+
+ChangeLog:
+
+2012-05-02: First public release 5.1 of portable cwm.
+
+2014-04-13: Second public release 5.5 of portable cwm.
+
+User visible changes (for a full list including smaller bug fixes, see
+http://www.openbsd.org/plus.html ff.)
+
+Changes made between OpenBSD 5.1 and 5.2
+* Fixed cwm(1) atom (WM_PROTOCOLS) style handing; closing a window will no
+  longer close entire application if the client supports CLIENT_PROTO_DELETE.
+* Re-implement atom handing for more consistent separation of cwm(1) and
+  Extended Window Manager Hints.
+* cwm(1) better integrated into the freedesktop.org Window Manager
+  Specification Project.
+
+Changes made between OpenBSD 5.2 and 5.3
+* Set the initial cwm(1) group to "1".
+* Added cwm(1) per-group vert/horiz tiling support with new bind commands
+  "vtile" and "htile."
+* Made cwm(1) screen font an Xft(3) font.
+* Specific last match for autogroup in cwmrc(5).
+* Tab completion support for cwm(1) menus.
+* Allow cwm(1) clients to be resized from a max state.
+* Multibyte input to cwm(1) menu code now possible.
+
+Changes made between OpenBSD 5.3 and 5.4
+* Added support for mouse based group {,r}cycle to cwmrc(5).
+* Allow mouse button4 and button5 in cwmrc(5).
+* Made cwm(1) check for, and honour, CWStackMode and CWSibling change requests
+  during a ConfigureRequest event.
+* Honour PATH search order for cwm(1)'s exec.
+
+Changes made between OpenBSD 5.5 and 5.4
+* Only set the cwm(1) urgency flag if the client is not active.
+* Allow the cwm(1) config parser continue parsing even after encountering an
+  error.
+* cwm(1) now follows the EWMH spec: if the cardinal returned is 0xFFFFFFFF (-1)
+  then the window should appear on all desktops.
+* Made cwm(1) supply a more useful title for windows launched via the ssh(1)
+  command menu ("[ssh] ").
+* Allowed cwm(1) to accept _NET_WM_DESKTOP and _NET_CURRENT_DESKTOP
+  ClientMessage.
+* Implemented cwm(1) support for _NET_WM_STATE_FULLSCREEN hint, with keybinding
+  changes: CM-f "fullscreen", CM-m "maximize".
+* Instead of using the work area, use the Xinerama area for cwm(1) snap
+  calculations.
+* Save-set when cwm(1) is re-exec'ing so as to not lose State on our hidden
+  clients.
+* Added cwmrc(5) support for XUrgency and matching
+  _NET_WM_STATE_DEMANDS_ATTENTION ewmh hint, with configurable urgencyborder.
+* Prepend the group shortcut in the cwm(1) client search menu;
+  prepend shortcut in unhide menu.
+* If not hidden during an UnmapNotify event, cwm(1) will now un-manage the
+  client.
+* Like "gap", made cwm(1) "snapdist" per-screen.
+* Removed cwmrc(5) option to bind a key by keycode with brackets, which never
+  worked. Users should be using keysym names not keycodes.
+* Re-added cwm(1) support for WM_TAKE_FOCUS. Solves keyboard input focus loss
+  for java apps.
+* For cwm(1) clients that support WM_TAKE_FOCUS in their WM_PROTOCOLS property,
+  send a ClientMessage event.
+
+2015-01-24: Third public release 5.6 of portable cwm.
+
+* Support building on FreeBSD and OS X.
+* Support for sticky windows (_NET_WM_STATE_STICKY).
+* Internal cleanups and bug fixes.
+
+--Christian Neukirchen <chneukirchen@gmail.com>
+
+[0]: http://cvsweb.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/

calmwm.c

@@ -19,7 +19,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 #include <sys/wait.h>
 
 #include <err.h>
@@ -27,7 +27,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <locale.h>
-#include <poll.h>
+#include <pwd.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,52 +36,47 @@
 
 #include "calmwm.h"
 
-Display			*X_Dpy;
-Time			 Last_Event_Time = CurrentTime;
-Atom			 cwmh[CWMH_NITEMS];
-Atom			 ewmh[EWMH_NITEMS];
-struct screen_q		 Screenq = TAILQ_HEAD_INITIALIZER(Screenq);
-struct conf		 Conf;
-volatile sig_atomic_t	 cwm_status;
+Display				*X_Dpy;
+Time				 Last_Event_Time = CurrentTime;
+Atom				 cwmh[CWMH_NITEMS];
+Atom				 ewmh[EWMH_NITEMS];
+
+struct screen_ctx_q		 Screenq = TAILQ_HEAD_INITIALIZER(Screenq);
+
+int				 HasRandr, Randr_ev;
+struct conf			 Conf;
+const char			*homedir;
+volatile sig_atomic_t		 cwm_status;
 
-__dead void	usage(void);
 static void	sighdlr(int);
 static int	x_errorhandler(Display *, XErrorEvent *);
-static int	x_init(const char *);
+static void	x_init(const char *);
+static void	x_restart(char **);
 static void	x_teardown(void);
 static int	x_wmerrorhandler(Display *, XErrorEvent *);
 
 int
 main(int argc, char **argv)
 {
-	char		*display_name = NULL;
-	char		*fallback;
-	int		 ch, xfd, nflag = 0;
-	struct pollfd	 pfd[1];
+	const char	*conf_file = NULL;
+	char		*conf_path, *display_name = NULL;
+	char		**cwm_argv;
+	int		 ch;
+	struct passwd	*pw;
 
 	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		warnx("no locale support");
 	mbtowc(NULL, NULL, MB_CUR_MAX);
 
-	conf_init(&Conf);
-
-	fallback = u_argv(argv);
-	Conf.wm_argv = u_argv(argv);
-	while ((ch = getopt(argc, argv, "c:d:nv")) != -1) {
+	cwm_argv = argv;
+	while ((ch = getopt(argc, argv, "c:d:")) != -1) {
 		switch (ch) {
 		case 'c':
-			free(Conf.conf_file);
-			Conf.conf_file = xstrdup(optarg);
+			conf_file = optarg;
 			break;
 		case 'd':
 			display_name = optarg;
 			break;
-		case 'n':
-			nflag = 1;
-			break;
-		case 'v':
-			Conf.debug++;
-			break;
 		default:
 			usage();
 		}
@@ -89,47 +84,46 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	if (signal(SIGCHLD, sighdlr) == SIG_ERR ||
-	    signal(SIGHUP, sighdlr) == SIG_ERR ||
-	    signal(SIGINT, sighdlr) == SIG_ERR ||
-	    signal(SIGTERM, sighdlr) == SIG_ERR)
+	if (signal(SIGCHLD, sighdlr) == SIG_ERR)
 		err(1, "signal");
 
-	if (parse_config(Conf.conf_file, &Conf) == -1) {
-		warnx("error parsing config file");
-		if (nflag)
-			return 1;
+	if ((homedir = getenv("HOME")) == NULL || *homedir == '\0') {
+		pw = getpwuid(getuid());
+		if (pw != NULL && pw->pw_dir != NULL && *pw->pw_dir != '\0')
+			homedir = pw->pw_dir;
+		else
+			homedir = "/";
 	}
-	if (nflag)
-		return 0;
 
-	xfd = x_init(display_name);
+	if (conf_file == NULL)
+		xasprintf(&conf_path, "%s/%s", homedir, CONFFILE);
+	else
+		conf_path = xstrdup(conf_file);
+
+	if (access(conf_path, R_OK) != 0) {
+		if (conf_file != NULL)
+			warn("%s", conf_file);
+		free(conf_path);
+		conf_path = NULL;
+	}
+
+	conf_init(&Conf);
+	if (conf_path && (parse_config(conf_path, &Conf) == -1))
+		warnx("config file %s has errors", conf_path);
+	free(conf_path);
+
+	x_init(display_name);
 	cwm_status = CWM_RUNNING;
-
-	if (pledge("stdio rpath proc exec", NULL) == -1)
-		err(1, "pledge");
-
-	memset(&pfd, 0, sizeof(pfd));
-	pfd[0].fd = xfd;
-	pfd[0].events = POLLIN;
-	while (cwm_status == CWM_RUNNING) {
+	while (cwm_status == CWM_RUNNING)
 		xev_process();
-		if (poll(pfd, 1, INFTIM) == -1) {
-			if (errno != EINTR)
-				warn("poll");
-		}
-	}
 	x_teardown();
-	if (cwm_status == CWM_EXEC_WM) {
-		u_exec(Conf.wm_argv);
-		warnx("'%s' failed to start, starting fallback", Conf.wm_argv);
-		u_exec(fallback);
-	}
+	if (cwm_status == CWM_RESTART)
+		x_restart(cwm_argv);
 
-	return 0;
+	return(0);
 }
 
-static int
+static void
 x_init(const char *dpyname)
 {
 	int	i;
@@ -142,15 +136,20 @@ x_init(const char *dpyname)
 	XSync(X_Dpy, False);
 	XSetErrorHandler(x_errorhandler);
 
-	Conf.xrandr = XRRQueryExtension(X_Dpy, &Conf.xrandr_event_base, &i);
+	HasRandr = XRRQueryExtension(X_Dpy, &Randr_ev, &i);
 
-	xu_atom_init();
+	conf_atoms();
 	conf_cursor(&Conf);
 
 	for (i = 0; i < ScreenCount(X_Dpy); i++)
 		screen_init(i);
+}
 
-	return ConnectionNumber(X_Dpy);
+static void
+x_restart(char **args)
+{
+	(void)setsid();
+	(void)execvp(args[0], args);
 }
 
 static void
@@ -166,7 +165,10 @@ x_teardown(void)
 			XftColorFree(X_Dpy, DefaultVisual(X_Dpy, sc->which),
 			    DefaultColormap(X_Dpy, sc->which),
 			    &sc->xftcolor[i]);
+		XftDrawDestroy(sc->xftdraw);
 		XftFontClose(X_Dpy, sc->xftfont);
+		XUnmapWindow(X_Dpy, sc->menuwin);
+		XDestroyWindow(X_Dpy, sc->menuwin);
 		XUngrabKey(X_Dpy, AnyKey, AnyModifier, sc->rootwin);
 	}
 	XUngrabPointer(X_Dpy, CurrentTime);
@@ -182,7 +184,8 @@ static int
 x_wmerrorhandler(Display *dpy, XErrorEvent *e)
 {
 	errx(1, "root window unavailable - perhaps another wm is running?");
-	return 0;
+
+	return(0);
 }
 
 static int
@@ -198,7 +201,7 @@ x_errorhandler(Display *dpy, XErrorEvent *e)
 
 	warnx("%s(0x%x): %s", req, (unsigned int)e->resourceid, msg);
 #endif
-	return 0;
+	return(0);
 }
 
 static void
@@ -214,24 +217,17 @@ sighdlr(int sig)
 		    (pid < 0 && errno == EINTR))
 			;
 		break;
-	case SIGHUP:
-		cwm_status = CWM_EXEC_WM;
-		break;
-	case SIGINT:
-	case SIGTERM:
-		cwm_status = CWM_QUIT;
-		break;
 	}
 
 	errno = save_errno;
 }
 
-__dead void
+void
 usage(void)
 {
 	extern char	*__progname;
 
-	(void)fprintf(stderr, "usage: %s [-nv] [-c file] [-d display]\n",
+	(void)fprintf(stderr, "usage: %s [-c file] [-d display]\n",
 	    __progname);
 	exit(1);
 }

calmwm.h

@@ -21,6 +21,25 @@
 #ifndef _CALMWM_H_
 #define _CALMWM_H_
 
+#include <sys/param.h>
+#include <stdio.h>
+#include "queue.h"
+
+/* prototypes for portable-included functions */
+char *fgetln(FILE *, size_t *);
+long long strtonum(const char *, long long, long long, const char **);
+
+#ifdef strlcat
+#define HAVE_STRLCAT
+#else
+size_t strlcat(char *, const char *, size_t);
+#endif
+#ifdef strlcpy
+#define HAVE_STRLCPY
+#else
+size_t strlcpy(char *, const char *, size_t);
+#endif
+
 #include <X11/XKBlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xft/Xft.h>
@@ -28,14 +47,10 @@
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
+#include <X11/extensions/Xinerama.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/keysym.h>
 
-#define LOG_DEBUG0(...)	log_debug(0, __func__, __VA_ARGS__)
-#define LOG_DEBUG1(...)	log_debug(1, __func__, __VA_ARGS__)
-#define LOG_DEBUG2(...)	log_debug(2, __func__, __VA_ARGS__)
-#define LOG_DEBUG3(...)	log_debug(3, __func__, __VA_ARGS__)
-
 #undef MIN
 #undef MAX
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
@@ -45,41 +60,73 @@
 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
 #endif
 
-#define BUTTONMASK	(ButtonPressMask | ButtonReleaseMask)
-#define MOUSEMASK	(BUTTONMASK | PointerMotionMask)
-#define IGNOREMODMASK	(LockMask | Mod2Mask | 0x2000)
+#define	CONFFILE	".cwmrc"
+#define	WMNAME	 	"CWM"
 
-/* direction/amount */
-#define CWM_UP			0x0001
-#define CWM_DOWN		0x0002
-#define CWM_LEFT		0x0004
-#define CWM_RIGHT		0x0008
-#define CWM_BIGAMOUNT		0x0010
-#define CWM_UP_BIG		(CWM_UP | CWM_BIGAMOUNT)
-#define CWM_DOWN_BIG		(CWM_DOWN | CWM_BIGAMOUNT)
-#define CWM_LEFT_BIG		(CWM_LEFT | CWM_BIGAMOUNT)
-#define CWM_RIGHT_BIG		(CWM_RIGHT | CWM_BIGAMOUNT)
-#define CWM_UP_RIGHT		(CWM_UP | CWM_RIGHT)
-#define CWM_UP_LEFT		(CWM_UP | CWM_LEFT)
-#define CWM_DOWN_RIGHT		(CWM_DOWN | CWM_RIGHT)
-#define CWM_DOWN_LEFT		(CWM_DOWN | CWM_LEFT)
+#define BUTTONMASK	(ButtonPressMask|ButtonReleaseMask)
+#define MOUSEMASK	(BUTTONMASK|PointerMotionMask)
+#define MENUMASK 	(MOUSEMASK|ButtonMotionMask|ExposureMask)
+#define MENUGRABMASK	(MOUSEMASK|ButtonMotionMask|StructureNotifyMask)
+#define KEYMASK		(KeyPressMask|ExposureMask)
+#define IGNOREMODMASK	(LockMask|Mod2Mask)
 
-#define CWM_CYCLE_FORWARD	0x0001
-#define CWM_CYCLE_REVERSE	0x0002
-#define CWM_CYCLE_INGROUP	0x0004
+/* kb movement */
+#define CWM_MOVE		0x0001
+#define CWM_RESIZE		0x0002
+#define CWM_PTRMOVE		0x0004
+#define CWM_BIGMOVE		0x0008
+#define CWM_UP			0x0010
+#define CWM_DOWN		0x0020
+#define CWM_LEFT		0x0040
+#define CWM_RIGHT		0x0080
 
-enum cwm_status {
-	CWM_QUIT,
-	CWM_RUNNING,
-	CWM_EXEC_WM
+/* exec */
+#define	CWM_EXEC_PROGRAM	0x0001
+#define	CWM_EXEC_WM		0x0002
+
+/* cycle */
+#define CWM_CYCLE		0x0001
+#define CWM_RCYCLE		0x0002
+#define CWM_INGROUP		0x0004
+
+/* menu */
+#define CWM_MENU_DUMMY		0x0001
+#define CWM_MENU_FILE		0x0002
+
+#define ARG_CHAR		0x0001
+#define ARG_INT			0x0002
+
+#define CWM_TILE_HORIZ 		0x0001
+#define CWM_TILE_VERT 		0x0002
+
+#define CWM_GAP			0x0001
+#define CWM_NOGAP		0x0002
+
+#define CWM_WIN			0x0001
+
+#define CWM_QUIT		0x0000
+#define CWM_RUNNING		0x0001
+#define CWM_RESTART		0x0002
+
+union arg {
+	char	*c;
+	int	 i;
 };
+
+union press {
+	KeySym		 keysym;
+	unsigned int	 button;
+};
+
 enum cursor_font {
-	CF_NORMAL,
+	CF_DEFAULT,
 	CF_MOVE,
-	CF_RESIZE,
+	CF_NORMAL,
 	CF_QUESTION,
+	CF_RESIZE,
 	CF_NITEMS
 };
+
 enum color {
 	CWM_COLOR_BORDER_ACTIVE,
 	CWM_COLOR_BORDER_INACTIVE,
@@ -99,6 +146,7 @@ struct geom {
 	int		 w;
 	int		 h;
 };
+
 struct gap {
 	int		 top;
 	int		 bottom;
@@ -110,17 +158,16 @@ struct winname {
 	TAILQ_ENTRY(winname)	 entry;
 	char			*name;
 };
-TAILQ_HEAD(name_q, winname);
+TAILQ_HEAD(winname_q, winname);
 TAILQ_HEAD(ignore_q, winname);
 
 struct client_ctx {
 	TAILQ_ENTRY(client_ctx)	 entry;
+	TAILQ_ENTRY(client_ctx)	 group_entry;
 	struct screen_ctx	*sc;
-	struct group_ctx	*gc;
 	Window			 win;
 	Colormap		 colormap;
-	int			 bwidth; /* border width */
-	int			 obwidth; /* original border width */
+	unsigned int		 bwidth; /* border width */
 	struct geom		 geom, savegeom, fullgeom;
 	struct {
 		long		 flags;	/* defined hints */
@@ -139,10 +186,6 @@ struct client_ctx {
 		int		 x;	/* x position */
 		int		 y;	/* y position */
 	} ptr;
-	struct {
-		int		 h;	/* height */
-		int		 w;	/* width */
-	} dim;
 #define CLIENT_HIDDEN			0x0001
 #define CLIENT_IGNORE			0x0002
 #define CLIENT_VMAXIMIZED		0x0004
@@ -157,115 +200,88 @@ struct client_ctx {
 #define CLIENT_FULLSCREEN		0x0800
 #define CLIENT_STICKY			0x1000
 #define CLIENT_ACTIVE			0x2000
-#define CLIENT_SKIP_PAGER		0x4000
-#define CLIENT_SKIP_TASKBAR		0x8000
 
-#define CLIENT_SKIP_CYCLE		(CLIENT_HIDDEN | CLIENT_IGNORE | \
-					 CLIENT_SKIP_TASKBAR | CLIENT_SKIP_PAGER)
 #define CLIENT_HIGHLIGHT		(CLIENT_GROUP | CLIENT_UNGROUP)
 #define CLIENT_MAXFLAGS			(CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
 #define CLIENT_MAXIMIZED		(CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
 	int			 flags;
 	int			 stackingorder;
-	struct name_q		 nameq;
+	struct winname_q	 nameq;
+#define CLIENT_MAXNAMEQLEN		5
+	int			 nameqlen;
 	char			*name;
 	char			*label;
-	char			*res_class; /* class hint */
-	char			*res_name; /* class hint */
-	int			 initial_state; /* wm hint */
+	char			*matchname;
+	struct group_ctx	*group;
+	XClassHint		ch;
+	XWMHints		*wmh;
 };
-TAILQ_HEAD(client_q, client_ctx);
+TAILQ_HEAD(client_ctx_q, client_ctx);
 
 struct group_ctx {
 	TAILQ_ENTRY(group_ctx)	 entry;
 	struct screen_ctx	*sc;
 	char			*name;
 	int			 num;
+	struct client_ctx_q	 clientq;
 };
-TAILQ_HEAD(group_q, group_ctx);
+TAILQ_HEAD(group_ctx_q, group_ctx);
 
-struct autogroup {
-	TAILQ_ENTRY(autogroup)	 entry;
-	char			*class;
-	char			*name;
-	int 			 num;
+struct autogroupwin {
+	TAILQ_ENTRY(autogroupwin)	 entry;
+	char				*class;
+	char				*name;
+	int 				 num;
 };
-TAILQ_HEAD(autogroup_q, autogroup);
+TAILQ_HEAD(autogroupwin_q, autogroupwin);
 
 struct region_ctx {
 	TAILQ_ENTRY(region_ctx)	 entry;
 	int			 num;
-	struct geom		 view; /* viewable area */
-	struct geom		 work; /* workable area, gap-applied */
+	struct geom		 area;
 };
-TAILQ_HEAD(region_q, region_ctx);
+TAILQ_HEAD(region_ctx_q, region_ctx);
 
 struct screen_ctx {
 	TAILQ_ENTRY(screen_ctx)	 entry;
 	int			 which;
 	Window			 rootwin;
+	Window			 menuwin;
 	int			 cycling;
 	int			 hideall;
 	int			 snapdist;
 	struct geom		 view; /* viewable area */
 	struct geom		 work; /* workable area, gap-applied */
 	struct gap		 gap;
-	struct client_q		 clientq;
-	struct region_q		 regionq;
-	struct group_q		 groupq;
+	struct client_ctx_q	 clientq;
+	struct region_ctx_q	 regionq;
+#define CALMWM_NGROUPS		 10
+	struct group_ctx_q	 groupq;
 	struct group_ctx	*group_active;
-	struct group_ctx	*group_last;
-	Colormap		 colormap;
-	Visual			*visual;
-	struct {
-		Window		 win;
-		XftDraw		*xftdraw;
-	} prop;
 	XftColor		 xftcolor[CWM_COLOR_NITEMS];
+	XftDraw			*xftdraw;
 	XftFont			*xftfont;
 };
-TAILQ_HEAD(screen_q, screen_ctx);
+TAILQ_HEAD(screen_ctx_q, screen_ctx);
 
-struct cargs {
-	char		*cmd;
-	int		 flag;
-	enum {
-		CWM_XEV_KEY,
-		CWM_XEV_BTN
-	} xev;
-};
-enum context {
-	CWM_CONTEXT_NONE = 0,
-	CWM_CONTEXT_CC,
-	CWM_CONTEXT_SC
-};
-struct bind_ctx {
-	TAILQ_ENTRY(bind_ctx)	 entry;
-	void			(*callback)(void *, struct cargs *);
-	struct cargs		*cargs;
-	enum context		 context;
+struct binding {
+	TAILQ_ENTRY(binding)	 entry;
+	void			(*callback)(struct client_ctx *, union arg *);
+	union arg		 argument;
 	unsigned int		 modmask;
-	union {
-		KeySym		 keysym;
-		unsigned int	 button;
-	} press;
+	union press		 press;
+	int			 flags;
+	int			 argtype;
 };
-TAILQ_HEAD(keybind_q, bind_ctx);
-TAILQ_HEAD(mousebind_q, bind_ctx);
+TAILQ_HEAD(keybinding_q, binding);
+TAILQ_HEAD(mousebinding_q, binding);
 
-struct cmd_ctx {
-	TAILQ_ENTRY(cmd_ctx)	 entry;
+struct cmd {
+	TAILQ_ENTRY(cmd)	 entry;
 	char			*name;
-	char			*path;
+	char			 path[PATH_MAX];
 };
-TAILQ_HEAD(cmd_q, cmd_ctx);
-TAILQ_HEAD(wm_q, cmd_ctx);
-
-#define CWM_MENU_DUMMY		0x0001
-#define CWM_MENU_FILE		0x0002
-#define CWM_MENU_LIST		0x0004
-#define CWM_MENU_WINDOW_ALL	0x0008
-#define CWM_MENU_WINDOW_HIDDEN	0x0010
+TAILQ_HEAD(cmd_q, cmd);
 
 struct menu {
 	TAILQ_ENTRY(menu)	 entry;
@@ -280,71 +296,47 @@ struct menu {
 TAILQ_HEAD(menu_q, menu);
 
 struct conf {
-	struct keybind_q	 keybindq;
-	struct mousebind_q	 mousebindq;
-	struct autogroup_q	 autogroupq;
+	struct keybinding_q	 keybindingq;
+	struct mousebinding_q	 mousebindingq;
+	struct autogroupwin_q	 autogroupq;
 	struct ignore_q		 ignoreq;
 	struct cmd_q		 cmdq;
-	struct wm_q		 wmq;
-	int			 ngroups;
-	int			 stickygroups;
-	int			 nameqlen;
+#define	CONF_STICKY_GROUPS		0x0001
+	int			 flags;
+#define CONF_BWIDTH			1
 	int			 bwidth;
+#define	CONF_MAMOUNT			1
 	int			 mamount;
+#define	CONF_SNAPDIST			0
 	int			 snapdist;
-	int			 htile;
-	int			 vtile;
 	struct gap		 gap;
 	char			*color[CWM_COLOR_NITEMS];
+	char			 known_hosts[PATH_MAX];
+#define	CONF_FONT			"sans-serif:pixelsize=14:bold"
 	char			*font;
-	char			*wmname;
 	Cursor			 cursor[CF_NITEMS];
-	int			 xrandr;
-	int			 xrandr_event_base;
-	char			*conf_file;
-	char			*known_hosts;
-	char			*wm_argv;
-	int			 debug;
 };
 
 /* MWM hints */
 struct mwm_hints {
-#define MWM_HINTS_ELEMENTS	5L
-
-#define MWM_HINTS_FUNCTIONS	(1L << 0)
-#define MWM_HINTS_DECORATIONS	(1L << 1)
-#define MWM_HINTS_INPUT_MODE	(1L << 2)
-#define MWM_HINTS_STATUS	(1L << 3)
 	unsigned long	flags;
-
-#define MWM_FUNC_ALL		(1L << 0)
-#define MWM_FUNC_RESIZE		(1L << 1)
-#define MWM_FUNC_MOVE		(1L << 2)
-#define MWM_FUNC_MINIMIZE	(1L << 3)
-#define MWM_FUNC_MAXIMIZE	(1L << 4)
-#define MWM_FUNC_CLOSE		(1L << 5)
 	unsigned long	functions;
-
-#define	MWM_DECOR_ALL		(1L << 0)
-#define	MWM_DECOR_BORDER	(1L << 1)
-#define MWM_DECOR_RESIZEH	(1L << 2)
-#define MWM_DECOR_TITLE		(1L << 3)
-#define MWM_DECOR_MENU		(1L << 4)
-#define MWM_DECOR_MINIMIZE	(1L << 5)
-#define MWM_DECOR_MAXIMIZE	(1L << 6)
 	unsigned long	decorations;
-
-#define MWM_INPUT_MODELESS			0
-#define MWM_INPUT_PRIMARY_APPLICATION_MODAL	1
-#define MWM_INPUT_SYSTEM_MODAL			2
-#define MWM_INPUT_FULL_APPLICATION_MODAL	3
-	long		inputMode;
-
-#define MWM_TEAROFF_WINDOW	(1L << 0)
-	unsigned long	status;
 };
+#define MWM_NUMHINTS		3
+#define	PROP_MWM_HINTS_ELEMENTS	3
+#define	MWM_HINTS_DECORATIONS	(1<<1)
+#define	MWM_DECOR_ALL		(1<<0)
+#define	MWM_DECOR_BORDER	(1<<1)
 
-enum cwmh {
+extern Display				*X_Dpy;
+extern Time				 Last_Event_Time;
+extern struct screen_ctx_q		 Screenq;
+extern struct conf			 Conf;
+extern const char			*homedir;
+extern int				 HasRandr, Randr_ev;
+
+enum {
 	WM_STATE,
 	WM_DELETE_WINDOW,
 	WM_TAKE_FOCUS,
@@ -354,12 +346,11 @@ enum cwmh {
 	WM_CHANGE_STATE,
 	CWMH_NITEMS
 };
-enum ewmh {
+enum {
 	_NET_SUPPORTED,
 	_NET_SUPPORTING_WM_CHECK,
 	_NET_ACTIVE_WINDOW,
 	_NET_CLIENT_LIST,
-	_NET_CLIENT_LIST_STACKING,
 	_NET_NUMBER_OF_DESKTOPS,
 	_NET_CURRENT_DESKTOP,
 	_NET_DESKTOP_VIEWPORT,
@@ -372,181 +363,170 @@ enum ewmh {
 	_NET_WM_DESKTOP,
 	_NET_CLOSE_WINDOW,
 	_NET_WM_STATE,
-#define	_NET_WM_STATES_NITEMS	9
+#define	_NET_WM_STATES_NITEMS	6
 	_NET_WM_STATE_STICKY,
 	_NET_WM_STATE_MAXIMIZED_VERT,
 	_NET_WM_STATE_MAXIMIZED_HORZ,
 	_NET_WM_STATE_HIDDEN,
 	_NET_WM_STATE_FULLSCREEN,
 	_NET_WM_STATE_DEMANDS_ATTENTION,
-	_NET_WM_STATE_SKIP_PAGER,
-	_NET_WM_STATE_SKIP_TASKBAR,
-	_CWM_WM_STATE_FREEZE,
 	EWMH_NITEMS
 };
-enum net_wm_state {
+enum {
 	_NET_WM_STATE_REMOVE,
 	_NET_WM_STATE_ADD,
 	_NET_WM_STATE_TOGGLE
 };
-
-extern Display				*X_Dpy;
-extern Time				 Last_Event_Time;
 extern Atom				 cwmh[CWMH_NITEMS];
 extern Atom				 ewmh[EWMH_NITEMS];
-extern struct screen_q			 Screenq;
-extern struct conf			 Conf;
 
-void			 client_apply_sizehints(struct client_ctx *);
-void			 client_close(struct client_ctx *);
+void			 usage(void);
+
+void			 client_applysizehints(struct client_ctx *);
 void			 client_config(struct client_ctx *);
-struct client_ctx	*client_current(struct screen_ctx *);
+struct client_ctx	*client_current(void);
+void			 client_cycle(struct screen_ctx *, int);
+void			 client_cycle_leave(struct screen_ctx *);
+void			 client_delete(struct client_ctx *);
 void			 client_draw_border(struct client_ctx *);
 struct client_ctx	*client_find(Window);
-void			 client_get_sizehints(struct client_ctx *);
+long			 client_get_wm_state(struct client_ctx *);
+void			 client_getsizehints(struct client_ctx *);
 void			 client_hide(struct client_ctx *);
 void 			 client_htile(struct client_ctx *);
-int			 client_inbound(struct client_ctx *, int, int);
-struct client_ctx	*client_init(Window, struct screen_ctx *);
 void			 client_lower(struct client_ctx *);
+void			 client_map(struct client_ctx *);
+void			 client_msg(struct client_ctx *, Atom, Time);
 void			 client_move(struct client_ctx *);
-void			 client_mtf(struct client_ctx *);
-struct client_ctx	*client_next(struct client_ctx *);
-struct client_ctx	*client_prev(struct client_ctx *);
-void			 client_ptr_inbound(struct client_ctx *, int);
-void			 client_ptr_save(struct client_ctx *);
-void			 client_ptr_warp(struct client_ctx *);
+struct client_ctx	*client_init(Window, struct screen_ctx *);
+void			 client_ptrsave(struct client_ctx *);
+void			 client_ptrwarp(struct client_ctx *);
 void			 client_raise(struct client_ctx *);
-void			 client_remove(struct client_ctx *);
 void			 client_resize(struct client_ctx *, int);
-void			 client_set_active(struct client_ctx *);
-void			 client_set_name(struct client_ctx *);
-void			 client_show(struct client_ctx *);
+void			 client_send_delete(struct client_ctx *);
+void			 client_set_wm_state(struct client_ctx *, long);
+void			 client_setactive(struct client_ctx *);
+void			 client_setname(struct client_ctx *);
 int			 client_snapcalc(int, int, int, int, int);
+void			 client_toggle_freeze(struct client_ctx *);
+void			 client_toggle_fullscreen(struct client_ctx *);
 void			 client_toggle_hidden(struct client_ctx *);
 void			 client_toggle_hmaximize(struct client_ctx *);
-void			 client_toggle_fullscreen(struct client_ctx *);
-void			 client_toggle_freeze(struct client_ctx *);
 void			 client_toggle_maximize(struct client_ctx *);
-void			 client_toggle_skip_pager(struct client_ctx *);
-void			 client_toggle_skip_taskbar(struct client_ctx *);
 void			 client_toggle_sticky(struct client_ctx *);
 void			 client_toggle_vmaximize(struct client_ctx *);
 void			 client_transient(struct client_ctx *);
+void			 client_unhide(struct client_ctx *);
 void			 client_urgency(struct client_ctx *);
 void 			 client_vtile(struct client_ctx *);
+void			 client_warp(struct client_ctx *);
 void			 client_wm_hints(struct client_ctx *);
 
-void			 group_assign(struct group_ctx *, struct client_ctx *);
-int			 group_autogroup(struct client_ctx *);
+void			 group_alltoggle(struct screen_ctx *);
+void			 group_autogroup(struct client_ctx *);
 void			 group_cycle(struct screen_ctx *, int);
 void			 group_hide(struct group_ctx *);
+void			 group_hidetoggle(struct screen_ctx *, int);
 int			 group_holds_only_hidden(struct group_ctx *);
 int			 group_holds_only_sticky(struct group_ctx *);
-void			 group_init(struct screen_ctx *, int, const char *);
+void			 group_init(struct screen_ctx *, int);
 void			 group_movetogroup(struct client_ctx *, int);
 void			 group_only(struct screen_ctx *, int);
-void			 group_close(struct screen_ctx *, int);
-int			 group_restore(struct client_ctx *);
 void			 group_show(struct group_ctx *);
-void			 group_toggle(struct screen_ctx *, int);
-void			 group_toggle_all(struct screen_ctx *);
-void			 group_toggle_membership(struct client_ctx *);
+void			 group_toggle_membership_enter(struct client_ctx *);
+void			 group_toggle_membership_leave(struct client_ctx *);
 void			 group_update_names(struct screen_ctx *);
 
 void			 search_match_client(struct menu_q *, struct menu_q *,
 			     char *);
-void			 search_match_cmd(struct menu_q *, struct menu_q *,
-			     char *);
 void			 search_match_exec(struct menu_q *, struct menu_q *,
 			     char *);
-void			 search_match_group(struct menu_q *, struct menu_q *,
-			     char *);
-void			 search_match_path(struct menu_q *, struct menu_q *,
+void			 search_match_exec_path(struct menu_q *,
+			     struct menu_q *, char *);
+void			 search_match_path_any(struct menu_q *, struct menu_q *,
 			     char *);
 void			 search_match_text(struct menu_q *, struct menu_q *,
 			     char *);
-void			 search_match_wm(struct menu_q *, struct menu_q *,
-			     char *);
 void			 search_print_client(struct menu *, int);
-void			 search_print_cmd(struct menu *, int);
-void			 search_print_group(struct menu *, int);
-void			 search_print_text(struct menu *, int);
-void			 search_print_wm(struct menu *, int);
 
-struct region_ctx	*region_find(struct screen_ctx *, int, int);
-void			 screen_assert_clients_within(struct screen_ctx *);
-struct geom		 screen_area(struct screen_ctx *, int, int, int);
 struct screen_ctx	*screen_find(Window);
+struct geom		 screen_find_xinerama(struct screen_ctx *,
+    			     int, int, int);
 void			 screen_init(int);
-void			 screen_prop_win_create(struct screen_ctx *, Window);
-void			 screen_prop_win_destroy(struct screen_ctx *);
-void			 screen_prop_win_draw(struct screen_ctx *,
-			     const char *, ...)
-			    __attribute__((__format__ (printf, 2, 3)))
-			    __attribute__((__nonnull__ (2)));
 void			 screen_update_geometry(struct screen_ctx *);
 void			 screen_updatestackingorder(struct screen_ctx *);
 
-void			 kbfunc_cwm_status(void *, struct cargs *);
-void			 kbfunc_ptrmove(void *, struct cargs *);
-void			 kbfunc_client_snap(void *, struct cargs *);
-void			 kbfunc_client_move(void *, struct cargs *);
-void			 kbfunc_client_resize(void *, struct cargs *);
-void			 kbfunc_client_close(void *, struct cargs *);
-void			 kbfunc_client_lower(void *, struct cargs *);
-void			 kbfunc_client_raise(void *, struct cargs *);
-void			 kbfunc_client_hide(void *, struct cargs *);
-void			 kbfunc_client_toggle_freeze(void *, struct cargs *);
-void			 kbfunc_client_toggle_sticky(void *, struct cargs *);
-void			 kbfunc_client_toggle_fullscreen(void *,
-			      struct cargs *);
-void			 kbfunc_client_toggle_maximize(void *, struct cargs *);
-void			 kbfunc_client_toggle_hmaximize(void *, struct cargs *);
-void			 kbfunc_client_toggle_vmaximize(void *, struct cargs *);
-void 			 kbfunc_client_htile(void *, struct cargs *);
-void 			 kbfunc_client_vtile(void *, struct cargs *);
-void			 kbfunc_client_cycle(void *, struct cargs *);
-void			 kbfunc_client_toggle_group(void *, struct cargs *);
-void			 kbfunc_client_movetogroup(void *, struct cargs *);
-void			 kbfunc_group_toggle(void *, struct cargs *);
-void			 kbfunc_group_only(void *, struct cargs *);
-void			 kbfunc_group_last(void *, struct cargs *);
-void			 kbfunc_group_close(void *, struct cargs *);
-void			 kbfunc_group_cycle(void *, struct cargs *);
-void			 kbfunc_group_toggle_all(void *, struct cargs *);
-void			 kbfunc_menu_client(void *, struct cargs *);
-void			 kbfunc_menu_cmd(void *, struct cargs *);
-void			 kbfunc_menu_group(void *, struct cargs *);
-void			 kbfunc_menu_wm(void *, struct cargs *);
-void			 kbfunc_menu_exec(void *, struct cargs *);
-void			 kbfunc_menu_ssh(void *, struct cargs *);
-void			 kbfunc_client_menu_label(void *, struct cargs *);
-void			 kbfunc_exec_cmd(void *, struct cargs *);
-void			 kbfunc_exec_lock(void *, struct cargs *);
-void			 kbfunc_exec_term(void *, struct cargs *);
+void			 kbfunc_client_cycle(struct client_ctx *, union arg *);
+void			 kbfunc_client_cyclegroup(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_delete(struct client_ctx *, union arg *);
+void			 kbfunc_client_group(struct client_ctx *, union arg *);
+void			 kbfunc_client_grouponly(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_grouptoggle(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_hide(struct client_ctx *, union arg *);
+void			 kbfunc_client_label(struct client_ctx *, union arg *);
+void			 kbfunc_client_lower(struct client_ctx *, union arg *);
+void			 kbfunc_client_moveresize(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_movetogroup(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_nogroup(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_raise(struct client_ctx *, union arg *);
+void			 kbfunc_client_rcycle(struct client_ctx *, union arg *);
+void			 kbfunc_client_search(struct client_ctx *, union arg *);
+void			 kbfunc_client_toggle_freeze(struct client_ctx *,
+    			     union arg *);
+void			 kbfunc_client_toggle_fullscreen(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_toggle_hmaximize(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_toggle_maximize(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_client_toggle_sticky(struct client_ctx *,
+    			     union arg *);
+void			 kbfunc_client_toggle_vmaximize(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_cmdexec(struct client_ctx *, union arg *);
+void			 kbfunc_cwm_status(struct client_ctx *, union arg *);
+void			 kbfunc_exec(struct client_ctx *, union arg *);
+void			 kbfunc_lock(struct client_ctx *, union arg *);
+void			 kbfunc_menu_cmd(struct client_ctx *, union arg *);
+void			 kbfunc_ssh(struct client_ctx *, union arg *);
+void			 kbfunc_term(struct client_ctx *, union arg *);
+void 			 kbfunc_tile(struct client_ctx *, union arg *);
+
+void			 mousefunc_client_grouptoggle(struct client_ctx *,
+			    union arg *);
+void			 mousefunc_client_move(struct client_ctx *,
+    			    union arg *);
+void			 mousefunc_client_resize(struct client_ctx *,
+    			    union arg *);
+void			 mousefunc_menu_cmd(struct client_ctx *, union arg *);
+void			 mousefunc_menu_group(struct client_ctx *, union arg *);
+void			 mousefunc_menu_unhide(struct client_ctx *,
+    			    union arg *);
 
 struct menu  		*menu_filter(struct screen_ctx *, struct menu_q *,
 			     const char *, const char *, int,
 			     void (*)(struct menu_q *, struct menu_q *, char *),
 			     void (*)(struct menu *, int));
-void			 menuq_add(struct menu_q *, void *, const char *, ...)
-			    __attribute__((__format__ (printf, 3, 4)));
+void			 menuq_add(struct menu_q *, void *, const char *, ...);
 void			 menuq_clear(struct menu_q *);
 
 int			 parse_config(const char *, struct conf *);
 
-void			 conf_autogroup(struct conf *, int, const char *,
-			     const char *);
-int			 conf_bind_key(struct conf *, const char *,
+void			 conf_atoms(void);
+void			 conf_autogroup(struct conf *, int, const char *);
+int			 conf_bind_kbd(struct conf *, const char *,
     			     const char *);
 int			 conf_bind_mouse(struct conf *, const char *,
     			     const char *);
 void			 conf_clear(struct conf *);
 void			 conf_client(struct client_ctx *);
-void			 conf_cmd_add(struct conf *, const char *,
-			     const char *);
-void			 conf_wm_add(struct conf *, const char *,
+int			 conf_cmd_add(struct conf *, const char *,
 			     const char *);
 void			 conf_cursor(struct conf *);
 void			 conf_grab_kbd(Window);
@@ -554,56 +534,53 @@ void			 conf_grab_mouse(Window);
 void			 conf_init(struct conf *);
 void			 conf_ignore(struct conf *, const char *);
 void			 conf_screen(struct screen_ctx *);
-void			 conf_group(struct screen_ctx *);
 
 void			 xev_process(void);
 
-int			 xu_get_prop(Window, Atom, Atom, long, unsigned char **);
-int			 xu_get_strprop(Window, Atom, char **);
-void			 xu_ptr_get(Window, int *, int *);
-void			 xu_ptr_set(Window, int, int);
-void			 xu_get_wm_state(Window, long *);
-void			 xu_set_wm_state(Window, long);
-void			 xu_send_clientmsg(Window, Atom, Time);
+void			 xu_btn_grab(Window, int, unsigned int);
+void			 xu_btn_ungrab(Window);
+int			 xu_getprop(Window, Atom, Atom, long, unsigned char **);
+int			 xu_getstrprop(Window, Atom, char **);
+void			 xu_key_grab(Window, unsigned int, KeySym);
+void			 xu_key_ungrab(Window);
+void			 xu_ptr_getpos(Window, int *, int *);
+int			 xu_ptr_grab(Window, unsigned int, Cursor);
+int			 xu_ptr_regrab(unsigned int, Cursor);
+void			 xu_ptr_setpos(Window, int, int);
+void			 xu_ptr_ungrab(void);
+void			 xu_xft_draw(struct screen_ctx *, const char *,
+			     int, int, int);
+int			 xu_xft_width(XftFont *, const char *, int);
 void 			 xu_xorcolor(XftColor, XftColor, XftColor *);
 
-void			 xu_atom_init(void);
 void			 xu_ewmh_net_supported(struct screen_ctx *);
 void			 xu_ewmh_net_supported_wm_check(struct screen_ctx *);
 void			 xu_ewmh_net_desktop_geometry(struct screen_ctx *);
-void			 xu_ewmh_net_desktop_viewport(struct screen_ctx *);
 void			 xu_ewmh_net_workarea(struct screen_ctx *);
 void			 xu_ewmh_net_client_list(struct screen_ctx *);
-void			 xu_ewmh_net_client_list_stacking(struct screen_ctx *);
 void			 xu_ewmh_net_active_window(struct screen_ctx *, Window);
-void			 xu_ewmh_net_number_of_desktops(struct screen_ctx *);
+void			 xu_ewmh_net_wm_desktop_viewport(struct screen_ctx *);
+void			 xu_ewmh_net_wm_number_of_desktops(struct screen_ctx *);
 void			 xu_ewmh_net_showing_desktop(struct screen_ctx *);
 void			 xu_ewmh_net_virtual_roots(struct screen_ctx *);
 void			 xu_ewmh_net_current_desktop(struct screen_ctx *);
 void			 xu_ewmh_net_desktop_names(struct screen_ctx *);
-int			 xu_ewmh_get_net_wm_desktop(struct client_ctx *, long *);
-void			 xu_ewmh_set_net_wm_desktop(struct client_ctx *);
+
+void			 xu_ewmh_net_wm_desktop(struct client_ctx *);
 Atom 			*xu_ewmh_get_net_wm_state(struct client_ctx *, int *);
 void 			 xu_ewmh_handle_net_wm_state_msg(struct client_ctx *,
-			     int, Atom, Atom);
+			     int, Atom , Atom);
 void 			 xu_ewmh_set_net_wm_state(struct client_ctx *);
 void 			 xu_ewmh_restore_net_wm_state(struct client_ctx *);
 
-char			*u_argv(char * const *);
 void			 u_exec(char *);
 void			 u_spawn(char *);
-void			 log_debug(int, const char *, const char *, ...)
-			    __attribute__((__format__ (printf, 3, 4)))
-			    __attribute__((__nonnull__ (3)));
 
 void			*xcalloc(size_t, size_t);
 void			*xmalloc(size_t);
-void			*xreallocarray(void *, size_t, size_t);
 char			*xstrdup(const char *);
 int			 xasprintf(char **, const char *, ...)
 			    __attribute__((__format__ (printf, 2, 3)))
 			    __attribute__((__nonnull__ (2)));
-int			 xvasprintf(char **, const char *, va_list)
-			    __attribute__((__nonnull__ (2)));
 
 #endif /* _CALMWM_H_ */

cwm.1

@@ -23,16 +23,128 @@
 .Sh SYNOPSIS
 .\" For a program:  program [-abc] file ...
 .Nm cwm
-.Op Fl nv
 .Op Fl c Ar file
 .Op Fl d Ar display
 .Sh DESCRIPTION
 .Nm
 is a window manager for X11 which contains many features that
-concentrate on the efficiency and transparency of window management,
-while maintaining the simplest and most pleasant aesthetic.
+concentrate on the efficiency and transparency of window management.
+.Nm
+also aims to maintain the simplest and most pleasant aesthetic.
 .Pp
-The options are as follows:
+The following notation is used throughout this page:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It Ic C
+Control.
+.It Ic M
+Meta.
+.It Ic S
+Shift.
+.It Ic M1
+Left mouse button.
+.It Ic M2
+Middle mouse button.
+.It Ic M3
+Right mouse button.
+.El
+.Pp
+.Nm
+is very simple in its use.
+Most of the actions are initiated via key bindings.
+The default key bindings are described below;
+their functionality is described in more detail later.
+.Pp
+.Bl -tag -width "CM-EscapeXXXXX" -offset indent -compact
+.It Ic CM-Return
+Spawn a new terminal.
+.It Ic CM-Delete
+Lock the screen.
+.It Ic M-Return
+Hide current window.
+.It Ic M-Down
+Lower current window.
+.It Ic M-Up
+Raise current window.
+.It Ic M-/
+Search for windows.
+.It Ic C-/
+Search for applications.
+.It Ic CM-n
+Label current window.
+.It Ic M-Tab
+Cycle through currently visible windows.
+.It Ic MS-Tab
+Reverse cycle through currently visible windows.
+.It Ic CM-x
+Delete current window.
+.It Ic CM-[n]
+Select group n, where n is 1-9.
+.It Ic CM-0
+Select all groups.
+.It Ic CM-g
+Toggle group membership of current window.
+.It Ic M-Right
+Cycle through active groups.
+.It Ic M-Left
+Reverse cycle through active groups.
+.It Ic CMS-f
+Toggle freezing geometry of current window.
+.It Ic CM-s
+Toggle stickiness of current window.
+.It Ic CM-f
+Toggle full-screen mode of current window.
+.It Ic CM-m
+Toggle maximization of current window.
+.It Ic CM-=
+Toggle vertical maximization of current window.
+.It Ic CMS-=
+Toggle horizontal maximization of current window.
+.It Ic M-?
+Spawn
+.Dq exec program
+dialog.
+.It Ic M-.
+Spawn
+.Dq ssh to
+dialog.
+This parses
+.Pa $HOME/.ssh/known_hosts
+to provide host auto-completion.
+.Xr ssh 1
+will be executed via the configured terminal emulator.
+.It Ic CM-w
+Spawn
+.Dq exec WindowManager
+dialog; allows you to switch from
+.Nm
+to another window manager without restarting the X server.
+.It Ic CMS-r
+Restart the running
+.Xr cwm 1 .
+.It Ic CMS-q
+Quit
+.Nm .
+.El
+.Pp
+The default mouse bindings are:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It Ic M-M1
+Move current window.
+.It Ic CM-M1
+Toggle group membership of current window.
+.It Ic M-M2
+Resize current window
+.It Ic M-M3
+Lower current window.
+.It Ic CMS-M3
+Hide current window.
+.El
+.Pp
+The options for
+.Nm
+are as follows:
 .Bl -tag -width Ds
 .It Fl c Ar file
 Specify an alternative configuration file.
@@ -48,159 +160,38 @@ however,
 will continue to process the rest of the configuration file.
 .It Fl d Ar display
 Specify the display to use.
-.It Fl n
-Configtest mode.
-Only check the configuration file for validity.
-.It Fl v
-Verbose mode.
-Multiple
-.Fl v
-options increase the verbosity.
 .El
-.Pp
+.Sh POINTER MOVEMENT
+The pointer can be moved with the use of the keyboard through bindings.
+.Ic C-[Up|Down|Left|Right]
+moves the pointer a small amount, while
+.Ic CS-[Up|Down|Left|Right]
+moves the pointer a larger amount.
+For example, to move the pointer to the left by a small amount,
+press
+.Ic C-Left .
+To move the pointer down by a larger amount, press
+.Ic CS-Down .
+.Sh WINDOW MOVEMENT AND RESIZING
 .Nm
-actions are initiated either via key or mouse bindings.
-The following notations are used throughout this page:
+windows can be moved with the use of the keyboard through
+.Cm vi Ns -like
+bindings.
+.Ic M-[hjkl]
+moves the current window a small amount, while
+.Ic MS-[hjkl]
+moves the current window a larger amount.
+For example, to move the current window to the left a small amount, press
+.Ic M-h .
+To move the current window down by a larger amount, press
+.Ic MS-j .
 .Pp
-.Bl -tag -width Ds -offset indent -compact
-.It Ic C
-Control key.
-.It Ic M
-Meta key.
-.It Ic S
-Shift key.
-.It Ic 4
-Mod4 (windows) key.
-.It Ic M1
-Left mouse button.
-.It Ic M2
-Middle mouse button.
-.It Ic M3
-Right mouse button.
-.El
-.Pp
-The default key bindings are:
-.Pp
-.Bl -tag -width "CM-EscapeXXXXX" -offset indent -compact
-.It Ic CM-Return
-Spawn a new terminal.
-.It Ic CM-Delete
-Lock the screen.
-.It Ic M-Return
-Hide current window.
-.It Ic M-Down
-Lower current window.
-.It Ic M-Up
-Raise current window.
-.It Ic M-slash
-Search for windows.
-.It Ic C-slash
-Search for applications.
-.It Ic CM-n
-Label current window.
-.It Ic M-Tab
-Cycle through currently visible windows.
-.It Ic MS-Tab
-Reverse cycle through currently visible windows.
-.It Ic CM-x
-Close current window.
-.It Ic CM-[n]
-Toggle visibility of group n, where n is 1-9.
-.It Ic CM-a
-Toggle visibility of all groups.
-.It Ic CM-g
-Toggle group membership of current window.
-.It Ic M-Right
-Cycle through active groups.
-.It Ic M-Left
-Reverse cycle through active groups.
-.It Ic CMS-f
-Toggle freezing geometry of current window.
-.It Ic CM-s
-Toggle stickiness of current window.
-.It Ic CM-f
-Toggle full-screen mode of current window.
-.It Ic CM-m
-Toggle maximization of current window.
-.It Ic CM-equal
-Toggle vertical maximization of current window.
-.It Ic CMS-equal
-Toggle horizontal maximization of current window.
-.It Ic M-[hjkl]
-Move window by a small amount.
-.It Ic MS-[hjkl]
-Move window by a large amount; see
-.Xr cwmrc 5 .
-.It Ic CM-[hjkl]
-Resize window by a small amount.
-.It Ic CMS-[hjkl]
-Resize window by a large amount; see
-.Xr cwmrc 5 .
-.It Ic M-question
-Spawn
-.Dq exec program
-dialog.
-.It Ic M-period
-Spawn
-.Dq ssh to
-dialog.
-This parses
-.Pa $HOME/.ssh/known_hosts
-to provide host auto-completion.
-.Xr ssh 1
-will be executed via the configured terminal emulator.
-.It Ic CM-w
-Spawn
-.Dq exec WindowManager
-menu, allowing a switch to another window manager.
-.It Ic CMS-r
-Restart.
-.It Ic CMS-q
-Quit.
-.El
-.Pp
-The default mouse bindings are:
-.Pp
-.Bl -tag -width "CM-EscapeXXXXX" -offset indent -compact
-.It Ic M-M1
-Move current window.
-.It Ic CM-M1
-Toggle group membership of current window.
-.It Ic M-M2
-Resize current window
-.It Ic M-M3
-Lower current window.
-.It Ic CMS-M3
-Hide current window.
-.El
-.Pp
-The following key bindings may be used to navigate
-search and exec dialogs:
-.Pp
-.Bl -tag -width "[Down] or C-s or M-j" -offset indent -compact
-.It Ic [Return]
-Select item.
-.It Ic [Down], C-s No or Ic M-j
-Next item.
-.It Ic [Up], C-r No or Ic M-k
-Previous item.
-.It Ic [Backspace] No or Ic C-h
-Backspace.
-.It Ic C-u
-Clear input.
-.It Ic C-a
-List all available items.
-.It Ic [Esc]
-Cancel.
-.El
-.Pp
-.Nm
-rereads its configuration file when it receives a hangup signal,
-.Dv SIGHUP ,
-by executing itself with the name and arguments with which it was started.
-This is equivalent to the
-.Ar restart
-function.
+Similarly, windows may be resized with the same key bindings with the addition
+of the Control key.
+.Ic CM-[hjkl]
+resizes the window a small amount and
+.Ic CMS-[hjkl]
+resizes by a larger increment.
 .Sh SEARCH
 .Nm
 features the ability to search for windows by their current title,
@@ -213,21 +204,37 @@ keeps a history of the 5 previous titles of a window.
 When searching, the leftmost character of the result list may show a
 flag:
 .Pp
-.Bl -tag -width Ds -offset indent -compact
+.Bl -tag -width 10n -offset indent -compact
 .It !
-Window is currently focused.
+The window is the currently focused window.
 .It &
-Window is hidden.
+The window is hidden.
+.El
+.Pp
+The following key bindings may be used to navigate the result list:
+.Pp
+.Bl -tag -width "[Down] or C-s or M-j" -offset indent -compact
+.It Ic [Down], C-s No or Ic M-j
+Select the next window in the list.
+.It Ic [Up], C-r No or Ic M-k
+Select the previous window in the list.
+.It Ic [Backspace] No or Ic C-h
+Backspace.
+.It Ic C-u
+Clear the input.
+.It Ic [Return]
+Focus the selected window.
+.It Ic [Esc]
+Cancel.
+.It Ic C-a
+Whenever there are no matching windows, list every window.
 .El
-.Sh APPLICATIONS
-.Nm
-manages a list of applications defined with the
-.Cm command
-configuration option.
 .Sh GROUPS
 .Nm
 has the ability to group windows together, and use the groups to
 perform operations on the entire group instead of just one window.
+Currently, the only operation that is supported is to hide and unhide
+the grouped windows.
 Together with the
 .Pa sticky
 option, this can be used to emulate virtual desktops.
@@ -239,19 +246,20 @@ and a red border will be shown on those just removed.
 .Sh MENUS
 Menus are recalled by clicking the mouse on the root window:
 .Pp
-.Bl -tag -width Ds -offset indent -compact
+.Bl -tag -width 10n -offset indent -compact
 .It Ic M1
-Show list of currently defined windows.
-Selecting an item will warp to that window, unhiding it if necessary.
+Show list of currently hidden windows.
+Clicking on an item will unhide that window.
 .It Ic M2
 Show list of currently defined groups.
-Selecting an item will hide/unhide that group.
+Clicking on an item will hide/unhide that group.
 .It Ic M3
-Show list of applications as defined in the configuration file.
-Selecting an item will spawn that application.
+Show list of applications as defined in
+.Pa ~/.cwmrc .
+Clicking on an item will spawn that application.
 .El
 .Sh ENVIRONMENT
-.Bl -tag -width "DISPLAYXXX" -compact
+.Bl -tag -width "DISPLAYXXX"
 .It DISPLAY
 .Nm
 starts on this display unless the
@@ -259,11 +267,8 @@ starts on this display unless the
 option is given.
 .El
 .Sh FILES
-.Bl -tag -width "~/.cwmrcXX" -compact
+.Bl -tag -width Ds
 .It Pa ~/.cwmrc
-Default
-.Nm
-configuration file.
 .El
 .Sh SEE ALSO
 .Xr cwmrc 5

cwm.pub

@@ -0,0 +1,2 @@
+untrusted comment: portable cwm release key public key
+RWTdOib0PoIM0pmDAPnV2S9/AMRqTOVfTY/KAkFemdH13cqBDHdduTas

cwmrc.5

@@ -37,8 +37,10 @@ Arguments containing whitespace should be surrounded by double quotes
 .Pq \&" .
 .Pp
 The following options are accepted:
-.Bl -tag -width Ds
-.It Ic autogroup Ar group Oo Ar windowname , Oc Ns Ar windowclass
+.Pp
+.Bl -tag -width Ds -compact
+.It Ic autogroup Ar group windowclass
+.It Ic autogroup Ar group windowname,windowclass
 Automatically add new windows to
 .Ar group
 if their class property matches
@@ -60,91 +62,75 @@ used to override
 The name and class values, respectively, for existing windows
 are both set in the WM_CLASS property and may be obtained using
 .Xr xprop 1 .
-.It Ic bind-key Ar key function
-Bind or rebind key
-.Ar key
-to
-.Ar function .
+.Pp
+.It Ic bind Ar keys command
+Cause the creation of a key binding, or replacement of a default
+key binding.
 The modifier keys come first, followed by a
-.Sq - ,
-then a keysym name, taken from
-.Pa /usr/X11R6/include/X11/keysymdef.h .
+.Sq - .
 .Pp
 The following modifiers are recognised:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
-.It Ic C
-Control key.
-.It Ic M
-Meta key.
-.It Ic S
-Shift key.
-.It Ic 4
-Mod4 (windows) key.
-.It Ic 5
-Mod5 (AltGr) key.
+.It C
+The Control key.
+.It M
+The Meta key.
+.It S
+The Shift key.
+.It 4
+The Mod4 key (normally the windows key).
 .El
 .Pp
 The
-.Ar function
+.Sq -
+should be followed by a keysym name, taken from
+.Pa /usr/X11R6/include/X11/keysymdef.h .
+The
+.Ar command
 may either be one from the
-.Sx BIND FUNCTION LIST
+.Sx BIND COMMAND LIST
 (see below) or the command line that is to be executed.
-.It Ic bind-mouse Ar button function
-Bind or rebind button
-.Ar button
-to
-.Ar function .
-The modifier keys come first, followed by a
-.Sq - ,
-then the button number.
 .Pp
-The same modifiers are recognised as for
-.Ar key
-in
-.Nm bind-key .
+A special
+.Ar command
+keyword
+.Dq unmap
+can be used to remove the named key binding.
+This can be used to remove a binding which conflicts with an
+application.
 .Pp
-The following buttons are recognised:
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It Ic 1
-Left mouse button.
-.It Ic 2
-Middle mouse button.
-.It Ic 3
-Right mouse button.
-.It Ic 4
-Scroll up mouse button.
-.It Ic 5
-Scroll down mouse button.
-.El
-.Pp
-The
-.Ar function
-may be taken from the
-.Sx BIND FUNCTION LIST
-(see below) or the command line that is to be executed.
 .It Ic borderwidth Ar pixels
 Set the window border width to
 .Ar pixels .
+.Pp
 .It Ic color activeborder Ar color
 Set the color of the active border.
+.Pp
 .It Ic color font Ar color
 Set menu font color.
+.Pp
 .It Ic color selfont Ar color
 Set font color for selected menu item.
+.Pp
 .It Ic color groupborder Ar color
 Set the color of the border while grouping a window.
+.Pp
 .It Ic color inactiveborder Ar color
 Set the color of the inactive border.
+.Pp
 .It Ic color menubg Ar color
 Set menu background color.
+.Pp
 .It Ic color menufg Ar color
 Set menu foreground color.
+.Pp
 .It Ic color urgencyborder Ar color
 Set the color of the border of a window indicating urgency.
+.Pp
 .It Ic color ungroupborder Ar color
 Set the color of the border while ungrouping a window.
+.Pp
 .It Ic command Ar name path
 Every
 .Ar name
@@ -152,7 +138,7 @@ entry is shown in the application menu.
 When selected, the defined
 .Ar path
 is executed with
-.Xr execvp 3 .
+.Xr execve 2 .
 .Pp
 The
 .Ar name
@@ -168,11 +154,13 @@ The defaults are
 and
 .Xr xlock 1 ,
 respectively.
+.Pp
 .It Ic fontname Ar font
 Change the default
 .Ar font
 for
 .Xr Xft 3 .
+.Pp
 .It Ic gap Ar top bottom left right
 Define a
 .Dq gap
@@ -183,277 +171,71 @@ This
 can be used for applications such as
 .Xr xclock 1 ,
 where the user may wish to remain visible.
-.It Ic htile Ar percent
-Set the percentage of screen the master window should occupy
-after calling
-.Ic window-htile .
-If set to 0, the horizontal size of the master window will
-remain unchanged.
-The default is 50.
+.Pp
 .It Ic ignore Ar windowname
 Ignore, and do not warp to, windows with the name
 .Ar windowname
 when drawing borders and cycling through windows.
+.Pp
+.It Ic mousebind Ar buttons command
+Cause the creation of a mouse binding, or replacement of a default
+mouse binding.
+The modifier keys come first, followed by a
+.Sq - .
+.Pp
+The following modifiers are recognised:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It C
+The Control key.
+.It M
+The Meta key.
+.It S
+The Shift key.
+.It 4
+The Mod4 key (normally the windows key).
+.El
+.Pp
+The
+.Sq -
+should be followed by number:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It 1
+Left mouse button.
+.It 2
+Middle mouse button.
+.It 3
+Right mouse button.
+.It 4
+Scroll up mouse button.
+.It 5
+Scroll down mouse button.
+.El
+.Pp
+The
+.Ar command
+may be taken from the
+.Sx MOUSEBIND COMMAND LIST
+(see below).
+.Pp
 .It Ic moveamount Ar pixels
 Set a default size for the keyboard movement bindings,
 in pixels.
 The default is 1.
+.Pp
 .It Ic snapdist Ar pixels
 Minimum distance to snap-to adjacent edge, in pixels.
 The default is 0.
+.Pp
 .It Ic sticky Ic yes Ns \&| Ns Ic no
 Toggle sticky group mode.
 The default behavior for new windows is to not assign any group.
 By enabling sticky group mode,
 .Xr cwm 1
 will assign new windows to the currently selected group.
-.It Ic unbind-key Ar key
-Unbind function bound to
-.Ar key .
-A special
-.Ar key
-keyword
-.Dq all
-can be used to unbind all keys.
-.It Ic unbind-mouse Ar button
-Unbind function bound to
-.Ar button .
-A special
-.Ar button
-keyword
-.Dq all
-can be used to unbind all buttons.
-.It Ic vtile Ar percent
-Set the percentage of screen the master window should occupy
-after calling
-.Ic window-vtile .
-If set to 0, the vertical size of the master window will
-remain unchanged.
-The default is 50.
-.It Ic wm Ar name path
-Every
-.Ar name
-entry is shown in the wm menu.
-When selected, the window manager is replaced by
-.Ar path .
 .El
-.Sh BIND FUNCTION LIST
-.Bl -tag -width 23n -compact
-.It restart
-Restart the running
-.Xr cwm 1 .
-.It quit
-Quit
-.Xr cwm 1 .
-.It terminal
-Spawn a new terminal.
-.It lock
-Lock the screen.
-.It menu-window
-Launch window search menu.
-.It menu-window-hidden
-Launch hidden window search menu.
-.It menu-cmd
-Launch application search menu.
-.It menu-group
-Launch group search menu.
-.It menu-exec
-Launch
-.Dq exec program
-menu.
-.It menu-exec-wm
-Launch
-.Dq exec WindowManager
-menu.
-.It menu-ssh
-Launch
-.Dq ssh
-menu.
-.It group-toggle-[n]
-Toggle visibility of group n, where n is 1-9.
-.It group-only-[n]
-Show only group n, where n is 1-9, hiding other groups.
-.It group-last
-Show only the previously active group.
-.It group-close-[n]
-Close all windows in group n, where n is 1-9.
-.It group-toggle-all
-Toggle visibility of all groups.
-.It window-group
-Toggle group membership of current window.
-.It window-movetogroup-[n]
-Hide current window from display and move to group n, where n is 1-9.
-.It group-cycle
-Forward cycle through groups.
-.It group-rcycle
-Reverse cycle through groups.
-.It window-cycle
-Forward cycle through windows.
-.It window-rcycle
-Reverse cycle through windows.
-.It window-cycle-ingroup
-Forward cycle through windows in current group.
-.It window-rcycle-ingroup
-Reverse cycle through windows in current group.
-.It window-close
-Close current window.
-.It window-hide
-Hide current window.
-.It window-lower
-Lower current window.
-.It window-raise
-Raise current window.
-.It window-menu-label
-Label current window.
-.It window-freeze
-Freeze current window geometry.
-.It window-stick
-Stick current window to all groups (same as assigning to nogroup).
-.It window-fullscreen
-Full-screen current window (gap + border removed).
-.It window-maximize
-Maximize current window (gap + border honored).
-.It window-vmaximize
-Vertically maximize current window (gap + border honored).
-.It window-hmaximize
-Horizontally maximize current window (gap + border honored).
-.It window-htile
-Current window is placed at the top of the screen, maximized
-horizontally and resized to
-.Ar htile
-(default half) of the vertical screen space.
-Other windows in its group share remaining screen space.
-.It window-vtile
-Current window is placed on the left of the screen, maximized vertically
-and resized to
-.Ar vtile
-(default half) of the horizontal screen space.
-Other windows in its group share remaining screen space.
-.It window-move
-Move current window.
-.It window-resize
-Resize current window.
-.It window-move-up
-Move window
-.Ar moveamount
-pixels up.
-.It window-move-down
-Move window
-.Ar moveamount
-pixels down.
-.It window-move-right
-Move window
-.Ar moveamount
-pixels right.
-.It window-move-left
-Move window
-.Ar moveamount
-pixels left.
-.It window-move-up-big
-Move window 10 times
-.Ar moveamount
-pixels up.
-.It window-move-down-big
-Move window 10 times
-.Ar moveamount
-pixels down.
-.It window-move-right-big
-Move window 10 times
-.Ar moveamount
-pixels right.
-.It window-move-left-big
-Move window 10 times
-.Ar moveamount
-pixels left.
-.It window-resize-up
-Resize window
-.Ar moveamount
-pixels up.
-.It window-resize-down
-Resize window
-.Ar moveamount
-pixels down.
-.It window-resize-right
-Resize window
-.Ar moveamount
-pixels right.
-.It window-resize-left
-Resize window
-.Ar moveamount
-pixels left.
-.It window-resize-up-big
-Resize window 10 times
-.Ar moveamount
-pixels up.
-.It window-resize-down-big
-Resize window 10 times
-.Ar moveamount
-pixels down.
-.It window-resize-right-big
-Resize window 10 times
-.Ar moveamount
-pixels right.
-.It window-resize-left-big
-Resize window 10 times
-.Ar moveamount
-pixels left.
-.It window-snap-up
-Snap window to top edge.
-.It window-snap-down
-Snap window to bottom edge.
-.It window-snap-right
-Snap window to right edge.
-.It window-snap-left
-Snap window to left edge.
-.It window-snap-up-right
-Snap window to top-right corner.
-.It window-snap-up-left
-Snap window to top-left corner.
-.It window-snap-down-right
-Snap window to bottom-right corner.
-.It window-snap-down-left
-Snap window to bottom-left corner.
-.It pointer-move-up
-Move pointer
-.Ar moveamount
-pixels up.
-.It pointer-move-down
-Move pointer
-.Ar moveamount
-pixels down.
-.It pointer-move-right
-Move pointer
-.Ar moveamount
-pixels right.
-.It pointer-move-left
-Move pointer
-.Ar moveamount
-pixels left.
-.It pointer-move-up-big
-Move pointer 10 times
-.Ar moveamount
-pixels up.
-.It pointer-move-down-big
-Move pointer 10 times
-.Ar moveamount
-pixels down.
-.It pointer-move-right-big
-Move pointer 10 times
-.Ar moveamount
-pixels right.
-.It pointer-move-left-big
-Move pointer 10 times
-.Ar moveamount
-pixels left.
-.El
-.Sh FILES
-.Bl -tag -width "~/.cwmrcXXX" -compact
-.It Pa ~/.cwmrc
-Default
-.Xr cwm 1
-configuration file.
-.El
-.Sh EXAMPLES
+.Sh EXAMPLE CONFIGURATION
 .Bd -literal
 # Set default Xft(3) font
 fontname "sans-serif:pixelsize=14:bold"
@@ -477,24 +259,233 @@ ignore xapm
 ignore xclock
 
 # Key bindings
-bind-key CM-r		window-menu-label
-bind-key CS-Return	"xterm -e top"
-bind-key C4-equal	window-vmaximize
-bind-key C4S-equal	window-hmaximize
-bind-key M-1		group-only-1
-bind-key M-2		group-only-2
-bind-key M-3		group-only-3
-bind-key MS-1		window-movetogroup-1
-bind-key MS-2		window-movetogroup-2
-bind-key MS-3		window-movetogroup-3
-unbind-key 4-o
-unbind-key CM-equal
-unbind-key CMS-equal
+bind CM-r	label
+bind CS-Return	"xterm -e top"
+bind 4-o	unmap
+bind CM-equal	unmap
+bind CMS-equal	unmap
+bind C4-equal	vmaximize
+bind C4S-equal	hmaximize
+bind M-1	grouponly1
+bind M-2	grouponly2
+bind M-3	grouponly3
+bind MS-1	movetogroup1
+bind MS-2	movetogroup2
+bind MS-3	movetogroup3
 
 # Mouse bindings
-bind-mouse M-2		window-lower
-bind-mouse M-3		window-resize
+mousebind M-2	window_lower
+mousebind M-3	window_resize
 .Ed
+.Sh BIND COMMAND LIST
+.Bl -tag -width 18n -compact
+.It restart
+Restart the running
+.Xr cwm 1 .
+.It quit
+Quit
+.Xr cwm 1 .
+.It terminal
+Spawn a new terminal.
+.It lock
+Lock the screen.
+.It search
+Launch window search menu.
+.It menusearch
+Launch application search menu.
+.It exec
+Launch
+.Dq exec program
+menu.
+.It exec_wm
+Launch
+.Dq exec WindowManager
+menu.
+.It ssh
+Launch
+.Dq ssh
+menu.
+.It group[n]
+Select group n, where n is 1-9.
+.It grouponly[n]
+Like
+.Ar group[n]
+but also hides the other groups.
+.It nogroup
+Select all groups.
+.It grouptoggle
+Toggle group membership of current window.
+.It movetogroup[n]
+Hide current window from display and move to group n, where n is 1-9.
+.It cyclegroup
+Forward cycle through groups.
+.It rcyclegroup
+Reverse cycle through groups.
+.It cycle
+Forward cycle through windows.
+.It rcycle
+Reverse cycle through windows.
+.It cycleingroup
+Forward cycle through windows in current group.
+.It rcycleingroup
+Reverse cycle through windows in current group.
+.It delete
+Delete current window.
+.It hide
+Hide current window.
+.It lower
+Lower current window.
+.It raise
+Raise current window.
+.It label
+Label current window.
+.It freeze
+Freeze current window geometry.
+.It sticky
+Stick current window to all groups (same as assigning to nogroup).
+.It fullscreen
+Full-screen current window (gap + border removed).
+.It maximize
+Maximize current window (gap + border honored).
+.It vmaximize
+Vertically maximize current window (gap + border honored).
+.It hmaximize
+Horizontally maximize current window (gap + border honored).
+.It moveup
+Move window
+.Ar moveamount
+pixels up.
+.It movedown
+Move window
+.Ar moveamount
+pixels down.
+.It moveright
+Move window
+.Ar moveamount
+pixels right.
+.It moveleft
+Move window
+.Ar moveamount
+pixels left.
+.It bigmoveup
+Move window 10 times
+.Ar moveamount
+pixels up.
+.It bigmovedown
+Move window 10 times
+.Ar moveamount
+pixels down.
+.It bigmoveright
+Move window 10 times
+.Ar moveamount
+pixels right.
+.It bigmoveleft
+Move window 10 times
+.Ar moveamount
+pixels left.
+.It resizeup
+Resize window
+.Ar moveamount
+pixels up.
+.It resizedown
+Resize window
+.Ar moveamount
+pixels down.
+.It resizeright
+Resize window
+.Ar moveamount
+pixels right.
+.It resizeleft
+Resize window
+.Ar moveamount
+pixels left.
+.It bigresizeup
+Resize window 10 times
+.Ar moveamount
+pixels up.
+.It bigresizedown
+Resize window 10 times
+.Ar moveamount
+pixels down.
+.It bigresizeright
+Resize window 10 times
+.Ar moveamount
+pixels right.
+.It bigresizeleft
+Resize window 10 times
+.Ar moveamount
+pixels left.
+.It ptrmoveup
+Move pointer
+.Ar moveamount
+pixels up.
+.It ptrmovedown
+Move pointer
+.Ar moveamount
+pixels down.
+.It ptrmoveright
+Move pointer
+.Ar moveamount
+pixels right.
+.It ptrmoveleft
+Move pointer
+.Ar moveamount
+pixels left.
+.It bigptrmoveup
+Move pointer 10 times
+.Ar moveamount
+pixels up.
+.It bigptrmovedown
+Move pointer 10 times
+.Ar moveamount
+pixels down.
+.It bigptrmoveright
+Move pointer 10 times
+.Ar moveamount
+pixels right.
+.It bigptrmoveleft
+Move pointer 10 times
+.Ar moveamount
+pixels left.
+.It htile
+Current window is placed at the top of the screen and maximized
+horizontally, other windows in its group share remaining screen space.
+.It vtile
+Current window is placed on the left of the screen and maximized
+vertically, other windows in its group share remaining screen space.
+.El
+.Sh MOUSEBIND COMMAND LIST
+.Bl -tag -width 18n -compact
+.It window_move
+Move current window.
+.It window_resize
+Resize current window.
+.It window_lower
+Lower current window.
+.It window_raise
+Raise current window.
+.It window_hide
+Hide current window.
+.It window_grouptoggle
+Toggle group membership of current window.
+.It cyclegroup
+Forward cycle through groups.
+.It rcyclegroup
+Reverse cycle through groups.
+.It menu_group
+Launch group list.
+.It menu_unhide
+Launch hidden window list.
+.It menu_cmd
+Launch command list.
+.El
+.Sh FILES
+.Bl -tag -width "~/.cwmrcXXX" -compact
+.It Pa ~/.cwmrc
+default
+.Xr cwm 1
+configuration file
+.El
 .Sh SEE ALSO
 .Xr cwm 1
 .Sh HISTORY

fgetln.c

@@ -0,0 +1,106 @@
+/*	$NetBSD: fgetln.c,v 1.9 2008/04/29 06:53:03 martin Exp $	*/
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#if !HAVE_FGETLN
+#include <stdlib.h>
+#ifndef HAVE_NBTOOL_CONFIG_H
+/* These headers are required, but included from nbtool_config.h */
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#endif
+
+char *
+fgetln(FILE *fp, size_t *len)
+{
+	static char *buf = NULL;
+	static size_t bufsiz = 0;
+	char *ptr;
+
+
+	if (buf == NULL) {
+		bufsiz = BUFSIZ;
+		if ((buf = malloc(bufsiz)) == NULL)
+			return NULL;
+	}
+
+	if (fgets(buf, bufsiz, fp) == NULL)
+		return NULL;
+
+	*len = 0;
+	while ((ptr = strchr(&buf[*len], '\n')) == NULL) {
+		size_t nbufsiz = bufsiz + BUFSIZ;
+		char *nbuf = realloc(buf, nbufsiz);
+
+		if (nbuf == NULL) {
+			int oerrno = errno;
+			free(buf);
+			errno = oerrno;
+			buf = NULL;
+			return NULL;
+		} else
+			buf = nbuf;
+
+		if (fgets(&buf[bufsiz], BUFSIZ, fp) == NULL) {
+			buf[bufsiz] = '\0';
+			*len = strlen(buf);
+			return buf;
+		}
+
+		*len = bufsiz;
+		bufsiz = nbufsiz;
+	}
+
+	*len = (ptr - buf) + 1;
+	return buf;
+}
+
+#endif
+
+#ifdef TEST
+int
+main(int argc, char *argv[])
+{
+	char *p;
+	size_t len;
+
+	while ((p = fgetln(stdin, &len)) != NULL) {
+		(void)printf("%zu %s", len, p);
+		free(p);
+	}
+	return 0;
+}
+#endif

group.c

@@ -20,8 +20,9 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 
+#include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
@@ -32,77 +33,68 @@
 
 #include "calmwm.h"
 
-static struct group_ctx	*group_next(struct group_ctx *);
-static struct group_ctx	*group_prev(struct group_ctx *);
+static void		 group_assign(struct group_ctx *, struct client_ctx *);
 static void		 group_restack(struct group_ctx *);
-static void		 group_set_active(struct group_ctx *);
+static void		 group_setactive(struct group_ctx *);
 
-void
+const char *num_to_name[] = {
+	"nogroup", "one", "two", "three", "four", "five", "six",
+	"seven", "eight", "nine"
+};
+
+static void
 group_assign(struct group_ctx *gc, struct client_ctx *cc)
 {
-	if ((gc != NULL) && (gc->num == 0))
-		gc = NULL;
+	if (cc->group != NULL)
+		TAILQ_REMOVE(&cc->group->clientq, cc, group_entry);
 
-	cc->gc = gc;
+	cc->group = gc;
 
-	xu_ewmh_set_net_wm_desktop(cc);
+	if (cc->group != NULL)
+		TAILQ_INSERT_TAIL(&gc->clientq, cc, group_entry);
+
+	xu_ewmh_net_wm_desktop(cc);
 }
 
 void
 group_hide(struct group_ctx *gc)
 {
-	struct screen_ctx	*sc = gc->sc;
 	struct client_ctx	*cc;
 
 	screen_updatestackingorder(gc->sc);
 
-	TAILQ_FOREACH(cc, &sc->clientq, entry) {
-		if (cc->gc != gc)
-			continue;
-		if (!(cc->flags & CLIENT_STICKY) &&
-		    !(cc->flags & CLIENT_HIDDEN))
-			client_hide(cc);
-	}
+	TAILQ_FOREACH(cc, &gc->clientq, group_entry)
+		client_hide(cc);
 }
 
 void
 group_show(struct group_ctx *gc)
 {
-	struct screen_ctx	*sc = gc->sc;
 	struct client_ctx	*cc;
 
-	TAILQ_FOREACH(cc, &sc->clientq, entry) {
-		if (cc->gc != gc)
-			continue;
-		if (!(cc->flags & CLIENT_STICKY) &&
-		     (cc->flags & CLIENT_HIDDEN))
-			client_show(cc);
-	}
+	TAILQ_FOREACH(cc, &gc->clientq, group_entry)
+		client_unhide(cc);
+
 	group_restack(gc);
-	group_set_active(gc);
+	group_setactive(gc);
 }
 
 static void
 group_restack(struct group_ctx *gc)
 {
-	struct screen_ctx	*sc = gc->sc;
 	struct client_ctx	*cc;
 	Window			*winlist;
 	int			 i, lastempty = -1;
 	int			 nwins = 0, highstack = 0;
 
-	TAILQ_FOREACH(cc, &sc->clientq, entry) {
-		if (cc->gc != gc)
-			continue;
+	TAILQ_FOREACH(cc, &gc->clientq, group_entry) {
 		if (cc->stackingorder > highstack)
 			highstack = cc->stackingorder;
 	}
-	winlist = xreallocarray(NULL, (highstack + 1), sizeof(*winlist));
+	winlist = xcalloc((highstack + 1), sizeof(*winlist));
 
 	/* Invert the stacking order for XRestackWindows(). */
-	TAILQ_FOREACH(cc, &sc->clientq, entry) {
-		if (cc->gc != gc)
-			continue;
+	TAILQ_FOREACH(cc, &gc->clientq, group_entry) {
 		winlist[highstack - cc->stackingorder] = cc->win;
 		nwins++;
 	}
@@ -123,22 +115,24 @@ group_restack(struct group_ctx *gc)
 }
 
 void
-group_init(struct screen_ctx *sc, int num, const char *name)
+group_init(struct screen_ctx *sc, int num)
 {
 	struct group_ctx	*gc;
 
 	gc = xmalloc(sizeof(*gc));
 	gc->sc = sc;
-	gc->name = xstrdup(name);
+	gc->name = xstrdup(num_to_name[num]);
 	gc->num = num;
+	TAILQ_INIT(&gc->clientq);
+
 	TAILQ_INSERT_TAIL(&sc->groupq, gc, entry);
 
 	if (num == 1)
-		group_set_active(gc);
+		group_setactive(gc);
 }
 
 void
-group_set_active(struct group_ctx *gc)
+group_setactive(struct group_ctx *gc)
 {
 	struct screen_ctx	*sc = gc->sc;
 
@@ -153,61 +147,97 @@ group_movetogroup(struct client_ctx *cc, int idx)
 	struct screen_ctx	*sc = cc->sc;
 	struct group_ctx	*gc;
 
+	if (idx < 0 || idx >= CALMWM_NGROUPS)
+		errx(1, "group_movetogroup: index out of range (%d)", idx);
+
 	TAILQ_FOREACH(gc, &sc->groupq, entry) {
-		if (gc->num == idx) {
-			if (cc->gc == gc)
-				return;
-			if (gc->num != 0 && group_holds_only_hidden(gc))
-				client_hide(cc);
-			group_assign(gc, cc);
-		}
+		if (gc->num == idx)
+			break;
 	}
+
+	if (cc->group == gc)
+		return;
+	if (group_holds_only_hidden(gc))
+		client_hide(cc);
+	group_assign(gc, cc);
 }
 
 void
-group_toggle_membership(struct client_ctx *cc)
+group_toggle_membership_enter(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
 	struct group_ctx	*gc = sc->group_active;
 
-	if (cc->gc == gc) {
+	if (gc == cc->group) {
 		group_assign(NULL, cc);
 		cc->flags |= CLIENT_UNGROUP;
 	} else {
 		group_assign(gc, cc);
 		cc->flags |= CLIENT_GROUP;
 	}
+
+	client_draw_border(cc);
+}
+
+void
+group_toggle_membership_leave(struct client_ctx *cc)
+{
+	cc->flags &= ~CLIENT_HIGHLIGHT;
 	client_draw_border(cc);
 }
 
 int
 group_holds_only_sticky(struct group_ctx *gc)
 {
-	struct screen_ctx	*sc = gc->sc;
 	struct client_ctx	*cc;
 
-	TAILQ_FOREACH(cc, &sc->clientq, entry) {
-		if (cc->gc != gc)
-			continue;
+	TAILQ_FOREACH(cc, &gc->clientq, group_entry) {
 		if (!(cc->flags & CLIENT_STICKY))
-			return 0;
+			return(0);
 	}
-	return 1;
+	return(1);
 }
 
 int
 group_holds_only_hidden(struct group_ctx *gc)
 {
-	struct screen_ctx	*sc = gc->sc;
 	struct client_ctx	*cc;
+	int			 hidden = 0, same = 0;
 
-	TAILQ_FOREACH(cc, &sc->clientq, entry) {
-		if (cc->gc != gc)
+	TAILQ_FOREACH(cc, &gc->clientq, group_entry) {
+		if (cc->flags & CLIENT_STICKY)
 			continue;
-		if (!(cc->flags & (CLIENT_HIDDEN | CLIENT_STICKY)))
-			return 0;
+		if (hidden == ((cc->flags & CLIENT_HIDDEN) ? 1 : 0))
+			same++;
+	}
+
+	if (same == 0)
+		hidden = !hidden;
+
+	return(hidden);
+}
+
+void
+group_hidetoggle(struct screen_ctx *sc, int idx)
+{
+	struct group_ctx	*gc;
+
+	if (idx < 0 || idx >= CALMWM_NGROUPS)
+		errx(1, "group_hidetoggle: index out of range (%d)", idx);
+
+	TAILQ_FOREACH(gc, &sc->groupq, entry) {
+		if (gc->num == idx)
+			break;
+	}
+
+	if (group_holds_only_hidden(gc))
+		group_show(gc);
+	else {
+		group_hide(gc);
+		/* make clients stick to empty group */
+		if (TAILQ_EMPTY(&gc->clientq))
+			group_setactive(gc);
 	}
-	return 1;
 }
 
 void
@@ -215,8 +245,8 @@ group_only(struct screen_ctx *sc, int idx)
 {
 	struct group_ctx	*gc;
 
-	if (sc->group_last != sc->group_active)
-		sc->group_last = sc->group_active;
+	if (idx < 0 || idx >= CALMWM_NGROUPS)
+		errx(1, "group_only: index out of range (%d)", idx);
 
 	TAILQ_FOREACH(gc, &sc->groupq, entry) {
 		if (gc->num == idx)
@@ -226,23 +256,45 @@ group_only(struct screen_ctx *sc, int idx)
 	}
 }
 
+/*
+ * Cycle through active groups.  If none exist, then just stay put.
+ */
 void
-group_toggle(struct screen_ctx *sc, int idx)
+group_cycle(struct screen_ctx *sc, int flags)
 {
-	struct group_ctx	*gc;
+	struct group_ctx	*gc, *showgroup = NULL;
 
-	TAILQ_FOREACH(gc, &sc->groupq, entry) {
-		if (gc->num == idx) {
-			if (group_holds_only_hidden(gc))
-				group_show(gc);
-			else
-				group_hide(gc);
-		}
+	assert(sc->group_active != NULL);
+
+	gc = sc->group_active;
+	for (;;) {
+		gc = (flags & CWM_RCYCLE) ? TAILQ_PREV(gc, group_ctx_q,
+		    entry) : TAILQ_NEXT(gc, entry);
+		if (gc == NULL)
+			gc = (flags & CWM_RCYCLE) ? TAILQ_LAST(&sc->groupq,
+			    group_ctx_q) : TAILQ_FIRST(&sc->groupq);
+		if (gc == sc->group_active)
+			break;
+
+		if (!group_holds_only_sticky(gc) && showgroup == NULL)
+			showgroup = gc;
+		else if (!group_holds_only_hidden(gc))
+			group_hide(gc);
 	}
+
+	if (showgroup == NULL)
+		return;
+
+	group_hide(sc->group_active);
+
+	if (group_holds_only_hidden(showgroup))
+		group_show(showgroup);
+	else
+		group_setactive(showgroup);
 }
 
 void
-group_toggle_all(struct screen_ctx *sc)
+group_alltoggle(struct screen_ctx *sc)
 {
 	struct group_ctx	*gc;
 
@@ -256,123 +308,50 @@ group_toggle_all(struct screen_ctx *sc)
 }
 
 void
-group_close(struct screen_ctx *sc, int idx)
-{
-	struct group_ctx	*gc;
-	struct client_ctx	*cc;
-
-	TAILQ_FOREACH(gc, &sc->groupq, entry) {
-		if (gc->num == idx) {
-			TAILQ_FOREACH(cc, &sc->clientq, entry) {
-				if (cc->gc != gc)
-					continue;
-				client_close(cc);
-			}
-		}
-	}
-}
-
-void
-group_cycle(struct screen_ctx *sc, int flags)
-{
-	struct group_ctx	*newgc, *oldgc, *showgroup = NULL;
-
-	oldgc = sc->group_active;
-
-	newgc = oldgc;
-	for (;;) {
-		newgc = (flags & CWM_CYCLE_REVERSE) ? group_prev(newgc) :
-		    group_next(newgc);
-
-		if (newgc == oldgc)
-			break;
-
-		if (!group_holds_only_sticky(newgc) && showgroup == NULL)
-			showgroup = newgc;
-		else if (!group_holds_only_hidden(newgc))
-			group_hide(newgc);
-	}
-	if (showgroup == NULL)
-		return;
-
-	group_hide(oldgc);
-
-	if (group_holds_only_hidden(showgroup))
-		group_show(showgroup);
-	else
-		group_set_active(showgroup);
-}
-
-static struct group_ctx *
-group_next(struct group_ctx *gc)
-{
-	struct screen_ctx	*sc = gc->sc;
-	struct group_ctx	*newgc;
-
-	return(((newgc = TAILQ_NEXT(gc, entry)) != NULL) ?
-	    newgc : TAILQ_FIRST(&sc->groupq));
-}
-
-static struct group_ctx *
-group_prev(struct group_ctx *gc)
-{
-	struct screen_ctx	*sc = gc->sc;
-	struct group_ctx	*newgc;
-
-	return(((newgc = TAILQ_PREV(gc, group_q, entry)) != NULL) ?
-	    newgc : TAILQ_LAST(&sc->groupq, group_q));
-}
-
-int
-group_restore(struct client_ctx *cc)
-{
-	struct screen_ctx	*sc = cc->sc;
-	struct group_ctx	*gc;
-	int			 num;
-	long			 grpnum;
-
-	if (!xu_ewmh_get_net_wm_desktop(cc, &grpnum))
-		return 0;
-
-	num = (grpnum == -1) ? 0 : grpnum;
-	num = MIN(num, (Conf.ngroups - 1));
-
-	TAILQ_FOREACH(gc, &sc->groupq, entry) {
-		if (gc->num == num) {
-			group_assign(gc, cc);
-			return 1;
-		}
-	}
-	return 0;
-}
-
-int
 group_autogroup(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct autogroup	*ag;
+	struct autogroupwin	*aw;
 	struct group_ctx	*gc;
-	int			 num = -1, both_match = 0;
+	int			 num = -2, both_match = 0;
+	long			*grpnum;
 
-	if (cc->res_class == NULL || cc->res_name == NULL)
-		return 0;
+	if (cc->ch.res_class == NULL || cc->ch.res_name == NULL)
+		return;
 
-	TAILQ_FOREACH(ag, &Conf.autogroupq, entry) {
-		if (strcmp(ag->class, cc->res_class) == 0) {
-			if ((ag->name != NULL) &&
-			    (strcmp(ag->name, cc->res_name) == 0)) {
-				num = ag->num;
-				both_match = 1;
-			} else if (ag->name == NULL && !both_match)
-				num = ag->num;
+	if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP],
+	    XA_CARDINAL, 1, (unsigned char **)&grpnum) > 0) {
+		num = *grpnum;
+		if (num > CALMWM_NGROUPS || num < -1)
+			num = CALMWM_NGROUPS - 1;
+		XFree(grpnum);
+	} else {
+		TAILQ_FOREACH(aw, &Conf.autogroupq, entry) {
+			if (strcmp(aw->class, cc->ch.res_class) == 0) {
+				if ((aw->name != NULL) &&
+				    (strcmp(aw->name, cc->ch.res_name) == 0)) {
+					num = aw->num;
+					both_match = 1;
+				} else if (aw->name == NULL && !both_match)
+					num = aw->num;
+			}
 		}
 	}
 
+	if ((num == -1) || (num == 0)) {
+		group_assign(NULL, cc);
+		return;
+	}
+
 	TAILQ_FOREACH(gc, &sc->groupq, entry) {
 		if (gc->num == num) {
 			group_assign(gc, cc);
-			return 1;
+			return;
 		}
 	}
-	return 0;
+
+	if (Conf.flags & CONF_STICKY_GROUPS)
+		group_assign(sc->group_active, cc);
+	else
+		group_assign(NULL, cc);
 }

menu.c

@@ -20,7 +20,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 
 #include <ctype.h>
 #include <err.h>
@@ -37,10 +37,6 @@
 #define PROMPT_SCHAR	"\xc2\xbb"
 #define PROMPT_ECHAR	"\xc2\xab"
 
-#define MENUMASK 	(MOUSEMASK | ButtonMotionMask | KeyPressMask | \
-			 ExposureMask)
-#define MENUGRABMASK	(MOUSEMASK | ButtonMotionMask | StructureNotifyMask)
-
 enum ctltype {
 	CTL_NONE = -1,
 	CTL_ERASEONE = 0, CTL_WIPE, CTL_UP, CTL_DOWN, CTL_RETURN,
@@ -49,34 +45,37 @@ enum ctltype {
 
 struct menu_ctx {
 	struct screen_ctx	*sc;
-	Window			 win;
-	XftDraw			*xftdraw;
-	struct geom		 geom;
 	char			 searchstr[MENU_MAXENTRY + 1];
 	char			 dispstr[MENU_MAXENTRY*2 + 1];
 	char			 promptstr[MENU_MAXENTRY + 1];
+	int			 hasprompt;
 	int			 list;
 	int			 listing;
 	int			 changed;
+	int			 noresult;
 	int			 prev;
 	int			 entry;
+	int			 height;
+	int			 width;
 	int			 num;
 	int 			 flags;
+	int			 x;
+	int			 y;
 	void (*match)(struct menu_q *, struct menu_q *, char *);
 	void (*print)(struct menu *, int);
 };
 static struct menu	*menu_handle_key(XEvent *, struct menu_ctx *,
 			     struct menu_q *, struct menu_q *);
-static void		 menu_handle_move(struct menu_ctx *,
-			     struct menu_q *, int, int);
-static struct menu	*menu_handle_release(struct menu_ctx *,
-			     struct menu_q *, int, int);
+static void		 menu_handle_move(XEvent *, struct menu_ctx *,
+			     struct menu_q *);
+static struct menu	*menu_handle_release(XEvent *, struct menu_ctx *,
+			     struct menu_q *);
 static void		 menu_draw(struct menu_ctx *, struct menu_q *,
 			     struct menu_q *);
 static void 		 menu_draw_entry(struct menu_ctx *, struct menu_q *,
 			     int, int);
 static int		 menu_calc_entry(struct menu_ctx *, int, int);
-static struct menu	*menu_complete_path(struct menu_ctx *);
+static struct menu 	*menu_complete_path(struct menu_ctx *);
 static int		 menu_keycode(XKeyEvent *, enum ctltype *, char *);
 
 struct menu *
@@ -90,59 +89,58 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
 	struct menu		*mi = NULL;
 	XEvent			 e;
 	Window			 focuswin;
-	int			 focusrevert, xsave, ysave, xcur, ycur;
+	int			 evmask, focusrevert;
+	int			 xsave, ysave, xcur, ycur;
 
 	TAILQ_INIT(&resultq);
 
-	xu_ptr_get(sc->rootwin, &xsave, &ysave);
-
 	(void)memset(&mc, 0, sizeof(mc));
+
+	xu_ptr_getpos(sc->rootwin, &mc.x, &mc.y);
+
+	xsave = mc.x;
+	ysave = mc.y;
+
 	mc.sc = sc;
 	mc.flags = flags;
-	mc.match = match;
-	mc.print = print;
-	mc.entry = mc.prev = -1;
-	mc.geom.x = xsave;
-	mc.geom.y = ysave;
-
-	if (mc.flags & CWM_MENU_LIST)
+	if (prompt != NULL) {
+		evmask = MENUMASK | KEYMASK; /* accept keys as well */
+		(void)strlcpy(mc.promptstr, prompt, sizeof(mc.promptstr));
+		mc.hasprompt = 1;
+	} else {
+		evmask = MENUMASK;
 		mc.list = 1;
+	}
 
-	(void)strlcpy(mc.promptstr, prompt, sizeof(mc.promptstr));
 	if (initial != NULL)
 		(void)strlcpy(mc.searchstr, initial, sizeof(mc.searchstr));
 	else
 		mc.searchstr[0] = '\0';
 
-	mc.win = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1,
-	    Conf.bwidth,
-	    sc->xftcolor[CWM_COLOR_MENU_FG].pixel,
-	    sc->xftcolor[CWM_COLOR_MENU_BG].pixel);
-	mc.xftdraw = XftDrawCreate(X_Dpy, mc.win,
-	    sc->visual, sc->colormap);
+	mc.match = match;
+	mc.print = print;
+	mc.entry = mc.prev = -1;
 
-	XSelectInput(X_Dpy, mc.win, MENUMASK);
-	XMapRaised(X_Dpy, mc.win);
+	XSelectInput(X_Dpy, sc->menuwin, evmask);
+	XMapRaised(X_Dpy, sc->menuwin);
 
-	if (XGrabPointer(X_Dpy, mc.win, False, MENUGRABMASK,
-	    GrabModeAsync, GrabModeAsync, None, Conf.cursor[CF_QUESTION],
-	    CurrentTime) != GrabSuccess) {
-		XftDrawDestroy(mc.xftdraw);
-		XDestroyWindow(X_Dpy, mc.win);
-		return NULL;
+	if (xu_ptr_grab(sc->menuwin, MENUGRABMASK,
+	    Conf.cursor[CF_QUESTION]) < 0) {
+		XUnmapWindow(X_Dpy, sc->menuwin);
+		return(NULL);
 	}
 
 	XGetInputFocus(X_Dpy, &focuswin, &focusrevert);
-	XSetInputFocus(X_Dpy, mc.win, RevertToPointerRoot, CurrentTime);
+	XSetInputFocus(X_Dpy, sc->menuwin, RevertToPointerRoot, CurrentTime);
 
 	/* make sure keybindings don't remove keys from the menu stream */
-	XGrabKeyboard(X_Dpy, mc.win, True,
+	XGrabKeyboard(X_Dpy, sc->menuwin, True,
 	    GrabModeAsync, GrabModeAsync, CurrentTime);
 
 	for (;;) {
 		mc.changed = 0;
 
-		XWindowEvent(X_Dpy, mc.win, MENUMASK, &e);
+		XWindowEvent(X_Dpy, sc->menuwin, evmask, &e);
 
 		switch (e.type) {
 		case KeyPress:
@@ -154,12 +152,11 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
 			menu_draw(&mc, menuq, &resultq);
 			break;
 		case MotionNotify:
-			menu_handle_move(&mc, &resultq,
-			    e.xbutton.x, e.xbutton.y);
+			menu_handle_move(&e, &mc, &resultq);
 			break;
 		case ButtonRelease:
-			if ((mi = menu_handle_release(&mc, &resultq,
-			    e.xbutton.x, e.xbutton.y)) != NULL)
+			if ((mi = menu_handle_release(&e, &mc, &resultq))
+			    != NULL)
 				goto out;
 			break;
 		default:
@@ -173,47 +170,48 @@ out:
 		mi = NULL;
 	}
 
-	XftDrawDestroy(mc.xftdraw);
-	XDestroyWindow(X_Dpy, mc.win);
-
 	XSetInputFocus(X_Dpy, focuswin, focusrevert, CurrentTime);
 	/* restore if user didn't move */
-	xu_ptr_get(sc->rootwin, &xcur, &ycur);
-	if (xcur == mc.geom.x && ycur == mc.geom.y)
-		xu_ptr_set(sc->rootwin, xsave, ysave);
+	xu_ptr_getpos(sc->rootwin, &xcur, &ycur);
+	if (xcur == mc.x && ycur == mc.y)
+		xu_ptr_setpos(sc->rootwin, xsave, ysave);
+	xu_ptr_ungrab();
 
-	XUngrabPointer(X_Dpy, CurrentTime);
+	XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0, 1, 1);
+	XUnmapWindow(X_Dpy, sc->menuwin);
 	XUngrabKeyboard(X_Dpy, CurrentTime);
 
-	return mi;
+	return(mi);
 }
 
 static struct menu *
 menu_complete_path(struct menu_ctx *mc)
 {
-	struct screen_ctx	*sc = mc->sc;
 	struct menu		*mi, *mr;
 	struct menu_q		 menuq;
-	int			 mflags = (CWM_MENU_DUMMY);
+	char			*path = NULL;
 
+	path = xcalloc(1, sizeof(mr->text));
 	mr = xcalloc(1, sizeof(*mr));
 
 	TAILQ_INIT(&menuq);
 
-	if ((mi = menu_filter(sc, &menuq, mc->searchstr, NULL, mflags,
-	    search_match_path, search_print_text)) != NULL) {
+	if ((mi = menu_filter(mc->sc, &menuq, mc->searchstr, NULL,
+	    CWM_MENU_DUMMY, search_match_path_any, NULL)) != NULL) {
 		mr->abort = mi->abort;
 		mr->dummy = mi->dummy;
-		if (mi->text[0] != '\0')
-			snprintf(mr->text, sizeof(mr->text), "%s \"%s\"",
-			    mc->searchstr, mi->text);
-		else if (!mr->abort)
-			strlcpy(mr->text, mc->searchstr, sizeof(mr->text));
+		strlcpy(path, mi->text, sizeof(mi->text));
 	}
 	
 	menuq_clear(&menuq);
 
-	return mr;
+	if (path[0] != '\0')
+		snprintf(mr->text, sizeof(mr->text), "%s \"%s\"",
+			mc->searchstr, path);
+	else if (!mr->abort)
+		strlcpy(mr->text,  mc->searchstr, sizeof(mr->text));
+	free(path);
+	return(mr);
 }
 
 static struct menu *
@@ -228,7 +226,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 	wchar_t 	 wc;
 
 	if (menu_keycode(&e->xkey, &ctl, chr) < 0)
-		return NULL;
+		return(NULL);
 
 	switch (ctl) {
 	case CTL_ERASEONE:
@@ -269,7 +267,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 			mi->dummy = 1;
 		}
 		mi->abort = 0;
-		return mi;
+		return(mi);
 	case CTL_WIPE:
 		mc->searchstr[0] = '\0';
 		mc->changed = 1;
@@ -284,7 +282,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 			if ((mc->flags & CWM_MENU_FILE) &&
 			    (strncmp(mc->searchstr, mi->text,
 					strlen(mi->text))) == 0)
-				return menu_complete_path(mc);
+				return(menu_complete_path(mc));
 
 			/*
 			 * Put common prefix of the results into searchstr
@@ -309,7 +307,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 		mi->text[0] = '\0';
 		mi->dummy = 1;
 		mi->abort = 1;
-		return mi;
+		return(mi);
 	default:
 		break;
 	}
@@ -319,15 +317,20 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 		(void)strlcat(mc->searchstr, chr, sizeof(mc->searchstr));
 	}
 
-	if (mc->changed) {
-		if (mc->searchstr[0] != '\0')
-			(*mc->match)(menuq, resultq, mc->searchstr);
-	} else if (!mc->list && mc->listing) {
+	mc->noresult = 0;
+	if (mc->changed && mc->searchstr[0] != '\0') {
+		(*mc->match)(menuq, resultq, mc->searchstr);
+		/* If menuq is empty, never show we've failed */
+		mc->noresult = TAILQ_EMPTY(resultq) && !TAILQ_EMPTY(menuq);
+	} else if (mc->changed)
+		TAILQ_INIT(resultq);
+
+	if (!mc->list && mc->listing && !mc->changed) {
 		TAILQ_INIT(resultq);
 		mc->listing = 0;
 	}
 
-	return NULL;
+	return(NULL);
 }
 
 static void
@@ -335,87 +338,98 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 {
 	struct screen_ctx	*sc = mc->sc;
 	struct menu		*mi;
-	struct geom		 area;
+	struct geom		 xine;
 	int			 n, xsave, ysave;
-	XGlyphInfo		 extents;
 
 	if (mc->list) {
-		if (TAILQ_EMPTY(resultq)) {
+		if (TAILQ_EMPTY(resultq) && mc->list) {
 			/* Copy them all over. */
 			TAILQ_FOREACH(mi, menuq, entry)
-				TAILQ_INSERT_TAIL(resultq, mi, resultentry);
+				TAILQ_INSERT_TAIL(resultq, mi,
+				    resultentry);
 
 			mc->listing = 1;
 		} else if (mc->changed)
 			mc->listing = 0;
 	}
 
-	(void)snprintf(mc->dispstr, sizeof(mc->dispstr), "%s%s%s%s",
-	    mc->promptstr, PROMPT_SCHAR, mc->searchstr, PROMPT_ECHAR);
-	XftTextExtentsUtf8(X_Dpy, sc->xftfont,
-	    (const FcChar8*)mc->dispstr, strlen(mc->dispstr), &extents);
-	mc->geom.w = extents.xOff;
-	mc->geom.h = sc->xftfont->ascent + sc->xftfont->descent;
-	mc->num = 1;
+	mc->num = 0;
+	mc->width = 0;
+	mc->height = 0;
+	if (mc->hasprompt) {
+		(void)snprintf(mc->dispstr, sizeof(mc->dispstr), "%s%s%s%s",
+		    mc->promptstr, PROMPT_SCHAR, mc->searchstr, PROMPT_ECHAR);
+		mc->width = xu_xft_width(sc->xftfont, mc->dispstr,
+		    strlen(mc->dispstr));
+		mc->height = sc->xftfont->height + 1;
+		mc->num = 1;
+	}
 
 	TAILQ_FOREACH(mi, resultq, resultentry) {
-		(*mc->print)(mi, mc->listing);
-		XftTextExtentsUtf8(X_Dpy, sc->xftfont,
-		    (const FcChar8*)mi->print,
-		    MIN(strlen(mi->print), MENU_MAXENTRY), &extents);
-		mc->geom.w = MAX(mc->geom.w, extents.xOff);
-		mc->geom.h += sc->xftfont->ascent + sc->xftfont->descent;
+		char *text;
+
+		if (mc->print != NULL) {
+			(*mc->print)(mi, mc->listing);
+			text = mi->print;
+		} else {
+			mi->print[0] = '\0';
+			text = mi->text;
+		}
+
+		mc->width = MAX(mc->width, xu_xft_width(sc->xftfont, text,
+		    MIN(strlen(text), MENU_MAXENTRY)));
+		mc->height += sc->xftfont->height + 1;
 		mc->num++;
 	}
 
-	area = screen_area(sc, mc->geom.x, mc->geom.y, 1);
-	area.w += area.x - Conf.bwidth * 2;
-	area.h += area.y - Conf.bwidth * 2;
+	xine = screen_find_xinerama(sc, mc->x, mc->y, CWM_GAP);
+	xine.w += xine.x - Conf.bwidth * 2;
+	xine.h += xine.y - Conf.bwidth * 2;
 
-	xsave = mc->geom.x;
-	ysave = mc->geom.y;
+	xsave = mc->x;
+	ysave = mc->y;
 
 	/* Never hide the top, or left side, of the menu. */
-	if (mc->geom.x + mc->geom.w >= area.w)
-		mc->geom.x = area.w - mc->geom.w;
-	if (mc->geom.x < area.x) {
-		mc->geom.x = area.x;
-		mc->geom.w = MIN(mc->geom.w, (area.w - area.x));
+	if (mc->x + mc->width >= xine.w)
+		mc->x = xine.w - mc->width;
+	if (mc->x < xine.x) {
+		mc->x = xine.x;
+		mc->width = MIN(mc->width, (xine.w - xine.x));
 	}
-	if (mc->geom.y + mc->geom.h >= area.h)
-		mc->geom.y = area.h - mc->geom.h;
-	if (mc->geom.y < area.y) {
-		mc->geom.y = area.y;
-		mc->geom.h = MIN(mc->geom.h, (area.h - area.y));
+	if (mc->y + mc->height >= xine.h)
+		mc->y = xine.h - mc->height;
+	if (mc->y < xine.y) {
+		mc->y = xine.y;
+		mc->height = MIN(mc->height, (xine.h - xine.y));
 	}
 
-	if (mc->geom.x != xsave || mc->geom.y != ysave)
-		xu_ptr_set(sc->rootwin, mc->geom.x, mc->geom.y);
+	if (mc->x != xsave || mc->y != ysave)
+		xu_ptr_setpos(sc->rootwin, mc->x, mc->y);
 
-	XClearWindow(X_Dpy, mc->win);
-	XMoveResizeWindow(X_Dpy, mc->win, mc->geom.x, mc->geom.y,
-	    mc->geom.w, mc->geom.h);
+	XClearWindow(X_Dpy, sc->menuwin);
+	XMoveResizeWindow(X_Dpy, sc->menuwin, mc->x, mc->y,
+	    mc->width, mc->height);
 
-	n = 1;
-	XftDrawStringUtf8(mc->xftdraw,
-	    &sc->xftcolor[CWM_COLOR_MENU_FONT], sc->xftfont,
-	    0, sc->xftfont->ascent,
-	    (const FcChar8*)mc->dispstr, strlen(mc->dispstr));
+	if (mc->hasprompt) {
+		xu_xft_draw(sc, mc->dispstr, CWM_COLOR_MENU_FONT,
+		    0, sc->xftfont->ascent);
+		n = 1;
+	} else
+		n = 0;
 
 	TAILQ_FOREACH(mi, resultq, resultentry) {
-		int y = n * (sc->xftfont->ascent + sc->xftfont->descent);
+		char *text = mi->print[0] != '\0' ?
+		    mi->print : mi->text;
+		int y = n * (sc->xftfont->height + 1) + sc->xftfont->ascent + 1;
 
 		/* Stop drawing when menu doesn't fit inside the screen. */
-		if (mc->geom.y + y >= area.h)
+		if (mc->y + y > xine.h)
 			break;
 
-		XftDrawStringUtf8(mc->xftdraw,
-		    &sc->xftcolor[CWM_COLOR_MENU_FONT], sc->xftfont,
-		    0, y + sc->xftfont->ascent,
-		    (const FcChar8*)mi->print, strlen(mi->print));
+		xu_xft_draw(sc, text, CWM_COLOR_MENU_FONT, 0, y);
 		n++;
 	}
-	if (n > 1)
+	if (mc->hasprompt && n > 1)
 		menu_draw_entry(mc, resultq, 1, 1);
 }
 
@@ -425,7 +439,11 @@ menu_draw_entry(struct menu_ctx *mc, struct menu_q *resultq,
 {
 	struct screen_ctx	*sc = mc->sc;
 	struct menu		*mi;
-	int			 color, i = 1, y;
+	char 			*text;
+	int			 color, i = 0;
+
+	if (mc->hasprompt)
+		i = 1;
 
 	TAILQ_FOREACH(mi, resultq, resultentry)
 		if (entry == i++)
@@ -433,21 +451,21 @@ menu_draw_entry(struct menu_ctx *mc, struct menu_q *resultq,
 	if (mi == NULL)
 		return;
 
-	y = entry * (sc->xftfont->ascent + sc->xftfont->descent);
-	color = (active) ? CWM_COLOR_MENU_FG : CWM_COLOR_MENU_BG;
-	XftDrawRect(mc->xftdraw, &sc->xftcolor[color], 0, y,
-	    mc->geom.w, sc->xftfont->ascent + sc->xftfont->descent);
-	color = (active) ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT;
-	XftDrawStringUtf8(mc->xftdraw,
-	    &sc->xftcolor[color], sc->xftfont, 0, y + sc->xftfont->ascent,
-	    (const FcChar8*)mi->print, strlen(mi->print));
+	color = active ? CWM_COLOR_MENU_FG : CWM_COLOR_MENU_BG;
+	text = mi->print[0] != '\0' ? mi->print : mi->text;
+	XftDrawRect(sc->xftdraw, &sc->xftcolor[color], 0,
+	    (sc->xftfont->height + 1) * entry, mc->width,
+	    (sc->xftfont->height + 1) + sc->xftfont->descent);
+	color = active ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT;
+	xu_xft_draw(sc, text, color,
+	    0, (sc->xftfont->height + 1) * entry + sc->xftfont->ascent + 1);
 }
 
 static void
-menu_handle_move(struct menu_ctx *mc, struct menu_q *resultq, int x, int y)
+menu_handle_move(XEvent *e, struct menu_ctx *mc, struct menu_q *resultq)
 {
 	mc->prev = mc->entry;
-	mc->entry = menu_calc_entry(mc, x, y);
+	mc->entry = menu_calc_entry(mc, e->xbutton.x, e->xbutton.y);
 
 	if (mc->prev == mc->entry)
 		return;
@@ -455,19 +473,22 @@ menu_handle_move(struct menu_ctx *mc, struct menu_q *resultq, int x, int y)
 	if (mc->prev != -1)
 		menu_draw_entry(mc, resultq, mc->prev, 0);
 	if (mc->entry != -1) {
-		XChangeActivePointerGrab(X_Dpy, MENUGRABMASK,
-		    Conf.cursor[CF_NORMAL], CurrentTime);
+		(void)xu_ptr_regrab(MENUGRABMASK, Conf.cursor[CF_NORMAL]);
 		menu_draw_entry(mc, resultq, mc->entry, 1);
-	}
+	} else
+		(void)xu_ptr_regrab(MENUGRABMASK, Conf.cursor[CF_DEFAULT]);
 }
 
 static struct menu *
-menu_handle_release(struct menu_ctx *mc, struct menu_q *resultq, int x, int y)
+menu_handle_release(XEvent *e, struct menu_ctx *mc, struct menu_q *resultq)
 {
 	struct menu		*mi;
-	int			 entry, i = 1;
+	int			 entry, i = 0;
 
-	entry = menu_calc_entry(mc, x, y);
+	entry = menu_calc_entry(mc, e->xbutton.x, e->xbutton.y);
+
+	if (mc->hasprompt)
+		i = 1;
 
 	TAILQ_FOREACH(mi, resultq, resultentry)
 		if (entry == i++)
@@ -477,7 +498,7 @@ menu_handle_release(struct menu_ctx *mc, struct menu_q *resultq, int x, int y)
 		mi->text[0] = '\0';
 		mi->dummy = 1;
 	}
-	return mi;
+	return(mi);
 }
 
 static int
@@ -486,37 +507,37 @@ menu_calc_entry(struct menu_ctx *mc, int x, int y)
 	struct screen_ctx	*sc = mc->sc;
 	int			 entry;
 
-	entry = y / (sc->xftfont->ascent + sc->xftfont->descent);
+	entry = y / (sc->xftfont->height + 1);
 
 	/* in bounds? */
-	if (x < 0 || x > mc->geom.w || y < 0 ||
-	    y > (sc->xftfont->ascent + sc->xftfont->descent) * mc->num ||
+	if (x < 0 || x > mc->width || y < 0 ||
+	    y > (sc->xftfont->height + 1) * mc->num ||
 	    entry < 0 || entry >= mc->num)
 		entry = -1;
 
-	if (entry == 0)
+	if (mc->hasprompt && entry == 0)
 		entry = -1;
 
-	return entry;
+	return(entry);
 }
 
 static int
 menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr)
 {
 	KeySym		 ks;
+	unsigned int 	 state = ev->state;
 
 	*ctl = CTL_NONE;
 	chr[0] = '\0';
 
 	ks = XkbKeycodeToKeysym(X_Dpy, ev->keycode, 0,
-	     (ev->state & ShiftMask) ? 1 : 0);
+	     (state & ShiftMask) ? 1 : 0);
 
 	/* Look for control characters. */
 	switch (ks) {
 	case XK_BackSpace:
 		*ctl = CTL_ERASEONE;
 		break;
-	case XK_KP_Enter:
 	case XK_Return:
 		*ctl = CTL_RETURN;
 		break;
@@ -534,7 +555,7 @@ menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr)
 		break;
 	}
 
-	if (*ctl == CTL_NONE && (ev->state & ControlMask)) {
+	if (*ctl == CTL_NONE && (state & ControlMask)) {
 		switch (ks) {
 		case XK_s:
 		case XK_S:
@@ -558,13 +579,10 @@ menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr)
 		case XK_A:
 			*ctl = CTL_ALL;
 			break;
-		case XK_bracketleft:
-			*ctl = CTL_ABORT;
-			break;
 		}
 	}
 
-	if (*ctl == CTL_NONE && (ev->state & Mod1Mask)) {
+	if (*ctl == CTL_NONE && (state & Mod1Mask)) {
 		switch (ks) {
 		case XK_j:
 		case XK_J:
@@ -580,12 +598,12 @@ menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr)
 	}
 
 	if (*ctl != CTL_NONE)
-		return 0;
+		return(0);
 
 	if (XLookupString(ev, chr, 32, &ks, NULL) < 0)
-		return -1;
+		return(-1);
 
-	return 0;
+	return(0);
 }
 
 void
@@ -598,10 +616,7 @@ menuq_add(struct menu_q *mq, void *ctx, const char *fmt, ...)
 	mi->ctx = ctx;
 
 	va_start(ap, fmt);
-	if (fmt != NULL)
-		(void)vsnprintf(mi->text, sizeof(mi->text), fmt, ap);
-	else
-		mi->text[0] = '\0';
+	(void)vsnprintf(mi->text, sizeof(mi->text), fmt, ap);
 	va_end(ap);
 
 	TAILQ_INSERT_TAIL(mq, mi, entry);

mousefunc.c

@@ -0,0 +1,265 @@
+/*
+ * calmwm - the calm window manager
+ *
+ * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
+ * Copyright (c) 2008 rivo nurges <rix@estpak.ee>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $OpenBSD$
+ */
+
+#include <sys/types.h>
+#include "queue.h"
+
+#include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "calmwm.h"
+
+static void	mousefunc_sweep_calc(struct client_ctx *, int, int, int, int);
+static void	mousefunc_sweep_draw(struct client_ctx *);
+
+static void
+mousefunc_sweep_calc(struct client_ctx *cc, int x, int y, int mx, int my)
+{
+	cc->geom.w = abs(x - mx) - cc->bwidth;
+	cc->geom.h = abs(y - my) - cc->bwidth;
+
+	client_applysizehints(cc);
+
+	cc->geom.x = x <= mx ? x : x - cc->geom.w;
+	cc->geom.y = y <= my ? y : y - cc->geom.h;
+}
+
+static void
+mousefunc_sweep_draw(struct client_ctx *cc)
+{
+	struct screen_ctx	*sc = cc->sc;
+	char			 s[14]; /* fits " nnnn x nnnn \0" */
+
+	(void)snprintf(s, sizeof(s), " %4d x %-4d ",
+	    (cc->geom.w - cc->hint.basew) / cc->hint.incw,
+	    (cc->geom.h - cc->hint.baseh) / cc->hint.inch);
+
+	XReparentWindow(X_Dpy, sc->menuwin, cc->win, 0, 0);
+	XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0,
+	    xu_xft_width(sc->xftfont, s, strlen(s)), sc->xftfont->height);
+	XMapWindow(X_Dpy, sc->menuwin);
+	XClearWindow(X_Dpy, sc->menuwin);
+
+	xu_xft_draw(sc, s, CWM_COLOR_MENU_FONT, 0, sc->xftfont->ascent + 1);
+}
+
+void
+mousefunc_client_resize(struct client_ctx *cc, union arg *arg)
+{
+	XEvent			 ev;
+	Time			 ltime = 0;
+	struct screen_ctx	*sc = cc->sc;
+	int			 x = cc->geom.x, y = cc->geom.y;
+
+	if (cc->flags & (CLIENT_FREEZE|CLIENT_STICKY))
+		return;
+
+	client_raise(cc);
+	client_ptrsave(cc);
+
+	if (xu_ptr_grab(cc->win, MOUSEMASK, Conf.cursor[CF_RESIZE]) < 0)
+		return;
+
+	xu_ptr_setpos(cc->win, cc->geom.w, cc->geom.h);
+	mousefunc_sweep_draw(cc);
+
+	for (;;) {
+		XMaskEvent(X_Dpy, MOUSEMASK, &ev);
+
+		switch (ev.type) {
+		case MotionNotify:
+			/* not more than 60 times / second */
+			if ((ev.xmotion.time - ltime) <= (1000 / 60))
+				continue;
+			ltime = ev.xmotion.time;
+
+			mousefunc_sweep_calc(cc, x, y,
+			    ev.xmotion.x_root, ev.xmotion.y_root);
+			client_resize(cc, 1);
+			mousefunc_sweep_draw(cc);
+			break;
+		case ButtonRelease:
+			client_resize(cc, 1);
+			XUnmapWindow(X_Dpy, sc->menuwin);
+			XReparentWindow(X_Dpy, sc->menuwin, sc->rootwin, 0, 0);
+			xu_ptr_ungrab();
+
+			/* Make sure the pointer stays within the window. */
+			if (cc->ptr.x > cc->geom.w)
+				cc->ptr.x = cc->geom.w - cc->bwidth;
+			if (cc->ptr.y > cc->geom.h)
+				cc->ptr.y = cc->geom.h - cc->bwidth;
+			client_ptrwarp(cc);
+			return;
+		}
+	}
+	/* NOTREACHED */
+}
+
+void
+mousefunc_client_move(struct client_ctx *cc, union arg *arg)
+{
+	XEvent			 ev;
+	Time			 ltime = 0;
+	struct screen_ctx	*sc = cc->sc;
+	struct geom		 xine;
+	int			 px, py;
+
+	client_raise(cc);
+
+	if (cc->flags & (CLIENT_FREEZE|CLIENT_STICKY))
+		return;
+
+	if (xu_ptr_grab(cc->win, MOUSEMASK, Conf.cursor[CF_MOVE]) < 0)
+		return;
+
+	xu_ptr_getpos(cc->win, &px, &py);
+
+	for (;;) {
+		XMaskEvent(X_Dpy, MOUSEMASK, &ev);
+
+		switch (ev.type) {
+		case MotionNotify:
+			/* not more than 60 times / second */
+			if ((ev.xmotion.time - ltime) <= (1000 / 60))
+				continue;
+			ltime = ev.xmotion.time;
+
+			cc->geom.x = ev.xmotion.x_root - px - cc->bwidth;
+			cc->geom.y = ev.xmotion.y_root - py - cc->bwidth;
+
+			xine = screen_find_xinerama(sc,
+			    cc->geom.x + cc->geom.w / 2,
+			    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+			cc->geom.x += client_snapcalc(cc->geom.x,
+			    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
+			    xine.x, xine.x + xine.w, sc->snapdist);
+			cc->geom.y += client_snapcalc(cc->geom.y,
+			    cc->geom.y + cc->geom.h + (cc->bwidth * 2),
+			    xine.y, xine.y + xine.h, sc->snapdist);
+
+			client_move(cc);
+			break;
+		case ButtonRelease:
+			client_move(cc);
+			xu_ptr_ungrab();
+			return;
+		}
+	}
+	/* NOTREACHED */
+}
+
+void
+mousefunc_client_grouptoggle(struct client_ctx *cc, union arg *arg)
+{
+	group_toggle_membership_enter(cc);
+}
+
+void
+mousefunc_menu_group(struct client_ctx *cc, union arg *arg)
+{
+	struct screen_ctx	*sc = cc->sc;
+	struct group_ctx	*gc;
+	struct menu		*mi;
+	struct menu_q		 menuq;
+
+	TAILQ_INIT(&menuq);
+	TAILQ_FOREACH(gc, &sc->groupq, entry) {
+		if (group_holds_only_sticky(gc))
+			continue;
+		menuq_add(&menuq, gc,
+		    group_holds_only_hidden(gc) ? "%d: [%s]" : "%d: %s",
+		    gc->num, gc->name);
+	}
+	if (TAILQ_EMPTY(&menuq))
+		return;
+
+	if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0,
+	    NULL, NULL)) != NULL) {
+		gc = (struct group_ctx *)mi->ctx;
+		(group_holds_only_hidden(gc)) ?
+		    group_show(gc) : group_hide(gc);
+	}
+
+	menuq_clear(&menuq);
+}
+
+void
+mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
+{
+	struct screen_ctx	*sc = cc->sc;
+	struct client_ctx	*old_cc;
+	struct menu		*mi;
+	struct menu_q		 menuq;
+	char			*wname;
+
+	old_cc = client_current();
+
+	TAILQ_INIT(&menuq);
+	TAILQ_FOREACH(cc, &sc->clientq, entry) {
+		if (cc->flags & CLIENT_HIDDEN) {
+			wname = (cc->label) ? cc->label : cc->name;
+			if (wname == NULL)
+				continue;
+			menuq_add(&menuq, cc, "(%d) %s",
+			    cc->group ? cc->group->num : 0, wname);
+		}
+	}
+	if (TAILQ_EMPTY(&menuq))
+		return;
+
+	if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0,
+	    NULL, NULL)) != NULL) {
+		cc = (struct client_ctx *)mi->ctx;
+		client_unhide(cc);
+		if (old_cc != NULL)
+			client_ptrsave(old_cc);
+		client_ptrwarp(cc);
+	}
+
+	menuq_clear(&menuq);
+}
+
+void
+mousefunc_menu_cmd(struct client_ctx *cc, union arg *arg)
+{
+	struct screen_ctx	*sc = cc->sc;
+	struct cmd		*cmd;
+	struct menu		*mi;
+	struct menu_q		 menuq;
+
+	TAILQ_INIT(&menuq);
+	TAILQ_FOREACH(cmd, &Conf.cmdq, entry)
+		menuq_add(&menuq, cmd, "%s", cmd->name);
+	if (TAILQ_EMPTY(&menuq))
+		return;
+
+	if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0,
+	    NULL, NULL)) != NULL)
+		u_spawn(((struct cmd *)mi->ctx)->path);
+
+	menuq_clear(&menuq);
+}

parse.y

@@ -35,6 +35,8 @@
 
 #include "calmwm.h"
 
+#define YYSTYPE_IS_DECLARED
+
 TAILQ_HEAD(files, file)		 files = TAILQ_HEAD_INITIALIZER(files);
 static struct file {
 	TAILQ_ENTRY(file)	 entry;
@@ -43,7 +45,7 @@ static struct file {
 	int			 lineno;
 	int			 errors;
 } *file, *topfile;
-struct file	*pushfile(const char *, FILE *);
+struct file	*pushfile(const char *);
 int		 popfile(void);
 int		 yyparse(void);
 int		 yylex(void);
@@ -68,10 +70,9 @@ typedef struct {
 
 %}
 
-%token	BINDKEY UNBINDKEY BINDMOUSE UNBINDMOUSE
-%token	FONTNAME STICKY GAP
-%token	AUTOGROUP COMMAND IGNORE WM
-%token	YES NO BORDERWIDTH MOVEAMOUNT HTILE VTILE
+%token	FONTNAME STICKY GAP MOUSEBIND
+%token	AUTOGROUP BIND COMMAND IGNORE
+%token	YES NO BORDERWIDTH MOVEAMOUNT
 %token	COLOR SNAPDIST
 %token	ACTIVEBORDER INACTIVEBORDER URGENCYBORDER
 %token	GROUPBORDER UNGROUPBORDER
@@ -81,7 +82,7 @@ typedef struct {
 %token	<v.string>		STRING
 %token	<v.number>		NUMBER
 %type	<v.number>		yesno
-%type	<v.string>		string numberstring
+%type	<v.string>		string
 %%
 
 grammar		: /* empty */
@@ -104,17 +105,6 @@ string		: string STRING			{
 		| STRING
 		;
 
-numberstring	: NUMBER				{
-			char	*s;
-			if (asprintf(&s, "%lld", $1) == -1) {
-				yyerror("string: asprintf");
-				YYERROR;
-			}
-			$$ = s;
-		}
-		| STRING
-		;
-
 yesno		: YES				{ $$ = 1; }
 		| NO				{ $$ = 0; }
 		;
@@ -124,95 +114,72 @@ main		: FONTNAME STRING		{
 			conf->font = $2;
 		}
 		| STICKY yesno {
-			conf->stickygroups = $2;
+			if ($2 == 0)
+				conf->flags &= ~CONF_STICKY_GROUPS;
+			else
+				conf->flags |= CONF_STICKY_GROUPS;
 		}
 		| BORDERWIDTH NUMBER {
-			if ($2 < 0 || $2 > INT_MAX) {
-				yyerror("invalid borderwidth");
+			if ($2 < 0 || $2 > UINT_MAX) {
+				yyerror("invalid borderwidth: %lld", $2);
 				YYERROR;
 			}
 			conf->bwidth = $2;
 		}
-		| HTILE NUMBER {
-			if ($2 < 0 || $2 > 99) {
-				yyerror("invalid htile percent");
-				YYERROR;
-			}
-			conf->htile = $2;
-		}
-		| VTILE NUMBER {
-			if ($2 < 0 || $2 > 99) {
-				yyerror("invalid vtile percent");
-				YYERROR;
-			}
-			conf->vtile = $2;
-		}
 		| MOVEAMOUNT NUMBER {
 			if ($2 < 0 || $2 > INT_MAX) {
-				yyerror("invalid movemount");
+				yyerror("invalid movemount: %lld", $2);
 				YYERROR;
 			}
 			conf->mamount = $2;
 		}
 		| SNAPDIST NUMBER {
 			if ($2 < 0 || $2 > INT_MAX) {
-				yyerror("invalid snapdist");
+				yyerror("invalid snapdist: %lld", $2);
 				YYERROR;
 			}
 			conf->snapdist = $2;
 		}
 		| COMMAND STRING string		{
-			if (strlen($3) >= PATH_MAX) {
-				yyerror("%s command path too long", $2);
+			if (!conf_cmd_add(conf, $2, $3)) {
+				yyerror("command name/path too long");
 				free($2);
 				free($3);
 				YYERROR;
 			}
-			conf_cmd_add(conf, $2, $3);
-			free($2);
-			free($3);
-		}
-		| WM STRING string	{
-			if (strlen($3) >= PATH_MAX) {
-				yyerror("%s wm path too long", $2);
-				free($2);
-				free($3);
-				YYERROR;
-			}
-			conf_wm_add(conf, $2, $3);
 			free($2);
 			free($3);
 		}
 		| AUTOGROUP NUMBER STRING	{
 			if ($2 < 0 || $2 > 9) {
-				yyerror("invalid autogroup");
 				free($3);
+				yyerror("invalid autogroup: %lld", $2);
 				YYERROR;
 			}
-			conf_autogroup(conf, $2, NULL, $3);
+			conf_autogroup(conf, $2, $3);
 			free($3);
 		}
-		| AUTOGROUP NUMBER STRING ',' STRING {
-			if ($2 < 0 || $2 > 9) {
-				yyerror("invalid autogroup");
-				free($3);
-				free($5);
-				YYERROR;
-			}
-			conf_autogroup(conf, $2, $3, $5);
-			free($3);
-			free($5);
-		}
 		| IGNORE STRING {
 			conf_ignore(conf, $2);
 			free($2);
 		}
+		| BIND STRING string		{
+			if (!conf_bind_kbd(conf, $2, $3)) {
+				yyerror("invalid bind: %s %s", $2, $3);
+				free($2);
+				free($3);
+				YYERROR;
+			}
+			free($2);
+			free($3);
+		}
 		| GAP NUMBER NUMBER NUMBER NUMBER {
 			if ($2 < 0 || $2 > INT_MAX ||
 			    $3 < 0 || $3 > INT_MAX ||
 			    $4 < 0 || $4 > INT_MAX ||
 			    $5 < 0 || $5 > INT_MAX) {
-				yyerror("invalid gap");
+				yyerror("invalid gap: %lld %lld %lld %lld",
+				    $2, $3, $4, $5);
 				YYERROR;
 			}
 			conf->gap.top = $2;
@@ -220,27 +187,9 @@ main		: FONTNAME STRING		{
 			conf->gap.left = $4;
 			conf->gap.right = $5;
 		}
-		| BINDKEY numberstring string {
-			if (!conf_bind_key(conf, $2, $3)) {
-				yyerror("invalid bind-key: %s %s", $2, $3);
-				free($2);
-				free($3);
-				YYERROR;
-			}
-			free($2);
-			free($3);
-		}
-		| UNBINDKEY numberstring {
-			if (!conf_bind_key(conf, $2, NULL)) {
-				yyerror("invalid unbind-key: %s", $2);
-				free($2);
-				YYERROR;
-			}
-			free($2);
-		}
-		| BINDMOUSE numberstring string {
+		| MOUSEBIND STRING string	{
 			if (!conf_bind_mouse(conf, $2, $3)) {
-				yyerror("invalid bind-mouse: %s %s", $2, $3);
+				yyerror("invalid mousebind: %s %s", $2, $3);
 				free($2);
 				free($3);
 				YYERROR;
@@ -248,14 +197,6 @@ main		: FONTNAME STRING		{
 			free($2);
 			free($3);
 		}
-		| UNBINDMOUSE numberstring {
-			if (!conf_bind_mouse(conf, $2, NULL)) {
-				yyerror("invalid unbind-mouse: %s", $2);
-				free($2);
-				YYERROR;
-			}
-			free($2);
-		}
 		;
 
 color		: COLOR colors
@@ -332,8 +273,7 @@ lookup(char *s)
 	static const struct keywords keywords[] = {
 		{ "activeborder",	ACTIVEBORDER},
 		{ "autogroup",		AUTOGROUP},
-		{ "bind-key",		BINDKEY},
-		{ "bind-mouse",		BINDMOUSE},
+		{ "bind",		BIND},
 		{ "borderwidth",	BORDERWIDTH},
 		{ "color",		COLOR},
 		{ "command",		COMMAND},
@@ -341,22 +281,18 @@ lookup(char *s)
 		{ "fontname",		FONTNAME},
 		{ "gap",		GAP},
 		{ "groupborder",	GROUPBORDER},
-		{ "htile",		HTILE},
 		{ "ignore",		IGNORE},
 		{ "inactiveborder",	INACTIVEBORDER},
 		{ "menubg",		MENUBG},
 		{ "menufg",		MENUFG},
+		{ "mousebind",		MOUSEBIND},
 		{ "moveamount",		MOVEAMOUNT},
 		{ "no",			NO},
 		{ "selfont", 		FONTSELCOLOR},
 		{ "snapdist",		SNAPDIST},
 		{ "sticky",		STICKY},
-		{ "unbind-key",		UNBINDKEY},
-		{ "unbind-mouse",	UNBINDMOUSE},
 		{ "ungroupborder",	UNGROUPBORDER},
 		{ "urgencyborder",	URGENCYBORDER},
-		{ "vtile",		VTILE},
-		{ "wm",			WM},
 		{ "yes",		YES}
 	};
 	const struct keywords	*p;
@@ -385,7 +321,7 @@ lgetc(int quotec)
 	if (parsebuf) {
 		/* Read character from the parsebuffer instead of input. */
 		if (parseindex >= 0) {
-			c = (unsigned char)parsebuf[parseindex++];
+			c = parsebuf[parseindex++];
 			if (c != '\0')
 				return (c);
 			parsebuf = NULL;
@@ -394,7 +330,7 @@ lgetc(int quotec)
 	}
 
 	if (pushback_index)
-		return ((unsigned char)pushback_buffer[--pushback_index]);
+		return (pushback_buffer[--pushback_index]);
 
 	if (quotec) {
 		if ((c = getc(file->stream)) == EOF) {
@@ -435,10 +371,10 @@ lungetc(int c)
 		if (parseindex >= 0)
 			return (c);
 	}
-	if (pushback_index + 1 >= MAXPUSHBACK)
+	if (pushback_index < MAXPUSHBACK-1)
+		return (pushback_buffer[pushback_index++] = c);
+	else
 		return (EOF);
-	pushback_buffer[pushback_index++] = c;
-	return (c);
 }
 
 int
@@ -451,7 +387,7 @@ findeol(void)
 	/* skip to either EOF or the first real EOL */
 	while (1) {
 		if (pushback_index)
-			c = (unsigned char)pushback_buffer[--pushback_index];
+			c = pushback_buffer[--pushback_index];
 		else
 			c = lgetc(0);
 		if (c == '\n') {
@@ -494,8 +430,7 @@ yylex(void)
 			} else if (c == '\\') {
 				if ((next = lgetc(quotec)) == EOF)
 					return (0);
-				if (next == quotec || next == ' ' ||
-				    next == '\t')
+				if (next == quotec || c == ' ' || c == '\t')
 					c = next;
 				else if (next == '\n') {
 					file->lineno++;
@@ -513,7 +448,7 @@ yylex(void)
 				yyerror("string too long");
 				return (findeol());
 			}
-			*p++ = c;
+			*p++ = (char)c;
 		}
 		yylval.v.string = xstrdup(buf);
 		return (STRING);
@@ -525,7 +460,7 @@ yylex(void)
 	if (c == '-' || isdigit(c)) {
 		do {
 			*p++ = c;
-			if ((size_t)(p-buf) >= sizeof(buf)) {
+			if ((unsigned)(p-buf) >= sizeof(buf)) {
 				yyerror("string too long");
 				return (findeol());
 			}
@@ -548,8 +483,8 @@ yylex(void)
 		} else {
 nodigits:
 			while (p > buf + 1)
-				lungetc((unsigned char)*--p);
-			c = (unsigned char)*--p;
+				lungetc(*--p);
+			c = *--p;
 			if (c == '-')
 				return (c);
 		}
@@ -564,7 +499,7 @@ nodigits:
 	if (isalnum(c) || c == ':' || c == '_' || c == '*' || c == '/') {
 		do {
 			*p++ = c;
-			if ((size_t)(p-buf) >= sizeof(buf)) {
+			if ((unsigned)(p-buf) >= sizeof(buf)) {
 				yyerror("string too long");
 				return (findeol());
 			}
@@ -585,13 +520,19 @@ nodigits:
 }
 
 struct file *
-pushfile(const char *name, FILE *stream)
+pushfile(const char *name)
 {
 	struct file	*nfile;
 
 	nfile = xcalloc(1, sizeof(struct file));
 	nfile->name = xstrdup(name);
-	nfile->stream = stream;
+
+	if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
+		warn("%s", nfile->name);
+		free(nfile->name);
+		free(nfile);
+		return (NULL);
+	}
 	nfile->lineno = 1;
 	TAILQ_INSERT_TAIL(&files, nfile, entry);
 	return (nfile);
@@ -616,19 +557,13 @@ popfile(void)
 int
 parse_config(const char *filename, struct conf *xconf)
 {
-	FILE		*stream;
 	int		 errors = 0;
 
 	conf = xconf;
 
-	stream = fopen(filename, "r");
-	if (stream == NULL) {
-		if (errno == ENOENT)
-			return (0);
-		warn("%s", filename);
+	if ((file = pushfile(filename)) == NULL) {
 		return (-1);
 	}
-	file = pushfile(filename, stream);
 	topfile = file;
 
 	yyparse();

queue.h

@@ -0,0 +1,568 @@
+/*	$OpenBSD: "queue.h",v 1.36 2012/04/11 13:29:14 naddy Exp $	*/
+/*	$NetBSD: "queue.h",v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
+
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)"queue.h"	8.5 (Berkeley) 8/20/94
+ */
+
+#ifndef	_SYS_QUEUE_H_
+#define	_SYS_QUEUE_H_
+
+/*
+ * This file defines five types of data structures: singly-linked lists, 
+ * lists, simple queues, tail queues, and circular queues.
+ *
+ *
+ * A singly-linked list is headed by a single forward pointer. The elements
+ * are singly linked for minimum space and pointer manipulation overhead at
+ * the expense of O(n) removal for arbitrary elements. New elements can be
+ * added to the list after an existing element or at the head of the list.
+ * Elements being removed from the head of the list should use the explicit
+ * macro for this purpose for optimum efficiency. A singly-linked list may
+ * only be traversed in the forward direction.  Singly-linked lists are ideal
+ * for applications with large datasets and few or no removals or for
+ * implementing a LIFO queue.
+ *
+ * A list is headed by a single forward pointer (or an array of forward
+ * pointers for a hash table header). The elements are doubly linked
+ * so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before
+ * or after an existing element or at the head of the list. A list
+ * may only be traversed in the forward direction.
+ *
+ * A simple queue is headed by a pair of pointers, one the head of the
+ * list and the other to the tail of the list. The elements are singly
+ * linked to save space, so elements can only be removed from the
+ * head of the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the
+ * list. A simple queue may only be traversed in the forward direction.
+ *
+ * A tail queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or
+ * after an existing element, at the head of the list, or at the end of
+ * the list. A tail queue may be traversed in either direction.
+ *
+ * A circle queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the list.
+ * A circle queue may be traversed in either direction, but has a more
+ * complex end of list detection.
+ *
+ * For details on the use of these macros, see the queue(3) manual page.
+ */
+
+#if defined(QUEUE_MACRO_DEBUG) || (defined(_KERNEL) && defined(DIAGNOSTIC))
+#define _Q_INVALIDATE(a) (a) = ((void *)-1)
+#else
+#define _Q_INVALIDATE(a)
+#endif
+
+/*
+ * Singly-linked List definitions.
+ */
+#define SLIST_HEAD(name, type)						\
+struct name {								\
+	struct type *slh_first;	/* first element */			\
+}
+ 
+#define	SLIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+ 
+#define SLIST_ENTRY(type)						\
+struct {								\
+	struct type *sle_next;	/* next element */			\
+}
+ 
+/*
+ * Singly-linked List access methods.
+ */
+#define	SLIST_FIRST(head)	((head)->slh_first)
+#define	SLIST_END(head)		NULL
+#define	SLIST_EMPTY(head)	(SLIST_FIRST(head) == SLIST_END(head))
+#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
+
+#define	SLIST_FOREACH(var, head, field)					\
+	for((var) = SLIST_FIRST(head);					\
+	    (var) != SLIST_END(head);					\
+	    (var) = SLIST_NEXT(var, field))
+
+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = SLIST_FIRST(head);				\
+	    (var) && ((tvar) = SLIST_NEXT(var, field), 1);		\
+	    (var) = (tvar))
+
+/*
+ * Singly-linked List functions.
+ */
+#define	SLIST_INIT(head) {						\
+	SLIST_FIRST(head) = SLIST_END(head);				\
+}
+
+#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
+	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
+	(slistelm)->field.sle_next = (elm);				\
+} while (0)
+
+#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
+	(elm)->field.sle_next = (head)->slh_first;			\
+	(head)->slh_first = (elm);					\
+} while (0)
+
+#define	SLIST_REMOVE_AFTER(elm, field) do {				\
+	(elm)->field.sle_next = (elm)->field.sle_next->field.sle_next;	\
+} while (0)
+
+#define	SLIST_REMOVE_HEAD(head, field) do {				\
+	(head)->slh_first = (head)->slh_first->field.sle_next;		\
+} while (0)
+
+#define SLIST_REMOVE(head, elm, type, field) do {			\
+	if ((head)->slh_first == (elm)) {				\
+		SLIST_REMOVE_HEAD((head), field);			\
+	} else {							\
+		struct type *curelm = (head)->slh_first;		\
+									\
+		while (curelm->field.sle_next != (elm))			\
+			curelm = curelm->field.sle_next;		\
+		curelm->field.sle_next =				\
+		    curelm->field.sle_next->field.sle_next;		\
+		_Q_INVALIDATE((elm)->field.sle_next);			\
+	}								\
+} while (0)
+
+/*
+ * List definitions.
+ */
+#define LIST_HEAD(name, type)						\
+struct name {								\
+	struct type *lh_first;	/* first element */			\
+}
+
+#define LIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define LIST_ENTRY(type)						\
+struct {								\
+	struct type *le_next;	/* next element */			\
+	struct type **le_prev;	/* address of previous next element */	\
+}
+
+/*
+ * List access methods
+ */
+#define	LIST_FIRST(head)		((head)->lh_first)
+#define	LIST_END(head)			NULL
+#define	LIST_EMPTY(head)		(LIST_FIRST(head) == LIST_END(head))
+#define	LIST_NEXT(elm, field)		((elm)->field.le_next)
+
+#define LIST_FOREACH(var, head, field)					\
+	for((var) = LIST_FIRST(head);					\
+	    (var)!= LIST_END(head);					\
+	    (var) = LIST_NEXT(var, field))
+
+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = LIST_FIRST(head);				\
+	    (var) && ((tvar) = LIST_NEXT(var, field), 1);		\
+	    (var) = (tvar))
+
+/*
+ * List functions.
+ */
+#define	LIST_INIT(head) do {						\
+	LIST_FIRST(head) = LIST_END(head);				\
+} while (0)
+
+#define LIST_INSERT_AFTER(listelm, elm, field) do {			\
+	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
+		(listelm)->field.le_next->field.le_prev =		\
+		    &(elm)->field.le_next;				\
+	(listelm)->field.le_next = (elm);				\
+	(elm)->field.le_prev = &(listelm)->field.le_next;		\
+} while (0)
+
+#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
+	(elm)->field.le_prev = (listelm)->field.le_prev;		\
+	(elm)->field.le_next = (listelm);				\
+	*(listelm)->field.le_prev = (elm);				\
+	(listelm)->field.le_prev = &(elm)->field.le_next;		\
+} while (0)
+
+#define LIST_INSERT_HEAD(head, elm, field) do {				\
+	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
+		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
+	(head)->lh_first = (elm);					\
+	(elm)->field.le_prev = &(head)->lh_first;			\
+} while (0)
+
+#define LIST_REMOVE(elm, field) do {					\
+	if ((elm)->field.le_next != NULL)				\
+		(elm)->field.le_next->field.le_prev =			\
+		    (elm)->field.le_prev;				\
+	*(elm)->field.le_prev = (elm)->field.le_next;			\
+	_Q_INVALIDATE((elm)->field.le_prev);				\
+	_Q_INVALIDATE((elm)->field.le_next);				\
+} while (0)
+
+#define LIST_REPLACE(elm, elm2, field) do {				\
+	if (((elm2)->field.le_next = (elm)->field.le_next) != NULL)	\
+		(elm2)->field.le_next->field.le_prev =			\
+		    &(elm2)->field.le_next;				\
+	(elm2)->field.le_prev = (elm)->field.le_prev;			\
+	*(elm2)->field.le_prev = (elm2);				\
+	_Q_INVALIDATE((elm)->field.le_prev);				\
+	_Q_INVALIDATE((elm)->field.le_next);				\
+} while (0)
+
+/*
+ * Simple queue definitions.
+ */
+#define SIMPLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *sqh_first;	/* first element */			\
+	struct type **sqh_last;	/* addr of last next element */		\
+}
+
+#define SIMPLEQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).sqh_first }
+
+#define SIMPLEQ_ENTRY(type)						\
+struct {								\
+	struct type *sqe_next;	/* next element */			\
+}
+
+/*
+ * Simple queue access methods.
+ */
+#define	SIMPLEQ_FIRST(head)	    ((head)->sqh_first)
+#define	SIMPLEQ_END(head)	    NULL
+#define	SIMPLEQ_EMPTY(head)	    (SIMPLEQ_FIRST(head) == SIMPLEQ_END(head))
+#define	SIMPLEQ_NEXT(elm, field)    ((elm)->field.sqe_next)
+
+#define SIMPLEQ_FOREACH(var, head, field)				\
+	for((var) = SIMPLEQ_FIRST(head);				\
+	    (var) != SIMPLEQ_END(head);					\
+	    (var) = SIMPLEQ_NEXT(var, field))
+
+#define	SIMPLEQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = SIMPLEQ_FIRST(head);				\
+	    (var) && ((tvar) = SIMPLEQ_NEXT(var, field), 1);		\
+	    (var) = (tvar))
+
+/*
+ * Simple queue functions.
+ */
+#define	SIMPLEQ_INIT(head) do {						\
+	(head)->sqh_first = NULL;					\
+	(head)->sqh_last = &(head)->sqh_first;				\
+} while (0)
+
+#define SIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)	\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(head)->sqh_first = (elm);					\
+} while (0)
+
+#define SIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.sqe_next = NULL;					\
+	*(head)->sqh_last = (elm);					\
+	(head)->sqh_last = &(elm)->field.sqe_next;			\
+} while (0)
+
+#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(listelm)->field.sqe_next = (elm);				\
+} while (0)
+
+#define SIMPLEQ_REMOVE_HEAD(head, field) do {			\
+	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
+		(head)->sqh_last = &(head)->sqh_first;			\
+} while (0)
+
+#define SIMPLEQ_REMOVE_AFTER(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (elm)->field.sqe_next->field.sqe_next) \
+	    == NULL)							\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+} while (0)
+
+/*
+ * Tail queue definitions.
+ */
+#define TAILQ_HEAD(name, type)						\
+struct name {								\
+	struct type *tqh_first;	/* first element */			\
+	struct type **tqh_last;	/* addr of last next element */		\
+}
+
+#define TAILQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).tqh_first }
+
+#define TAILQ_ENTRY(type)						\
+struct {								\
+	struct type *tqe_next;	/* next element */			\
+	struct type **tqe_prev;	/* address of previous next element */	\
+}
+
+/* 
+ * tail queue access methods 
+ */
+#define	TAILQ_FIRST(head)		((head)->tqh_first)
+#define	TAILQ_END(head)			NULL
+#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
+#define TAILQ_LAST(head, headname)					\
+	(*(((struct headname *)((head)->tqh_last))->tqh_last))
+/* XXX */
+#define TAILQ_PREV(elm, headname, field)				\
+	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
+#define	TAILQ_EMPTY(head)						\
+	(TAILQ_FIRST(head) == TAILQ_END(head))
+
+#define TAILQ_FOREACH(var, head, field)					\
+	for((var) = TAILQ_FIRST(head);					\
+	    (var) != TAILQ_END(head);					\
+	    (var) = TAILQ_NEXT(var, field))
+
+#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = TAILQ_FIRST(head);					\
+	    (var) != TAILQ_END(head) &&					\
+	    ((tvar) = TAILQ_NEXT(var, field), 1);			\
+	    (var) = (tvar))
+
+
+#define TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
+	for((var) = TAILQ_LAST(head, headname);				\
+	    (var) != TAILQ_END(head);					\
+	    (var) = TAILQ_PREV(var, headname, field))
+
+#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
+	for ((var) = TAILQ_LAST(head, headname);			\
+	    (var) != TAILQ_END(head) &&					\
+	    ((tvar) = TAILQ_PREV(var, headname, field), 1);		\
+	    (var) = (tvar))
+
+/*
+ * Tail queue functions.
+ */
+#define	TAILQ_INIT(head) do {						\
+	(head)->tqh_first = NULL;					\
+	(head)->tqh_last = &(head)->tqh_first;				\
+} while (0)
+
+#define TAILQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
+		(head)->tqh_first->field.tqe_prev =			\
+		    &(elm)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm)->field.tqe_next;		\
+	(head)->tqh_first = (elm);					\
+	(elm)->field.tqe_prev = &(head)->tqh_first;			\
+} while (0)
+
+#define TAILQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.tqe_next = NULL;					\
+	(elm)->field.tqe_prev = (head)->tqh_last;			\
+	*(head)->tqh_last = (elm);					\
+	(head)->tqh_last = &(elm)->field.tqe_next;			\
+} while (0)
+
+#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
+		(elm)->field.tqe_next->field.tqe_prev =			\
+		    &(elm)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm)->field.tqe_next;		\
+	(listelm)->field.tqe_next = (elm);				\
+	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
+} while (0)
+
+#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
+	(elm)->field.tqe_next = (listelm);				\
+	*(listelm)->field.tqe_prev = (elm);				\
+	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
+} while (0)
+
+#define TAILQ_REMOVE(head, elm, field) do {				\
+	if (((elm)->field.tqe_next) != NULL)				\
+		(elm)->field.tqe_next->field.tqe_prev =			\
+		    (elm)->field.tqe_prev;				\
+	else								\
+		(head)->tqh_last = (elm)->field.tqe_prev;		\
+	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
+	_Q_INVALIDATE((elm)->field.tqe_prev);				\
+	_Q_INVALIDATE((elm)->field.tqe_next);				\
+} while (0)
+
+#define TAILQ_REPLACE(head, elm, elm2, field) do {			\
+	if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != NULL)	\
+		(elm2)->field.tqe_next->field.tqe_prev =		\
+		    &(elm2)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm2)->field.tqe_next;		\
+	(elm2)->field.tqe_prev = (elm)->field.tqe_prev;			\
+	*(elm2)->field.tqe_prev = (elm2);				\
+	_Q_INVALIDATE((elm)->field.tqe_prev);				\
+	_Q_INVALIDATE((elm)->field.tqe_next);				\
+} while (0)
+
+/*
+ * Circular queue definitions.
+ */
+#define CIRCLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *cqh_first;		/* first element */		\
+	struct type *cqh_last;		/* last element */		\
+}
+
+#define CIRCLEQ_HEAD_INITIALIZER(head)					\
+	{ CIRCLEQ_END(&head), CIRCLEQ_END(&head) }
+
+#define CIRCLEQ_ENTRY(type)						\
+struct {								\
+	struct type *cqe_next;		/* next element */		\
+	struct type *cqe_prev;		/* previous element */		\
+}
+
+/*
+ * Circular queue access methods 
+ */
+#define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
+#define	CIRCLEQ_LAST(head)		((head)->cqh_last)
+#define	CIRCLEQ_END(head)		((void *)(head))
+#define	CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
+#define	CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
+#define	CIRCLEQ_EMPTY(head)						\
+	(CIRCLEQ_FIRST(head) == CIRCLEQ_END(head))
+
+#define CIRCLEQ_FOREACH(var, head, field)				\
+	for((var) = CIRCLEQ_FIRST(head);				\
+	    (var) != CIRCLEQ_END(head);					\
+	    (var) = CIRCLEQ_NEXT(var, field))
+
+#define	CIRCLEQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = CIRCLEQ_FIRST(head);				\
+	    (var) != CIRCLEQ_END(head) &&				\
+	    ((tvar) = CIRCLEQ_NEXT(var, field), 1);			\
+	    (var) = (tvar))
+
+#define CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
+	for((var) = CIRCLEQ_LAST(head);					\
+	    (var) != CIRCLEQ_END(head);					\
+	    (var) = CIRCLEQ_PREV(var, field))
+
+#define	CIRCLEQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
+	for ((var) = CIRCLEQ_LAST(head, headname);			\
+	    (var) != CIRCLEQ_END(head) && 				\
+	    ((tvar) = CIRCLEQ_PREV(var, headname, field), 1);		\
+	    (var) = (tvar))
+
+/*
+ * Circular queue functions.
+ */
+#define	CIRCLEQ_INIT(head) do {						\
+	(head)->cqh_first = CIRCLEQ_END(head);				\
+	(head)->cqh_last = CIRCLEQ_END(head);				\
+} while (0)
+
+#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
+	(elm)->field.cqe_prev = (listelm);				\
+	if ((listelm)->field.cqe_next == CIRCLEQ_END(head))		\
+		(head)->cqh_last = (elm);				\
+	else								\
+		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
+	(listelm)->field.cqe_next = (elm);				\
+} while (0)
+
+#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
+	(elm)->field.cqe_next = (listelm);				\
+	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
+	if ((listelm)->field.cqe_prev == CIRCLEQ_END(head))		\
+		(head)->cqh_first = (elm);				\
+	else								\
+		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
+	(listelm)->field.cqe_prev = (elm);				\
+} while (0)
+
+#define CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
+	(elm)->field.cqe_next = (head)->cqh_first;			\
+	(elm)->field.cqe_prev = CIRCLEQ_END(head);			\
+	if ((head)->cqh_last == CIRCLEQ_END(head))			\
+		(head)->cqh_last = (elm);				\
+	else								\
+		(head)->cqh_first->field.cqe_prev = (elm);		\
+	(head)->cqh_first = (elm);					\
+} while (0)
+
+#define CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.cqe_next = CIRCLEQ_END(head);			\
+	(elm)->field.cqe_prev = (head)->cqh_last;			\
+	if ((head)->cqh_first == CIRCLEQ_END(head))			\
+		(head)->cqh_first = (elm);				\
+	else								\
+		(head)->cqh_last->field.cqe_next = (elm);		\
+	(head)->cqh_last = (elm);					\
+} while (0)
+
+#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
+	if ((elm)->field.cqe_next == CIRCLEQ_END(head))			\
+		(head)->cqh_last = (elm)->field.cqe_prev;		\
+	else								\
+		(elm)->field.cqe_next->field.cqe_prev =			\
+		    (elm)->field.cqe_prev;				\
+	if ((elm)->field.cqe_prev == CIRCLEQ_END(head))			\
+		(head)->cqh_first = (elm)->field.cqe_next;		\
+	else								\
+		(elm)->field.cqe_prev->field.cqe_next =			\
+		    (elm)->field.cqe_next;				\
+	_Q_INVALIDATE((elm)->field.cqe_prev);				\
+	_Q_INVALIDATE((elm)->field.cqe_next);				\
+} while (0)
+
+#define CIRCLEQ_REPLACE(head, elm, elm2, field) do {			\
+	if (((elm2)->field.cqe_next = (elm)->field.cqe_next) ==		\
+	    CIRCLEQ_END(head))						\
+		(head).cqh_last = (elm2);				\
+	else								\
+		(elm2)->field.cqe_next->field.cqe_prev = (elm2);	\
+	if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) ==		\
+	    CIRCLEQ_END(head))						\
+		(head).cqh_first = (elm2);				\
+	else								\
+		(elm2)->field.cqe_prev->field.cqe_next = (elm2);	\
+	_Q_INVALIDATE((elm)->field.cqe_prev);				\
+	_Q_INVALIDATE((elm)->field.cqe_next);				\
+} while (0)
+
+#endif	/* !_SYS_QUEUE_H_ */

screen.c

@@ -19,12 +19,11 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,14 +31,13 @@
 
 #include "calmwm.h"
 
-static struct geom screen_apply_gap(struct screen_ctx *, struct geom);
-static void screen_scan(struct screen_ctx *);
-
 void
 screen_init(int which)
 {
 	struct screen_ctx	*sc;
-	XSetWindowAttributes	 attr;
+	Window			*wins, w0, w1;
+	XSetWindowAttributes	 rootattr;
+	unsigned int		 nwins, i;
 
 	sc = xmalloc(sizeof(*sc));
 
@@ -49,8 +47,6 @@ screen_init(int which)
 
 	sc->which = which;
 	sc->rootwin = RootWindow(X_Dpy, sc->which);
-	sc->colormap = DefaultColormap(X_Dpy, sc->which);
-	sc->visual = DefaultVisual(X_Dpy, sc->which);
 	sc->cycling = 0;
 	sc->hideall = 0;
 
@@ -59,54 +55,42 @@ screen_init(int which)
 	xu_ewmh_net_supported(sc);
 	xu_ewmh_net_supported_wm_check(sc);
 
-	conf_group(sc);
-	sc->group_last = sc->group_active;
 	screen_update_geometry(sc);
 
+	for (i = 0; i < CALMWM_NGROUPS; i++)
+		group_init(sc, i);
+
 	xu_ewmh_net_desktop_names(sc);
-	xu_ewmh_net_number_of_desktops(sc);
+	xu_ewmh_net_wm_desktop_viewport(sc);
+	xu_ewmh_net_wm_number_of_desktops(sc);
 	xu_ewmh_net_showing_desktop(sc);
 	xu_ewmh_net_virtual_roots(sc);
 
-	attr.cursor = Conf.cursor[CF_NORMAL];
-	attr.event_mask = SubstructureRedirectMask | SubstructureNotifyMask |
-	    EnterWindowMask | PropertyChangeMask | ButtonPressMask;
-	XChangeWindowAttributes(X_Dpy, sc->rootwin, (CWEventMask | CWCursor), &attr);
+	rootattr.cursor = Conf.cursor[CF_NORMAL];
+	rootattr.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|
+	    PropertyChangeMask|EnterWindowMask|LeaveWindowMask|
+	    ColormapChangeMask|BUTTONMASK;
 
-	if (Conf.xrandr)
-		XRRSelectInput(X_Dpy, sc->rootwin, RRScreenChangeNotifyMask);
+	XChangeWindowAttributes(X_Dpy, sc->rootwin,
+	    CWEventMask|CWCursor, &rootattr);
 
-	screen_scan(sc);
+	/* Deal with existing clients. */
+	if (XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins)) {
+		for (i = 0; i < nwins; i++)
+			(void)client_init(wins[i], sc);
+
+		XFree(wins);
+	}
 	screen_updatestackingorder(sc);
 
+	if (HasRandr)
+		XRRSelectInput(X_Dpy, sc->rootwin, RRScreenChangeNotifyMask);
+
 	TAILQ_INSERT_TAIL(&Screenq, sc, entry);
 
 	XSync(X_Dpy, False);
 }
 
-static void
-screen_scan(struct screen_ctx *sc)
-{
-	struct client_ctx	 *cc, *active = NULL;
-	Window			*wins, w0, w1, rwin, cwin;
-	unsigned int		 nwins, i, mask;
-	int			 rx, ry, wx, wy;
-
-	XQueryPointer(X_Dpy, sc->rootwin, &rwin, &cwin,
-	    &rx, &ry, &wx, &wy, &mask);
-
-	if (XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins)) {
-		for (i = 0; i < nwins; i++) {
-			if ((cc = client_init(wins[i], sc)) != NULL)
-				if (cc->win == cwin)
-					active = cc;
-		}
-		XFree(wins);
-	}
-	if (active)
-		client_set_active(active);
-}
-
 struct screen_ctx *
 screen_find(Window win)
 {
@@ -114,10 +98,10 @@ screen_find(Window win)
 
 	TAILQ_FOREACH(sc, &Screenq, entry) {
 		if (sc->rootwin == win)
-			return sc;
+			return(sc);
 	}
-	warnx("%s: failure win 0x%lx", __func__, win);
-	return NULL;
+	/* XXX FAIL HERE */
+	return(TAILQ_FIRST(&Screenq));
 }
 
 void
@@ -140,168 +124,68 @@ screen_updatestackingorder(struct screen_ctx *sc)
 	}
 }
 
-struct region_ctx *
-region_find(struct screen_ctx *sc, int x, int y)
-{
-	struct region_ctx	*rc;
-
-	TAILQ_FOREACH(rc, &sc->regionq, entry) {
-		if ((x >= rc->view.x) && (x < (rc->view.x + rc->view.w)) &&
-		    (y >= rc->view.y) && (y < (rc->view.y + rc->view.h))) {
-			break;
-		}
-	}
-	return rc;
-}
-
+/*
+ * Find which xinerama screen the coordinates (x,y) is on.
+ */
 struct geom
-screen_area(struct screen_ctx *sc, int x, int y, int apply_gap)
+screen_find_xinerama(struct screen_ctx *sc, int x, int y, int flags)
 {
-	struct region_ctx	*rc;
-	struct geom		 area = sc->view;
+	struct region_ctx	*region;
+	struct geom		 geom = sc->work;
 
-	TAILQ_FOREACH(rc, &sc->regionq, entry) {
-		if ((x >= rc->view.x) && (x < (rc->view.x + rc->view.w)) &&
-		    (y >= rc->view.y) && (y < (rc->view.y + rc->view.h))) {
-			area = rc->view;
+	TAILQ_FOREACH(region, &sc->regionq, entry) {
+		if (x >= region->area.x && x < region->area.x+region->area.w &&
+		    y >= region->area.y && y < region->area.y+region->area.h) {
+			geom = region->area;
 			break;
 		}
 	}
-	if (apply_gap)
-		area = screen_apply_gap(sc, area);
-	return area;
+	if (flags & CWM_GAP) {
+		geom.x += sc->gap.left;
+		geom.y += sc->gap.top;
+		geom.w -= (sc->gap.left + sc->gap.right);
+		geom.h -= (sc->gap.top + sc->gap.bottom);
+	}
+	return(geom);
 }
 
 void
 screen_update_geometry(struct screen_ctx *sc)
 {
-	struct region_ctx	*rc;
+	XineramaScreenInfo	*info = NULL;
+	struct region_ctx	*region;
+	int			 info_num = 0, i;
 
 	sc->view.x = 0;
 	sc->view.y = 0;
 	sc->view.w = DisplayWidth(X_Dpy, sc->which);
 	sc->view.h = DisplayHeight(X_Dpy, sc->which);
-	sc->work = screen_apply_gap(sc, sc->view);
 
-	while ((rc = TAILQ_FIRST(&sc->regionq)) != NULL) {
-		TAILQ_REMOVE(&sc->regionq, rc, entry);
-		free(rc);
+	sc->work.x = sc->view.x + sc->gap.left;
+	sc->work.y = sc->view.y + sc->gap.top;
+	sc->work.w = sc->view.w - (sc->gap.left + sc->gap.right);
+	sc->work.h = sc->view.h - (sc->gap.top + sc->gap.bottom);
+
+	/* RandR event may have a CTRC added or removed. */
+	if (XineramaIsActive(X_Dpy))
+		info = XineramaQueryScreens(X_Dpy, &info_num);
+
+	while ((region = TAILQ_FIRST(&sc->regionq)) != NULL) {
+		TAILQ_REMOVE(&sc->regionq, region, entry);
+		free(region);
 	}
-
-	if (Conf.xrandr) {
-		XRRScreenResources *sr;
-		XRRCrtcInfo *ci;
-		int i;
-
-		sr = XRRGetScreenResources(X_Dpy, sc->rootwin);
-		for (i = 0, ci = NULL; i < sr->ncrtc; i++) {
-			ci = XRRGetCrtcInfo(X_Dpy, sr, sr->crtcs[i]);
-			if (ci == NULL)
-				continue;
-			if (ci->noutput == 0) {
-				XRRFreeCrtcInfo(ci);
-				continue;
-			}
-
-			rc = xmalloc(sizeof(*rc));
-			rc->num = i;
-			rc->view.x = ci->x;
-			rc->view.y = ci->y;
-			rc->view.w = ci->width;
-			rc->view.h = ci->height;
-			rc->work = screen_apply_gap(sc, rc->view);
-			TAILQ_INSERT_TAIL(&sc->regionq, rc, entry);
-
-			XRRFreeCrtcInfo(ci);
-		}
-		XRRFreeScreenResources(sr);
-	} else {
-		rc = xmalloc(sizeof(*rc));
-		rc->num = 0;
-		rc->view.x = 0;
-		rc->view.y = 0;
-		rc->view.w = DisplayWidth(X_Dpy, sc->which);
-		rc->view.h = DisplayHeight(X_Dpy, sc->which);
-		rc->work = screen_apply_gap(sc, rc->view);
-		TAILQ_INSERT_TAIL(&sc->regionq, rc, entry);
+	for (i = 0; i < info_num; i++) {
+		region = xmalloc(sizeof(*region));
+		region->num = i;
+		region->area.x = info[i].x_org;
+		region->area.y = info[i].y_org;
+		region->area.w = info[i].width;
+		region->area.h = info[i].height;
+		TAILQ_INSERT_TAIL(&sc->regionq, region, entry);
 	}
+	if (info)
+		XFree(info);
 
 	xu_ewmh_net_desktop_geometry(sc);
-	xu_ewmh_net_desktop_viewport(sc);
 	xu_ewmh_net_workarea(sc);
 }
-
-static struct geom
-screen_apply_gap(struct screen_ctx *sc, struct geom geom)
-{
-	geom.x += sc->gap.left;
-	geom.y += sc->gap.top;
-	geom.w -= (sc->gap.left + sc->gap.right);
-	geom.h -= (sc->gap.top + sc->gap.bottom);
-
-	return geom;
-}
-
-/* Bring back clients which are beyond the screen. */
-void
-screen_assert_clients_within(struct screen_ctx *sc)
-{
-	struct client_ctx	*cc;
-	int			 top, left, right, bottom;
-
-	TAILQ_FOREACH(cc, &sc->clientq, entry) {
-		if (cc->sc != sc)
-			continue;
-		top = cc->geom.y;
-		left = cc->geom.x;
-		right = cc->geom.x + cc->geom.w + (cc->bwidth * 2) - 1;
-		bottom = cc->geom.y + cc->geom.h + (cc->bwidth * 2) - 1;
-		if ((top > sc->view.h || left > sc->view.w) ||
-		    (bottom < 0 || right < 0)) {
-			cc->geom.x = sc->gap.left;
-			cc->geom.y = sc->gap.top;
-			client_move(cc);
-		}
-	}
-}
-
-void
-screen_prop_win_create(struct screen_ctx *sc, Window win)
-{
-	sc->prop.win = XCreateSimpleWindow(X_Dpy, win, 0, 0, 1, 1, 0,
-	    sc->xftcolor[CWM_COLOR_MENU_BG].pixel,
-	    sc->xftcolor[CWM_COLOR_MENU_BG].pixel);
-	sc->prop.xftdraw = XftDrawCreate(X_Dpy, sc->prop.win,
-	    sc->visual, sc->colormap);
-
-	XMapWindow(X_Dpy, sc->prop.win);
-}
-
-void
-screen_prop_win_destroy(struct screen_ctx *sc)
-{
-	XftDrawDestroy(sc->prop.xftdraw);
-	XDestroyWindow(X_Dpy, sc->prop.win);
-}
-
-void
-screen_prop_win_draw(struct screen_ctx *sc, const char *fmt, ...)
-{
-	va_list			 ap;
-	char			*text;
-	XGlyphInfo		 extents;
-
-	va_start(ap, fmt);
-	xvasprintf(&text, fmt, ap);
-	va_end(ap);
-
-	XftTextExtentsUtf8(X_Dpy, sc->xftfont, (const FcChar8*)text,
-	    strlen(text), &extents);
-	XResizeWindow(X_Dpy, sc->prop.win, extents.xOff, sc->xftfont->height);
-	XClearWindow(X_Dpy, sc->prop.win);
-	XftDrawStringUtf8(sc->prop.xftdraw, &sc->xftcolor[CWM_COLOR_MENU_FONT],
-	    sc->xftfont, 0, sc->xftfont->ascent + 1,
-	    (const FcChar8*)text, strlen(text));
-
-	free(text);
-}

search.c

@@ -19,8 +19,9 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 
+#include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <fnmatch.h>
@@ -36,78 +37,77 @@
 #define PATH_ANY 	0x0001
 #define PATH_EXEC 	0x0002
 
-static void	match_path_type(struct menu_q *, char *, int);
-static int	match_substr(char *, char *, int);
+static void	search_match_path(struct menu_q *, struct menu_q *,
+		    char *, int);
+static void	search_match_path_exec(struct menu_q *, struct menu_q *,
+		    char *);
+static int	strsubmatch(char *, char *, int);
 
-static int
-match_substr(char *sub, char *str, int zeroidx)
-{
-	size_t		 len, sublen;
-	unsigned int	 n, flen;
-
-	if (sub == NULL || str == NULL)
-		return 0;
-
-	len = strlen(str);
-	sublen = strlen(sub);
-
-	if (sublen > len)
-		return 0;
-
-	if (zeroidx)
-		flen = 0;
-	else
-		flen = len - sublen;
-
-	for (n = 0; n <= flen; n++)
-		if (strncasecmp(sub, str + n, sublen) == 0)
-			return 1;
-
-	return 0;
-}
+/*
+ * Match: label, title, class.
+ */
 
 void
 search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
 {
-	struct menu		*mi, *tierp[3], *before = NULL;
-	struct client_ctx	*cc;
-	struct winname		*wn;
+	struct winname	*wn;
+	struct menu	*mi, *tierp[4], *before = NULL;
+
+	TAILQ_INIT(resultq);
 
 	(void)memset(tierp, 0, sizeof(tierp));
 
-	TAILQ_INIT(resultq);
+	/*
+	 * In order of rank:
+	 *
+	 *   1. Look through labels.
+	 *   2. Look at title history, from present to past.
+	 *   3. Look at window class name.
+	 */
+
 	TAILQ_FOREACH(mi, menuq, entry) {
 		int tier = -1, t;
-		cc = (struct client_ctx *)mi->ctx;
+		struct client_ctx *cc = mi->ctx;
 
-		/* Match on label. */
-		if (match_substr(search, cc->label, 0))
+		/* First, try to match on labels. */
+		if (cc->label != NULL && strsubmatch(search, cc->label, 0)) {
+			cc->matchname = cc->label;
 			tier = 0;
+		}
 
-		/* Match on window name history, from present to past. */
+		/* Then, on window names. */
 		if (tier < 0) {
-			TAILQ_FOREACH_REVERSE(wn, &cc->nameq, name_q, entry)
-				if (match_substr(search, wn->name, 0)) {
-					tier = 1;
+			TAILQ_FOREACH_REVERSE(wn, &cc->nameq, winname_q, entry)
+				if (strsubmatch(search, wn->name, 0)) {
+					cc->matchname = wn->name;
+					tier = 2;
 					break;
 				}
 		}
 
-		/* Match on window resource class. */
-		if ((tier < 0) && match_substr(search, cc->res_class, 0))
-			tier = 2;
+		/* Then if there is a match on the window class name. */
+		if (tier < 0 && strsubmatch(search, cc->ch.res_class, 0)) {
+			cc->matchname = cc->ch.res_class;
+			tier = 3;
+		}
 
 		if (tier < 0)
 			continue;
 
-		/* Current window is ranked down. */
-		if ((tier < nitems(tierp) - 1) && (cc->flags & CLIENT_ACTIVE))
+		/*
+		 * De-rank a client one tier if it's the current
+		 * window.  Furthermore, this is denoted by a "!" when
+		 * printing the window name in the search menu.
+		 */
+		if (cc == client_current() && tier < nitems(tierp) - 1)
 			tier++;
 
-		/* Hidden window is ranked up. */
-		if ((tier > 0) && (cc->flags & CLIENT_HIDDEN))
+		/* Clients that are hidden get ranked one up. */
+		if ((cc->flags & CLIENT_HIDDEN) && (tier > 0))
 			tier--;
 
+		assert(tier < nitems(tierp));
+
 		/*
 		 * If you have a tierp, insert after it, and make it
 		 * the new tierp.  If you don't have a tierp, find the
@@ -128,56 +128,92 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
 }
 
 void
-search_match_cmd(struct menu_q *menuq, struct menu_q *resultq, char *search)
+search_print_client(struct menu *mi, int list)
 {
-	struct menu		*mi;
-	struct cmd_ctx		*cmd;
+	struct client_ctx	*cc;
+	char			 flag = ' ';
 
-	TAILQ_INIT(resultq);
-	TAILQ_FOREACH(mi, menuq, entry) {
-		cmd = (struct cmd_ctx *)mi->ctx;
-		if (match_substr(search, cmd->name, 0))
-			TAILQ_INSERT_TAIL(resultq, mi, resultentry);
-	}
-}
+	cc = mi->ctx;
 
-void
-search_match_group(struct menu_q *menuq, struct menu_q *resultq, char *search)
-{
-	struct menu		*mi;
-	struct group_ctx	*gc;
-	char			*s;
+	if (cc == client_current())
+		flag = '!';
+	else if (cc->flags & CLIENT_HIDDEN)
+		flag = '&';
 
-	TAILQ_INIT(resultq);
-	TAILQ_FOREACH(mi, menuq, entry) {
-		gc = (struct group_ctx *)mi->ctx;
-		xasprintf(&s, "%d %s", gc->num, gc->name);
-		if (match_substr(search, s, 0))
-			TAILQ_INSERT_TAIL(resultq, mi, resultentry);
-		free(s);
+	if (list)
+		cc->matchname = cc->name;
+
+	(void)snprintf(mi->print, sizeof(mi->print), "(%d) %c%s",
+	    cc->group ? cc->group->num : 0, flag, cc->matchname);
+
+	if (!list && cc->matchname != cc->name &&
+	    strlen(mi->print) < sizeof(mi->print) - 1) {
+		const char	*marker = "";
+		char		 buf[MENU_MAXENTRY + 1];
+		int		 diff;
+
+		diff = sizeof(mi->print) - 1 - strlen(mi->print);
+
+		/* One for the ':' */
+		diff -= 1;
+
+		if (strlen(cc->name) > diff) {
+			marker = "..";
+			diff -= 2;
+		} else {
+			diff = strlen(cc->name);
+		}
+
+		(void)strlcpy(buf, mi->print, sizeof(buf));
+		(void)snprintf(mi->print, sizeof(mi->print),
+		    "%s:%.*s%s", buf, diff, cc->name, marker);
 	}
 }
 
 static void
-match_path_type(struct menu_q *resultq, char *search, int flag)
+search_match_path(struct menu_q *menuq, struct menu_q *resultq, char *search, int flag)
 {
-	struct menu     *mi;
-	char 		*pattern;
-	glob_t		 g;
-	int		 i;
+	char 	 pattern[PATH_MAX];
+	glob_t	 g;
+	int	 i;
+
+	TAILQ_INIT(resultq);
+
+	(void)strlcpy(pattern, search, sizeof(pattern));
+	(void)strlcat(pattern, "*", sizeof(pattern));
 
-	xasprintf(&pattern, "%s*", search);
 	if (glob(pattern, GLOB_MARK, NULL, &g) != 0)
 		return;
 	for (i = 0; i < g.gl_pathc; i++) {
 		if ((flag & PATH_EXEC) && access(g.gl_pathv[i], X_OK))
 			continue;
-		mi = xcalloc(1, sizeof(*mi));
-		(void)strlcpy(mi->text, g.gl_pathv[i], sizeof(mi->text));
-		TAILQ_INSERT_TAIL(resultq, mi, resultentry);
+		menuq_add(resultq, NULL, "%s", g.gl_pathv[i]);
 	}
 	globfree(&g);
-	free(pattern);
+}
+
+static void
+search_match_path_exec(struct menu_q *menuq, struct menu_q *resultq, char *search)
+{
+	return(search_match_path(menuq, resultq, search, PATH_EXEC));
+}
+
+void
+search_match_path_any(struct menu_q *menuq, struct menu_q *resultq, char *search)
+{
+	return(search_match_path(menuq, resultq, search, PATH_ANY));
+}
+
+void
+search_match_text(struct menu_q *menuq, struct menu_q *resultq, char *search)
+{
+	struct menu	*mi;
+
+	TAILQ_INIT(resultq);
+
+	TAILQ_FOREACH(mi, menuq, entry)
+		if (strsubmatch(search, mi->text, 0))
+			TAILQ_INSERT_TAIL(resultq, mi, resultentry);
 }
 
 void
@@ -187,12 +223,13 @@ search_match_exec(struct menu_q *menuq, struct menu_q *resultq, char *search)
 	int		 r;
 
 	TAILQ_INIT(resultq);
+
 	TAILQ_FOREACH(mi, menuq, entry) {
-		if (match_substr(search, mi->text, 1) == 0 &&
+		if (strsubmatch(search, mi->text, 1) == 0 &&
 		    fnmatch(search, mi->text, 0) == FNM_NOMATCH)
 			continue;
 		TAILQ_FOREACH(mj, resultq, resultentry) {
-			r = strcmp(mi->text, mj->text);
+			r = strcasecmp(mi->text, mj->text);
 			if (r < 0)
 				TAILQ_INSERT_BEFORE(mj, mi, resultentry);
 			if (r <= 0)
@@ -201,89 +238,39 @@ search_match_exec(struct menu_q *menuq, struct menu_q *resultq, char *search)
 		if (mj == NULL)
 			TAILQ_INSERT_TAIL(resultq, mi, resultentry);
 	}
+}
+
+void
+search_match_exec_path(struct menu_q *menuq, struct menu_q *resultq, char *search)
+{
+	search_match_exec(menuq, resultq, search);
 	if (TAILQ_EMPTY(resultq))
-		match_path_type(resultq, search, PATH_EXEC);
+		search_match_path_exec(menuq, resultq, search);
 }
 
-void
-search_match_path(struct menu_q *menuq, struct menu_q *resultq, char *search)
+static int
+strsubmatch(char *sub, char *str, int zeroidx)
 {
-	TAILQ_INIT(resultq);
-	match_path_type(resultq, search, PATH_ANY);
-}
-
-void
-search_match_text(struct menu_q *menuq, struct menu_q *resultq, char *search)
-{
-	struct menu	*mi;
-
-	TAILQ_INIT(resultq);
-	TAILQ_FOREACH(mi, menuq, entry) {
-		if (match_substr(search, mi->text, 0))
-			TAILQ_INSERT_TAIL(resultq, mi, resultentry);
-	}
-}
-
-void
-search_match_wm(struct menu_q *menuq, struct menu_q *resultq, char *search)
-{
-	struct menu		*mi;
-	struct cmd_ctx		*wm;
-
-	TAILQ_INIT(resultq);
-	TAILQ_FOREACH(mi, menuq, entry) {
-		wm = (struct cmd_ctx *)mi->ctx;
-		if ((match_substr(search, wm->name, 0)) ||
-		    (match_substr(search, wm->path, 0)))
-			TAILQ_INSERT_TAIL(resultq, mi, resultentry);
-	}
-}
-
-void
-search_print_client(struct menu *mi, int listing)
-{
-	struct client_ctx	*cc = (struct client_ctx *)mi->ctx;
-	char			 flag = ' ';
-
-	if (cc->flags & CLIENT_ACTIVE)
-		flag = '!';
-	else if (cc->flags & CLIENT_HIDDEN)
-		flag = '&';
-
-	(void)snprintf(mi->print, sizeof(mi->print), "(%d) %c[%s] %s",
-	    (cc->gc) ? cc->gc->num : 0, flag,
-	    (cc->label) ? cc->label : "", cc->name);
-}
-
-void
-search_print_cmd(struct menu *mi, int listing)
-{
-	struct cmd_ctx		*cmd = (struct cmd_ctx *)mi->ctx;
-
-	(void)snprintf(mi->print, sizeof(mi->print), "%s", cmd->name);
-}
-
-void
-search_print_group(struct menu *mi, int listing)
-{
-	struct group_ctx	*gc = (struct group_ctx *)mi->ctx;
-
-	(void)snprintf(mi->print, sizeof(mi->print),
-	    (group_holds_only_hidden(gc)) ? "%d: [%s]" : "%d: %s",
-	    gc->num, gc->name);
-}
-
-void
-search_print_text(struct menu *mi, int listing)
-{
-	(void)snprintf(mi->print, sizeof(mi->print), "%s", mi->text);
-}
-
-void
-search_print_wm(struct menu *mi, int listing)
-{
-	struct cmd_ctx		*wm = (struct cmd_ctx *)mi->ctx;
-
-	(void)snprintf(mi->print, sizeof(mi->print), "%s [%s]",
-	    wm->name, wm->path);
+	size_t		 len, sublen;
+	unsigned int	 n, flen;
+
+	if (sub == NULL || str == NULL)
+		return(0);
+
+	len = strlen(str);
+	sublen = strlen(sub);
+
+	if (sublen > len)
+		return(0);
+
+	if (!zeroidx)
+		flen = len - sublen;
+	else
+		flen = 0;
+
+	for (n = 0; n <= flen; n++)
+		if (strncasecmp(sub, str + n, sublen) == 0)
+			return(1);
+
+	return(0);
 }

strlcat.c

@@ -0,0 +1,62 @@
+/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
+
+#include <sys/types.h>
+#include <string.h>
+#include "calmwm.h"
+
+#ifndef HAVE_STRLCAT
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+
+	return(dlen + (s - src));	/* count does not include NUL */
+}
+
+#endif /* !HAVE_STRLCAT */

strlcpy.c

@@ -0,0 +1,58 @@
+/*	$OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */
+
+#include <sys/types.h>
+#include <string.h>
+#include "calmwm.h"
+
+#ifndef HAVE_STRLCPY
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0 && --n != 0) {
+		do {
+			if ((*d++ = *s++) == 0)
+				break;
+		} while (--n != 0);
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}
+
+#endif /* !HAVE_STRLCPY */

strtonum.c

@@ -0,0 +1,70 @@
+/*	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $	*/
+
+/*
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtonum.c */
+
+#ifndef HAVE_STRTONUM
+#include <stdlib.h>
+#include <limits.h>
+#include <errno.h>
+
+#define INVALID 	1
+#define TOOSMALL 	2
+#define TOOLARGE 	3
+
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
+    const char **errstrp)
+{
+	long long ll = 0;
+	char *ep;
+	int error = 0;
+	struct errval {
+		const char *errstr;
+		int err;
+	} ev[4] = {
+		{ NULL,		0 },
+		{ "invalid",	EINVAL },
+		{ "too small",	ERANGE },
+		{ "too large",	ERANGE },
+	};
+
+	ev[0].err = errno;
+	errno = 0;
+	if (minval > maxval)
+		error = INVALID;
+	else {
+		ll = strtoll(numstr, &ep, 10);
+		if (numstr == ep || *ep != '\0')
+			error = INVALID;
+		else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
+			error = TOOSMALL;
+		else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
+			error = TOOLARGE;
+	}
+	if (errstrp != NULL)
+		*errstrp = ev[error].errstr;
+	errno = ev[error].err;
+	if (error)
+		ll = 0;
+
+	return (ll);
+}
+
+#endif /* HAVE_STRTONUM */

update.sh

@@ -0,0 +1 @@
+GIT_MERGE_AUTOEDIT=no git cvsimport -o master -v -k -m -d anoncvs@openbsd.cs.fau.de:/cvs xenocara/app/cwm

util.c

@@ -19,12 +19,11 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,7 +31,7 @@
 
 #include "calmwm.h"
 
-static void	 log_msg(const char *, va_list);
+#define MAXARGLEN 20
 
 void
 u_spawn(char *argstr)
@@ -40,7 +39,8 @@ u_spawn(char *argstr)
 	switch (fork()) {
 	case 0:
 		u_exec(argstr);
-		exit(1);
+		err(1, "%s", argstr);
+		break;
 	case -1:
 		warn("fork");
 	default:
@@ -51,10 +51,8 @@ u_spawn(char *argstr)
 void
 u_exec(char *argstr)
 {
-#define MAXARGLEN 20
 	char	*args[MAXARGLEN], **ap = args;
-	char	**end = &args[MAXARGLEN - 2], *tmp;
-	char	*s = argstr;
+	char	**end = &args[MAXARGLEN - 1], *tmp;
 
 	while (ap < end && (*ap = strsep(&argstr, " \t")) != NULL) {
 		if (**ap == '\0')
@@ -77,64 +75,8 @@ u_exec(char *argstr)
 			}
 		}
 	}
-	*ap = NULL;
 
+	*ap = NULL;
 	(void)setsid();
 	(void)execvp(args[0], args);
-	warn("%s", s);
-}
-
-char *
-u_argv(char * const *argv)
-{
-	size_t	 siz = 0;
-	int	 i;
-	char	*p;
-
-	if (argv == 0)
-		return NULL;
-
-	for (i = 0; argv[i]; i++)
-		siz += strlen(argv[i]) + 1;
-	if (siz == 0)
-		return NULL;
-
-	p = xmalloc(siz);
-	strlcpy(p, argv[0], siz);
-	for (i = 1; argv[i]; i++) {
-		strlcat(p, " ", siz);
-		strlcat(p, argv[i], siz);
-	}
-	return p;
-}
-
-static void
-log_msg(const char *msg, va_list ap)
-{
-	char	*fmt;
-
-	if (asprintf(&fmt, "%s\n", msg) == -1) {
-		vfprintf(stderr, msg, ap);
-		fprintf(stderr, "\n");
-	} else {
-		vfprintf(stderr, fmt, ap);
-		free(fmt);
-	}
-	fflush(stderr);
-}
-
-void
-log_debug(int level, const char *func, const char *msg, ...)
-{
-	char	*fmt;
-	va_list	 ap;
-
-	if (Conf.debug < level)
-		return;
-
-	va_start(ap, msg);
-	xasprintf(&fmt, "debug%d: %s: %s", level, func, msg);
-	log_msg(fmt, ap);
-	free(fmt);
-	va_end(ap);
 }

xevents.c

@@ -25,7 +25,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 
 #include <err.h>
 #include <errno.h>
@@ -69,28 +69,22 @@ void		(*xev_handlers[LASTEvent])(XEvent *) = {
 };
 
 static KeySym modkeys[] = { XK_Alt_L, XK_Alt_R, XK_Super_L, XK_Super_R,
-			    XK_Control_L, XK_Control_R, XK_ISO_Level3_Shift };
+			    XK_Control_L, XK_Control_R };
 
 static void
 xev_handle_maprequest(XEvent *ee)
 {
 	XMapRequestEvent	*e = &ee->xmaprequest;
-	struct screen_ctx	*sc;
-	struct client_ctx	*cc, *old_cc;
+	struct client_ctx	*cc = NULL, *old_cc;
 
-	LOG_DEBUG3("parent: 0x%lx window: 0x%lx", e->parent, e->window);
-
-	if ((sc = screen_find(e->parent)) == NULL)
-		return;
-
-	if ((old_cc = client_current(sc)) != NULL)
-		client_ptr_save(old_cc);
+	if ((old_cc = client_current()))
+		client_ptrsave(old_cc);
 
 	if ((cc = client_find(e->window)) == NULL)
 		cc = client_init(e->window, NULL);
 
 	if ((cc != NULL) && (!(cc->flags & CLIENT_IGNORE)))
-		client_ptr_warp(cc);
+		client_ptrwarp(cc);
 }
 
 static void
@@ -99,14 +93,12 @@ xev_handle_unmapnotify(XEvent *ee)
 	XUnmapEvent		*e = &ee->xunmap;
 	struct client_ctx	*cc;
 
-	LOG_DEBUG3("window: 0x%lx", e->window);
-
 	if ((cc = client_find(e->window)) != NULL) {
 		if (e->send_event) {
-			xu_set_wm_state(cc->win, WithdrawnState);
+			client_set_wm_state(cc, WithdrawnState);
 		} else {
 			if (!(cc->flags & CLIENT_HIDDEN))
-				client_remove(cc);
+				client_delete(cc);
 		}
 	}
 }
@@ -117,10 +109,8 @@ xev_handle_destroynotify(XEvent *ee)
 	XDestroyWindowEvent	*e = &ee->xdestroywindow;
 	struct client_ctx	*cc;
 
-	LOG_DEBUG3("window: 0x%lx", e->window);
-
 	if ((cc = client_find(e->window)) != NULL)
-		client_remove(cc);
+		client_delete(cc);
 }
 
 static void
@@ -131,8 +121,6 @@ xev_handle_configurerequest(XEvent *ee)
 	struct screen_ctx	*sc;
 	XWindowChanges		 wc;
 
-	LOG_DEBUG3("window: 0x%lx", e->window);
-
 	if ((cc = client_find(e->window)) != NULL) {
 		sc = cc->sc;
 
@@ -186,15 +174,13 @@ xev_handle_propertynotify(XEvent *ee)
 	struct screen_ctx	*sc;
 	struct client_ctx	*cc;
 
-	LOG_DEBUG3("window: 0x%lx", e->window);
-
 	if ((cc = client_find(e->window)) != NULL) {
 		switch (e->atom) {
 		case XA_WM_NORMAL_HINTS:
-			client_get_sizehints(cc);
+			client_getsizehints(cc);
 			break;
 		case XA_WM_NAME:
-			client_set_name(cc);
+			client_setname(cc);
 			break;
 		case XA_WM_HINTS:
 			client_wm_hints(cc);
@@ -202,19 +188,17 @@ xev_handle_propertynotify(XEvent *ee)
 			break;
 		case XA_WM_TRANSIENT_FOR:
 			client_transient(cc);
-			client_draw_border(cc);
-			if (cc->gc)
-				group_movetogroup(cc, cc->gc->num);
 			break;
 		default:
-			if (e->atom == ewmh[_NET_WM_NAME])
-				client_set_name(cc);
+			/* do nothing */
 			break;
 		}
 	} else {
-		if (e->atom == ewmh[_NET_DESKTOP_NAMES])  {
-			if ((sc = screen_find(e->window)) != NULL)
-				xu_ewmh_net_desktop_names(sc);
+		TAILQ_FOREACH(sc, &Screenq, entry) {
+			if (sc->rootwin == e->window) {
+				if (e->atom == ewmh[_NET_DESKTOP_NAMES])
+					xu_ewmh_net_desktop_names(sc);
+			}
 		}
 	}
 }
@@ -225,92 +209,67 @@ xev_handle_enternotify(XEvent *ee)
 	XCrossingEvent		*e = &ee->xcrossing;
 	struct client_ctx	*cc;
 
-	LOG_DEBUG3("window: 0x%lx", e->window);
-
 	Last_Event_Time = e->time;
 
 	if ((cc = client_find(e->window)) != NULL)
-		client_set_active(cc);
+		client_setactive(cc);
 }
 
+/* We can split this into two event handlers. */
 static void
 xev_handle_buttonpress(XEvent *ee)
 {
 	XButtonEvent		*e = &ee->xbutton;
-	struct client_ctx	*cc;
-	struct screen_ctx	*sc;
-	struct bind_ctx		*mb;
-
-	LOG_DEBUG3("root: 0x%lx window: 0x%lx subwindow: 0x%lx",
-	    e->root, e->window, e->subwindow);
-
-	if ((sc = screen_find(e->root)) == NULL)
-		return;
+	struct client_ctx	*cc, fakecc;
+	struct binding		*mb;
 
 	e->state &= ~IGNOREMODMASK;
 
-	TAILQ_FOREACH(mb, &Conf.mousebindq, entry) {
+	TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
 		if (e->button == mb->press.button && e->state == mb->modmask)
 			break;
 	}
+
 	if (mb == NULL)
 		return;
-	mb->cargs->xev = CWM_XEV_BTN;
-	switch (mb->context) {
-	case CWM_CONTEXT_CC:
+	if (mb->flags & CWM_WIN) {
 		if (((cc = client_find(e->window)) == NULL) &&
-		    ((cc = client_current(sc)) == NULL))
+		    (cc = client_current()) == NULL)
 			return;
-		(*mb->callback)(cc, mb->cargs);
-		break;
-	case CWM_CONTEXT_SC:
-		(*mb->callback)(sc, mb->cargs);
-		break;
-	case CWM_CONTEXT_NONE:
-		(*mb->callback)(NULL, mb->cargs);
-		break;
+	} else {
+		if (e->window != e->root)
+			return;
+		cc = &fakecc;
+		cc->sc = screen_find(e->window);
 	}
+
+	(*mb->callback)(cc, &mb->argument);
 }
 
 static void
 xev_handle_buttonrelease(XEvent *ee)
 {
-	XButtonEvent		*e = &ee->xbutton;
-	struct client_ctx	*cc;
+	struct client_ctx *cc;
 
-	LOG_DEBUG3("root: 0x%lx window: 0x%lx subwindow: 0x%lx",
-	    e->root, e->window, e->subwindow);
-
-	if ((cc = client_find(e->window)) != NULL) {
-		if (cc->flags & (CLIENT_ACTIVE | CLIENT_HIGHLIGHT)) {
-			cc->flags &= ~CLIENT_HIGHLIGHT;
-			client_draw_border(cc);
-		}
-	}
+	if ((cc = client_current()))
+		group_toggle_membership_leave(cc);
 }
 
 static void
 xev_handle_keypress(XEvent *ee)
 {
 	XKeyEvent		*e = &ee->xkey;
-	struct client_ctx	*cc;
-	struct screen_ctx	*sc;
-	struct bind_ctx		*kb;
+	struct client_ctx	*cc = NULL, fakecc;
+	struct binding		*kb;
 	KeySym			 keysym, skeysym;
 	unsigned int		 modshift;
 
-	LOG_DEBUG3("root: 0x%lx window: 0x%lx subwindow: 0x%lx",
-	    e->root, e->window, e->subwindow);
-
-	if ((sc = screen_find(e->root)) == NULL)
-		return;
-
 	keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0);
 	skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1);
 
 	e->state &= ~IGNOREMODMASK;
 
-	TAILQ_FOREACH(kb, &Conf.keybindq, entry) {
+	TAILQ_FOREACH(kb, &Conf.keybindingq, entry) {
 		if (keysym != kb->press.keysym && skeysym == kb->press.keysym)
 			modshift = ShiftMask;
 		else
@@ -319,26 +278,22 @@ xev_handle_keypress(XEvent *ee)
 		if ((kb->modmask | modshift) != e->state)
 			continue;
 
-		if (kb->press.keysym == ((modshift == 0) ? keysym : skeysym))
+		if (kb->press.keysym == (modshift == 0 ? keysym : skeysym))
 			break;
 	}
+
 	if (kb == NULL)
 		return;
-	kb->cargs->xev = CWM_XEV_KEY;
-	switch (kb->context) {
-	case CWM_CONTEXT_CC:
-		if (((cc = client_find(e->subwindow)) == NULL) &&
-		    ((cc = client_current(sc)) == NULL))
+	if (kb->flags & CWM_WIN) {
+		if (((cc = client_find(e->window)) == NULL) &&
+		    (cc = client_current()) == NULL)
 			return;
-		(*kb->callback)(cc, kb->cargs);
-		break;
-	case CWM_CONTEXT_SC:
-		(*kb->callback)(sc, kb->cargs);
-		break;
-	case CWM_CONTEXT_NONE:
-		(*kb->callback)(NULL, kb->cargs);
-		break;
+	} else {
+		cc = &fakecc;
+		cc->sc = screen_find(e->window);
 	}
+
+	(*kb->callback)(cc, &kb->argument);
 }
 
 /*
@@ -349,30 +304,15 @@ xev_handle_keyrelease(XEvent *ee)
 {
 	XKeyEvent		*e = &ee->xkey;
 	struct screen_ctx	*sc;
-	struct client_ctx	*cc;
 	KeySym			 keysym;
 	unsigned int		 i;
 
-	LOG_DEBUG3("root: 0x%lx window: 0x%lx subwindow: 0x%lx",
-	    e->root, e->window, e->subwindow);
-
-	if ((sc = screen_find(e->root)) == NULL)
-		return;
+	sc = screen_find(e->root);
 
 	keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0);
 	for (i = 0; i < nitems(modkeys); i++) {
 		if (keysym == modkeys[i]) {
-			if ((cc = client_current(sc)) != NULL) {
-				if (sc->cycling) {
-					sc->cycling = 0;
-					client_mtf(cc);
-				}
-				if (cc->flags & CLIENT_HIGHLIGHT) {
-					cc->flags &= ~CLIENT_HIGHLIGHT;
-					client_draw_border(cc);
-				}
-			}
-			XUngrabKeyboard(X_Dpy, CurrentTime);
+			client_cycle_leave(sc);
 			break;
 		}
 	}
@@ -385,66 +325,58 @@ xev_handle_clientmessage(XEvent *ee)
 	struct client_ctx	*cc, *old_cc;
 	struct screen_ctx       *sc;
 
-	LOG_DEBUG3("window: 0x%lx", e->window);
+	sc = screen_find(e->window);
 
-	if (e->message_type == cwmh[WM_CHANGE_STATE]) {
-		if ((cc = client_find(e->window)) != NULL) {
-	    		if (e->data.l[0] == IconicState)
-				client_hide(cc);
-		}
-	} else if (e->message_type == ewmh[_NET_CLOSE_WINDOW]) {
-		if ((cc = client_find(e->window)) != NULL) {
-			client_close(cc);
-		}
-	} else if (e->message_type == ewmh[_NET_ACTIVE_WINDOW]) {
-		if ((cc = client_find(e->window)) != NULL) {
-			if ((old_cc = client_current(NULL)) != NULL)
-				client_ptr_save(old_cc);
-			client_show(cc);
-			client_ptr_warp(cc);
-		}
-	} else if (e->message_type == ewmh[_NET_WM_DESKTOP]) {
-		if ((cc = client_find(e->window)) != NULL) {
-			/*
-			 * The EWMH spec states that if the cardinal returned
-			 * is 0xFFFFFFFF (-1) then the window should appear
-			 * on all desktops, in our case, group 0.
-			 */
-			if (e->data.l[0] == (unsigned long)-1)
-				group_movetogroup(cc, 0);
-			else
-				if (e->data.l[0] >= 0 &&
-				    e->data.l[0] < Conf.ngroups)
-					group_movetogroup(cc, e->data.l[0]);
-		}
-	} else if (e->message_type == ewmh[_NET_WM_STATE]) {
-		if ((cc = client_find(e->window)) != NULL) {
-			xu_ewmh_handle_net_wm_state_msg(cc,
-			    e->data.l[0], e->data.l[1], e->data.l[2]);
-		}
-	} else if (e->message_type == ewmh[_NET_CURRENT_DESKTOP]) {
-		if ((sc = screen_find(e->window)) != NULL) {
-			if (e->data.l[0] >= 0 &&
-			    e->data.l[0] < Conf.ngroups)
-				group_only(sc, e->data.l[0]);
-		}
+	if ((cc = client_find(e->window)) == NULL && e->window != sc->rootwin)
+		return;
+
+	if (e->message_type == cwmh[WM_CHANGE_STATE] && e->format == 32 &&
+	    e->data.l[0] == IconicState)
+		client_hide(cc);
+
+	if (e->message_type == ewmh[_NET_CLOSE_WINDOW])
+		client_send_delete(cc);
+
+	if (e->message_type == ewmh[_NET_ACTIVE_WINDOW] && e->format == 32) {
+		if ((old_cc = client_current()))
+			client_ptrsave(old_cc);
+		client_ptrwarp(cc);
 	}
+
+	if (e->message_type == ewmh[_NET_WM_DESKTOP] && e->format == 32) {
+		/*
+		 * The EWMH spec states that if the cardinal returned is
+		 * 0xFFFFFFFF (-1) then the window should appear on all
+		 * desktops, which in our case is assigned to group 0.
+		 */
+		if (e->data.l[0] == (unsigned long)-1)
+			group_movetogroup(cc, 0);
+		else
+			group_movetogroup(cc, e->data.l[0]);
+	}
+
+	if (e->message_type == ewmh[_NET_WM_STATE] && e->format == 32)
+		xu_ewmh_handle_net_wm_state_msg(cc,
+		    e->data.l[0], e->data.l[1], e->data.l[2]);
+
+	if (e->message_type == ewmh[_NET_CURRENT_DESKTOP] && e->format == 32)
+		group_only(sc, e->data.l[0]);
 }
 
 static void
 xev_handle_randr(XEvent *ee)
 {
-	XRRScreenChangeNotifyEvent	*e = (XRRScreenChangeNotifyEvent *)ee;
+	XRRScreenChangeNotifyEvent	*rev = (XRRScreenChangeNotifyEvent *)ee;
 	struct screen_ctx		*sc;
+	int				 i;
 
-	LOG_DEBUG3("size: %d/%d", e->width, e->height);
-
-	if ((sc = screen_find(e->root)) == NULL)
-		return;
-
-	XRRUpdateConfiguration(ee);
-	screen_update_geometry(sc);
-	screen_assert_clients_within(sc);
+	i = XRRRootToScreen(X_Dpy, rev->root);
+	TAILQ_FOREACH(sc, &Screenq, entry) {
+		if (sc->which == i) {
+			XRRUpdateConfiguration(ee);
+			screen_update_geometry(sc);
+		}
+	}
 }
 
 /*
@@ -457,8 +389,6 @@ xev_handle_mappingnotify(XEvent *ee)
 	XMappingEvent		*e = &ee->xmapping;
 	struct screen_ctx	*sc;
 
-	LOG_DEBUG3("window: 0x%lx", e->window);
-
 	XRefreshKeyboardMapping(e);
 	if (e->request == MappingKeyboard) {
 		TAILQ_FOREACH(sc, &Screenq, entry)
@@ -472,8 +402,6 @@ xev_handle_expose(XEvent *ee)
 	XExposeEvent		*e = &ee->xexpose;
 	struct client_ctx	*cc;
 
-	LOG_DEBUG3("window: 0x%lx", e->window);
-
 	if ((cc = client_find(e->window)) != NULL && e->count == 0)
 		client_draw_border(cc);
 }
@@ -483,11 +411,9 @@ xev_process(void)
 {
 	XEvent		 e;
 
-	while (XPending(X_Dpy)) {
-		XNextEvent(X_Dpy, &e);
-		if ((e.type - Conf.xrandr_event_base) == RRScreenChangeNotify)
-			xev_handle_randr(&e);
-		else if ((e.type < LASTEvent) && (xev_handlers[e.type] != NULL))
-			(*xev_handlers[e.type])(&e);
-	}
+	XNextEvent(X_Dpy, &e);
+	if (e.type - Randr_ev == RRScreenChangeNotify)
+		xev_handle_randr(&e);
+	else if (e.type < LASTEvent && xev_handlers[e.type] != NULL)
+		(*xev_handlers[e.type])(&e);
 }

xmalloc.c

@@ -19,7 +19,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 
 #include <err.h>
 #include <errno.h>
@@ -43,7 +43,7 @@ xmalloc(size_t siz)
 	if ((p = malloc(siz)) == NULL)
 		err(1, "malloc");
 
-	return p;
+	return(p);
 }
 
 void *
@@ -58,19 +58,7 @@ xcalloc(size_t no, size_t siz)
 	if ((p = calloc(no, siz)) == NULL)
 		err(1, "calloc");
 
-	return p;
-}
-
-void *
-xreallocarray(void *ptr, size_t nmemb, size_t size)
-{
-	void	*p;
-
-	p = reallocarray(ptr, nmemb, size);
-	if (p == NULL)
-		errx(1, "xreallocarray: out of memory (new_size %zu bytes)",
-		    nmemb * size);
-	return p;
+	return(p);
 }
 
 char *
@@ -81,7 +69,7 @@ xstrdup(const char *str)
 	if ((p = strdup(str)) == NULL)
 		err(1, "strdup");
 
-	return p;
+	return(p);
 }
 
 int
@@ -91,20 +79,11 @@ xasprintf(char **ret, const char *fmt, ...)
 	int	 i;
 
 	va_start(ap, fmt);
-	i = xvasprintf(ret, fmt, ap);
+	i = vasprintf(ret, fmt, ap);
 	va_end(ap);
 
-	return i;
-}
-
-int
-xvasprintf(char **ret, const char *fmt, va_list ap)
-{
-	int	 i;
-
-	i = vasprintf(ret, fmt, ap);
-	if (i == -1)
-		err(1, "vasprintf");
-
-	return i;
+	if (i < 0 || *ret == NULL)
+		err(1, "asprintf");
+
+	return(i);
 }

xutil.c

@@ -19,7 +19,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
+#include "queue.h"
 
 #include <err.h>
 #include <errno.h>
@@ -31,8 +31,70 @@
 
 #include "calmwm.h"
 
+static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };
+
 void
-xu_ptr_get(Window win, int *x, int *y)
+xu_btn_grab(Window win, int mask, unsigned int btn)
+{
+	unsigned int	i;
+
+	for (i = 0; i < nitems(ign_mods); i++)
+		XGrabButton(X_Dpy, btn, (mask | ign_mods[i]), win,
+		    False, BUTTONMASK, GrabModeAsync,
+		    GrabModeSync, None, None);
+}
+
+void
+xu_btn_ungrab(Window win)
+{
+	XUngrabButton(X_Dpy, AnyButton, AnyModifier, win);
+}
+
+void
+xu_key_grab(Window win, unsigned int mask, KeySym keysym)
+{
+	KeyCode		 code;
+	unsigned int	 i;
+
+	code = XKeysymToKeycode(X_Dpy, keysym);
+	if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) &&
+	    (XkbKeycodeToKeysym(X_Dpy, code, 0, 1) == keysym))
+		mask |= ShiftMask;
+
+	for (i = 0; i < nitems(ign_mods); i++)
+		XGrabKey(X_Dpy, code, (mask | ign_mods[i]), win,
+		    True, GrabModeAsync, GrabModeAsync);
+}
+
+void
+xu_key_ungrab(Window win)
+{
+	XUngrabKey(X_Dpy, AnyKey, AnyModifier, win);
+}
+
+int
+xu_ptr_grab(Window win, unsigned int mask, Cursor curs)
+{
+	return(XGrabPointer(X_Dpy, win, False, mask,
+	    GrabModeAsync, GrabModeAsync,
+	    None, curs, CurrentTime) == GrabSuccess ? 0 : -1);
+}
+
+int
+xu_ptr_regrab(unsigned int mask, Cursor curs)
+{
+	return(XChangeActivePointerGrab(X_Dpy, mask,
+	    curs, CurrentTime) == GrabSuccess ? 0 : -1);
+}
+
+void
+xu_ptr_ungrab(void)
+{
+	XUngrabPointer(X_Dpy, CurrentTime);
+}
+
+void
+xu_ptr_getpos(Window win, int *x, int *y)
 {
 	Window		 w0, w1;
 	int		 tmp0, tmp1;
@@ -42,13 +104,13 @@ xu_ptr_get(Window win, int *x, int *y)
 }
 
 void
-xu_ptr_set(Window win, int x, int y)
+xu_ptr_setpos(Window win, int x, int y)
 {
 	XWarpPointer(X_Dpy, None, win, 0, 0, 0, 0, x, y);
 }
 
 int
-xu_get_prop(Window win, Atom atm, Atom type, long len, unsigned char **p)
+xu_getprop(Window win, Atom atm, Atom type, long len, unsigned char **p)
 {
 	Atom		 realtype;
 	unsigned long	 n, extra;
@@ -56,16 +118,16 @@ xu_get_prop(Window win, Atom atm, Atom type, long len, unsigned char **p)
 
 	if (XGetWindowProperty(X_Dpy, win, atm, 0L, len, False, type,
 	    &realtype, &format, &n, &extra, p) != Success || *p == NULL)
-		return -1;
+		return(-1);
 
 	if (n == 0)
 		XFree(*p);
 
-	return n;
+	return(n);
 }
 
 int
-xu_get_strprop(Window win, Atom atm, char **text) {
+xu_getstrprop(Window win, Atom atm, char **text) {
 	XTextProperty	 prop;
 	char		**list;
 	int		 nitems = 0;
@@ -73,10 +135,8 @@ xu_get_strprop(Window win, Atom atm, char **text) {
 	*text = NULL;
 
 	XGetTextProperty(X_Dpy, win, &prop, atm);
-	if (!prop.nitems) {
-		XFree(prop.value);
-		return 0;
-	}
+	if (!prop.nitems)
+		return(0);
 
 	if (Xutf8TextPropertyToTextList(X_Dpy, &prop, &list,
 	    &nitems) == Success && nitems > 0 && *list) {
@@ -92,101 +152,10 @@ xu_get_strprop(Window win, Atom atm, char **text) {
 		}
 		XFreeStringList(list);
 	}
+
 	XFree(prop.value);
 
-	return nitems;
-}
-
-void
-xu_send_clientmsg(Window win, Atom proto, Time ts)
-{
-	XClientMessageEvent	 cm;
-
-	(void)memset(&cm, 0, sizeof(cm));
-	cm.type = ClientMessage;
-	cm.window = win;
-	cm.message_type = cwmh[WM_PROTOCOLS];
-	cm.format = 32;
-	cm.data.l[0] = proto;
-	cm.data.l[1] = ts;
-
-	XSendEvent(X_Dpy, win, False, NoEventMask, (XEvent *)&cm);
-}
-
-void
-xu_get_wm_state(Window win, long *state)
-{
-	long	*p;
-
-	*state = -1;
-	if (xu_get_prop(win, cwmh[WM_STATE], cwmh[WM_STATE], 2L,
-	    (unsigned char **)&p) > 0) {
-		*state = *p;
-		XFree(p);
-	}
-}
-
-void
-xu_set_wm_state(Window win, long state)
-{
-	long	 data[] = { state, None };
-
-	XChangeProperty(X_Dpy, win, cwmh[WM_STATE], cwmh[WM_STATE], 32,
-	    PropModeReplace, (unsigned char *)data, 2);
-}
-void
-xu_xorcolor(XftColor a, XftColor b, XftColor *r)
-{
-	r->pixel = a.pixel ^ b.pixel;
-	r->color.red = a.color.red ^ b.color.red;
-	r->color.green = a.color.green ^ b.color.green;
-	r->color.blue = a.color.blue ^ b.color.blue;
-	r->color.alpha = 0xffff;
-}
-
-void
-xu_atom_init(void)
-{
-	char *cwmhints[] = {
-		"WM_STATE",
-		"WM_DELETE_WINDOW",
-		"WM_TAKE_FOCUS",
-		"WM_PROTOCOLS",
-		"_MOTIF_WM_HINTS",
-		"UTF8_STRING",
-		"WM_CHANGE_STATE",
-	};
-	char *ewmhints[] = {
-		"_NET_SUPPORTED",
-		"_NET_SUPPORTING_WM_CHECK",
-		"_NET_ACTIVE_WINDOW",
-		"_NET_CLIENT_LIST",
-		"_NET_CLIENT_LIST_STACKING",
-		"_NET_NUMBER_OF_DESKTOPS",
-		"_NET_CURRENT_DESKTOP",
-		"_NET_DESKTOP_VIEWPORT",
-		"_NET_DESKTOP_GEOMETRY",
-		"_NET_VIRTUAL_ROOTS",
-		"_NET_SHOWING_DESKTOP",
-		"_NET_DESKTOP_NAMES",
-		"_NET_WORKAREA",
-		"_NET_WM_NAME",
-		"_NET_WM_DESKTOP",
-		"_NET_CLOSE_WINDOW",
-		"_NET_WM_STATE",
-		"_NET_WM_STATE_STICKY",
-		"_NET_WM_STATE_MAXIMIZED_VERT",
-		"_NET_WM_STATE_MAXIMIZED_HORZ",
-		"_NET_WM_STATE_HIDDEN",
-		"_NET_WM_STATE_FULLSCREEN",
-		"_NET_WM_STATE_DEMANDS_ATTENTION",
-		"_NET_WM_STATE_SKIP_PAGER",
-		"_NET_WM_STATE_SKIP_TASKBAR",
-		"_CWM_WM_STATE_FREEZE",
-	};
-
-	XInternAtoms(X_Dpy, cwmhints, nitems(cwmhints), False, cwmh);
-	XInternAtoms(X_Dpy, ewmhints, nitems(ewmhints), False, ewmh);
+	return(nitems);
 }
 
 /* Root Window Properties */
@@ -208,8 +177,8 @@ xu_ewmh_net_supported_wm_check(struct screen_ctx *sc)
 	XChangeProperty(X_Dpy, w, ewmh[_NET_SUPPORTING_WM_CHECK],
 	    XA_WINDOW, 32, PropModeReplace, (unsigned char *)&w, 1);
 	XChangeProperty(X_Dpy, w, ewmh[_NET_WM_NAME],
-	    cwmh[UTF8_STRING], 8, PropModeReplace,
-	    (unsigned char *)Conf.wmname, strlen(Conf.wmname));
+	    cwmh[UTF8_STRING], 8, PropModeReplace, (unsigned char *)WMNAME,
+	    strlen(WMNAME));
 }
 
 void
@@ -221,33 +190,22 @@ xu_ewmh_net_desktop_geometry(struct screen_ctx *sc)
 	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)geom , 2);
 }
 
-void
-xu_ewmh_net_desktop_viewport(struct screen_ctx *sc)
-{
-	long	 viewports[2] = {0, 0};
-
-	/* We don't support large desktops, so this is (0, 0). */
-	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_DESKTOP_VIEWPORT],
-	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)viewports, 2);
-}
-
 void
 xu_ewmh_net_workarea(struct screen_ctx *sc)
 {
-	unsigned long	*workarea;
-	int		 i, ngroups = Conf.ngroups;
+	long	 workareas[CALMWM_NGROUPS][4];
+	int	 i;
 
-	workarea = xreallocarray(NULL, ngroups * 4, sizeof(unsigned long));
-	for (i = 0; i < ngroups; i++) {
-		workarea[4 * i + 0] = sc->work.x;
-		workarea[4 * i + 1] = sc->work.y;
-		workarea[4 * i + 2] = sc->work.w;
-		workarea[4 * i + 3] = sc->work.h;
+	for (i = 0; i < CALMWM_NGROUPS; i++) {
+		workareas[i][0] = sc->work.x;
+		workareas[i][1] = sc->work.y;
+		workareas[i][2] = sc->work.w;
+		workareas[i][3] = sc->work.h;
 	}
+
 	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_WORKAREA],
-	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)workarea,
-	    ngroups * 4);
-	free(workarea);
+	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)workareas,
+	    CALMWM_NGROUPS * 4);
 }
 
 void
@@ -262,7 +220,7 @@ xu_ewmh_net_client_list(struct screen_ctx *sc)
 	if (i == 0)
 		return;
 
-	winlist = xreallocarray(NULL, i, sizeof(*winlist));
+	winlist = xcalloc(i, sizeof(*winlist));
 	TAILQ_FOREACH(cc, &sc->clientq, entry)
 		winlist[j++] = cc->win;
 	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_CLIENT_LIST],
@@ -270,27 +228,6 @@ xu_ewmh_net_client_list(struct screen_ctx *sc)
 	free(winlist);
 }
 
-void
-xu_ewmh_net_client_list_stacking(struct screen_ctx *sc)
-{
-	struct client_ctx	*cc;
-	Window			*winlist;
-	int			 i = 0, j;
-
-	TAILQ_FOREACH(cc, &sc->clientq, entry)
-		i++;
-	if (i == 0)
-		return;
-
-	j = i;
-	winlist = xreallocarray(NULL, i, sizeof(*winlist));
-	TAILQ_FOREACH(cc, &sc->clientq, entry)
-		winlist[--j] = cc->win;
-	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_CLIENT_LIST_STACKING],
-	    XA_WINDOW, 32, PropModeReplace, (unsigned char *)winlist, i);
-	free(winlist);
-}
-
 void
 xu_ewmh_net_active_window(struct screen_ctx *sc, Window w)
 {
@@ -299,9 +236,19 @@ xu_ewmh_net_active_window(struct screen_ctx *sc, Window w)
 }
 
 void
-xu_ewmh_net_number_of_desktops(struct screen_ctx *sc)
+xu_ewmh_net_wm_desktop_viewport(struct screen_ctx *sc)
 {
-	long	 ndesks = Conf.ngroups;
+	long	 viewports[2] = {0, 0};
+
+	/* We don't support large desktops, so this is (0, 0). */
+	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_DESKTOP_VIEWPORT],
+	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)viewports, 2);
+}
+
+void
+xu_ewmh_net_wm_number_of_desktops(struct screen_ctx *sc)
+{
+	long	 ndesks = CALMWM_NGROUPS;
 
 	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_NUMBER_OF_DESKTOPS],
 	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&ndesks, 1);
@@ -347,7 +294,7 @@ xu_ewmh_net_desktop_names(struct screen_ctx *sc)
 
 	/* Let group names be overwritten if _NET_DESKTOP_NAMES is set. */
 
-	if ((j = xu_get_prop(sc->rootwin, ewmh[_NET_DESKTOP_NAMES],
+	if ((j = xu_getprop(sc->rootwin, ewmh[_NET_DESKTOP_NAMES],
 	    cwmh[UTF8_STRING], 0xffffff, (unsigned char **)&prop_ret)) > 0) {
 		prop_ret[j - 1] = '\0'; /* paranoia */
 		while (i < j) {
@@ -373,7 +320,7 @@ xu_ewmh_net_desktop_names(struct screen_ctx *sc)
 
 	TAILQ_FOREACH(gc, &sc->groupq, entry)
 		len += strlen(gc->name) + 1;
-	q = p = xreallocarray(NULL, len, sizeof(*p));
+	q = p = xcalloc(len, sizeof(*p));
 
 	tlen = len;
 	TAILQ_FOREACH(gc, &sc->groupq, entry) {
@@ -385,30 +332,16 @@ xu_ewmh_net_desktop_names(struct screen_ctx *sc)
 
 	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_DESKTOP_NAMES],
 	    cwmh[UTF8_STRING], 8, PropModeReplace, (unsigned char *)p, len);
-	free(p);
 }
 
 /* Application Window Properties */
-int
-xu_ewmh_get_net_wm_desktop(struct client_ctx *cc, long *n)
-{
-	long		*p;
-
-	if (xu_get_prop(cc->win, ewmh[_NET_WM_DESKTOP], XA_CARDINAL, 1L,
-	    (unsigned char **)&p) <= 0)
-		return 0;
-	*n = *p;
-	XFree(p);
-	return 1;
-}
-
 void
-xu_ewmh_set_net_wm_desktop(struct client_ctx *cc)
+xu_ewmh_net_wm_desktop(struct client_ctx *cc)
 {
 	long	 num = 0xffffffff;
 
-	if (cc->gc)
-		num = cc->gc->num;
+	if (cc->group)
+		num = cc->group->num;
 
 	XChangeProperty(X_Dpy, cc->win, ewmh[_NET_WM_DESKTOP],
 	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&num, 1);
@@ -419,15 +352,15 @@ xu_ewmh_get_net_wm_state(struct client_ctx *cc, int *n)
 {
 	Atom	*state, *p = NULL;
 
-	if ((*n = xu_get_prop(cc->win, ewmh[_NET_WM_STATE], XA_ATOM, 64L,
+	if ((*n = xu_getprop(cc->win, ewmh[_NET_WM_STATE], XA_ATOM, 64L,
 	    (unsigned char **)&p)) <= 0)
-		return NULL;
+		return(NULL);
 
-	state = xreallocarray(NULL, *n, sizeof(Atom));
+	state = xcalloc(*n, sizeof(Atom));
 	(void)memcpy(state, p, *n * sizeof(Atom));
 	XFree((char *)p);
 
-	return state;
+	return(state);
 }
 
 void
@@ -435,9 +368,9 @@ xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action,
     Atom first, Atom second)
 {
 	unsigned int i;
-	struct handlers {
-		Atom atom;
-		int flag;
+	static struct handlers {
+		int atom;
+		int property;
 		void (*toggle)(struct client_ctx *);
 	} handlers[] = {
 		{ _NET_WM_STATE_STICKY,
@@ -458,15 +391,6 @@ xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action,
 		{ _NET_WM_STATE_DEMANDS_ATTENTION,
 			CLIENT_URGENCY,
 			client_urgency },
-		{ _NET_WM_STATE_SKIP_PAGER,
-			CLIENT_SKIP_PAGER,
-			client_toggle_skip_pager},
-		{ _NET_WM_STATE_SKIP_TASKBAR,
-			CLIENT_SKIP_TASKBAR,
-			client_toggle_skip_taskbar},
-		{ _CWM_WM_STATE_FREEZE,
-			CLIENT_FREEZE,
-			client_toggle_freeze },
 	};
 
 	for (i = 0; i < nitems(handlers); i++) {
@@ -475,11 +399,11 @@ xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action,
 			continue;
 		switch (action) {
 		case _NET_WM_STATE_ADD:
-			if (!(cc->flags & handlers[i].flag))
+			if (!(cc->flags & handlers[i].property))
 				handlers[i].toggle(cc);
 			break;
 		case _NET_WM_STATE_REMOVE:
-			if (cc->flags & handlers[i].flag)
+			if (cc->flags & handlers[i].property)
 				handlers[i].toggle(cc);
 			break;
 		case _NET_WM_STATE_TOGGLE:
@@ -498,22 +422,16 @@ xu_ewmh_restore_net_wm_state(struct client_ctx *cc)
 	for (i = 0; i < n; i++) {
 		if (atoms[i] == ewmh[_NET_WM_STATE_STICKY])
 			client_toggle_sticky(cc);
-		if (atoms[i] == ewmh[_NET_WM_STATE_MAXIMIZED_VERT])
-			client_toggle_vmaximize(cc);
 		if (atoms[i] == ewmh[_NET_WM_STATE_MAXIMIZED_HORZ])
 			client_toggle_hmaximize(cc);
+		if (atoms[i] == ewmh[_NET_WM_STATE_MAXIMIZED_VERT])
+			client_toggle_vmaximize(cc);
 		if (atoms[i] == ewmh[_NET_WM_STATE_HIDDEN])
 			client_toggle_hidden(cc);
 		if (atoms[i] == ewmh[_NET_WM_STATE_FULLSCREEN])
 			client_toggle_fullscreen(cc);
 		if (atoms[i] == ewmh[_NET_WM_STATE_DEMANDS_ATTENTION])
 			client_urgency(cc);
-		if (atoms[i] == ewmh[_NET_WM_STATE_SKIP_PAGER])
-			client_toggle_skip_pager(cc);
-		if (atoms[i] == ewmh[_NET_WM_STATE_SKIP_TASKBAR])
-			client_toggle_skip_taskbar(cc);
-		if (atoms[i] == ewmh[_CWM_WM_STATE_FREEZE])
-			client_toggle_freeze(cc);
 	}
 	free(atoms);
 }
@@ -525,17 +443,14 @@ xu_ewmh_set_net_wm_state(struct client_ctx *cc)
 	int	 n, i, j;
 
 	oatoms = xu_ewmh_get_net_wm_state(cc, &n);
-	atoms = xreallocarray(NULL, (n + _NET_WM_STATES_NITEMS), sizeof(Atom));
+	atoms = xcalloc((n + _NET_WM_STATES_NITEMS), sizeof(Atom));
 	for (i = j = 0; i < n; i++) {
 		if (oatoms[i] != ewmh[_NET_WM_STATE_STICKY] &&
-		    oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_VERT] &&
 		    oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_HORZ] &&
+		    oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_VERT] &&
 		    oatoms[i] != ewmh[_NET_WM_STATE_HIDDEN] &&
 		    oatoms[i] != ewmh[_NET_WM_STATE_FULLSCREEN] &&
-		    oatoms[i] != ewmh[_NET_WM_STATE_DEMANDS_ATTENTION] &&
-		    oatoms[i] != ewmh[_NET_WM_STATE_SKIP_PAGER] &&
-		    oatoms[i] != ewmh[_NET_WM_STATE_SKIP_TASKBAR] &&
-		    oatoms[i] != ewmh[_CWM_WM_STATE_FREEZE])
+		    oatoms[i] != ewmh[_NET_WM_STATE_DEMANDS_ATTENTION])
 			atoms[j++] = oatoms[i];
 	}
 	free(oatoms);
@@ -546,19 +461,13 @@ xu_ewmh_set_net_wm_state(struct client_ctx *cc)
 	if (cc->flags & CLIENT_FULLSCREEN)
 		atoms[j++] = ewmh[_NET_WM_STATE_FULLSCREEN];
 	else {
-		if (cc->flags & CLIENT_VMAXIMIZED)
-			atoms[j++] = ewmh[_NET_WM_STATE_MAXIMIZED_VERT];
 		if (cc->flags & CLIENT_HMAXIMIZED)
 			atoms[j++] = ewmh[_NET_WM_STATE_MAXIMIZED_HORZ];
+		if (cc->flags & CLIENT_VMAXIMIZED)
+			atoms[j++] = ewmh[_NET_WM_STATE_MAXIMIZED_VERT];
 	}
 	if (cc->flags & CLIENT_URGENCY)
 		atoms[j++] = ewmh[_NET_WM_STATE_DEMANDS_ATTENTION];
-	if (cc->flags & CLIENT_SKIP_PAGER)
-		atoms[j++] = ewmh[_NET_WM_STATE_SKIP_PAGER];
-	if (cc->flags & CLIENT_SKIP_TASKBAR)
-		atoms[j++] = ewmh[_NET_WM_STATE_SKIP_TASKBAR];
-	if (cc->flags & CLIENT_FREEZE)
-		atoms[j++] = ewmh[_CWM_WM_STATE_FREEZE];
 	if (j > 0)
 		XChangeProperty(X_Dpy, cc->win, ewmh[_NET_WM_STATE],
 		    XA_ATOM, 32, PropModeReplace, (unsigned char *)atoms, j);
@@ -566,3 +475,31 @@ xu_ewmh_set_net_wm_state(struct client_ctx *cc)
 		XDeleteProperty(X_Dpy, cc->win, ewmh[_NET_WM_STATE]);
 	free(atoms);
 }
+
+void
+xu_xorcolor(XftColor a, XftColor b, XftColor *r)
+{
+	r->pixel = a.pixel ^ b.pixel;
+	r->color.red = a.color.red ^ b.color.red;
+	r->color.green = a.color.green ^ b.color.green;
+	r->color.blue = a.color.blue ^ b.color.blue;
+	r->color.alpha = 0xffff;
+}
+
+int
+xu_xft_width(XftFont *xftfont, const char *text, int len)
+{
+	XGlyphInfo	 extents;
+
+	XftTextExtentsUtf8(X_Dpy, xftfont, (const FcChar8*)text,
+	    len, &extents);
+
+	return(extents.xOff);
+}
+
+void
+xu_xft_draw(struct screen_ctx *sc, const char *text, int color, int x, int y)
+{
+	XftDrawStringUtf8(sc->xftdraw, &sc->xftcolor[color], sc->xftfont,
+	    x, y, (const FcChar8*)text, strlen(text));
+}