Version 5.1

group_movetogroup() on one client will still increment nhidden if the
group is hidden.

found the hard way by Thomas Jeunet and fix from Alexander Polakov -
thanks to both!

ok oga@

Makefile

@@ -1,26 +1,47 @@
-# $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 input.c xevents.c group.c \
+		search.c util.c xutil.c conf.c xevents.c group.c \
 		kbfunc.c mousefunc.c font.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 font.o strlcpy.o strlcat.o y.tab.o \
+		strtonum.o fgetln.o
 
-CFLAGS+=	-Wall
+CPPFLAGS+=	`pkg-config --cflags fontconfig x11 xft xinerama xrandr`
 
-LDADD+=		-L${X11BASE}/lib -lXft -lXrender -lX11 -lXau -lXdmcp \
-		-lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
+CFLAGS=		-Wall -O2 -g
 
-MANDIR=		${X11BASE}/man/cat
-MAN=		cwm.1 cwmrc.5
+LDFLAGS+=	`pkg-config --libs fontconfig x11 xft xinerama xrandr`
 
-CLEANFILES=	cwm.cat1 cwmrc.cat5
+MANPREFIX=	${PREFIX}/share/man
 
-obj: _xenocara_obj
+all: ${PROG}
 
-.include <bsd.prog.mk>
-.include <bsd.xorg.mk>
+clean:
+	rm -rf ${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

README

@@ -1,58 +1,24 @@
---------------------------------------------------------------------------------
-cwm release three
---------------------------------------------------------------------------------
-   by Marius Aamodt Eriksen <marius@monkey.org>
-   contributions by Andy Adamson <dros@monkey.org>,
-                    Niels Provos <provos@monkey.org>,
-                    Martin Murray <mmurray@monkey.org>,
-                    Dimitris Economou <dimeco@stanford.edu> &
-                    Antti Nyk<79>nen <aon@iki.fi>.
+This is a port of OpenBSD's excellent cwm[0] to Linux and other
+Unices.
 
-   http://monkey.org/~marius/cwm
+    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.
 
-DESCRIPTION
+This port requires pkg-config, Xft, Xinerama and Xrandr.  The included
+Makefile should work with both GNU make and BSD make.
 
-   cwm is a window manager initially inspired by evilwm[1].  It
-   developed out of modifications to evilwm, but eventually the code
-   base of evilwm did not accomodate well for the new features added.
-   So calmwm was written from scratch.
+This version actively tracks changes in the OpenBSD CVS repository.
+Releases are roughly coordinated.
 
-   Its main goal is to be as efficient as possible, while providing
-   a very clean, simple & attractive aesthetic.
+The revision controlled version is at https://github.com/chneukirchen/cwm
+Releases can be found at http://chneukirchen.org/releases
 
-   cwm has several novel features, including the ability to search
-   for windows.
+ChangeLog:
 
-HIGHLIGHTS IN RELEASE TWO
+2012-05-02: First public release 5.1 of portable cwm.
 
-   * Improved alt-tabbing, including the ability to reverse cycle.
-   * Display of a context menu when alt-tabbing, showing the previous,
-     current and next window in the cycle order.
-   * Much improved ranking in search.
-   * In search-menus, the ability to list every item.
+--Christian Neukirchen <chneukirchen@gmail.com>
 
-HIGHLIGHTS IN RELEASE THREE
-
-   * More search ranking improvements
-   * Many contributions by Antti Nyk<79>nen: keyboard binding "i18n",
-     show window labels in minimized window menu, automatic window
-     grouping, MWM hints support & some bug fixes.
-   * Xft support & the addition of the -f flag (see manpage).
-
-INSTALL
-
-   ./configure
-   make
-   su
-   make install
-
-DOCUMENTATION
-
-   See the manpage cwm(1).
-
-LICENSE
-
-   cwm is distributed under a BSD like license. Please see the LICENSE
-   file or the top of any source file for more information.
-
-[1] http://evilwm.sourceforge.net/
+[0]: http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/

TODO

@@ -1,26 +0,0 @@
-- window initial position
-
-- don't map windows if it's within [some time increment] of active typing,
-  this is part of the "calm" goal.  also, it helps if you're mindlessly
-  typing in a password and the keyboard input ends up in some other window,
-  bad...
-
-- integrate everything into /ONE/ event loop.
-  register handlers, with the ability to select, for example,
-  a window, or an event, etc.  (no, maybe not...)
-
-- ignoreq, always lower them.  perhaps implement by lowering the entire
-  queue on each XLower...
-
-- search window should try to stay inside of the screen boundaries.
-
-- geographical keyboard navigation (window switching)
-
-- make kbd shortcuts/events more general.  the ability to associate an
-  event with a mode (i.e. prioritize).  gets rid of hacky-ness in
-  groups, etc.
-
-- figure out what's up when alt-tab goes back to the current window
-  once before moving on.
-
-- cache all the atoms somewhere.

calmwm.c

@@ -15,32 +15,42 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <getopt.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 Display				*X_Dpy;
 
-Cursor				 Cursor_move;
-Cursor				 Cursor_resize;
-Cursor				 Cursor_select;
 Cursor				 Cursor_default;
+Cursor				 Cursor_move;
+Cursor				 Cursor_normal;
 Cursor				 Cursor_question;
+Cursor				 Cursor_resize;
 
-struct screen_ctx_q		 Screenq;
-struct screen_ctx		*Curscreen;
-
-struct client_ctx_q		 Clientq;
+struct screen_ctx_q		 Screenq = TAILQ_HEAD_INITIALIZER(Screenq);
+struct client_ctx_q		 Clientq = TAILQ_HEAD_INITIALIZER(Clientq);
 
 int				 HasXinerama, HasRandr, Randr_ev;
-int				 Starting;
 struct conf			 Conf;
 
 static void	sigchld_cb(int);
 static void	dpy_init(const char *);
 static int	x_errorhandler(Display *, XErrorEvent *);
+static int	x_wmerrorhandler(Display *, XErrorEvent *);
 static void	x_setup(void);
 static void	x_setupscreen(struct screen_ctx *, u_int);
 static void	x_teardown(void);
@@ -70,18 +80,12 @@ main(int argc, char **argv)
 	if (signal(SIGCHLD, sigchld_cb) == SIG_ERR)
 		err(1, "signal");
 
-	Starting = 1;
 	dpy_init(display_name);
 
-	screen_init();
-	group_init();
-	client_init();
-
 	bzero(&Conf, sizeof(Conf));
 	conf_setup(&Conf, conf_file);
 	xu_getatoms();
 	x_setup();
-	Starting = 0;
 
 	xev_loop();
 
@@ -95,10 +99,15 @@ dpy_init(const char *dpyname)
 {
 	int	i;
 
+	XSetErrorHandler(x_errorhandler);
+
 	if ((X_Dpy = XOpenDisplay(dpyname)) == NULL)
 		errx(1, "unable to open display \"%s\"",
 		    XDisplayName(dpyname));
 
+	XSetErrorHandler(x_wmerrorhandler);
+	XSelectInput(X_Dpy, DefaultRootWindow(X_Dpy), SubstructureRedirectMask);
+	XSync(X_Dpy, False);
 	XSetErrorHandler(x_errorhandler);
 
 	HasRandr = XRRQueryExtension(X_Dpy, &Randr_ev, &i);
@@ -111,6 +120,12 @@ x_setup(void)
 	struct keybinding	*kb;
 	int			 i;
 
+	Cursor_default = XCreateFontCursor(X_Dpy, XC_X_cursor);
+	Cursor_move = XCreateFontCursor(X_Dpy, XC_fleur);
+	Cursor_normal = XCreateFontCursor(X_Dpy, XC_left_ptr);
+	Cursor_question = XCreateFontCursor(X_Dpy, XC_question_arrow);
+	Cursor_resize = XCreateFontCursor(X_Dpy, XC_bottom_right_corner);
+
 	for (i = 0; i < ScreenCount(X_Dpy); i++) {
 		sc = xcalloc(1, sizeof(*sc));
 		x_setupscreen(sc, i);
@@ -123,12 +138,6 @@ x_setup(void)
 	 */
 	TAILQ_FOREACH(kb, &Conf.keybindingq, entry)
 		conf_grab(&Conf, kb);
-
-	Cursor_move = XCreateFontCursor(X_Dpy, XC_fleur);
-	Cursor_resize = XCreateFontCursor(X_Dpy, XC_bottom_right_corner);
-	Cursor_select = XCreateFontCursor(X_Dpy, XC_hand1);
-	Cursor_default = XCreateFontCursor(X_Dpy, XC_X_cursor);
-	Cursor_question = XCreateFontCursor(X_Dpy, XC_question_arrow);
 }
 
 static void
@@ -150,24 +159,32 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
 	XSetWindowAttributes	 rootattr;
 	int			 fake;
 	u_int			 nwins, i;
-
-	Curscreen = sc;
-
 	sc->which = which;
 	sc->rootwin = RootWindow(X_Dpy, sc->which);
-	sc->xmax = DisplayWidth(X_Dpy, sc->which);
-	sc->ymax = DisplayHeight(X_Dpy, sc->which);
 
-	conf_color(&Conf);
+	conf_gap(&Conf, sc);
+	screen_update_geometry(sc, DisplayWidth(X_Dpy, sc->which),
+	    DisplayHeight(X_Dpy, sc->which));
 
-	font_init(sc);
-	conf_font(&Conf);
+	conf_color(&Conf, sc);
+
+	group_init(sc);
+	conf_font(&Conf, sc);
 
 	TAILQ_INIT(&sc->mruq);
 
 	/* Initialize menu window. */
 	menu_init(sc);
 
+	xu_setwmname(sc);
+
+	rootattr.cursor = Cursor_normal;
+	rootattr.event_mask = CHILDMASK|PropertyChangeMask|EnterWindowMask|
+	    LeaveWindowMask|ColormapChangeMask|BUTTONMASK;
+
+	XChangeWindowAttributes(X_Dpy, sc->rootwin,
+	    CWEventMask|CWCursor, &rootattr);
+
 	/* Deal with existing clients. */
 	XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins);
 
@@ -176,17 +193,11 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
 		if (winattr.override_redirect ||
 		    winattr.map_state != IsViewable)
 			continue;
-		client_new(wins[i], sc, winattr.map_state != IsUnmapped);
+		(void)client_new(wins[i], sc, winattr.map_state != IsUnmapped);
 	}
 	XFree(wins);
 
-	screen_updatestackingorder();
-
-	rootattr.event_mask = ChildMask|PropertyChangeMask|EnterWindowMask|
-	    LeaveWindowMask|ColormapChangeMask|ButtonMask;
-
-	XChangeWindowAttributes(X_Dpy, sc->rootwin,
-	    CWEventMask, &rootattr);
+	screen_updatestackingorder(sc);
 
 	if (XineramaQueryExtension(X_Dpy, &fake, &fake) == 1 &&
 	    ((HasXinerama = XineramaIsActive(X_Dpy)) == 1))
@@ -203,28 +214,26 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
 	XSync(X_Dpy, False);
 }
 
+static int
+x_wmerrorhandler(Display *dpy, XErrorEvent *e)
+{
+	errx(1, "root window unavailable - perhaps another wm is running?");
+
+	return (0);
+}
 static int
 x_errorhandler(Display *dpy, XErrorEvent *e)
 {
-#ifdef DEBUG
-	{
-		char msg[80], number[80], req[80];
+#if DEBUG
+	char msg[80], number[80], req[80];
 
-		XGetErrorText(X_Dpy, e->error_code, msg, sizeof(msg));
-		snprintf(number, sizeof(number), "%d", e->request_code);
-		XGetErrorDatabaseText(X_Dpy, "XRequest", number,
-		    "<unknown>", req, sizeof(req));
+	XGetErrorText(X_Dpy, e->error_code, msg, sizeof(msg));
+	(void)snprintf(number, sizeof(number), "%d", e->request_code);
+	XGetErrorDatabaseText(X_Dpy, "XRequest", number,
+	    "<unknown>", req, sizeof(req));
 
-		warnx("%s(0x%x): %s", req, (u_int)e->resourceid, msg);
-	}
+	warnx("%s(0x%x): %s", req, (u_int)e->resourceid, msg);
 #endif
-
-	if (Starting &&
-	    e->error_code == BadAccess &&
-	    e->request_code == X_GrabKey)
-		errx(1, "root window unavailable - perhaps another "
-		    "wm is running?");
-
 	return (0);
 }
 
@@ -248,6 +257,7 @@ usage(void)
 {
 	extern char	*__progname;
 
-	fprintf(stderr, "usage: %s [-c file] [-d display]\n", __progname);
+	(void)fprintf(stderr, "usage: %s [-c file] [-d display]\n",
+	    __progname);
 	exit(1);
 }

calmwm.h

@@ -15,200 +15,74 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
 #ifndef _CALMWM_H_
 #define _CALMWM_H_
 
-#define CALMWM_MAXNAMELEN 256
+/* ugly stuff */
+#ifndef TAILQ_END
+#define TAILQ_END(head) NULL
+#endif
+#ifndef __dead
+#define __dead
+#endif
+char *fgetln(FILE *, size_t *);
+long long strtonum(const char *, long long, long long, const char **);
+size_t strlcpy(char *, const char *, size_t);
+size_t strlcat(char *, const char *, size_t);
+
+#include <X11/Xatom.h>
+#include <X11/Xft/Xft.h>
+#include <X11/Xlib.h>
+#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>
 
 #undef MIN
 #undef MAX
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
 
+#ifndef nitems
+#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
+#endif
+
 #define	CONFFILE	".cwmrc"
+#define	WMNAME	 	"CWM"
 
-#define ChildMask	(SubstructureRedirectMask|SubstructureNotifyMask)
-#define ButtonMask	(ButtonPressMask|ButtonReleaseMask)
-#define MouseMask	(ButtonMask|PointerMotionMask)
-#define KeyMask		(KeyPressMask|ExposureMask)
-#define MenuMask 	(ButtonMask|ButtonMotionMask|ExposureMask| \
+#define CHILDMASK	(SubstructureRedirectMask|SubstructureNotifyMask)
+#define BUTTONMASK	(ButtonPressMask|ButtonReleaseMask)
+#define MOUSEMASK	(BUTTONMASK|PointerMotionMask)
+#define KEYMASK		(KeyPressMask|ExposureMask)
+#define MENUMASK 	(BUTTONMASK|ButtonMotionMask|ExposureMask| \
 			PointerMotionMask)
-#define MenuGrabMask	(ButtonMask|ButtonMotionMask|StructureNotifyMask|\
+#define MENUGRABMASK	(BUTTONMASK|ButtonMotionMask|StructureNotifyMask|\
 			PointerMotionMask)
-#define SearchMask	(KeyPressMask|ExposureMask)
+#define SEARCHMASK	(KeyPressMask|ExposureMask)
 
-enum cwmcolor {
-	CWM_COLOR_BORDOR_ACTIVE,
-	CWM_COLOR_BORDER_INACTIVE,
-	CWM_COLOR_BORDER_GROUP,
-	CWM_COLOR_BORDER_UNGROUP,
-	CWM_COLOR_FG_MENU,
-	CWM_COLOR_BG_MENU,
-	CWM_COLOR_MAX
-};
+/* 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
 
-struct color {
-	unsigned long	 pixel;
-	char		*name;
-};
+/* exec */
+#define	CWM_EXEC_PROGRAM	0x0001
+#define	CWM_EXEC_WM		0x0002
 
-struct client_ctx;
-
-TAILQ_HEAD(cycle_entry_q, client_ctx);
-
-struct screen_ctx {
-	TAILQ_ENTRY(screen_ctx)	entry;
-
-	u_int		 which;
-	Window		 rootwin;
-	Window		 menuwin;
-
-	struct color	 color[CWM_COLOR_MAX];
-	GC		 gc;
-
-	int		 altpersist;
-
-	int		 xmax;
-	int		 ymax;
-
-	struct cycle_entry_q mruq;
-
-	XftDraw		*xftdraw;
-	XftColor	 xftcolor;
-
-	int		 xinerama_no;
-	XineramaScreenInfo *xinerama;
-};
-
-TAILQ_HEAD(screen_ctx_q, screen_ctx);
-
-#define CLIENT_PROTO_DELETE	0x01
-#define CLIENT_PROTO_TAKEFOCUS	0x02
-
-#define CLIENT_MAXNAMEQLEN	5
-
-#define CLIENT_HIDDEN		0x01
-#define CLIENT_IGNORE		0x02
-#define CLIENT_DOMAXIMIZE	0x04
-#define CLIENT_MAXIMIZED	0x08
-#define CLIENT_DOVMAXIMIZE	0x10
-#define CLIENT_VMAXIMIZED	0x20
-
-#define CLIENT_HIGHLIGHT_GROUP		1
-#define CLIENT_HIGHLIGHT_UNGROUP	2
-
-struct winname {
-	TAILQ_ENTRY(winname)	 entry;
-	char			*name;
-};
-
-TAILQ_HEAD(winname_q, winname);
-
-struct client_ctx {
-	TAILQ_ENTRY(client_ctx) entry;
-	TAILQ_ENTRY(client_ctx) searchentry;
-	TAILQ_ENTRY(client_ctx) group_entry;
-	TAILQ_ENTRY(client_ctx) mru_entry;
-
-	struct screen_ctx	*sc;
-	Window			 win;
-	XSizeHints		*size;
-
-	Colormap		 cmap;
-
-	u_int			 bwidth;
-	struct {
-		int		 x, y, width, height;
-		int		 min_dx, min_dy;
-	} geom, savegeom;
-
-	struct {
-		int		 x,y;
-	} ptr;
-
-	int			 xproto;
-
-	int			 flags;
-	int			 state;
-	char			*name;
-	struct winname_q	 nameq;
-	size_t			 nameqlen;
-
-	char			*label;
-	int			 active;
-	int			 highlight;
-
-	char			*matchname;
-	struct group_ctx	*group;
-
-	int			stackingorder;
-
-	char			*app_class;
-	char			*app_name;
-	char			*app_cliarg;
-};
-
-TAILQ_HEAD(client_ctx_q, client_ctx);
-
-extern const char *shortcut_to_name[];
-
-struct group_ctx {
-	TAILQ_ENTRY(group_ctx)	 entry;
-	struct client_ctx_q	 clients;
-	const char		*name;
-	int			 shortcut;
-	int			 hidden;
-	int			 nhidden;
-	int			 highstack;
-};
-
-TAILQ_HEAD(group_ctx_q, group_ctx);
-
-/* Autogroups */
-struct autogroupwin {
-	TAILQ_ENTRY(autogroupwin) entry;
-
-	char	*class;
-	char	*name;
-	char	*group;
-};
-
-TAILQ_HEAD(autogroupwin_q, autogroupwin);
-
-#define CWM_MOVE	0x01
-#define CWM_RESIZE	0x02
-#define CWM_PTRMOVE	0x04
-#define CWM_BIGMOVE	0x08
-#define CWM_UP		0x10
-#define CWM_DOWN	0x20
-#define CWM_LEFT	0x40
-#define CWM_RIGHT	0x80
-
-/*
- * Match a window.
- */
-#define CONF_MAX_WINTITLE	256
-struct winmatch {
-	TAILQ_ENTRY(winmatch)	entry;
-	char			title[CONF_MAX_WINTITLE];
-};
-
-TAILQ_HEAD(winmatch_q, winmatch);
-
-/* for cwm_exec */
-#define	CWM_EXEC_PROGRAM	0x1
-#define	CWM_EXEC_WM		0x2
-/* for alt-tab */
-#define CWM_CYCLE		0x0
-#define CWM_RCYCLE		0x1
-/* for group cycle */
-#define CWM_CYCLEGROUP		0x0
-#define CWM_RCYCLEGROUP		0x1
-
-#define KBFLAG_NEEDCLIENT 0x01
+/* cycle */
+#define CWM_CYCLE		0x0001
+#define CWM_RCYCLE		0x0002
+#define CWM_INGROUP		0x0004
 
 #define KBTOGROUP(X) ((X) - 1)
 
@@ -217,6 +91,149 @@ union arg {
 	int	 i;
 };
 
+enum cwmcolor {
+	CWM_COLOR_BORDER_ACTIVE,
+	CWM_COLOR_BORDER_INACTIVE,
+	CWM_COLOR_BORDER_GROUP,
+	CWM_COLOR_BORDER_UNGROUP,
+	CWM_COLOR_FG_MENU,
+	CWM_COLOR_BG_MENU,
+	CWM_COLOR_FONT,
+	CWM_COLOR_MAX
+};
+
+struct color {
+	char		*name;
+	unsigned long	 pixel;
+};
+
+struct gap {
+	int		 top;
+	int		 bottom;
+	int		 left;
+	int		 right;
+};
+
+struct winname {
+	TAILQ_ENTRY(winname)	 entry;
+	char			*name;
+};
+TAILQ_HEAD(winname_q, winname);
+
+struct client_ctx {
+	TAILQ_ENTRY(client_ctx) entry;
+	TAILQ_ENTRY(client_ctx) group_entry;
+	TAILQ_ENTRY(client_ctx) mru_entry;
+	struct screen_ctx	*sc;
+	Window			 win;
+	XSizeHints		*size;
+	Colormap		 cmap;
+	u_int			 bwidth; /* border width */
+	struct {
+		int		 x;	/* x position */
+		int		 y;	/* y position */
+		int		 width;	/* width */
+		int		 height;/* height */
+	} geom, savegeom;
+	struct {
+		int		 basew;	/* desired width */
+		int		 baseh;	/* desired height */
+		int		 minw;	/* minimum width */
+		int		 minh;	/* minimum height */
+		int		 maxw;	/* maximum width */
+		int		 maxh;	/* maximum height */
+		int		 incw;	/* width increment progression */
+		int		 inch;	/* height increment progression */
+		float		 mina;	/* minimum aspect ratio */
+		float		 maxa;	/* maximum aspect ratio */
+	} hint;
+	struct {
+		int		 x;	/* x position */
+		int		 y;	/* y position */
+	} ptr;
+#define CLIENT_PROTO_DELETE		 0x0001
+#define CLIENT_PROTO_TAKEFOCUS		 0x0002
+	int			 xproto;
+#define CLIENT_HIDDEN			0x0001
+#define CLIENT_IGNORE			0x0002
+#define CLIENT_VMAXIMIZED		0x0004
+#define CLIENT_HMAXIMIZED		0x0008
+#define CLIENT_FREEZE			0x0010
+
+#define CLIENT_MAXFLAGS			(CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
+#define CLIENT_MAXIMIZED		(CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
+	int			 flags;
+	int			 state;
+	int			 active;
+	int			 stackingorder;
+#define CLIENT_HIGHLIGHT_GROUP		0x0001
+#define CLIENT_HIGHLIGHT_UNGROUP	0x0002
+	int			 highlight;
+	struct winname_q	 nameq;
+#define CLIENT_MAXNAMEQLEN		5
+	int			 nameqlen;
+	char			*name;
+	char			*label;
+	char			*matchname;
+	struct group_ctx	*group;
+	char			*app_class;
+	char			*app_name;
+};
+TAILQ_HEAD(client_ctx_q, client_ctx);
+TAILQ_HEAD(cycle_entry_q, client_ctx);
+
+struct winmatch {
+	TAILQ_ENTRY(winmatch)	entry;
+#define WIN_MAXTITLELEN		256
+	char			title[WIN_MAXTITLELEN];
+};
+TAILQ_HEAD(winmatch_q, winmatch);
+
+struct group_ctx {
+	TAILQ_ENTRY(group_ctx)	 entry;
+	struct client_ctx_q	 clients;
+	int			 shortcut;
+	int			 hidden;
+	int			 nhidden;
+	int			 highstack;
+};
+TAILQ_HEAD(group_ctx_q, group_ctx);
+
+struct autogroupwin {
+	TAILQ_ENTRY(autogroupwin)	 entry;
+	char				*class;
+	char				*name;
+	int 				 num;
+};
+TAILQ_HEAD(autogroupwin_q, autogroupwin);
+
+struct screen_ctx {
+	TAILQ_ENTRY(screen_ctx)	 entry;
+	u_int			 which;
+	Window			 rootwin;
+	Window			 menuwin;
+	struct color		 color[CWM_COLOR_MAX];
+	GC			 gc;
+	int			 altpersist;
+	int			 xmax;
+	int			 ymax;
+	struct gap		 gap;
+	struct cycle_entry_q	 mruq;
+	XftColor		 xftcolor;
+	XftDraw			*xftdraw;
+	XftFont			*font;
+	int			 xinerama_no;
+	XineramaScreenInfo	*xinerama;
+#define CALMWM_NGROUPS		 9
+	struct group_ctx	 groups[CALMWM_NGROUPS];
+	struct group_ctx_q	 groupq;
+	int			 group_hideall;
+	int			 group_nonames;
+	struct group_ctx	*group_active;
+	char 			**group_names;
+};
+TAILQ_HEAD(screen_ctx_q, screen_ctx);
+
 struct keybinding {
 	TAILQ_ENTRY(keybinding)	 entry;
 	void			(*callback)(struct client_ctx *, union arg *);
@@ -224,33 +241,43 @@ struct keybinding {
 	int			 modmask;
 	int			 keysym;
 	int			 keycode;
+#define KBFLAG_NEEDCLIENT	 0x0001
 	int			 flags;
 };
+TAILQ_HEAD(keybinding_q, keybinding);
+
+struct mousebinding {
+	TAILQ_ENTRY(mousebinding)	entry;
+	void			 	(*callback)(struct client_ctx *, void *);
+	int				modmask;
+	int			 	button;
+#define MOUSEBIND_CTX_ROOT		0x0001
+#define MOUSEBIND_CTX_WIN		0x0002
+	int				context;
+};
+TAILQ_HEAD(mousebinding_q, mousebinding);
 
 struct cmd {
 	TAILQ_ENTRY(cmd)	entry;
 	int			flags;
 	char			image[MAXPATHLEN];
-	char			label[256];
-	/* (argv) */
+#define CMD_MAXLABELLEN		256
+	char			label[CMD_MAXLABELLEN];
 };
-
-struct mousebinding {
-	int				modmask;
-	int			 	button;
-	int				context;
-	void			 	(*callback)(struct client_ctx *, void *);
-	TAILQ_ENTRY(mousebinding)	entry;
-};
-
-#define MOUSEBIND_CTX_ROOT	1
-#define MOUSEBIND_CTX_WIN	2
-
-TAILQ_HEAD(keybinding_q, keybinding);
 TAILQ_HEAD(cmd_q, cmd);
-TAILQ_HEAD(mousebinding_q, mousebinding);
 
-/* Global configuration */
+struct menu {
+	TAILQ_ENTRY(menu)	 entry;
+	TAILQ_ENTRY(menu)	 resultentry;
+#define MENU_MAXENTRY		 50
+	char			 text[MENU_MAXENTRY + 1];
+	char			 print[MENU_MAXENTRY + 1];
+	void			*ctx;
+	short			 dummy;
+	short			 abort;
+};
+TAILQ_HEAD(menu_q, menu);
+
 struct conf {
 	struct keybinding_q	 keybindingq;
 	struct autogroupwin_q	 autogroupq;
@@ -258,260 +285,246 @@ struct conf {
 	char			 conf_path[MAXPATHLEN];
 	struct cmd_q		 cmdq;
 	struct mousebinding_q	 mousebindingq;
-
-#define	CONF_STICKY_GROUPS	 0x0001
+#define	CONF_STICKY_GROUPS		0x0001
 	int			 flags;
-#define CONF_BWIDTH		 1
+#define CONF_BWIDTH			1
 	int			 bwidth;
-#define	CONF_MAMOUNT		 1
+#define	CONF_MAMOUNT			1
 	int			 mamount;
-
-#define CONF_COLOR_ACTIVEBORDER		"#CCCCCC"
-#define CONF_COLOR_INACTIVEBORDER	"#666666"
-#define CONF_COLOR_GROUPBORDER		"blue"
-#define CONF_COLOR_UNGROUPBORDER	"red"
-#define CONF_COLOR_MENUFG		"black"
-#define CONF_COLOR_MENUBG		"white"
+#define	CONF_SNAPDIST			0
+	int			 snapdist;
+	struct gap		 gap;
 	struct color		 color[CWM_COLOR_MAX];
-
 	char			 termpath[MAXPATHLEN];
 	char			 lockpath[MAXPATHLEN];
-
-#define	DEFAULTFONTNAME		 "sans-serif:pixelsize=14:bold"
-	char			*DefaultFontName;
-	XftFont			*DefaultFont;
-	u_int			 FontHeight;
-	int			 gap_top, gap_bottom, gap_left, gap_right;
-};
-
-/* Menu stuff */
-
-#define MENU_MAXENTRY 50
-
-struct menu {
-	TAILQ_ENTRY(menu)	entry;
-	TAILQ_ENTRY(menu)	resultentry;
-
-	char			 text[MENU_MAXENTRY + 1];
-	char			 print[MENU_MAXENTRY + 1];
-	void			*ctx;
-	short			 dummy;
-};
-
-TAILQ_HEAD(menu_q, menu);
-
-enum ctltype {
-	CTL_NONE = -1,
-	CTL_ERASEONE = 0, CTL_WIPE, CTL_UP, CTL_DOWN, CTL_RETURN,
-	CTL_ABORT, CTL_ALL
+#define	CONF_FONT			"sans-serif:pixelsize=14:bold"
+	char			*font;
 };
 
 /* MWM hints */
-
 struct mwm_hints {
 	u_long	flags;
 	u_long	functions;
 	u_long	decorations;
 };
-
-#define MWM_NUMHINTS 3
-
+#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)
-
-int			 input_keycodetrans(KeyCode, u_int, enum ctltype *,
-			     char *);
+#define	MWM_HINTS_DECORATIONS	(1<<1)
+#define	MWM_DECOR_ALL		(1<<0)
+#define	MWM_DECOR_BORDER	(1<<1)
 
 __dead void		 usage(void);
 
-struct client_ctx	*client_find(Window);
-void			 client_init(void);
-struct client_ctx	*client_new(Window, struct screen_ctx *, int);
-int			 client_delete(struct client_ctx *);
-void			 client_setactive(struct client_ctx *, int);
-void			 client_resize(struct client_ctx *);
-void			 client_lower(struct client_ctx *);
-void			 client_raise(struct client_ctx *);
-void			 client_move(struct client_ctx *);
-void			 client_leave(struct client_ctx *);
-void			 client_send_delete(struct client_ctx *);
+void			 client_applysizehints(struct client_ctx *);
 struct client_ctx	*client_current(void);
-void			 client_hide(struct client_ctx *);
-void			 client_unhide(struct client_ctx *);
-void			 client_setname(struct client_ctx *);
-void			 client_warp(struct client_ctx *);
-void			 client_ptrwarp(struct client_ctx *);
-void			 client_ptrsave(struct client_ctx *);
+void			 client_cycle(struct screen_ctx *, int);
+void			 client_delete(struct client_ctx *);
 void			 client_draw_border(struct client_ctx *);
-void			 client_maximize(struct client_ctx *);
-void			 client_vertmaximize(struct client_ctx *);
+struct client_ctx	*client_find(Window);
+void			 client_freeze(struct client_ctx *);
+void			 client_getsizehints(struct client_ctx *);
+void			 client_hide(struct client_ctx *);
+void			 client_horizmaximize(struct client_ctx *);
+void			 client_leave(struct client_ctx *);
+void			 client_lower(struct client_ctx *);
 void			 client_map(struct client_ctx *);
+void			 client_maximize(struct client_ctx *);
+void			 client_move(struct client_ctx *);
 void			 client_mtf(struct client_ctx *);
-struct client_ctx	*client_cycle(int);
+struct client_ctx	*client_new(Window, struct screen_ctx *, int);
+void			 client_ptrsave(struct client_ctx *);
+void			 client_ptrwarp(struct client_ctx *);
+void			 client_raise(struct client_ctx *);
+void			 client_resize(struct client_ctx *);
+void			 client_send_delete(struct client_ctx *);
+void			 client_setactive(struct client_ctx *, int);
+void			 client_setname(struct client_ctx *);
+int			 client_snapcalc(int, int, int, int, int);
+void			 client_transient(struct client_ctx *);
+void			 client_unhide(struct client_ctx *);
+void			 client_vertmaximize(struct client_ctx *);
+void			 client_warp(struct client_ctx *);
 
-struct menu  		*menu_filter(struct menu_q *, char *, char *, int,
+void			 group_alltoggle(struct screen_ctx *);
+void			 group_autogroup(struct client_ctx *);
+void			 group_client_delete(struct client_ctx *);
+void			 group_cycle(struct screen_ctx *, int);
+void			 group_hidetoggle(struct screen_ctx *, int);
+void			 group_init(struct screen_ctx *);
+void			 group_make_autogroup(struct conf *, char *, int);
+void			 group_menu(XButtonEvent *);
+void			 group_movetogroup(struct client_ctx *, int);
+void			 group_only(struct screen_ctx *, int);
+void			 group_sticky(struct client_ctx *);
+void			 group_sticky_toggle_enter(struct client_ctx *);
+void			 group_sticky_toggle_exit(struct client_ctx *);
+void			 group_update_names(struct screen_ctx *);
+
+void			 search_match_client(struct menu_q *, struct menu_q *,
+			     char *);
+void			 search_match_exec(struct menu_q *, struct menu_q *,
+			     char *);
+void			 search_match_text(struct menu_q *, struct menu_q *,
+			     char *);
+void			 search_print_client(struct menu *, int);
+
+XineramaScreenInfo	*screen_find_xinerama(struct screen_ctx *, int, int);
+struct screen_ctx	*screen_fromroot(Window);
+void			 screen_init_xinerama(struct screen_ctx *);
+void			 screen_update_geometry(struct screen_ctx *, int, int);
+void			 screen_updatestackingorder(struct screen_ctx *);
+
+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_freeze(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_hmaximize(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_maximize(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_vmaximize(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_cmdexec(struct client_ctx *, union arg *);
+void			 kbfunc_exec(struct client_ctx *, union arg *);
+void			 kbfunc_lock(struct client_ctx *, union arg *);
+void			 kbfunc_menu_search(struct client_ctx *, union arg *);
+void			 kbfunc_moveresize(struct client_ctx *, union arg *);
+void			 kbfunc_quit_wm(struct client_ctx *, union arg *);
+void			 kbfunc_reload(struct client_ctx *, union arg *);
+void			 kbfunc_ssh(struct client_ctx *, union arg *);
+void			 kbfunc_term(struct client_ctx *, union arg *);
+
+void			 mousefunc_menu_cmd(struct client_ctx *, void *);
+void			 mousefunc_menu_group(struct client_ctx *, void *);
+void			 mousefunc_menu_unhide(struct client_ctx *, void *);
+void			 mousefunc_window_grouptoggle(struct client_ctx *,
+			    void *);
+void			 mousefunc_window_hide(struct client_ctx *, void *);
+void			 mousefunc_window_lower(struct client_ctx *, void *);
+void			 mousefunc_window_move(struct client_ctx *, void *);
+void			 mousefunc_window_raise(struct client_ctx *, void *);
+void			 mousefunc_window_resize(struct client_ctx *, void *);
+
+struct menu  		*menu_filter(struct screen_ctx *, struct menu_q *,
+			     char *, char *, int,
 			     void (*)(struct menu_q *, struct menu_q *, char *),
 			     void (*)(struct menu *, int));
 void			 menu_init(struct screen_ctx *);
 
-/* XXX should be xu_ */
-void			  xev_reconfig(struct client_ctx *);
+int			 parse_config(const char *, struct conf *);
+
+void			 conf_bindname(struct conf *, char *, char *);
+void			 conf_clear(struct conf *);
+void			 conf_client(struct client_ctx *);
+void			 conf_cmd_add(struct conf *, char *, char *, int);
+void			 conf_color(struct conf *, struct screen_ctx *);
+void			 conf_font(struct conf *, struct screen_ctx *);
+void			 conf_gap(struct conf *, struct screen_ctx *);
+void			 conf_grab(struct conf *, struct keybinding *);
+void			 conf_grab_mouse(struct client_ctx *);
+void			 conf_init(struct conf *);
+void			 conf_mousebind(struct conf *, char *, char *);
+void			 conf_reload(struct conf *);
+void			 conf_setup(struct conf *, const char *);
+void			 conf_ungrab(struct conf *, struct keybinding *);
+
+int			 font_ascent(struct screen_ctx *);
+int			 font_descent(struct screen_ctx *);
+void			 font_draw(struct screen_ctx *, const char *, int,
+			     Drawable, int, int);
+u_int			 font_height(struct screen_ctx *);
+void			 font_init(struct screen_ctx *, const char *);
+int			 font_width(struct screen_ctx *, const char *, int);
+XftFont			*font_make(struct screen_ctx *, const char *);
 
 void			 xev_loop(void);
 
-void			 xu_getatoms(void);
-int			 xu_ptr_grab(Window, int, Cursor);
 void			 xu_btn_grab(Window, int, u_int);
-int			 xu_ptr_regrab(int, Cursor);
 void			 xu_btn_ungrab(Window, int, u_int);
-void			 xu_ptr_ungrab(void);
-void			 xu_ptr_setpos(Window, int, int);
-void			 xu_ptr_getpos(Window, int *, int *);
+void			 xu_configure(struct client_ctx *);
+void			 xu_freecolor(struct screen_ctx *, unsigned long);
+void			 xu_getatoms(void);
+unsigned long		 xu_getcolor(struct screen_ctx *, char *);
+int			 xu_getprop(Window, Atom, Atom, long, u_char **);
+int			 xu_getstate(struct client_ctx *, int *);
+int			 xu_getstrprop(Window, Atom, char **);
 void			 xu_key_grab(Window, int, int);
 void			 xu_key_ungrab(Window, int, int);
-void			 xu_sendmsg(struct client_ctx *, Atom, long);
-int			 xu_getprop(struct client_ctx *, Atom, Atom, long,
-			     u_char **);
-char			*xu_getstrprop(struct client_ctx *, Atom atm);
+void			 xu_ptr_getpos(Window, int *, int *);
+int			 xu_ptr_grab(Window, int, Cursor);
+int			 xu_ptr_regrab(int, Cursor);
+void			 xu_ptr_setpos(Window, int, int);
+void			 xu_ptr_ungrab(void);
+void			 xu_sendmsg(Window, Atom, long);
 void			 xu_setstate(struct client_ctx *, int);
-int			 xu_getstate(struct client_ctx *, int *);
-unsigned long		 xu_getcolor(struct screen_ctx *, char *);
-void			 xu_freecolor(struct screen_ctx *, unsigned long);
+void			 xu_setwmname(struct screen_ctx *);
 
-int			 u_spawn(char *);
 void			 u_exec(char *);
+void			 u_spawn(char *);
 
+void			*xcalloc(size_t, size_t);
 void			 xfree(void *);
 void			*xmalloc(size_t);
-void			*xcalloc(size_t, size_t);
 char			*xstrdup(const char *);
 
-void			 screen_init(void);
-struct screen_ctx	*screen_fromroot(Window);
-struct screen_ctx	*screen_current(void);
-void			 screen_updatestackingorder(void);
-void			 screen_init_xinerama(struct screen_ctx *);
-XineramaScreenInfo	*screen_find_xinerama(struct screen_ctx *, int, int);
-
-void			 conf_setup(struct conf *, const char *);
-void			 conf_client(struct client_ctx *);
-void			 conf_grab(struct conf *, struct keybinding *);
-void			 conf_ungrab(struct conf *, struct keybinding *);
-void			 conf_bindname(struct conf *, char *, char *);
-void			 conf_mousebind(struct conf *, char *, char *);
-void			 conf_grab_mouse(struct client_ctx *);
-void			 conf_reload(struct conf *);
-void			 conf_font(struct conf *);
-void			 conf_color(struct conf *);
-void			 conf_init(struct conf *);
-void			 conf_clear(struct conf *);
-void			 conf_cmd_add(struct conf *, char *, char *, int);
-
-int			 parse_config(const char *, struct conf *);
-
-void			 kbfunc_client_lower(struct client_ctx *, union arg *);
-void			 kbfunc_client_raise(struct client_ctx *, union arg *);
-void			 kbfunc_client_search(struct client_ctx *, union arg *);
-void			 kbfunc_client_hide(struct client_ctx *, union arg *);
-void			 kbfunc_client_cycle(struct client_ctx *, union arg *);
-void			 kbfunc_client_rcycle(struct client_ctx *, union arg *);
-void			 kbfunc_cmdexec(struct client_ctx *, union arg *);
-void			 kbfunc_client_label(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_cyclegroup(struct client_ctx *,
-			     union arg *);
-void			 kbfunc_client_nogroup(struct client_ctx *,
-			     union arg *);
-void			 kbfunc_client_grouptoggle(struct client_ctx *,
-			     union arg *);
-void			 kbfunc_client_movetogroup(struct client_ctx *,
-			     union arg *);
-void			 kbfunc_client_maximize(struct client_ctx *,
-			     union arg *);
-void			 kbfunc_client_vmaximize(struct client_ctx *,
-			     union arg *);
-void			 kbfunc_reload(struct client_ctx *, union arg *);
-void			 kbfunc_quit_wm(struct client_ctx *, union arg *);
-void			 kbfunc_moveresize(struct client_ctx *, union arg *);
-void			 kbfunc_menu_search(struct client_ctx *, union arg *);
-void			 kbfunc_exec(struct client_ctx *, union arg *);
-void			 kbfunc_ssh(struct client_ctx *, union arg *);
-void			 kbfunc_term(struct client_ctx *, union arg *);
-void			 kbfunc_lock(struct client_ctx *, union arg *);
-
-void			 mousefunc_window_resize(struct client_ctx *, void *);
-void			 mousefunc_window_move(struct client_ctx *, void *);
-void			 mousefunc_window_grouptoggle(struct client_ctx *,
-			    void *);
-void			 mousefunc_window_lower(struct client_ctx *, void *);
-void			 mousefunc_window_hide(struct client_ctx *, void *);
-void			 mousefunc_menu_group(struct client_ctx *, void *);
-void			 mousefunc_menu_unhide(struct client_ctx *, void *);
-void			 mousefunc_menu_cmd(struct client_ctx *, void *);
-
-void			 search_match_client(struct menu_q *, struct menu_q *,
-			     char *);
-void			 search_print_client(struct menu *, int);
-void			 search_match_text(struct menu_q *, struct menu_q *,
-			     char *);
-void			 search_match_exec(struct menu_q *, struct menu_q *,
-			     char *);
-
-void			 group_init(void);
-void			 group_hidetoggle(int);
-void			 group_only(int);
-void			 group_cycle(int);
-void			 group_sticky(struct client_ctx *);
-void			 group_client_delete(struct client_ctx *);
-void			 group_menu(XButtonEvent *);
-void			 group_alltoggle(void);
-void			 group_sticky_toggle_enter(struct client_ctx *);
-void			 group_sticky_toggle_exit(struct client_ctx *);
-void			 group_autogroup(struct client_ctx *);
-void			 group_movetogroup(struct client_ctx *, int);
-
-void			 font_init(struct screen_ctx *);
-int			 font_width(const char *, int);
-void			 font_draw(struct screen_ctx *, const char *, int,
-			     Drawable, int, int);
-XftFont			*font_make(struct screen_ctx *, const char *);
-
-#define font_ascent()	Conf.DefaultFont->ascent
-#define font_descent()	Conf.DefaultFont->descent
-#define	font_height()	Conf.FontHeight
-
-#define CCTOSC(cc) (cc->sc)
-
 /* Externs */
-
 extern Display				*X_Dpy;
 
-extern Cursor				 Cursor_move;
-extern Cursor				 Cursor_resize;
-extern Cursor				 Cursor_select;
 extern Cursor				 Cursor_default;
+extern Cursor				 Cursor_move;
+extern Cursor				 Cursor_normal;
 extern Cursor				 Cursor_question;
+extern Cursor				 Cursor_resize;
 
 extern struct screen_ctx_q		 Screenq;
-extern struct screen_ctx		*curscreen;
-
 extern struct client_ctx_q		 Clientq;
+extern struct conf			 Conf;
 
 extern int				 HasXinerama, HasRandr, Randr_ev;
-extern struct conf			 Conf;
 
 #define	WM_STATE			 cwm_atoms[0]
 #define WM_DELETE_WINDOW		 cwm_atoms[1]
 #define WM_TAKE_FOCUS			 cwm_atoms[2]
 #define WM_PROTOCOLS			 cwm_atoms[3]
 #define _MOTIF_WM_HINTS			 cwm_atoms[4]
-#define	_CWM_GRP			 cwm_atoms[5]
-#define CWM_NO_ATOMS			 6
+#define	UTF8_STRING			 cwm_atoms[5]
+/*
+ * please make all hints below this point netwm hints, starting with
+ * _NET_SUPPORTED. If you change other hints make sure you update
+ * CWM_NETWM_START
+ */
+#define	_NET_SUPPORTED			 cwm_atoms[6]
+#define	_NET_SUPPORTING_WM_CHECK	 cwm_atoms[7]
+#define	_NET_WM_NAME			 cwm_atoms[8]
+#define	_NET_ACTIVE_WINDOW		 cwm_atoms[9]
+#define	_NET_CLIENT_LIST		 cwm_atoms[10]
+#define	_NET_NUMBER_OF_DESKTOPS		 cwm_atoms[11]
+#define	_NET_CURRENT_DESKTOP		 cwm_atoms[12]
+#define	_NET_DESKTOP_VIEWPORT		 cwm_atoms[13]
+#define	_NET_DESKTOP_GEOMETRY		 cwm_atoms[14]
+#define	_NET_VIRTUAL_ROOTS		 cwm_atoms[15]
+#define	_NET_SHOWING_DESKTOP		 cwm_atoms[16]
+#define	_NET_DESKTOP_NAMES		 cwm_atoms[17]
+#define	_NET_WM_DESKTOP			 cwm_atoms[18]
+#define	_NET_WORKAREA			 cwm_atoms[19]
+#define CWM_NO_ATOMS			 20
+#define CWM_NETWM_START			 6
 
 extern Atom				 cwm_atoms[CWM_NO_ATOMS];
 

client.c

@@ -15,14 +15,25 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 static struct client_ctx	*client_mrunext(struct client_ctx *);
 static struct client_ctx	*client_mruprev(struct client_ctx *);
+static void			 client_none(struct screen_ctx *);
 static void			 client_placecalc(struct client_ctx *);
 static void			 client_update(struct client_ctx *);
 static void			 client_gethints(struct client_ctx *);
@@ -32,12 +43,6 @@ static int			 client_inbound(struct client_ctx *, int, int);
 static char		 emptystring[] = "";
 struct client_ctx	*_curcc = NULL;
 
-void
-client_init(void)
-{
-	TAILQ_INIT(&Clientq);
-}
-
 struct client_ctx *
 client_find(Window win)
 {
@@ -56,7 +61,6 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 	struct client_ctx	*cc;
 	XWindowAttributes	 wattr;
 	XWMHints		*wmhints;
-	long			 tmp;
 	int			 state;
 
 	if (win == None)
@@ -71,14 +75,7 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 	cc->win = win;
 	cc->size = XAllocSizeHints();
 
-	XGetWMNormalHints(X_Dpy, cc->win, cc->size, &tmp);
-	if (cc->size->flags & PBaseSize) {
-		cc->geom.min_dx = cc->size->base_width;
-		cc->geom.min_dy = cc->size->base_height;
-	} else if (cc->size->flags & PMinSize) {
-		cc->geom.min_dx = cc->size->min_width;
-		cc->geom.min_dy = cc->size->min_height;
-	}
+	client_getsizehints(cc);
 
 	TAILQ_INIT(&cc->nameq);
 	client_setname(cc);
@@ -116,8 +113,10 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 
 	XAddToSaveSet(X_Dpy, cc->win);
 
+	client_transient(cc);
+
 	/* Notify client of its configuration. */
-	xev_reconfig(cc);
+	xu_configure(cc);
 
 	(state == IconicState) ? client_hide(cc) : client_unhide(cc);
 	xu_setstate(cc, cc->state);
@@ -127,6 +126,9 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 
 	TAILQ_INSERT_TAIL(&sc->mruq, cc, mru_entry);
 	TAILQ_INSERT_TAIL(&Clientq, cc, entry);
+	/* append to the client list */
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_CLIENT_LIST, XA_WINDOW, 32,
+	    PropModeAppend,  (unsigned char *)&cc->win, 1);
 
 	client_gethints(cc);
 	client_update(cc);
@@ -137,11 +139,14 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 	return (cc);
 }
 
-int
+void
 client_delete(struct client_ctx *cc)
 {
-	struct screen_ctx	*sc = CCTOSC(cc);
+	struct screen_ctx	*sc = cc->sc;
+	struct client_ctx	*tcc;
 	struct winname		*wn;
+	Window			*winlist;
+	int			 i, j;
 
 	group_client_delete(cc);
 
@@ -154,23 +159,38 @@ client_delete(struct client_ctx *cc)
 
 	TAILQ_REMOVE(&sc->mruq, cc, mru_entry);
 	TAILQ_REMOVE(&Clientq, cc, entry);
+	/*
+	 * Sadly we can't remove just one entry from a property, so we must
+	 * redo the whole thing from scratch. this is the stupid way, the other
+	 * way incurs many roundtrips to the server.
+	 */
+	i = j = 0;
+	TAILQ_FOREACH(tcc, &Clientq, entry)
+		i++;
+	if (i > 0) {
+		winlist = xmalloc(i * sizeof(*winlist));
+		TAILQ_FOREACH(tcc, &Clientq, entry)
+			winlist[j++] = tcc->win;
+		XChangeProperty(X_Dpy, sc->rootwin, _NET_CLIENT_LIST,
+		    XA_WINDOW, 32, PropModeReplace,
+		    (unsigned char *)winlist, i);
+		xfree(winlist);
+	}
 
 	if (_curcc == cc)
-		_curcc = NULL;
+		client_none(sc);
 
 	XFree(cc->size);
 
 	while ((wn = TAILQ_FIRST(&cc->nameq)) != NULL) {
 		TAILQ_REMOVE(&cc->nameq, wn, entry);
 		if (wn->name != emptystring)
-			XFree(wn->name);
+			xfree(wn->name);
 		xfree(wn);
 	}
 
 	client_freehints(cc);
 	xfree(cc);
-
-	return (0);
 }
 
 void
@@ -183,7 +203,7 @@ client_leave(struct client_ctx *cc)
 	if (cc == NULL)
 		return;
 
-	sc = CCTOSC(cc);
+	sc = cc->sc;
 	xu_btn_ungrab(sc->rootwin, AnyModifier, Button1);
 }
 
@@ -197,7 +217,7 @@ client_setactive(struct client_ctx *cc, int fg)
 	if (cc == NULL)
 		return;
 
-	sc = CCTOSC(cc);
+	sc = cc->sc;
 
 	if (fg) {
 		XInstallColormap(X_Dpy, cc->cmap);
@@ -216,113 +236,210 @@ client_setactive(struct client_ctx *cc, int fg)
 	if (fg && _curcc != cc) {
 		client_setactive(NULL, 0);
 		_curcc = cc;
+		XChangeProperty(X_Dpy, sc->rootwin, _NET_ACTIVE_WINDOW,
+		    XA_WINDOW, 32, PropModeReplace,
+		    (unsigned char *)&cc->win, 1);
 	}
 
 	cc->active = fg;
 	client_draw_border(cc);
 }
 
+/*
+ * set when there is no active client
+ */
+static void
+client_none(struct screen_ctx *sc)
+{
+	Window none = None;
+
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_ACTIVE_WINDOW,
+	    XA_WINDOW, 32, PropModeReplace, (unsigned char *)&none, 1);
+	_curcc = NULL;
+}
+
 struct client_ctx *
 client_current(void)
 {
 	return (_curcc);
 }
 
+void
+client_freeze(struct client_ctx *cc)
+{
+	if (cc->flags & CLIENT_FREEZE)
+		cc->flags &= ~CLIENT_FREEZE;
+	else
+		cc->flags |= CLIENT_FREEZE;
+}
+
 void
 client_maximize(struct client_ctx *cc)
 {
-	struct screen_ctx	*sc = CCTOSC(cc);
+	struct screen_ctx	*sc = cc->sc;
 	int			 xmax = sc->xmax, ymax = sc->ymax;
 	int			 x_org = 0, y_org = 0;
 
-	if (cc->flags & CLIENT_MAXIMIZED) {
+	if (cc->flags & CLIENT_FREEZE)
+		return;
+
+	if ((cc->flags & CLIENT_MAXFLAGS) == CLIENT_MAXIMIZED) {
+		cc->flags &= ~CLIENT_MAXIMIZED;
 		cc->geom = cc->savegeom;
-	} else {
-		if (!(cc->flags & CLIENT_VMAXIMIZED))
-			cc->savegeom = cc->geom;
-		if (HasXinerama) {
-			XineramaScreenInfo *xine;
-			/*
-			 * pick screen that the middle of the window is on.
-			 * that's probably more fair than if just the origin of
-			 * a window is poking over a boundary
-			 */
-			xine = screen_find_xinerama(CCTOSC(cc),
-			    cc->geom.x + cc->geom.width / 2,
-			    cc->geom.y + cc->geom.height / 2);
-			if (xine == NULL)
-				goto calc;
-			x_org = xine->x_org;
-			y_org = xine->y_org;
-			xmax = xine->width;
-			ymax = xine->height;
-		}
-calc:
-		cc->geom.x = x_org - cc->bwidth + Conf.gap_left;
-		cc->geom.y = y_org - cc->bwidth + Conf.gap_top;
-		cc->geom.height = ymax - (Conf.gap_top + Conf.gap_bottom);
-		cc->geom.width = xmax - (Conf.gap_left + Conf.gap_right);
-		cc->flags |= CLIENT_DOMAXIMIZE;
+		cc->bwidth = Conf.bwidth;
+		goto resize;
 	}
 
+	if ((cc->flags & CLIENT_VMAXIMIZED) == 0) {
+		cc->savegeom.height = cc->geom.height;
+		cc->savegeom.y = cc->geom.y;
+	}
+
+	if ((cc->flags & CLIENT_HMAXIMIZED) == 0) {
+		cc->savegeom.width = cc->geom.width;
+		cc->savegeom.x = cc->geom.x;
+	}
+
+	if (HasXinerama) {
+		XineramaScreenInfo *xine;
+		/*
+		 * pick screen that the middle of the window is on.
+		 * that's probably more fair than if just the origin of
+		 * a window is poking over a boundary
+		 */
+		xine = screen_find_xinerama(sc,
+		    cc->geom.x + cc->geom.width / 2,
+		    cc->geom.y + cc->geom.height / 2);
+		if (xine == NULL)
+			goto calc;
+		x_org = xine->x_org;
+		y_org = xine->y_org;
+		xmax = xine->width;
+		ymax = xine->height;
+	}
+calc:
+	cc->geom.x = x_org + sc->gap.left;
+	cc->geom.y = y_org + sc->gap.top;
+	cc->geom.height = ymax - (sc->gap.top + sc->gap.bottom);
+	cc->geom.width = xmax - (sc->gap.left + sc->gap.right);
+	cc->bwidth = 0;
+	cc->flags |= CLIENT_MAXIMIZED;
+
+resize:
 	client_resize(cc);
 }
 
 void
 client_vertmaximize(struct client_ctx *cc)
 {
-	struct screen_ctx	*sc = CCTOSC(cc);
+	struct screen_ctx	*sc = cc->sc;
 	int			 y_org = 0, ymax = sc->ymax;
 
+	if (cc->flags & CLIENT_FREEZE)
+		return;
+
 	if (cc->flags & CLIENT_VMAXIMIZED) {
-		cc->geom = cc->savegeom;
-	} else {
-		if (!(cc->flags & CLIENT_MAXIMIZED))
-			cc->savegeom = cc->geom;
-		if (HasXinerama) {
-			XineramaScreenInfo *xine;
-			xine = screen_find_xinerama(CCTOSC(cc),
-			    cc->geom.x + cc->geom.width / 2,
-			    cc->geom.y + cc->geom.height / 2);
-			if (xine == NULL)
-				goto calc;
-			y_org = xine->y_org;
-			ymax = xine->height;
-		}
-calc:
-		cc->geom.y = y_org + Conf.gap_top;
-		cc->geom.height = ymax - (cc->bwidth * 2) - (Conf.gap_top +
-		    Conf.gap_bottom);
-		cc->flags |= CLIENT_DOVMAXIMIZE;
+		cc->geom.y = cc->savegeom.y;
+		cc->geom.height = cc->savegeom.height;
+		cc->bwidth = Conf.bwidth;
+		if (cc->flags & CLIENT_HMAXIMIZED)
+			cc->geom.width -= cc->bwidth * 2;
+		cc->flags &= ~CLIENT_VMAXIMIZED;
+		goto resize;
 	}
 
+	cc->savegeom.y = cc->geom.y;
+	cc->savegeom.height = cc->geom.height;
+
+	/* if this will make us fully maximized then remove boundary */
+	if ((cc->flags & CLIENT_MAXFLAGS) == CLIENT_HMAXIMIZED) {
+		cc->geom.width += Conf.bwidth * 2;
+		cc->bwidth = 0;
+	}
+
+	if (HasXinerama) {
+		XineramaScreenInfo *xine;
+		xine = screen_find_xinerama(sc,
+		    cc->geom.x + cc->geom.width / 2,
+		    cc->geom.y + cc->geom.height / 2);
+		if (xine == NULL)
+			goto calc;
+		y_org = xine->y_org;
+		ymax = xine->height;
+	}
+calc:
+	cc->geom.y = y_org + sc->gap.top;
+	cc->geom.height = ymax - (cc->bwidth * 2) - (sc->gap.top +
+	    sc->gap.bottom);
+	cc->flags |= CLIENT_VMAXIMIZED;
+
+resize:
+	client_resize(cc);
+}
+
+void
+client_horizmaximize(struct client_ctx *cc)
+{
+	struct screen_ctx	*sc = cc->sc;
+	int			 x_org = 0, xmax = sc->xmax;
+
+	if (cc->flags & CLIENT_FREEZE)
+		return;
+
+	if (cc->flags & CLIENT_HMAXIMIZED) {
+		cc->geom.x = cc->savegeom.x;
+		cc->geom.width = cc->savegeom.width;
+		cc->bwidth = Conf.bwidth;
+		if (cc->flags & CLIENT_VMAXIMIZED)
+			cc->geom.height -= cc->bwidth * 2;
+		cc->flags &= ~CLIENT_HMAXIMIZED;
+		goto resize;
+	} 
+
+	cc->savegeom.x = cc->geom.x;
+	cc->savegeom.width = cc->geom.width;
+
+	/* if this will make us fully maximized then remove boundary */
+	if ((cc->flags & CLIENT_MAXFLAGS) == CLIENT_VMAXIMIZED) {
+		cc->geom.height += cc->bwidth * 2;
+		cc->bwidth = 0;
+	}
+
+	if (HasXinerama) {
+		XineramaScreenInfo *xine;
+		xine = screen_find_xinerama(sc,
+		    cc->geom.x + cc->geom.width / 2,
+		    cc->geom.y + cc->geom.height / 2);
+		if (xine == NULL)
+			goto calc;
+		x_org = xine->x_org;
+		xmax = xine->width;
+	}
+calc:
+	cc->geom.x = x_org + sc->gap.left;
+	cc->geom.width = xmax - (cc->bwidth * 2) - (sc->gap.left +
+	    sc->gap.right);
+	cc->flags |= CLIENT_HMAXIMIZED;
+
+resize:
 	client_resize(cc);
 }
 
 void
 client_resize(struct client_ctx *cc)
 {
-	if (cc->flags & (CLIENT_MAXIMIZED | CLIENT_VMAXIMIZED))
-		cc->flags &= ~(CLIENT_MAXIMIZED | CLIENT_VMAXIMIZED);
-
-	if (cc->flags & CLIENT_DOMAXIMIZE) {
-		cc->flags &= ~CLIENT_DOMAXIMIZE;
-		cc->flags |= CLIENT_MAXIMIZED;
-	} else if (cc->flags & CLIENT_DOVMAXIMIZE) {
-		cc->flags &= ~CLIENT_DOVMAXIMIZE;
-		cc->flags |= CLIENT_VMAXIMIZED;
-	}
+	client_draw_border(cc);
 
 	XMoveResizeWindow(X_Dpy, cc->win, cc->geom.x,
 	    cc->geom.y, cc->geom.width, cc->geom.height);
-	xev_reconfig(cc);
+	xu_configure(cc);
 }
 
 void
 client_move(struct client_ctx *cc)
 {
 	XMoveWindow(X_Dpy, cc->win, cc->geom.x, cc->geom.y);
-	xev_reconfig(cc);
+	xu_configure(cc);
 }
 
 void
@@ -360,6 +477,9 @@ client_ptrsave(struct client_ctx *cc)
 	if (client_inbound(cc, x, y)) {
 		cc->ptr.x = x;
 		cc->ptr.y = y;
+	} else {
+		cc->ptr.x = -1;
+		cc->ptr.y = -1;
 	}
 }
 
@@ -374,7 +494,7 @@ client_hide(struct client_ctx *cc)
 	xu_setstate(cc, IconicState);
 
 	if (cc == _curcc)
-		_curcc = NULL;
+		client_none(cc->sc);
 }
 
 void
@@ -391,7 +511,7 @@ client_unhide(struct client_ctx *cc)
 void
 client_draw_border(struct client_ctx *cc)
 {
-	struct screen_ctx	*sc = CCTOSC(cc);
+	struct screen_ctx	*sc = cc->sc;
 	unsigned long		 pixel;
 
 	if (cc->active)
@@ -403,7 +523,7 @@ client_draw_border(struct client_ctx *cc)
 			pixel = sc->color[CWM_COLOR_BORDER_UNGROUP].pixel;
 			break;
 		default:
-			pixel = sc->color[CWM_COLOR_BORDOR_ACTIVE].pixel;
+			pixel = sc->color[CWM_COLOR_BORDER_ACTIVE].pixel;
 			break;
 		}
 	else
@@ -416,11 +536,11 @@ client_draw_border(struct client_ctx *cc)
 static void
 client_update(struct client_ctx *cc)
 {
-	Atom	*p; 
+	Atom	*p;
 	int	 i;
 	long	 n;
 
-	if ((n = xu_getprop(cc, WM_PROTOCOLS,
+	if ((n = xu_getprop(cc->win, WM_PROTOCOLS,
 		 XA_ATOM, 20L, (u_char **)&p)) <= 0)
 		return;
 
@@ -437,7 +557,7 @@ void
 client_send_delete(struct client_ctx *cc)
 {
 	if (cc->xproto & CLIENT_PROTO_DELETE)
-		xu_sendmsg(cc, WM_PROTOCOLS, WM_DELETE_WINDOW);
+		xu_sendmsg(cc->win, WM_PROTOCOLS, WM_DELETE_WINDOW);
 	else
 		XKillClient(X_Dpy, cc->win);
 }
@@ -448,9 +568,9 @@ client_setname(struct client_ctx *cc)
 	struct winname	*wn;
 	char		*newname;
 
-	XFetchName(X_Dpy, cc->win, &newname);
-	if (newname == NULL)
-		newname = emptystring;
+	if (!xu_getstrprop(cc->win, _NET_WM_NAME, &newname))
+		if (!xu_getstrprop(cc->win, XA_WM_NAME, &newname))
+			newname = emptystring;
 
 	TAILQ_FOREACH(wn, &cc->nameq, entry)
 		if (strcmp(wn->name, newname) == 0) {
@@ -474,47 +594,44 @@ match:
 		assert(wn != NULL);
 		TAILQ_REMOVE(&cc->nameq, wn, entry);
 		if (wn->name != emptystring)
-			XFree(wn->name);
+			xfree(wn->name);
 		xfree(wn);
 		cc->nameqlen--;
 	}
-
-	return;
 }
 
-struct client_ctx *
-client_cycle(int reverse)
+void
+client_cycle(struct screen_ctx *sc, int flags)
 {
 	struct client_ctx	*oldcc, *newcc;
-	struct screen_ctx	*sc;
 	int			 again = 1;
 
 	oldcc = client_current();
-	sc = screen_current();
 
 	/* If no windows then you cant cycle */
 	if (TAILQ_EMPTY(&sc->mruq))
-		return (NULL);
+		return;
 
 	if (oldcc == NULL)
-		oldcc = (reverse ? TAILQ_LAST(&sc->mruq, cycle_entry_q) :
+		oldcc = (flags & CWM_RCYCLE ? TAILQ_LAST(&sc->mruq, cycle_entry_q) :
 		    TAILQ_FIRST(&sc->mruq));
 
 	newcc = oldcc;
 	while (again) {
 		again = 0;
 
-		newcc = (reverse ? client_mruprev(newcc) :
+		newcc = (flags & CWM_RCYCLE ? client_mruprev(newcc) :
 		    client_mrunext(newcc));
 
 		/* Only cycle visible and non-ignored windows. */
-		if (newcc->flags & (CLIENT_HIDDEN|CLIENT_IGNORE))
+		if ((newcc->flags & (CLIENT_HIDDEN|CLIENT_IGNORE))
+			|| ((flags & CWM_INGROUP) && (newcc->group != oldcc->group)))
 			again = 1;
 
 		/* Is oldcc the only non-hidden window? */
 		if (newcc == oldcc) {
 			if (again)
-				return (NULL);	/* No windows visible. */
+				return;	/* No windows visible. */
 
 			break;
 		}
@@ -524,14 +641,12 @@ client_cycle(int reverse)
 	sc->altpersist = 1;
 	client_ptrsave(oldcc);
 	client_ptrwarp(newcc);
-
-	return (newcc);
 }
 
 static struct client_ctx *
 client_mrunext(struct client_ctx *cc)
 {
-	struct screen_ctx	*sc = CCTOSC(cc);
+	struct screen_ctx	*sc = cc->sc;
 	struct client_ctx	*ccc;
 
 	return ((ccc = TAILQ_NEXT(cc, mru_entry)) != NULL ?
@@ -541,7 +656,7 @@ client_mrunext(struct client_ctx *cc)
 static struct client_ctx *
 client_mruprev(struct client_ctx *cc)
 {
-	struct screen_ctx	*sc = CCTOSC(cc);
+	struct screen_ctx	*sc = cc->sc;
 	struct client_ctx	*ccc;
 
 	return ((ccc = TAILQ_PREV(cc, cycle_entry_q, mru_entry)) != NULL ?
@@ -551,10 +666,10 @@ client_mruprev(struct client_ctx *cc)
 static void
 client_placecalc(struct client_ctx *cc)
 {
-	struct screen_ctx	*sc = CCTOSC(cc);
+	struct screen_ctx	*sc = cc->sc;
 	int			 xslack, yslack;
 
-	if (cc->size->flags & USPosition) {
+	if (cc->size->flags & (USPosition|PPosition)) {
 		/*
 		 * Ignore XINERAMA screens, just make sure it's somewhere
 		 * in the virtual desktop. else it stops people putting xterms
@@ -599,21 +714,21 @@ noxine:
 
 		if (xslack >= xorig) {
 			cc->geom.x = MAX(MIN(xmouse, xslack),
-			    xorig + Conf.gap_left);
-			if (cc->geom.x > (xslack - Conf.gap_right))
-				cc->geom.x -= Conf.gap_right;
+			    xorig + sc->gap.left);
+			if (cc->geom.x > (xslack - sc->gap.right))
+				cc->geom.x -= sc->gap.right;
 		} else {
-			cc->geom.x = xorig + Conf.gap_left;
-			cc->geom.width = xmax - Conf.gap_left;
+			cc->geom.x = xorig + sc->gap.left;
+			cc->geom.width = xmax - sc->gap.left;
 		}
 		if (yslack >= yorig) {
 			cc->geom.y = MAX(MIN(ymouse, yslack),
-			    yorig + Conf.gap_top);
-			if (cc->geom.y > (yslack - Conf.gap_bottom))
-				cc->geom.y -= Conf.gap_bottom;
+			    yorig + sc->gap.top);
+			if (cc->geom.y > (yslack - sc->gap.bottom))
+				cc->geom.y -= sc->gap.bottom;
 		} else {
-			cc->geom.y = yorig + Conf.gap_top;
-			cc->geom.height = ymax - Conf.gap_top;
+			cc->geom.y = yorig + sc->gap.top;
+			cc->geom.height = ymax - sc->gap.top;
 		}
 	}
 }
@@ -628,19 +743,108 @@ client_mtf(struct client_ctx *cc)
 	if (cc == NULL)
 		return;
 
-	sc = CCTOSC(cc);
+	sc = cc->sc;
 
 	/* Move to front. */
 	TAILQ_REMOVE(&sc->mruq, cc, mru_entry);
 	TAILQ_INSERT_HEAD(&sc->mruq, cc, mru_entry);
 }
 
+void
+client_getsizehints(struct client_ctx *cc)
+{
+	long		 tmp;
+
+	if (!XGetWMNormalHints(X_Dpy, cc->win, cc->size, &tmp))
+		cc->size->flags = PSize;
+
+	if (cc->size->flags & PBaseSize) {
+		cc->hint.basew = cc->size->base_width;
+		cc->hint.baseh = cc->size->base_height;
+	} else if (cc->size->flags & PMinSize) {
+		cc->hint.basew = cc->size->min_width;
+		cc->hint.baseh = cc->size->min_height;
+	}
+	if (cc->size->flags & PMinSize) {
+		cc->hint.minw = cc->size->min_width;
+		cc->hint.minh = cc->size->min_height;
+	} else if (cc->size->flags & PBaseSize) {
+		cc->hint.minw = cc->size->base_width;
+		cc->hint.minh = cc->size->base_height;
+	}
+	if (cc->size->flags & PMaxSize) {
+		cc->hint.maxw = cc->size->max_width;
+		cc->hint.maxh = cc->size->max_height;
+	}
+	if (cc->size->flags & PResizeInc) {
+		cc->hint.incw = cc->size->width_inc;
+		cc->hint.inch = cc->size->height_inc;
+	}
+	cc->hint.incw = MAX(1, cc->hint.incw);
+	cc->hint.inch = MAX(1, cc->hint.inch);
+
+	if (cc->size->flags & PAspect) {
+		if (cc->size->min_aspect.x > 0)
+			cc->hint.mina = (float)cc->size->min_aspect.y /
+			    cc->size->min_aspect.x;
+		if (cc->size->max_aspect.y > 0)
+			cc->hint.maxa = (float)cc->size->max_aspect.x /
+			    cc->size->max_aspect.y;
+	}
+}
+void
+client_applysizehints(struct client_ctx *cc)
+{
+	Bool		 baseismin;
+
+	baseismin = (cc->hint.basew == cc->hint.minw) &&
+	    (cc->hint.baseh == cc->hint.minh);
+
+	/* temporarily remove base dimensions, ICCCM 4.1.2.3 */
+	if (!baseismin) {
+		cc->geom.width -= cc->hint.basew;
+		cc->geom.height -= cc->hint.baseh;
+	}
+
+	/* adjust for aspect limits */
+	if (cc->hint.mina > 0 && cc->hint.maxa > 0) {
+		if (cc->hint.maxa <
+		    (float)cc->geom.width / cc->geom.height)
+			cc->geom.width = cc->geom.height * cc->hint.maxa;
+		else if (cc->hint.mina <
+		    (float)cc->geom.height / cc->geom.width)
+			cc->geom.height = cc->geom.width * cc->hint.mina;
+	}
+
+	/* remove base dimensions for increment */
+	if (baseismin) {
+		cc->geom.width -= cc->hint.basew;
+		cc->geom.height -= cc->hint.baseh;
+	}
+
+	/* adjust for increment value */
+	cc->geom.width -= cc->geom.width % cc->hint.incw;
+	cc->geom.height -= cc->geom.height % cc->hint.inch;
+
+	/* restore base dimensions */
+	cc->geom.width += cc->hint.basew;
+	cc->geom.height += cc->hint.baseh;
+
+	/* adjust for min width/height */
+	cc->geom.width = MAX(cc->geom.width, cc->hint.minw);
+	cc->geom.height = MAX(cc->geom.height, cc->hint.minh);
+
+	/* adjust for max width/height */
+	if (cc->hint.maxw)
+		cc->geom.width = MIN(cc->geom.width, cc->hint.maxw);
+	if (cc->hint.maxh)
+		cc->geom.height = MIN(cc->geom.height, cc->hint.maxh);
+}
+
 static void
 client_gethints(struct client_ctx *cc)
 {
 	XClassHint		 xch;
-	int			 argc;
-	char			**argv;
 	struct mwm_hints	*mwmh;
 
 	if (XGetClassHint(X_Dpy, cc->win, &xch)) {
@@ -650,35 +854,12 @@ client_gethints(struct client_ctx *cc)
 			cc->app_class = xch.res_class;
 	}
 
-	if (xu_getprop(cc, _MOTIF_WM_HINTS, _MOTIF_WM_HINTS,
+	if (xu_getprop(cc->win, _MOTIF_WM_HINTS, _MOTIF_WM_HINTS,
 	    PROP_MWM_HINTS_ELEMENTS, (u_char **)&mwmh) == MWM_NUMHINTS)
 		if (mwmh->flags & MWM_HINTS_DECORATIONS &&
 		    !(mwmh->decorations & MWM_DECOR_ALL) &&
 		    !(mwmh->decorations & MWM_DECOR_BORDER))
 			cc->bwidth = 0;
-	if (XGetCommand(X_Dpy, cc->win, &argv, &argc)) {
-#define MAX_ARGLEN 512
-#define ARG_SEP_ " "
-		int	 i, o, len = MAX_ARGLEN;
-		char	*buf;
-
-		buf = xmalloc(len);
-		buf[0] = '\0';
-
-		for (o = 0, i = 0; o < len && i < argc; i++) {
-			if (argv[i] == NULL)
-				break;
-			strlcat(buf, argv[i], len);
-			o += strlen(buf);
-			strlcat(buf, ARG_SEP_, len);
-			o += strlen(ARG_SEP_);
-		}
-
-		if (strlen(buf) > 0)
-			cc->app_cliarg = buf;
-
-		XFreeStringList(argv);
-	}
 }
 
 static void
@@ -688,7 +869,21 @@ client_freehints(struct client_ctx *cc)
 		XFree(cc->app_name);
 	if (cc->app_class != NULL)
 		XFree(cc->app_class);
-	xfree(cc->app_cliarg);
+}
+
+void
+client_transient(struct client_ctx *cc)
+{
+	struct client_ctx	*tc;
+	Window			 trans;
+
+	if (XGetTransientForHint(X_Dpy, cc->win, &trans)) {
+		if ((tc = client_find(trans)) && tc->group) {
+			group_movetogroup(cc, tc->group->shortcut - 1);
+			if (tc->flags & CLIENT_IGNORE)
+				cc->flags |= CLIENT_IGNORE;
+		}
+	}
 }
 
 static int
@@ -697,3 +892,32 @@ client_inbound(struct client_ctx *cc, int x, int y)
 	return (x < cc->geom.width && x >= 0 &&
 	    y < cc->geom.height && y >= 0);
 }
+
+int
+client_snapcalc(int n, int dn, int nmax, int bwidth, int snapdist)
+{
+	int	 n0, n1, s0, s1;
+
+	s0 = s1 = 0;
+	n0 = n;
+	n1 = n + dn + (bwidth * 2);
+
+	if (abs(n0) <= snapdist)
+		s0 = -n0;
+
+	if (nmax - snapdist <= n1 && n1 <= nmax + snapdist)
+		s1 = nmax - n1;
+
+	/* possible to snap in both directions */
+	if (s0 != 0 && s1 != 0)
+		if (abs(s0) < abs(s1))
+			return s0;
+		else
+			return s1;
+	else if (s0 != 0)
+		return s0;
+	else if (s1 != 0)
+		return s1;
+	else
+		return 0;
+}

conf.c

@@ -15,24 +15,25 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
-#include "calmwm.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/stat.h>
 
-#ifndef timespeccmp
-#define timespeccmp(tsp, usp, cmp)			\
-	(((tsp)->tv_sec == (usp)->tv_sec) ?		\
-	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :	\
-	    ((tsp)->tv_sec cmp (usp)->tv_sec))
-#endif
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "calmwm.h"
 
 static void	 conf_mouseunbind(struct conf *, struct mousebinding *);
 static void	 conf_unbind(struct conf *, struct keybinding *);
 
-extern struct screen_ctx	*Curscreen;
-
 /* Add an command menu entry to the end of the menu */
 void
 conf_cmd_add(struct conf *c, char *image, char *label, int flags)
@@ -40,36 +41,45 @@ conf_cmd_add(struct conf *c, char *image, char *label, int flags)
 	/* "term" and "lock" have special meanings. */
 
 	if (strcmp(label, "term") == 0)
-		strlcpy(c->termpath, image, sizeof(c->termpath));
+		(void)strlcpy(c->termpath, image, sizeof(c->termpath));
 	else if (strcmp(label, "lock") == 0)
-		strlcpy(c->lockpath, image, sizeof(c->lockpath));
+		(void)strlcpy(c->lockpath, image, sizeof(c->lockpath));
 	else {
 		struct cmd *cmd = xmalloc(sizeof(*cmd));
 		cmd->flags = flags;
-		strlcpy(cmd->image, image, sizeof(cmd->image));
-		strlcpy(cmd->label, label, sizeof(cmd->label));
+		(void)strlcpy(cmd->image, image, sizeof(cmd->image));
+		(void)strlcpy(cmd->label, label, sizeof(cmd->label));
 		TAILQ_INSERT_TAIL(&c->cmdq, cmd, entry);
 	}
 }
 
 void
-conf_font(struct conf *c)
+conf_gap(struct conf *c, struct screen_ctx *sc)
 {
-	struct screen_ctx	*sc;
-
-	sc = screen_current();
-
-	c->DefaultFont = font_make(sc, c->DefaultFontName);
-	c->FontHeight = font_ascent() + font_descent() + 1;
+	sc->gap = c->gap;
 }
 
 void
-conf_color(struct conf *c)
+conf_font(struct conf *c, struct screen_ctx *sc)
 {
-	struct screen_ctx	*sc;
-	int			 i;
+	font_init(sc, c->color[CWM_COLOR_FONT].name);
+	sc->font = font_make(sc, c->font);
+}
 
-	sc = screen_current();
+static struct color color_binds[] = {
+	{ "#CCCCCC",	0 }, /* CWM_COLOR_BORDER_ACTIVE */
+	{ "#666666",	0 }, /* CWM_COLOR_BORDER_INACTIVE */
+	{ "blue",	0 }, /* CWM_COLOR_BORDER_GROUP */
+	{ "red",	0 }, /* CWM_COLOR_BORDER_UNGROUP */
+	{ "black",	0 }, /* CWM_COLOR_FG_MENU */
+	{ "white",	0 }, /* CWM_COLOR_BG_MENU */
+	{ "black",	0 }, /* CWM_COLOR_FONT */
+};
+
+void
+conf_color(struct conf *c, struct screen_ctx *sc)
+{
+	int	 i;
 
 	for (i = 0; i < CWM_COLOR_MAX; i++) {
 		xu_freecolor(sc, sc->color[i].pixel);
@@ -80,6 +90,7 @@ conf_color(struct conf *c)
 void
 conf_reload(struct conf *c)
 {
+	struct screen_ctx	*sc;
 	struct client_ctx	*cc;
 
 	if (parse_config(c->conf_path, c) == -1) {
@@ -87,18 +98,98 @@ conf_reload(struct conf *c)
 		return;
 	}
 
-	conf_color(c);
+	TAILQ_FOREACH(sc, &Screenq, entry) {
+		conf_gap(c, sc);
+		conf_color(c, sc);
+		conf_font(c, sc);
+		menu_init(sc);
+	}
 	TAILQ_FOREACH(cc, &Clientq, entry)
 		client_draw_border(cc);
-	conf_font(c);
 }
 
+static struct {
+	char	*key;
+	char	*func;
+} kb_binds[] = {
+	{ "CM-Return",	"terminal" },
+	{ "CM-Delete",	"lock" },
+	{ "M-question",	"exec" },
+	{ "CM-w",	"exec_wm" },
+	{ "M-period",	"ssh" },
+	{ "M-Return",	"hide" },
+	{ "M-Down",	"lower" },
+	{ "M-Up",	"raise" },
+	{ "M-slash",	"search" },
+	{ "C-slash",	"menusearch" },
+	{ "M-Tab",	"cycle" },
+	{ "MS-Tab",	"rcycle" },
+	{ "CM-n",	"label" },
+	{ "CM-x",	"delete" },
+	{ "CM-0",	"nogroup" },
+	{ "CM-1",	"group1" },
+	{ "CM-2",	"group2" },
+	{ "CM-3",	"group3" },
+	{ "CM-4",	"group4" },
+	{ "CM-5",	"group5" },
+	{ "CM-6",	"group6" },
+	{ "CM-7",	"group7" },
+	{ "CM-8",	"group8" },
+	{ "CM-9",	"group9" },
+	{ "M-Right",	"cyclegroup" },
+	{ "M-Left",	"rcyclegroup" },
+	{ "CM-g",	"grouptoggle" },
+	{ "CM-f",	"maximize" },
+	{ "CM-equal",	"vmaximize" },
+	{ "CMS-equal",	"hmaximize" },
+	{ "CMS-f",	"freeze" },
+	{ "CMS-r",	"reload" },
+	{ "CMS-q",	"quit" },
+	{ "M-h",	"moveleft" },
+	{ "M-j",	"movedown" },
+	{ "M-k",	"moveup" },
+	{ "M-l",	"moveright" },
+	{ "M-H",	"bigmoveleft" },
+	{ "M-J",	"bigmovedown" },
+	{ "M-K",	"bigmoveup" },
+	{ "M-L",	"bigmoveright" },
+	{ "CM-h",	"resizeleft" },
+	{ "CM-j",	"resizedown" },
+	{ "CM-k",	"resizeup" },
+	{ "CM-l",	"resizeright" },
+	{ "CM-H",	"bigresizeleft" },
+	{ "CM-J",	"bigresizedown" },
+	{ "CM-K",	"bigresizeup" },
+	{ "CM-L",	"bigresizeright" },
+	{ "C-Left",	"ptrmoveleft" },
+	{ "C-Down",	"ptrmovedown" },
+	{ "C-Up",	"ptrmoveup" },
+	{ "C-Right",	"ptrmoveright" },
+	{ "CS-Left",	"bigptrmoveleft" },
+	{ "CS-Down",	"bigptrmovedown" },
+	{ "CS-Up",	"bigptrmoveup" },
+	{ "CS-Right",	"bigptrmoveright" },
+},
+m_binds[] = {
+	{ "1",		"menu_unhide" },
+	{ "2",		"menu_group" },
+	{ "3",		"menu_cmd" },
+	{ "M-1",	"window_move" },
+	{ "CM-1",	"window_grouptoggle" },
+	{ "M-2",	"window_resize" },
+	{ "M-3",	"window_lower" },
+	{ "CMS-3",	"window_hide" },
+};
+
 void
 conf_init(struct conf *c)
 {
+	int	i;
+
 	c->flags = 0;
 	c->bwidth = CONF_BWIDTH;
 	c->mamount = CONF_MAMOUNT;
+	c->snapdist = CONF_SNAPDIST;
 
 	TAILQ_INIT(&c->ignoreq);
 	TAILQ_INIT(&c->cmdq);
@@ -106,92 +197,20 @@ conf_init(struct conf *c)
 	TAILQ_INIT(&c->autogroupq);
 	TAILQ_INIT(&c->mousebindingq);
 
-	conf_bindname(c, "CM-Return", "terminal");
-	conf_bindname(c, "CM-Delete", "lock");
-	conf_bindname(c, "M-question", "exec");
-	conf_bindname(c, "CM-w", "exec_wm");
-	conf_bindname(c, "M-period", "ssh");
-	conf_bindname(c, "M-Return", "hide");
-	conf_bindname(c, "M-Down", "lower");
-	conf_bindname(c, "M-Up", "raise");
-	conf_bindname(c, "M-slash", "search");
-	conf_bindname(c, "C-slash", "menusearch");
-	conf_bindname(c, "M-Tab", "cycle");
-	conf_bindname(c, "MS-Tab", "rcycle");
-	conf_bindname(c, "CM-n", "label");
-	conf_bindname(c, "CM-x", "delete");
-	conf_bindname(c, "CM-0", "nogroup");
-	conf_bindname(c, "CM-1", "group1");
-	conf_bindname(c, "CM-2", "group2");
-	conf_bindname(c, "CM-3", "group3");
-	conf_bindname(c, "CM-4", "group4");
-	conf_bindname(c, "CM-5", "group5");
-	conf_bindname(c, "CM-6", "group6");
-	conf_bindname(c, "CM-7", "group7");
-	conf_bindname(c, "CM-8", "group8");
-	conf_bindname(c, "CM-9", "group9");
-	conf_bindname(c, "M-Right", "cyclegroup");
-	conf_bindname(c, "M-Left", "rcyclegroup");
-	conf_bindname(c, "CM-g", "grouptoggle");
-	conf_bindname(c, "CM-f", "maximize");
-	conf_bindname(c, "CM-equal", "vmaximize");
-	conf_bindname(c, "CMS-r", "reload");
-	conf_bindname(c, "CMS-q", "quit");
+	for (i = 0; i < nitems(kb_binds); i++)
+		conf_bindname(c, kb_binds[i].key, kb_binds[i].func);
 
-	conf_bindname(c, "M-h", "moveleft");
-	conf_bindname(c, "M-j", "movedown");
-	conf_bindname(c, "M-k", "moveup");
-	conf_bindname(c, "M-l", "moveright");
-	conf_bindname(c, "M-H", "bigmoveleft");
-	conf_bindname(c, "M-J", "bigmovedown");
-	conf_bindname(c, "M-K", "bigmoveup");
-	conf_bindname(c, "M-L", "bigmoveright");
+	for (i = 0; i < nitems(m_binds); i++)
+		conf_mousebind(c, m_binds[i].key, m_binds[i].func);
 
-	conf_bindname(c, "CM-h", "resizeleft");
-	conf_bindname(c, "CM-j", "resizedown");
-	conf_bindname(c, "CM-k", "resizeup");
-	conf_bindname(c, "CM-l", "resizeright");
-	conf_bindname(c, "CM-H", "bigresizeleft");
-	conf_bindname(c, "CM-J", "bigresizedown");
-	conf_bindname(c, "CM-K", "bigresizeup");
-	conf_bindname(c, "CM-L", "bigresizeright");
-
-	conf_bindname(c, "C-Left", "ptrmoveleft");
-	conf_bindname(c, "C-Down", "ptrmovedown");
-	conf_bindname(c, "C-Up", "ptrmoveup");
-	conf_bindname(c, "C-Right", "ptrmoveright");
-	conf_bindname(c, "CS-Left", "bigptrmoveleft");
-	conf_bindname(c, "CS-Down", "bigptrmovedown");
-	conf_bindname(c, "CS-Up", "bigptrmoveup");
-	conf_bindname(c, "CS-Right", "bigptrmoveright");
-
-	conf_mousebind(c, "1", "menu_unhide");
-	conf_mousebind(c, "2", "menu_group");
-	conf_mousebind(c, "3", "menu_cmd");
-	conf_mousebind(c, "M-1", "window_move");
-	conf_mousebind(c, "CM-1", "window_grouptoggle");
-	conf_mousebind(c, "M-2", "window_resize");
-	conf_mousebind(c, "M-3", "window_lower");
-	conf_mousebind(c, "CMS-3", "window_hide");
+	for (i = 0; i < nitems(color_binds); i++)
+		c->color[i].name = xstrdup(color_binds[i].name);
 
 	/* Default term/lock */
-	strlcpy(c->termpath, "xterm", sizeof(c->termpath));
-	strlcpy(c->lockpath, "xlock", sizeof(c->lockpath));
+	(void)strlcpy(c->termpath, "xterm", sizeof(c->termpath));
+	(void)strlcpy(c->lockpath, "xlock", sizeof(c->lockpath));
 
-	c->color[CWM_COLOR_BORDOR_ACTIVE].name =
-	    xstrdup(CONF_COLOR_ACTIVEBORDER);
-	c->color[CWM_COLOR_BORDER_INACTIVE].name =
-	    xstrdup(CONF_COLOR_INACTIVEBORDER);
-	c->color[CWM_COLOR_BORDER_GROUP].name =
-	    xstrdup(CONF_COLOR_GROUPBORDER);
-	c->color[CWM_COLOR_BORDER_UNGROUP].name =
-	    xstrdup(CONF_COLOR_UNGROUPBORDER);
-	c->color[CWM_COLOR_FG_MENU].name =
-	    xstrdup(CONF_COLOR_MENUFG);
-	c->color[CWM_COLOR_BG_MENU].name =
-	    xstrdup(CONF_COLOR_MENUBG);
-
-	c->DefaultFontName = xstrdup(DEFAULTFONTNAME);
+	c->font = xstrdup(CONF_FONT);
 }
 
 void
@@ -219,7 +238,6 @@ conf_clear(struct conf *c)
 		xfree(ag->class);
 		if (ag->name)
 			xfree(ag->name);
-		xfree(ag->group);
 		xfree(ag);
 	}
 
@@ -236,31 +254,39 @@ conf_clear(struct conf *c)
 	for (i = 0; i < CWM_COLOR_MAX; i++)
 		xfree(c->color[i].name);
 
-	xfree(c->DefaultFontName);
+	xfree(c->font);
 }
 
 void
 conf_setup(struct conf *c, const char *conf_file)
 {
+	char		*home;
 	struct stat	 sb;
-
-	if (conf_file == NULL) {
-		char *home = getenv("HOME");
-
-		if (home == NULL)
-			errx(1, "No HOME directory.");
-
-		snprintf(c->conf_path, sizeof(c->conf_path), "%s/%s", home,
-		    CONFFILE);
-	} else
-		if (stat(conf_file, &sb) == -1 || !(sb.st_mode & S_IFREG))
-			errx(1, "%s: %s", conf_file, strerror(errno));
-		else
-			strlcpy(c->conf_path, conf_file, sizeof(c->conf_path));
+	int		 parse = 0;
 
 	conf_init(c);
 
-	(void)parse_config(c->conf_path, c);
+	if (conf_file == NULL) {
+		if ((home = getenv("HOME")) == NULL)
+			errx(1, "No HOME directory.");
+
+		(void)snprintf(c->conf_path, sizeof(c->conf_path), "%s/%s",
+		    home, CONFFILE);
+
+		if (stat(c->conf_path, &sb) == 0 && (sb.st_mode & S_IFREG))
+			parse = 1;
+	} else {
+		if (stat(conf_file, &sb) == -1 || !(sb.st_mode & S_IFREG))
+			errx(1, "%s: %s", conf_file, strerror(errno));
+		else {
+			(void)strlcpy(c->conf_path, conf_file,
+			    sizeof(c->conf_path));
+			parse = 1;
+		}
+	}
+
+	if (parse && (parse_config(c->conf_path, c) == -1))
+		warnx("config file %s has errors, not loading", c->conf_path);
 }
 
 void
@@ -333,11 +359,15 @@ static struct {
 	{ "movetogroup9", kbfunc_client_movetogroup, KBFLAG_NEEDCLIENT,
 	    {.i = 9} },
 	{ "nogroup", kbfunc_client_nogroup, 0, {0} },
-	{ "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLEGROUP} },
-	{ "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLEGROUP} },
+	{ "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLE} },
+	{ "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLE} },
+	{ "cycleingroup", kbfunc_client_cycle, KBFLAG_NEEDCLIENT, {.i = CWM_CYCLE|CWM_INGROUP} },
+	{ "rcycleingroup", kbfunc_client_cycle, KBFLAG_NEEDCLIENT, {.i = CWM_RCYCLE|CWM_INGROUP} },
 	{ "grouptoggle", kbfunc_client_grouptoggle, KBFLAG_NEEDCLIENT, {0}},
 	{ "maximize", kbfunc_client_maximize, KBFLAG_NEEDCLIENT, {0} },
 	{ "vmaximize", kbfunc_client_vmaximize, KBFLAG_NEEDCLIENT, {0} },
+	{ "hmaximize", kbfunc_client_hmaximize, KBFLAG_NEEDCLIENT, {0} },
+	{ "freeze", kbfunc_client_freeze, KBFLAG_NEEDCLIENT, {0} },
 	{ "reload", kbfunc_reload, 0, {0} },
 	{ "quit", kbfunc_quit_wm, 0, {0} },
 	{ "exec", kbfunc_exec, 0, {.i = CWM_EXEC_PROGRAM} },
@@ -390,7 +420,6 @@ static struct {
 	    {.i = (CWM_LEFT|CWM_PTRMOVE|CWM_BIGMOVE)} },
 	{ "bigptrmoveright", kbfunc_moveresize, 0,
 	    {.i = (CWM_RIGHT|CWM_PTRMOVE|CWM_BIGMOVE)} },
-	{ NULL, NULL, 0, {0}},
 };
 
 /*
@@ -424,36 +453,39 @@ conf_ungrab(struct conf *c, struct keybinding *kb)
 		xu_key_ungrab(sc->rootwin, kb->modmask, kb->keysym);
 }
 
+static struct {
+	char	chr;
+	int	mask;
+} bind_mods[] = {
+	{ 'C',	ControlMask },
+	{ 'M',	Mod1Mask },
+	{ '4',	Mod4Mask },
+	{ 'S',	ShiftMask },
+};
+
 void
 conf_bindname(struct conf *c, char *name, char *binding)
 {
 	struct keybinding	*current_binding;
-	char			*substring;
+	char			*substring, *tmp;
 	int			 iter;
 
 	current_binding = xcalloc(1, sizeof(*current_binding));
 
-	if (strchr(name, 'C') != NULL &&
-	    strchr(name, 'C') < strchr(name, '-'))
-		current_binding->modmask |= ControlMask;
+	if ((substring = strchr(name, '-')) != NULL) {
+		for (iter = 0; iter < nitems(bind_mods); iter++) {
+			if ((tmp = strchr(name, bind_mods[iter].chr)) !=
+			    NULL && tmp < substring) {
+				current_binding->modmask |=
+				    bind_mods[iter].mask;
+			}
+		}
 
-	if (strchr(name, 'M') != NULL &&
-	    strchr(name, 'M') < strchr(name, '-'))
-		current_binding->modmask |= Mod1Mask;
-
-	if (strchr(name, '4') != NULL &&
-	    strchr(name, '4') < strchr(name, '-'))
-		current_binding->modmask |= Mod4Mask;
-
-	if (strchr(name, 'S') != NULL &&
-	    strchr(name, 'S') < strchr(name, '-'))
-		current_binding->modmask |= ShiftMask;
-
-	substring = strchr(name, '-') + 1;
-
-	/* If there is no '-' in name, continue as is */
-	if (strchr(name, '-') == NULL)
+		/* skip past the modifiers */
+		substring++;
+	} else {
 		substring = name;
+	}
 
 	if (substring[0] == '[' &&
 	    substring[strlen(substring)-1] == ']') {
@@ -476,7 +508,7 @@ conf_bindname(struct conf *c, char *name, char *binding)
 	if (strcmp("unmap", binding) == 0)
 		return;
 
-	for (iter = 0; name_to_kbfunc[iter].tag != NULL; iter++) {
+	for (iter = 0; iter < nitems(name_to_kbfunc); iter++) {
 		if (strcmp(name_to_kbfunc[iter].tag, binding) != 0)
 			continue;
 
@@ -493,7 +525,6 @@ conf_bindname(struct conf *c, char *name, char *binding)
 	current_binding->flags = 0;
 	conf_grab(c, current_binding);
 	TAILQ_INSERT_TAIL(&c->keybindingq, current_binding, entry);
-	return;
 }
 
 static void
@@ -528,42 +559,35 @@ static struct {
 	{ "window_grouptoggle", mousefunc_window_grouptoggle,
 	    MOUSEBIND_CTX_WIN },
 	{ "window_lower", mousefunc_window_lower, MOUSEBIND_CTX_WIN },
+	{ "window_raise", mousefunc_window_raise, MOUSEBIND_CTX_WIN },
 	{ "window_hide", mousefunc_window_hide, MOUSEBIND_CTX_WIN },
 	{ "menu_group", mousefunc_menu_group, MOUSEBIND_CTX_ROOT },
 	{ "menu_unhide", mousefunc_menu_unhide, MOUSEBIND_CTX_ROOT },
 	{ "menu_cmd", mousefunc_menu_cmd, MOUSEBIND_CTX_ROOT },
-	{ NULL, NULL, 0 },
 };
 
 void
 conf_mousebind(struct conf *c, char *name, char *binding)
 {
 	struct mousebinding	*current_binding;
-	char			*substring;
+	char			*substring, *tmp;
 	const char		*errstr;
 	int			 iter;
 
 	current_binding = xcalloc(1, sizeof(*current_binding));
 
-	if (strchr(name, 'C') != NULL &&
-	    strchr(name, 'C') < strchr(name, '-'))
-		current_binding->modmask |= ControlMask;
+	if ((substring = strchr(name, '-')) != NULL) {
+		for (iter = 0; iter < nitems(bind_mods); iter++) {
+			if ((tmp = strchr(name, bind_mods[iter].chr)) !=
+			    NULL && tmp < substring) {
+				current_binding->modmask |=
+				    bind_mods[iter].mask;
+			}
+		}
 
-	if (strchr(name, 'M') != NULL &&
-	    strchr(name, 'M') < strchr(name, '-'))
-		current_binding->modmask |= Mod1Mask;
-
-	if (strchr(name, 'S') != NULL &&
-	    strchr(name, 'S') < strchr(name, '-'))
-		current_binding->modmask |= ShiftMask;
-
-	if (strchr(name, '4') != NULL &&
-	    strchr(name, '4') < strchr(name, '-'))
-		current_binding->modmask |= Mod4Mask;
-
-	substring = strchr(name, '-') + 1;
-
-	if (strchr(name, '-') == NULL)
+		/* skip past the modifiers */
+		substring++;
+	} else
 		substring = name;
 
 	current_binding->button = strtonum(substring, 1, 3, &errstr);
@@ -575,7 +599,7 @@ conf_mousebind(struct conf *c, char *name, char *binding)
 	if (strcmp("unmap", binding) == 0)
 		return;
 
-	for (iter = 0; name_to_mousefunc[iter].tag != NULL; iter++) {
+	for (iter = 0; iter < nitems(name_to_mousefunc); iter++) {
 		if (strcmp(name_to_mousefunc[iter].tag, binding) != 0)
 			continue;
 

cwm.1

@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 18 2009 $
+.Dd $Mdocdate: September 25 2010 $
 .Dt CWM 1
 .Os
 .Sh NAME
@@ -88,10 +88,14 @@ Toggle group membership of current window.
 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-f
 Toggle full-screen size 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
@@ -186,7 +190,7 @@ 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 10n -offset -indent -compact
+.Bl -tag -width 10n -offset indent -compact
 .It !
 The window is the currently focused window.
 .It &
@@ -228,7 +232,7 @@ 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 10n -offset -indent -compact
+.Bl -tag -width 10n -offset indent -compact
 .It Ic M1
 Show list of currently hidden windows.
 Clicking on an item will unhide that window.
@@ -264,7 +268,7 @@ with contributions from
 .An Andy Adamson Aq dros@monkey.org ,
 .An Niels Provos Aq provos@monkey.org ,
 and
-.An Antti Nyk<EFBFBD>nen Aq aon@iki.fi .
+.An Antti Nyk\(:anen Aq aon@iki.fi .
 Ideas, discussion with many others.
 .Sh HISTORY
 .Nm

cwmrc.5

@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 17 2009 $
+.Dd $Mdocdate: September 8 2011 $
 .Dt CWMRC 5
 .Os
 .Sh NAME
@@ -24,12 +24,24 @@
 This manual page describes the
 .Xr cwm 1
 configuration file.
-The following options are accepted in the configuration file:
+.Pp
+The current line can be extended over multiple lines using a backslash
+.Pq Sq \e .
+Comments can be put anywhere in the file using a hash mark
+.Pq Sq # ,
+and extend to the end of the current line.
+Care should be taken when commenting out multi-line text:
+the comment is effective until the end of the entire block.
+.Pp
+Arguments containing whitespace should be surrounded by double quotes
+.Pq \&" .
+.Pp
+The following options are accepted:
 .Pp
 .Bl -tag -width Ds -compact
-.It Ic autogroup Ar group Dq windowclass
-.It Ic autogroup Ar group Dq windowclass,windowname
-Control automatic window grouping, based on the class and/or name
+.It Ic autogroup Ar group windowname
+.It Ic autogroup Ar group windowname,windowclass
+Control automatic window grouping, based on the name and/or class
 properties, where
 .Ar group
 is a number between 0 and 9.
@@ -38,10 +50,10 @@ allow for
 .Dq sticky
 windows in sticky group mode.
 .Pp
-The class and name of a window may be obtained using
+The name and class of a window may be obtained using
 .Xr xprop 1 .
 .Pp
-.It Ic bind Ar keys Ar command
+.It Ic bind Ar keys command
 Cause the creation of a keybinding, or replacement of a default
 keybinding.
 The modifier keys come first, followed by a
@@ -87,16 +99,25 @@ Set the window border width to
 .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 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 ungroupborder Ar color
 Set the color of the border while ungrouping a window.
 .Pp
-.It Ic command Ar name Ar path
+.It Ic command Ar name path
 Every
 .Ar name
 entry is shown in the application menu.
@@ -138,16 +159,16 @@ can be used for applications such as
 where the user may wish to remain visible.
 .Pp
 .It Ic ignore Ar windowname
-Ignore windows with the name
+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 Ar command
+.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 - .
-.Pb
+.Pp
 The following modifiers are recognised:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
@@ -164,9 +185,8 @@ The Mod4 key (normally the windows key).
 The
 .Sq -
 should be followed by number:
-.Pb
-.Bl -tag -width Ds -offset indent -compact
 .Pp
+.Bl -tag -width Ds -offset indent -compact
 .It 1
 Left mouse button.
 .It 2
@@ -186,6 +206,10 @@ 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.
@@ -278,6 +302,10 @@ Reverse cycle through groups.
 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
@@ -288,10 +316,14 @@ Lower current window.
 Raise current window.
 .It label
 Label current window.
+.It freeze
+Freeze current window geometry.
 .It maximize
 Maximize current window full-screen.
 .It vmaximize
 Maximize current window vertically.
+.It hmaximize
+Maximize current window horizontally.
 .It moveup
 Move window
 .Ar moveamount
@@ -397,6 +429,8 @@ Move current window.
 Resize current window.
 .It window_lower
 Lower current window.
+.It window_raise
+Raise current window.
 .It window_hide
 Hide current window.
 .It window_grouptoggle

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

font.c

@@ -1,5 +1,5 @@
 /*
- * font.c - cwm font abstraction
+ * calmwm - the calm window manager
  *
  * Copyright (c) 2005 Marius Eriksen <marius@monkey.org>
  *
@@ -14,30 +14,64 @@
  * 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 "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
-void
-font_init(struct screen_ctx *sc)
+int
+font_ascent(struct screen_ctx *sc)
 {
+	return (sc->font->ascent);
+}
+
+int
+font_descent(struct screen_ctx *sc)
+{
+	return (sc->font->descent);
+}
+
+u_int
+font_height(struct screen_ctx *sc)
+{
+	return (sc->font->height + 1);
+}
+
+void
+font_init(struct screen_ctx *sc, const char *color)
+{
+	if (sc->xftdraw)
+		XftDrawDestroy(sc->xftdraw);
 	sc->xftdraw = XftDrawCreate(X_Dpy, sc->rootwin,
 	    DefaultVisual(X_Dpy, sc->which), DefaultColormap(X_Dpy, sc->which));
 	if (sc->xftdraw == NULL)
 		errx(1, "XftDrawCreate");
 
+	if (sc->xftcolor.pixel)
+		XftColorFree(X_Dpy, DefaultVisual(X_Dpy, sc->which),
+		    DefaultColormap(X_Dpy, sc->which), &sc->xftcolor);
 	if (!XftColorAllocName(X_Dpy, DefaultVisual(X_Dpy, sc->which),
-	    DefaultColormap(X_Dpy, sc->which), "black", &sc->xftcolor))
+	    DefaultColormap(X_Dpy, sc->which), color, &sc->xftcolor))
 		errx(1, "XftColorAllocName");
 }
 
 int
-font_width(const char *text, int len)
+font_width(struct screen_ctx *sc, const char *text, int len)
 {
 	XGlyphInfo	 extents;
 
-	XftTextExtents8(X_Dpy, Conf.DefaultFont, (const XftChar8*)text,
+	XftTextExtentsUtf8(X_Dpy, sc->font, (const FcChar8*)text,
 	    len, &extents);
 
 	return (extents.xOff);
@@ -48,8 +82,7 @@ font_draw(struct screen_ctx *sc, const char *text, int len,
     Drawable d, int x, int y)
 {
 	XftDrawChange(sc->xftdraw, d);
-	/* Really needs to be UTF8'd. */
-	XftDrawString8(sc->xftdraw, &sc->xftcolor, Conf.DefaultFont, x, y,
+	XftDrawStringUtf8(sc->xftdraw, &sc->xftcolor, sc->font, x, y,
 	    (const FcChar8*)text, len);
 }
 

group.c

@@ -16,24 +16,29 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
-#include "calmwm.h"
+#include <sys/param.h>
+#include <sys/queue.h>
 
-#define CALMWM_NGROUPS 9
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "calmwm.h"
 
 static void		 group_add(struct group_ctx *, struct client_ctx *);
 static void		 group_remove(struct client_ctx *);
-static void		 group_hide(struct group_ctx *);
-static void		 group_show(struct group_ctx *);
+static void		 group_hide(struct screen_ctx *, struct group_ctx *);
+static void		 group_show(struct screen_ctx *, struct group_ctx *);
 static void		 group_fix_hidden_state(struct group_ctx *);
-
-struct group_ctx	*Group_active = NULL;
-struct group_ctx	 Groups[CALMWM_NGROUPS];
-int			 Grouphideall = 0;
-struct group_ctx_q	 Groupq;
+static void		 group_setactive(struct screen_ctx *, long);
+static void		 group_set_names(struct screen_ctx *);
 
 const char *shortcut_to_name[] = {
 	"nogroup", "one", "two", "three", "four", "five", "six",
@@ -43,17 +48,20 @@ const char *shortcut_to_name[] = {
 static void
 group_add(struct group_ctx *gc, struct client_ctx *cc)
 {
+	long	no;
 	if (cc == NULL || gc == NULL)
 		errx(1, "group_add: a ctx is NULL");
 
+	no = gc->shortcut - 1;
+
 	if (cc->group == gc)
 		return;
 
 	if (cc->group != NULL)
 		TAILQ_REMOVE(&cc->group->clients, cc, group_entry);
 
-	XChangeProperty(X_Dpy, cc->win, _CWM_GRP, XA_STRING,
-	    8, PropModeReplace, gc->name, strlen(gc->name));
+	XChangeProperty(X_Dpy, cc->win, _NET_WM_DESKTOP, XA_CARDINAL,
+	    32, PropModeReplace, (unsigned char *)&no, 1);
 
 	TAILQ_INSERT_TAIL(&gc->clients, cc, group_entry);
 	cc->group = gc;
@@ -62,23 +70,24 @@ group_add(struct group_ctx *gc, struct client_ctx *cc)
 static void
 group_remove(struct client_ctx *cc)
 {
+	long	no = 0xffffffff;
+
 	if (cc == NULL || cc->group == NULL)
 		errx(1, "group_remove: a ctx is NULL");
 
-	XChangeProperty(X_Dpy, cc->win, _CWM_GRP, XA_STRING, 8,
-	    PropModeReplace, shortcut_to_name[0],
-	    strlen(shortcut_to_name[0]));
+	XChangeProperty(X_Dpy, cc->win, _NET_WM_DESKTOP, XA_CARDINAL,
+	    32, PropModeReplace, (unsigned char *)&no, 1);
 
 	TAILQ_REMOVE(&cc->group->clients, cc, group_entry);
 	cc->group = NULL;
 }
 
 static void
-group_hide(struct group_ctx *gc)
+group_hide(struct screen_ctx *sc, struct group_ctx *gc)
 {
 	struct client_ctx	*cc;
 
-	screen_updatestackingorder();
+	screen_updatestackingorder(sc);
 
 	gc->nhidden = 0;
 	gc->highstack = 0;
@@ -92,13 +101,18 @@ group_hide(struct group_ctx *gc)
 }
 
 static void
-group_show(struct group_ctx *gc)
+group_show(struct screen_ctx *sc, struct group_ctx *gc)
 {
 	struct client_ctx	*cc;
 	Window			*winlist;
 	u_int			 i;
 	int			 lastempty = -1;
 
+	gc->highstack = 0;
+	TAILQ_FOREACH(cc, &gc->clients, group_entry) {
+		if (cc->stackingorder > gc->highstack)
+			gc->highstack = cc->stackingorder;
+	}
 	winlist = (Window *) xcalloc(sizeof(*winlist), (gc->highstack + 1));
 
 	/*
@@ -125,36 +139,96 @@ group_show(struct group_ctx *gc)
 	xfree(winlist);
 
 	gc->hidden = 0;
-	Group_active = gc;
+	group_setactive(sc, gc->shortcut - 1);
 }
 
 void
-group_init(void)
+group_init(struct screen_ctx *sc)
 {
 	int	 i;
+	long	 viewports[2] = {0, 0};
+	long	 ndesks = CALMWM_NGROUPS, zero = 0;
 
-	TAILQ_INIT(&Groupq);
+	TAILQ_INIT(&sc->groupq);
+	sc->group_hideall = 0;
+	/* see if any group names have already been set and update the property
+	 * with ours if they'll have changed.
+	 */
+	group_update_names(sc);
 
 	for (i = 0; i < CALMWM_NGROUPS; i++) {
-		TAILQ_INIT(&Groups[i].clients);
-		Groups[i].hidden = 0;
-		Groups[i].shortcut = i + 1;
-		Groups[i].name = shortcut_to_name[Groups[i].shortcut];
-		TAILQ_INSERT_TAIL(&Groupq, &Groups[i], entry);
+		TAILQ_INIT(&sc->groups[i].clients);
+		sc->groups[i].hidden = 0;
+		sc->groups[i].shortcut = i + 1;
+		TAILQ_INSERT_TAIL(&sc->groupq, &sc->groups[i], entry);
 	}
 
-	Group_active = &Groups[0];
+	/* we don't support large desktops, so this is always (0, 0) */
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_DESKTOP_VIEWPORT,
+	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)viewports, 2);
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_NUMBER_OF_DESKTOPS,
+	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&ndesks, 1);
+	/*
+	 * we don't use virtual roots, so make sure it's not there from a 
+	 * previous wm.
+	 */
+	XDeleteProperty(X_Dpy, sc->rootwin, _NET_VIRTUAL_ROOTS);
+	/*
+	 * We don't really have a ``showing desktop'' mode, so this is zero
+	 * always. XXX Note that when we hide all groups, or when all groups
+	 * are hidden we could technically set this later on.
+	 */
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_SHOWING_DESKTOP,
+	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&zero, 1);
+	group_setactive(sc, 0);
+}
+
+void
+group_make_autogroup(struct conf *conf, char *val, int no)
+{
+	struct autogroupwin	*aw;
+	char			*p;
+
+	aw = xcalloc(1, sizeof(*aw));
+
+	if ((p = strchr(val, ',')) == NULL) {
+		aw->name = NULL;
+		aw->class = xstrdup(val);
+	} else {
+		*(p++) = '\0';
+		aw->name = xstrdup(val);
+		aw->class = xstrdup(p);
+	}
+	aw->num = no;
+
+	TAILQ_INSERT_TAIL(&conf->autogroupq, aw, entry);
+}
+
+static void
+group_setactive(struct screen_ctx *sc, long idx)
+{
+	sc->group_active = &sc->groups[idx];
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_CURRENT_DESKTOP,
+	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&idx, 1);
 }
 
 void
 group_movetogroup(struct client_ctx *cc, int idx)
 {
+	struct screen_ctx	*sc = cc->sc;
+	struct group_ctx	*gc;
+
 	if (idx < 0 || idx >= CALMWM_NGROUPS)
 		err(1, "group_movetogroup: index out of range (%d)", idx);
 
-	if(Group_active != &Groups[idx])
+	gc = &sc->groups[idx];
+	if (cc->group == gc)
+		return;
+	if (gc->hidden) {
 		client_hide(cc);
-	group_add(&Groups[idx], cc);
+		gc->nhidden++;
+	}
+	group_add(gc, cc);
 }
 
 /*
@@ -163,9 +237,10 @@ group_movetogroup(struct client_ctx *cc, int idx)
 void
 group_sticky_toggle_enter(struct client_ctx *cc)
 {
+	struct screen_ctx	*sc = cc->sc;
 	struct group_ctx	*gc;
 
-	gc = Group_active;
+	gc = sc->group_active;
 
 	if (gc == cc->group) {
 		group_remove(cc);
@@ -204,28 +279,28 @@ group_fix_hidden_state(struct group_ctx *gc)
 }
 
 void
-group_hidetoggle(int idx)
+group_hidetoggle(struct screen_ctx *sc, int idx)
 {
 	struct group_ctx	*gc;
 
 	if (idx < 0 || idx >= CALMWM_NGROUPS)
 		err(1, "group_hidetoggle: index out of range (%d)", idx);
 
-	gc = &Groups[idx];
-
+	gc = &sc->groups[idx];
 	group_fix_hidden_state(gc);
 
 	if (gc->hidden)
-		group_show(gc);
+		group_show(sc, gc);
 	else {
-		group_hide(gc);
+		group_hide(sc, gc);
+		/* XXX wtf? */
 		if (TAILQ_EMPTY(&gc->clients))
-			Group_active = gc;
+			group_setactive(sc, idx);
 	}
 }
 
 void
-group_only(int idx)
+group_only(struct screen_ctx *sc, int idx)
 {
 	int	 i;
 
@@ -234,9 +309,9 @@ group_only(int idx)
 
 	for (i = 0; i < CALMWM_NGROUPS; i++) {
 		if (i == idx)
-			group_show(&Groups[i]);
+			group_show(sc, &sc->groups[i]);
 		else
-			group_hide(&Groups[i]);
+			group_hide(sc, &sc->groups[i]);
 	}
 }
 
@@ -244,37 +319,37 @@ group_only(int idx)
  * Cycle through active groups.  If none exist, then just stay put.
  */
 void
-group_cycle(int reverse)
+group_cycle(struct screen_ctx *sc, int flags)
 {
 	struct group_ctx	*gc, *showgroup = NULL;
 
-	assert(Group_active != NULL);
+	assert(sc->group_active != NULL);
 
-	gc = Group_active;
+	gc = sc->group_active;
 	for (;;) {
-		gc = reverse ? TAILQ_PREV(gc, group_ctx_q, entry) :
-		    TAILQ_NEXT(gc, entry);
+		gc = (flags & CWM_RCYCLE) ? TAILQ_PREV(gc, group_ctx_q,
+		    entry) : TAILQ_NEXT(gc, entry);
 		if (gc == NULL)
-			gc = reverse ? TAILQ_LAST(&Groupq, group_ctx_q) :
-			    TAILQ_FIRST(&Groupq);
-		if (gc == Group_active)
+			gc = (flags & CWM_RCYCLE) ? TAILQ_LAST(&sc->groupq,
+			    group_ctx_q) : TAILQ_FIRST(&sc->groupq);
+		if (gc == sc->group_active)
 			break;
 
 		if (!TAILQ_EMPTY(&gc->clients) && showgroup == NULL)
 			showgroup = gc;
 		else if (!gc->hidden)
-			group_hide(gc);
+			group_hide(sc, gc);
 	}
 
 	if (showgroup == NULL)
 		return;
 
-	group_hide(Group_active);
+	group_hide(sc, sc->group_active);
 
 	if (showgroup->hidden)
-		group_show(showgroup);
+		group_show(sc, showgroup);
 	else
-		Group_active = showgroup;
+		group_setactive(sc, showgroup->shortcut - 1);
 }
 
 /* called when a client is deleted */
@@ -291,26 +366,28 @@ group_client_delete(struct client_ctx *cc)
 void
 group_menu(XButtonEvent *e)
 {
+	struct screen_ctx	*sc;
 	struct group_ctx	*gc;
 	struct menu		*mi;
 	struct menu_q		 menuq;
 	int			 i;
 
+	sc = screen_fromroot(e->root);
 	TAILQ_INIT(&menuq);
 
 	for (i = 0; i < CALMWM_NGROUPS; i++) {
-		gc = &Groups[i];
+		gc = &sc->groups[i];
 
 		if (TAILQ_EMPTY(&gc->clients))
 			continue;
 
 		mi = xcalloc(1, sizeof(*mi));
 		if (gc->hidden)
-			snprintf(mi->text, sizeof(mi->text), "%d: [%s]",
-			    gc->shortcut, shortcut_to_name[gc->shortcut]);
+			(void)snprintf(mi->text, sizeof(mi->text), "%d: [%s]",
+			    gc->shortcut, sc->group_names[i]);
 		else
-			snprintf(mi->text, sizeof(mi->text), "%d: %s",
-			    gc->shortcut, shortcut_to_name[gc->shortcut]);
+			(void)snprintf(mi->text, sizeof(mi->text), "%d: %s",
+			    gc->shortcut, sc->group_names[i]);
 		mi->ctx = gc;
 		TAILQ_INSERT_TAIL(&menuq, mi, entry);
 	}
@@ -318,14 +395,14 @@ group_menu(XButtonEvent *e)
 	if (TAILQ_EMPTY(&menuq))
 		return;
 
-	mi = menu_filter(&menuq, NULL, NULL, 0, NULL, NULL);
+	mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL);
 
 	if (mi == NULL || mi->ctx == NULL)
 		goto cleanup;
 
 	gc = (struct group_ctx *)mi->ctx;
 
-	(gc->hidden) ? group_show(gc) : group_hide(gc);
+	(gc->hidden) ? group_show(sc, gc) : group_hide(sc, gc);
 
 cleanup:
 	while ((mi = TAILQ_FIRST(&menuq)) != NULL) {
@@ -335,56 +412,138 @@ cleanup:
 }
 
 void
-group_alltoggle(void)
+group_alltoggle(struct screen_ctx *sc)
 {
 	int	 i;
 
 	for (i = 0; i < CALMWM_NGROUPS; i++) {
-		if (Grouphideall)
-			group_show(&Groups[i]);
+		if (sc->group_hideall)
+			group_show(sc, &sc->groups[i]);
 		else
-			group_hide(&Groups[i]);
+			group_hide(sc, &sc->groups[i]);
 	}
 
-	Grouphideall = (Grouphideall) ? 0 : 1;
+	sc->group_hideall = (!sc->group_hideall);
 }
 
 void
 group_autogroup(struct client_ctx *cc)
 {
+	struct screen_ctx	*sc = cc->sc;
 	struct autogroupwin	*aw;
 	struct group_ctx	*gc;
-	unsigned char		*grpstr = NULL;
-	char			 group[CALMWM_MAXNAMELEN];
+	int			 no = -1;
+	long			*grpno;
 
 	if (cc->app_class == NULL || cc->app_name == NULL)
 		return;
-	if (xu_getprop(cc, _CWM_GRP,  XA_STRING,
-	    (CALMWM_MAXNAMELEN - 1)/sizeof(long), &grpstr) > 0) {
-		strlcpy(group, grpstr, sizeof(group));
-		XFree(grpstr);
+
+	if (xu_getprop(cc->win, _NET_WM_DESKTOP, XA_CARDINAL,
+	    1, (unsigned char **)&grpno) > 0) {
+		if (*grpno == 0xffffffff)
+			no = 0;
+		else if (*grpno > CALMWM_NGROUPS || *grpno < 0)
+			no = CALMWM_NGROUPS - 1;
+		else
+			no = *grpno + 1;
+		XFree(grpno);
 	} else {
 		TAILQ_FOREACH(aw, &Conf.autogroupq, entry) {
 			if (strcmp(aw->class, cc->app_class) == 0 &&
 			    (aw->name == NULL ||
 			    strcmp(aw->name, cc->app_name) == 0)) {
-				strlcpy(group, aw->group, sizeof(group));
+				no = aw->num;
 				break;
 			}
 		}
 	}
 
-	if (strncmp("nogroup", group, 7) == 0)
+	/* no group please */
+	if (no == 0)
 		return;
 
-	TAILQ_FOREACH(gc, &Groupq, entry) {
-		if (strcmp(shortcut_to_name[gc->shortcut], group) == 0) {
+	TAILQ_FOREACH(gc, &sc->groupq, entry) {
+		if (gc->shortcut == no) {
 			group_add(gc, cc);
 			return;
 		}
 	}
 
 	if (Conf.flags & CONF_STICKY_GROUPS)
-		group_add(Group_active, cc);
-
+		group_add(sc->group_active, cc);
+}
+
+void
+group_update_names(struct screen_ctx *sc)
+{
+	char		**strings, *p;
+	unsigned char	*prop_ret;
+	Atom		 type_ret;
+	int		 format_ret, i = 0, nstrings = 0, n, setnames = 0;
+	unsigned long	 bytes_after, num_ret;
+	
+	if (XGetWindowProperty(X_Dpy, sc->rootwin, _NET_DESKTOP_NAMES, 0,
+	    0xffffff, False, UTF8_STRING, &type_ret, &format_ret,
+	    &num_ret, &bytes_after, &prop_ret) == Success &&
+	    prop_ret != NULL && format_ret == 8) {
+		/* failure, just set defaults */
+		prop_ret[num_ret - 1] = '\0'; /* paranoia */
+		while (i < num_ret) {
+			if (prop_ret[i++] == '\0')
+				nstrings++;
+		}
+	}
+
+	strings = xmalloc((nstrings < CALMWM_NGROUPS ? CALMWM_NGROUPS :
+	    nstrings) * sizeof(*strings));
+
+	i = n = 0;
+	p = prop_ret;
+	while (n < nstrings) {
+		strings[n++] = xstrdup(p);
+		p += strlen(p) + 1;
+	}
+	/*
+	 * make sure we always set our defaults if nothing is there to
+	 * replace them.
+	 */
+	if (n < CALMWM_NGROUPS) {
+		setnames = 1;
+		i = 1;
+		while (n < CALMWM_NGROUPS)
+			strings[n++] = xstrdup(shortcut_to_name[i++]);
+	}
+
+	if (prop_ret != NULL)
+		XFree(prop_ret);
+	if (sc->group_nonames != 0)
+		xfree(sc->group_names);
+
+	sc->group_names = strings;
+	sc->group_nonames = n;
+	if (setnames)
+		group_set_names(sc);
+}
+
+static void
+group_set_names(struct screen_ctx *sc)
+{
+	unsigned char	*p, *q;
+	size_t		 len = 0, tlen, slen;
+	int		 i;
+
+	for (i = 0; i < sc->group_nonames; i++)
+		len += strlen(sc->group_names[i]) + 1;
+	q = p = xcalloc(len, sizeof(*p));
+
+	tlen = len;
+	for (i = 0; i < sc->group_nonames; i++) {
+		slen = strlen(sc->group_names[i]) + 1;
+		(void)strlcpy(q, sc->group_names[i], tlen);
+		tlen -= slen;
+		q += slen;
+	}
+		
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_DESKTOP_NAMES,
+	    UTF8_STRING, 8, PropModeReplace, p, len);
 }

headers.h

@@ -1,53 +0,0 @@
-/*
- * calmwm - the calm window manager
- *
- * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
- *
- * 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.
- *
- * $Id$
- */
-
-#ifndef _CALMWM_HEADERS_H_
-#define _CALMWM_HEADERS_H_
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <dirent.h>
-#include <getopt.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <X11/Intrinsic.h>
-#include <X11/Xatom.h>
-#include <X11/Xft/Xft.h>
-#include <X11/Xlib.h>
-#include <X11/Xos.h>
-#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>
-
-#endif /* _CALMWM_HEADERS_H_ */

input.c

@@ -1,108 +0,0 @@
-/*
- * calmwm - the calm window manager
- *
- * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
- *
- * 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.
- *
- * $Id$
- */
-
-#include "headers.h"
-#include "calmwm.h"
-
-int
-input_keycodetrans(KeyCode kc, u_int state, enum ctltype *ctl, char *chr)
-{
-	int	 ks;
-
-	*ctl = CTL_NONE;
-	*chr = '\0';
-
-	ks = XKeycodeToKeysym(X_Dpy, kc, (state & ShiftMask) ? 1 : 0);
-
-	/* Look for control characters. */
-	switch (ks) {
-	case XK_BackSpace:
-		*ctl = CTL_ERASEONE;
-		break;
-	case XK_Return:
-		*ctl = CTL_RETURN;
-		break;
-	case XK_Up:
-		*ctl = CTL_UP;
-		break;
-	case XK_Down:
-		*ctl = CTL_DOWN;
-		break;
-	case XK_Escape:
-		*ctl = CTL_ABORT;
-		break;
-	}
-
-	if (*ctl == CTL_NONE && (state & ControlMask)) {
-		switch (ks) {
-		case XK_s:
-		case XK_S:
-			/* Emacs "next" */
-			*ctl = CTL_DOWN;
-			break;
-		case XK_r:
-		case XK_R:
-			/* Emacs "previous" */
-			*ctl = CTL_UP;
-			break;
-		case XK_u:
-		case XK_U:
-			*ctl = CTL_WIPE;
-			break;
-		case XK_h:
-		case XK_H:
-			*ctl = CTL_ERASEONE;
-			break;
-		case XK_a:
-		case XK_A:
-			*ctl = CTL_ALL;
-			break;
-		}
-	}
-
-	if (*ctl == CTL_NONE && (state & Mod1Mask)) {
-		switch (ks) {
-		case XK_j:
-		case XK_J:
-			/* Vi "down" */
-			*ctl = CTL_DOWN;
-			break;
-		case XK_k:
-		case XK_K:
-			/* Vi "up" */
-			*ctl = CTL_UP;
-			break;
-		}
-	}
-
-	if (*ctl != CTL_NONE)
-		return (0);
-
-	/*
-	 * For regular characters, only (part of, actually) Latin 1
-	 * for now.
-	 */
-	if (ks < 0x20 || ks > 0x07e)
-		return (-1);
-
-	*chr = (char)ks;
-
-	return (0);
-}

kbfunc.c

@@ -1,7 +1,7 @@
 /*
- *  calmwm - the calm window manager
+ * calmwm - the calm window manager
  *
- *  Copyright (c) 2004 Martin Murray <mmurray@monkey.org>
+ * Copyright (c) 2004 Martin Murray <mmurray@monkey.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,18 +15,28 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include <paths.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <dirent.h>
+#include <err.h>
+#include <errno.h>
+#include <paths.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
 
-#include "headers.h"
 #include "calmwm.h"
 
 #define KNOWN_HOSTS	".ssh/known_hosts"
 #define HASH_MARKER	"|1|"
 
-extern int		_xev_quit;
+extern sig_atomic_t	xev_quit;
 
 void
 kbfunc_client_lower(struct client_ctx *cc, union arg *arg)
@@ -40,8 +50,8 @@ kbfunc_client_raise(struct client_ctx *cc, union arg *arg)
 	client_raise(cc);
 }
 
-#define typemask	(CWM_MOVE | CWM_RESIZE | CWM_PTRMOVE)
-#define movemask	(CWM_UP | CWM_DOWN | CWM_LEFT | CWM_RIGHT)
+#define TYPEMASK	(CWM_MOVE | CWM_RESIZE | CWM_PTRMOVE)
+#define MOVEMASK	(CWM_UP | CWM_DOWN | CWM_LEFT | CWM_RIGHT)
 void
 kbfunc_moveresize(struct client_ctx *cc, union arg *arg)
 {
@@ -49,7 +59,10 @@ kbfunc_moveresize(struct client_ctx *cc, union arg *arg)
 	int			 x, y, flags, amt;
 	u_int			 mx, my;
 
-	sc = screen_current();
+	if (cc->flags & CLIENT_FREEZE)
+		return;
+
+	sc = cc->sc;
 	mx = my = 0;
 
 	flags = arg->i;
@@ -60,7 +73,7 @@ kbfunc_moveresize(struct client_ctx *cc, union arg *arg)
 		amt = amt * 10;
 	}
 
-	switch (flags & movemask) {
+	switch (flags & MOVEMASK) {
 	case CWM_UP:
 		my -= amt;
 		break;
@@ -74,7 +87,7 @@ kbfunc_moveresize(struct client_ctx *cc, union arg *arg)
 		mx -= amt;
 		break;
 	}
-	switch (flags & typemask) {
+	switch (flags & TYPEMASK) {
 	case CWM_MOVE:
 		cc->geom.y += my;
 		if (cc->geom.y + cc->geom.height < 0)
@@ -88,6 +101,13 @@ kbfunc_moveresize(struct client_ctx *cc, union arg *arg)
 		if (cc->geom.x > cc->sc->xmax - 1)
 			cc->geom.x = cc->sc->xmax - 1;
 
+		cc->geom.x += client_snapcalc(cc->geom.x,
+		    cc->geom.width, cc->sc->xmax,
+		    cc->bwidth, Conf.snapdist);
+		cc->geom.y += client_snapcalc(cc->geom.y,
+		    cc->geom.height, cc->sc->ymax,
+		    cc->bwidth, Conf.snapdist);
+
 		client_move(cc);
 		xu_ptr_getpos(cc->win, &x, &y);
 		cc->ptr.y = y + my;
@@ -110,13 +130,8 @@ kbfunc_moveresize(struct client_ctx *cc, union arg *arg)
 		client_ptrwarp(cc);
 		break;
 	case CWM_PTRMOVE:
-		if (cc) {
-			xu_ptr_getpos(cc->win, &x, &y);
-			xu_ptr_setpos(cc->win, x + mx, y + my);
-		} else {
-			xu_ptr_getpos(sc->rootwin, &x, &y);
-			xu_ptr_setpos(sc->rootwin, x + mx, y + my);
-		}
+		xu_ptr_getpos(sc->rootwin, &x, &y);
+		xu_ptr_setpos(sc->rootwin, x + mx, y + my);
 		break;
 	default:
 		warnx("invalid flags passed to kbfunc_client_moveresize");
@@ -124,24 +139,26 @@ kbfunc_moveresize(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_client_search(struct client_ctx *scratch, union arg *arg)
+kbfunc_client_search(struct client_ctx *cc, union arg *arg)
 {
-	struct client_ctx	*cc, *old_cc;
+	struct screen_ctx	*sc;
+	struct client_ctx	*old_cc;
 	struct menu		*mi;
 	struct menu_q		 menuq;
 
+	sc = cc->sc;
 	old_cc = client_current();
 
 	TAILQ_INIT(&menuq);
 
 	TAILQ_FOREACH(cc, &Clientq, entry) {
 		mi = xcalloc(1, sizeof(*mi));
-		strlcpy(mi->text, cc->name, sizeof(mi->text));
+		(void)strlcpy(mi->text, cc->name, sizeof(mi->text));
 		mi->ctx = cc;
 		TAILQ_INSERT_TAIL(&menuq, mi, entry);
 	}
 
-	if ((mi = menu_filter(&menuq, "window", NULL, 0,
+	if ((mi = menu_filter(sc, &menuq, "window", NULL, 0,
 	    search_match_client, search_print_client)) != NULL) {
 		cc = (struct client_ctx *)mi->ctx;
 		if (cc->flags & CLIENT_HIDDEN)
@@ -159,22 +176,24 @@ kbfunc_client_search(struct client_ctx *scratch, union arg *arg)
 }
 
 void
-kbfunc_menu_search(struct client_ctx *scratch, union arg *arg)
+kbfunc_menu_search(struct client_ctx *cc, union arg *arg)
 {
-	struct cmd	*cmd;
-	struct menu	*mi;
-	struct menu_q	 menuq;
+	struct screen_ctx	*sc;
+	struct cmd		*cmd;
+	struct menu		*mi;
+	struct menu_q		 menuq;
 
+	sc = cc->sc;
 	TAILQ_INIT(&menuq);
 
 	TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
 		mi = xcalloc(1, sizeof(*mi));
-		strlcpy(mi->text, cmd->label, sizeof(mi->text));
+		(void)strlcpy(mi->text, cmd->label, sizeof(mi->text));
 		mi->ctx = cmd;
 		TAILQ_INSERT_TAIL(&menuq, mi, entry);
 	}
 
-	if ((mi = menu_filter(&menuq, "application", NULL, 0,
+	if ((mi = menu_filter(sc, &menuq, "application", NULL, 0,
 	    search_match_text, NULL)) != NULL)
 		u_spawn(((struct cmd *)mi->ctx)->image);
 
@@ -185,17 +204,17 @@ kbfunc_menu_search(struct client_ctx *scratch, union arg *arg)
 }
 
 void
-kbfunc_client_cycle(struct client_ctx *scratch, union arg *arg)
+kbfunc_client_cycle(struct client_ctx *cc, union arg *arg)
 {
 	struct screen_ctx	*sc;
 
-	sc = screen_current();
+	sc = cc->sc;
 
 	/* XXX for X apps that ignore events */
 	XGrabKeyboard(X_Dpy, sc->rootwin, True,
 	    GrabModeAsync, GrabModeAsync, CurrentTime);
 
-	client_cycle(arg->i);
+	client_cycle(sc, arg->i);
 }
 
 void
@@ -223,21 +242,19 @@ kbfunc_lock(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_exec(struct client_ctx *scratch, union arg *arg)
+kbfunc_exec(struct client_ctx *cc, union arg *arg)
 {
 #define NPATHS 256
-	char		**ap, *paths[NPATHS], *path, *pathcpy, *label;
-	char		 tpath[MAXPATHLEN];
-	int		 l, i, j, ngroups;
-	gid_t		 mygroups[NGROUPS_MAX];
-	uid_t		 ruid, euid, suid;
-	DIR		*dirp;
-	struct dirent	*dp;
-	struct menu	*mi;
-	struct menu_q	 menuq;
-	struct stat	 sb;
+	struct screen_ctx	*sc;
+	char			**ap, *paths[NPATHS], *path, *pathcpy, *label;
+	char			 tpath[MAXPATHLEN];
+	DIR			*dirp;
+	struct dirent		*dp;
+	struct menu		*mi;
+	struct menu_q		 menuq;
+	int			 l, i, cmd = arg->i;
 
-	int cmd = arg->i;
+	sc = cc->sc;
 	switch (cmd) {
 		case CWM_EXEC_PROGRAM:
 			label = "exec";
@@ -250,11 +267,6 @@ kbfunc_exec(struct client_ctx *scratch, union arg *arg)
 			/*NOTREACHED*/
 	}
 
-	if (getgroups(0, mygroups) == -1)
-		err(1, "getgroups failure");
-	if ((ngroups = getresuid(&ruid, &euid, &suid)) == -1)
-		err(1, "getresuid failure");
-
 	TAILQ_INIT(&menuq);
 
 	if ((path = getenv("PATH")) == NULL)
@@ -275,45 +287,27 @@ kbfunc_exec(struct client_ctx *scratch, union arg *arg)
 			/* skip everything but regular files and symlinks */
 			if (dp->d_type != DT_REG && dp->d_type != DT_LNK)
 				continue;
-			memset(tpath, '\0', sizeof(tpath));
+			(void)memset(tpath, '\0', sizeof(tpath));
 			l = snprintf(tpath, sizeof(tpath), "%s/%s", paths[i],
 			    dp->d_name);
 			/* check for truncation etc */
 			if (l == -1 || l >= (int)sizeof(tpath))
 				continue;
-			/* just ignore on stat failure */
-			if (stat(tpath, &sb) == -1)
-				continue;
-			/* may we execute this file? */
-			if (euid == sb.st_uid) {
-					if (sb.st_mode & S_IXUSR)
-						goto executable;
-					else
-						continue;
+			if (access(tpath, X_OK) == 0) {
+				mi = xcalloc(1, sizeof(*mi));
+				(void)strlcpy(mi->text,
+				    dp->d_name, sizeof(mi->text));
+				TAILQ_INSERT_TAIL(&menuq, mi, entry);
 			}
-			for (j = 0; j < ngroups; j++) {
-				if (mygroups[j] == sb.st_gid) {
-					if (sb.st_mode & S_IXGRP)
-						goto executable;
-					else
-						continue;
-				}
-			}
-			if (sb.st_mode & S_IXOTH)
-				goto executable;
-			continue;
-		executable:
-			/* the thing in tpath, we may execute */
-			mi = xcalloc(1, sizeof(*mi));
-			strlcpy(mi->text, dp->d_name, sizeof(mi->text));
-			TAILQ_INSERT_TAIL(&menuq, mi, entry);
 		}
 		(void)closedir(dirp);
 	}
 	xfree(path);
 
-	if ((mi = menu_filter(&menuq, label, NULL, 1,
+	if ((mi = menu_filter(sc, &menuq, label, NULL, 1,
 	    search_match_exec, NULL)) != NULL) {
+		if (mi->text[0] == '\0')
+			goto out;
 		switch (cmd) {
 			case CWM_EXEC_PROGRAM:
 				u_spawn(mi->text);
@@ -327,7 +321,7 @@ kbfunc_exec(struct client_ctx *scratch, union arg *arg)
 				break;
 		}
 	}
-
+out:
 	if (mi != NULL && mi->dummy)
 		xfree(mi);
 	while ((mi = TAILQ_FIRST(&menuq)) != NULL) {
@@ -337,16 +331,19 @@ kbfunc_exec(struct client_ctx *scratch, union arg *arg)
 }
 
 void
-kbfunc_ssh(struct client_ctx *scratch, union arg *arg)
+kbfunc_ssh(struct client_ctx *cc, union arg *arg)
 {
-	struct menu	*mi;
-	struct menu_q	 menuq;
-	FILE		*fp;
-	char		*buf, *lbuf, *p, *home;
-	char		 hostbuf[MAXHOSTNAMELEN], filename[MAXPATHLEN];
-	char		 cmd[256];
-	int		 l;
-	size_t		 len;
+	struct screen_ctx	*sc;
+	struct menu		*mi;
+	struct menu_q		 menuq;
+	FILE			*fp;
+	char			*buf, *lbuf, *p, *home;
+	char			 hostbuf[MAXHOSTNAMELEN], filename[MAXPATHLEN];
+	char			 cmd[256];
+	int			 l;
+	size_t			 len;
+
+	sc = cc->sc;
 
 	if ((home = getenv("HOME")) == NULL)
 		return;
@@ -366,7 +363,7 @@ kbfunc_ssh(struct client_ctx *scratch, union arg *arg)
 		else {
 			/* EOF without EOL, copy and add the NUL */
 			lbuf = xmalloc(len + 1);
-			memcpy(lbuf, buf, len);
+			(void)memcpy(lbuf, buf, len);
 			lbuf[len] = '\0';
 			buf = lbuf;
 		}
@@ -379,22 +376,24 @@ kbfunc_ssh(struct client_ctx *scratch, union arg *arg)
 		/* ignore badness */
 		if (p - buf + 1 > sizeof(hostbuf))
 			continue;
-		(void) strlcpy(hostbuf, buf, p - buf + 1);
+		(void)strlcpy(hostbuf, buf, p - buf + 1);
 		mi = xcalloc(1, sizeof(*mi));
-		(void) strlcpy(mi->text, hostbuf, sizeof(mi->text));
+		(void)strlcpy(mi->text, hostbuf, sizeof(mi->text));
 		TAILQ_INSERT_TAIL(&menuq, mi, entry);
 	}
 	xfree(lbuf);
-	fclose(fp);
+	(void)fclose(fp);
 
-	if ((mi = menu_filter(&menuq, "ssh", NULL, 1,
+	if ((mi = menu_filter(sc, &menuq, "ssh", NULL, 1,
 	    search_match_exec, NULL)) != NULL) {
+		if (mi->text[0] == '\0')
+			goto out;
 		l = snprintf(cmd, sizeof(cmd), "%s -e ssh %s", Conf.termpath,
 		    mi->text);
 		if (l != -1 && l < sizeof(cmd))
 			u_spawn(cmd);
 	}
-
+out:
 	if (mi != NULL && mi->dummy)
 		xfree(mi);
 	while ((mi = TAILQ_FIRST(&menuq)) != NULL) {
@@ -408,19 +407,19 @@ kbfunc_client_label(struct client_ctx *cc, union arg *arg)
 {
 	struct menu	*mi;
 	struct menu_q	 menuq;
-	char		*current;
 
 	TAILQ_INIT(&menuq);
-	
-	current = cc->label;
 
-	if ((mi = menu_filter(&menuq, "label", current, 1,
-	    search_match_text, NULL)) != NULL) {
+	/* dummy is set, so this will always return */
+	mi = menu_filter(cc->sc, &menuq, "label", cc->label, 1,
+	    search_match_text, NULL);
+
+	if (!mi->abort) {
 		if (cc->label != NULL)
 			xfree(cc->label);
 		cc->label = xstrdup(mi->text);
-		xfree(mi);
 	}
+	xfree(mi);
 }
 
 void
@@ -432,25 +431,25 @@ kbfunc_client_delete(struct client_ctx *cc, union arg *arg)
 void
 kbfunc_client_group(struct client_ctx *cc, union arg *arg)
 {
-	group_hidetoggle(KBTOGROUP(arg->i));
+	group_hidetoggle(cc->sc, KBTOGROUP(arg->i));
 }
 
 void
 kbfunc_client_grouponly(struct client_ctx *cc, union arg *arg)
 {
-	group_only(KBTOGROUP(arg->i));
+	group_only(cc->sc, KBTOGROUP(arg->i));
 }
 
 void
 kbfunc_client_cyclegroup(struct client_ctx *cc, union arg *arg)
 {
-	group_cycle(arg->i);
+	group_cycle(cc->sc, arg->i);
 }
 
 void
 kbfunc_client_nogroup(struct client_ctx *cc, union arg *arg)
 {
-	group_alltoggle();
+	group_alltoggle(cc->sc);
 }
 
 void
@@ -481,10 +480,22 @@ kbfunc_client_vmaximize(struct client_ctx *cc, union arg *arg)
 	client_vertmaximize(cc);
 }
 
+void
+kbfunc_client_hmaximize(struct client_ctx *cc, union arg *arg)
+{
+	client_horizmaximize(cc);
+}
+
+void
+kbfunc_client_freeze(struct client_ctx *cc, union arg *arg)
+{
+	client_freeze(cc);
+}
+
 void
 kbfunc_quit_wm(struct client_ctx *cc, union arg *arg)
 {
-	_xev_quit = 1;
+	xev_quit = 1;
 }
 
 void

menu.c

@@ -1,4 +1,6 @@
 /*
+ * calmwm - the calm window manager
+ *
  * Copyright (c) 2008 Owain G. Ainsworth <oga@openbsd.org>
  * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
  *
@@ -13,13 +15,30 @@
  * 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 "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
-#define PROMPT_SCHAR	'<27>'
-#define PROMPT_ECHAR	'<27>'
+#define PROMPT_SCHAR	"\xc2\xbb"
+#define PROMPT_ECHAR	"\xc2\xab"
+
+enum ctltype {
+	CTL_NONE = -1,
+	CTL_ERASEONE = 0, CTL_WIPE, CTL_UP, CTL_DOWN, CTL_RETURN,
+	CTL_ABORT, CTL_ALL
+};
 
 struct menu_ctx {
 	char			 searchstr[MENU_MAXENTRY + 1];
@@ -49,14 +68,19 @@ static void		 menu_draw(struct screen_ctx *, struct menu_ctx *,
 			     struct menu_q *, struct menu_q *);
 static int		 menu_calc_entry(struct screen_ctx *, struct menu_ctx *,
 			     int, int);
+static int		 menu_keycode(KeyCode, u_int, enum ctltype *,
+                             char *);
 
 void
 menu_init(struct screen_ctx *sc)
 {
 	XGCValues	 gv;
 
-	sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1, 0,
-	    sc->color[CWM_COLOR_BG_MENU].pixel,
+	if (sc->menuwin)
+		XDestroyWindow(X_Dpy, sc->menuwin);
+	sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1,
+	    Conf.bwidth,
+	    sc->color[CWM_COLOR_FG_MENU].pixel,
 	    sc->color[CWM_COLOR_BG_MENU].pixel);
 
 	gv.foreground =
@@ -64,24 +88,25 @@ menu_init(struct screen_ctx *sc)
 	gv.background = sc->color[CWM_COLOR_BG_MENU].pixel;
 	gv.function = GXxor;
 
+	if (sc->gc)
+		XFreeGC(X_Dpy, sc->gc);
 	sc->gc = XCreateGC(X_Dpy, sc->menuwin,
 	    GCForeground|GCBackground|GCFunction, &gv);
 }
 
 struct menu *
-menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy,
+menu_filter(struct screen_ctx *sc, struct menu_q *menuq, char *prompt,
+    char *initial, int dummy,
     void (*match)(struct menu_q *, struct menu_q *, char *),
     void (*print)(struct menu *, int))
 {
-	struct screen_ctx	*sc;
 	struct menu_ctx		 mc;
 	struct menu_q		 resultq;
 	struct menu		*mi = NULL;
 	XEvent			 e;
 	Window			 focuswin;
 	int			 evmask, focusrevert;
-
-	sc = screen_current();
+	int			 xsave, ysave, xcur, ycur;
 
 	TAILQ_INIT(&resultq);
 
@@ -89,22 +114,25 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy,
 
 	xu_ptr_getpos(sc->rootwin, &mc.x, &mc.y);
 
+	xsave = mc.x;
+	ysave = mc.y;
+
 	if (prompt == NULL) {
-		evmask = MenuMask;
+		evmask = MENUMASK;
 		mc.promptstr[0] = '\0';
 		mc.list = 1;
 	} else {
-		evmask = MenuMask | KeyMask; /* only accept keys if prompt */
-		snprintf(mc.promptstr, sizeof(mc.promptstr), "%s%c", prompt,
-		    PROMPT_SCHAR);
-		snprintf(mc.dispstr, sizeof(mc.dispstr), "%s%s%c", mc.promptstr,
-		    mc.searchstr, PROMPT_ECHAR);
-		mc.width = font_width(mc.dispstr, strlen(mc.dispstr));
+		evmask = MENUMASK | KEYMASK; /* only accept keys if prompt */
+		(void)snprintf(mc.promptstr, sizeof(mc.promptstr), "%s%s",
+		    prompt, PROMPT_SCHAR);
+		(void)snprintf(mc.dispstr, sizeof(mc.dispstr), "%s%s%s",
+		    mc.promptstr, mc.searchstr, PROMPT_ECHAR);
+		mc.width = font_width(sc, mc.dispstr, strlen(mc.dispstr));
 		mc.hasprompt = 1;
 	}
 
 	if (initial != NULL)
-		strlcpy(mc.searchstr, initial, sizeof(mc.searchstr));
+		(void)strlcpy(mc.searchstr, initial, sizeof(mc.searchstr));
 	else
 		mc.searchstr[0] = '\0';
 
@@ -113,11 +141,11 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy,
 	mc.entry = mc.prev = -1;
 
 	XMoveResizeWindow(X_Dpy, sc->menuwin, mc.x, mc.y, mc.width,
-	    font_height());
+	    font_height(sc));
 	XSelectInput(X_Dpy, sc->menuwin, evmask);
 	XMapRaised(X_Dpy, sc->menuwin);
 
-	if (xu_ptr_grab(sc->menuwin, MenuGrabMask, Cursor_question) < 0) {
+	if (xu_ptr_grab(sc->menuwin, MENUGRABMASK, Cursor_question) < 0) {
 		XUnmapWindow(X_Dpy, sc->menuwin);
 		return (NULL);
 	}
@@ -135,8 +163,6 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy,
 		XWindowEvent(X_Dpy, sc->menuwin, evmask, &e);
 
 		switch (e.type) {
-		default:
-			break;
 		case KeyPress:
 			if ((mi = menu_handle_key(&e, &mc, menuq, &resultq))
 			    != NULL)
@@ -153,16 +179,23 @@ menu_filter(struct menu_q *menuq, char *prompt, char *initial, int dummy,
 			    != NULL)
 				goto out;
 			break;
+		default:
+			break;
 		}
 	}
 out:
-	if (dummy == 0 && mi->dummy) { /* no match */
-		xfree (mi);
+	if (dummy == 0 && mi->dummy) { /* no mouse based match */
+		xfree(mi);
 		mi = NULL;
-		xu_ptr_ungrab();
-		XSetInputFocus(X_Dpy, focuswin, focusrevert, CurrentTime);
 	}
 
+	XSetInputFocus(X_Dpy, focuswin, focusrevert, CurrentTime);
+	/* restore if user didn't move */
+	xu_ptr_getpos(sc->rootwin, &xcur, &ycur);
+	if (xcur == mc.x && ycur == mc.y)
+		xu_ptr_setpos(sc->rootwin, xsave, ysave);
+	xu_ptr_ungrab();
+
 	XUnmapWindow(X_Dpy, sc->menuwin);
 	XUngrabKeyboard(X_Dpy, CurrentTime);
 
@@ -178,8 +211,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 	char		 chr;
 	size_t		 len;
 
-	if (input_keycodetrans(e->xkey.keycode, e->xkey.state,
-	    &ctl, &chr) < 0)
+	if (menu_keycode(e->xkey.keycode, e->xkey.state, &ctl, &chr) < 0)
 		return (NULL);
 
 	switch (ctl) {
@@ -216,6 +248,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 			    mc->searchstr, sizeof(mi->text));
 			mi->dummy = 1;
 		}
+		mi->abort = 0;
 		return (mi);
 	case CTL_WIPE:
 		mc->searchstr[0] = '\0';
@@ -228,6 +261,7 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 		mi = xmalloc(sizeof *mi);
 		mi->text[0] = '\0';
 		mi->dummy = 1;
+		mi->abort = 1;
 		return (mi);
 	default:
 		break;
@@ -239,18 +273,18 @@ menu_handle_key(XEvent *e, struct menu_ctx *mc, struct menu_q *menuq,
 		str[0] = chr;
 		str[1] = '\0';
 		mc->changed = 1;
-		strlcat(mc->searchstr, str, sizeof(mc->searchstr));
+		(void)strlcat(mc->searchstr, str, sizeof(mc->searchstr));
 	}
 
 	mc->noresult = 0;
-	if (mc->changed && strlen(mc->searchstr) > 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) {
+	if (!mc->list && mc->listing && !mc->changed) {
 		TAILQ_INIT(resultq);
 		mc->listing = 0;
 	}
@@ -262,8 +296,10 @@ static void
 menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
     struct menu_q *resultq)
 {
-	struct menu	*mi;
-	int		 n, dy, xsave, ysave;
+	struct menu		*mi;
+	XineramaScreenInfo	*xine;
+	int			 xmin, xmax, ymin, ymax;
+	int			 n, dy, xsave, ysave;
 
 	if (mc->list) {
 		if (TAILQ_EMPTY(resultq) && mc->list) {
@@ -281,10 +317,10 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
 	mc->width = 0;
 	dy = 0;
 	if (mc->hasprompt) {
-		snprintf(mc->dispstr, sizeof(mc->dispstr), "%s%s%c",
+		(void)snprintf(mc->dispstr, sizeof(mc->dispstr), "%s%s%s",
 		    mc->promptstr, mc->searchstr, PROMPT_ECHAR);
-		mc->width = font_width(mc->dispstr, strlen(mc->dispstr));
-		dy = font_height();
+		mc->width = font_width(sc, mc->dispstr, strlen(mc->dispstr));
+		dy = font_height(sc);
 		mc->num = 1;
 	}
 
@@ -299,24 +335,39 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
 			text = mi->text;
 		}
 
-		mc->width = MAX(mc->width, font_width(text,
+		mc->width = MAX(mc->width, font_width(sc, text,
 		    MIN(strlen(text), MENU_MAXENTRY)));
-		dy += font_height();
+		dy += font_height(sc);
 		mc->num++;
 	}
 
+	xine = screen_find_xinerama(sc, mc->x, mc->y);
+	if (xine) {
+		xmin = xine->x_org;
+		xmax = xine->x_org + xine->width;
+		ymin = xine->y_org;
+		ymax = xine->y_org + xine->height;
+	} else {
+		xmin = ymin = 0;
+		xmax = sc->xmax;
+		ymax = sc->ymax;
+	}
+
 	xsave = mc->x;
 	ysave = mc->y;
-	if (mc->x < 0)
-		mc->x = 0;
-	else if (mc->x + mc->width >= sc->xmax)
-		mc->x = sc->xmax - mc->width;
 
-	if (mc->y + dy >= sc->ymax)
-		mc->y = sc->ymax - dy;
+	if (mc->x < xmin)
+		mc->x = xmin;
+	else if (mc->x + mc->width >= xmax)
+		mc->x = xmax - mc->width;
+
+	if (mc->y + dy >= ymax)
+		mc->y = ymax - dy;
 	/* never hide the top of the menu */
-        if (mc->y < 0)
-                mc->y = 0;
+	if (mc->y < ymin) {
+		mc->y = ymin;
+		dy = ymax - ymin;
+	}
 
 	if (mc->x != xsave || mc->y != ysave)
 		xu_ptr_setpos(sc->rootwin, mc->x, mc->y);
@@ -326,7 +377,7 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
 
 	if (mc->hasprompt) {
 		font_draw(sc, mc->dispstr, strlen(mc->dispstr), sc->menuwin,
-		    0, font_ascent() + 1);
+		    0, font_ascent(sc) + 1);
 		n = 1;
 	} else
 		n = 0;
@@ -336,17 +387,17 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
 		    mi->print : mi->text;
 
 		font_draw(sc, text, MIN(strlen(text), MENU_MAXENTRY),
-		    sc->menuwin, 0, n*font_height() + font_ascent() + 1);
+		    sc->menuwin, 0, n * font_height(sc) + font_ascent(sc) + 1);
 		n++;
 	}
 
-	if (mc->hasprompt && n > 1)
+	if (mc->hasprompt && n > 1 && (mc->searchstr[0] != '\0'))
 		XFillRectangle(X_Dpy, sc->menuwin, sc->gc,
-		    0, font_height(), mc->width, font_height());
+		    0, font_height(sc), mc->width, font_height(sc));
 
 	if (mc->noresult)
 		XFillRectangle(X_Dpy, sc->menuwin, sc->gc,
-		    0, 0, mc->width, font_height());
+		    0, 0, mc->width, font_height(sc));
 }
 
 static void
@@ -357,13 +408,13 @@ menu_handle_move(XEvent *e, struct menu_ctx *mc, struct screen_ctx *sc)
 
 	if (mc->prev != -1)
 		XFillRectangle(X_Dpy, sc->menuwin, sc->gc, 0,
-		    font_height() * mc->prev, mc->width, font_height());
+		    font_height(sc) * mc->prev, mc->width, font_height(sc));
 	if (mc->entry != -1) {
-		xu_ptr_regrab(MenuGrabMask, Cursor_select);
+		(void)xu_ptr_regrab(MENUGRABMASK, Cursor_normal);
 		XFillRectangle(X_Dpy, sc->menuwin, sc->gc, 0,
-		    font_height() * mc->entry, mc->width, font_height());
+		    font_height(sc) * mc->entry, mc->width, font_height(sc));
 	} else
-		xu_ptr_regrab(MenuGrabMask, Cursor_default);
+		(void)xu_ptr_regrab(MENUGRABMASK, Cursor_default);
 }
 
 static struct menu *
@@ -374,7 +425,6 @@ menu_handle_release(XEvent *e, struct menu_ctx *mc, struct screen_ctx *sc,
 	int		 entry, i = 0;
 
 	entry = menu_calc_entry(sc, mc, e->xbutton.x, e->xbutton.y);
-	xu_ptr_ungrab();
 
 	if (mc->hasprompt)
 		i = 1;
@@ -395,11 +445,11 @@ menu_calc_entry(struct screen_ctx *sc, struct menu_ctx *mc, int x, int y)
 {
 	int	 entry;
 
-	entry = y / font_height();
+	entry = y / font_height(sc);
 
 	/* in bounds? */
-	if (x < 0 || x > mc->width || y < 0 || y > font_height() * mc->num ||
-	    entry < 0 || entry >= mc->num)
+	if (x <= 0 || x > mc->width || y <= 0 ||
+	    y > font_height(sc) * mc->num || entry < 0 || entry >= mc->num)
 		entry = -1;
 
 	if (mc->hasprompt && entry == 0)
@@ -407,3 +457,89 @@ menu_calc_entry(struct screen_ctx *sc, struct menu_ctx *mc, int x, int y)
 
 	return (entry);
 }
+
+static int
+menu_keycode(KeyCode kc, u_int state, enum ctltype *ctl, char *chr)
+{
+	int	 ks;
+
+	*ctl = CTL_NONE;
+	*chr = '\0';
+
+	ks = XKeycodeToKeysym(X_Dpy, kc, (state & ShiftMask) ? 1 : 0);
+
+	/* Look for control characters. */
+	switch (ks) {
+	case XK_BackSpace:
+		*ctl = CTL_ERASEONE;
+		break;
+	case XK_Return:
+		*ctl = CTL_RETURN;
+		break;
+	case XK_Up:
+		*ctl = CTL_UP;
+		break;
+	case XK_Down:
+		*ctl = CTL_DOWN;
+		break;
+	case XK_Escape:
+		*ctl = CTL_ABORT;
+		break;
+	}
+
+	if (*ctl == CTL_NONE && (state & ControlMask)) {
+		switch (ks) {
+		case XK_s:
+		case XK_S:
+			/* Emacs "next" */
+			*ctl = CTL_DOWN;
+			break;
+		case XK_r:
+		case XK_R:
+			/* Emacs "previous" */
+			*ctl = CTL_UP;
+			break;
+		case XK_u:
+		case XK_U:
+			*ctl = CTL_WIPE;
+			break;
+		case XK_h:
+		case XK_H:
+			*ctl = CTL_ERASEONE;
+			break;
+		case XK_a:
+		case XK_A:
+			*ctl = CTL_ALL;
+			break;
+		}
+	}
+
+	if (*ctl == CTL_NONE && (state & Mod1Mask)) {
+		switch (ks) {
+		case XK_j:
+		case XK_J:
+			/* Vi "down" */
+			*ctl = CTL_DOWN;
+			break;
+		case XK_k:
+		case XK_K:
+			/* Vi "up" */
+			*ctl = CTL_UP;
+			break;
+		}
+	}
+
+	if (*ctl != CTL_NONE)
+		return (0);
+
+	/*
+	 * For regular characters, only (part of, actually) Latin 1
+	 * for now.
+	 */
+	if (ks < 0x20 || ks > 0x07e)
+		return (-1);
+
+	*chr = (char)ks;
+
+	return (0);
+}

mousefunc.c

@@ -1,8 +1,8 @@
 /*
- *  calmwm - the calm window manager
+ * calmwm - the calm window manager
  *
- *  Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
- *  Copyright (c) 2008 rivo nurges <rix@estpak.ee>
+ * 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
@@ -16,10 +16,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 static int	mousefunc_sweep_calc(struct client_ctx *, int, int, int, int);
@@ -33,22 +42,7 @@ mousefunc_sweep_calc(struct client_ctx *cc, int x, int y, int mx, int my)
 	cc->geom.width = abs(x - mx) - cc->bwidth;
 	cc->geom.height = abs(y - my) - cc->bwidth;
 
-	if (cc->size->flags & PResizeInc) {
-		cc->geom.width -=
-		    (cc->geom.width - cc->geom.min_dx) % cc->size->width_inc;
-		cc->geom.height -=
-		    (cc->geom.height - cc->geom.min_dy) % cc->size->height_inc;
-	}
-
-	if (cc->size->flags & PMinSize) {
-		cc->geom.width = MAX(cc->geom.width, cc->size->min_width);
-		cc->geom.height = MAX(cc->geom.height, cc->size->min_height);
-	}
-
-	if (cc->size->flags & PMaxSize) {
-		cc->geom.width = MIN(cc->geom.width, cc->size->max_width);
-		cc->geom.height = MIN(cc->geom.height, cc->size->max_height);
-	}
+	client_applysizehints(cc);
 
 	cc->geom.x = x <= mx ? x : x - cc->geom.width;
 	cc->geom.y = y <= my ? y : y - cc->geom.height;
@@ -59,51 +53,49 @@ mousefunc_sweep_calc(struct client_ctx *cc, int x, int y, int mx, int my)
 static void
 mousefunc_sweep_draw(struct client_ctx *cc)
 {
-	struct screen_ctx	*sc = CCTOSC(cc);
+	struct screen_ctx	*sc = cc->sc;
 	char			 asize[10]; /* fits "nnnnxnnnn\0" */
-	int			 width, height, width_size, width_name;
+	int			 width, width_size, width_name;
 
-	snprintf(asize, sizeof(asize), "%dx%d",
-	    (cc->geom.width - cc->geom.min_dx) / cc->size->width_inc,
-	    (cc->geom.height - cc->geom.min_dy) / cc->size->height_inc);
-	width_size = font_width(asize, strlen(asize)) + 4;
-	width_name = font_width(cc->name, strlen(cc->name)) + 4;
+	(void)snprintf(asize, sizeof(asize), "%dx%d",
+	    (cc->geom.width - cc->hint.basew) / cc->hint.incw,
+	    (cc->geom.height - cc->hint.baseh) / cc->hint.inch);
+	width_size = font_width(sc, asize, strlen(asize)) + 4;
+	width_name = font_width(sc, cc->name, strlen(cc->name)) + 4;
 	width = MAX(width_size, width_name);
-	height = font_ascent() + font_descent() + 1;
 
-	XMoveResizeWindow(X_Dpy, sc->menuwin, cc->geom.x, cc->geom.y,
-	    width, height * 2);
-	XMapWindow(X_Dpy, sc->menuwin);
 	XReparentWindow(X_Dpy, sc->menuwin, cc->win, 0, 0);
+	XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0, width, font_height(sc) * 2);
+	XMapWindow(X_Dpy, sc->menuwin);
 	XClearWindow(X_Dpy, sc->menuwin);
 	font_draw(sc, cc->name, strlen(cc->name), sc->menuwin,
-	    2, font_ascent() + 1);
+	    2, font_ascent(sc) + 1);
 	font_draw(sc, asize, strlen(asize), sc->menuwin,
-	    width / 2 - width_size / 2, height + font_ascent() + 1);
+	    width / 2 - width_size / 2, font_height(sc) + font_ascent(sc) + 1);
 }
 
 void
 mousefunc_window_resize(struct client_ctx *cc, void *arg)
 {
 	XEvent			 ev;
-	Time			 time = 0;
-	struct screen_ctx	*sc = CCTOSC(cc);
+	Time			 ltime = 0;
+	struct screen_ctx	*sc = cc->sc;
 	int			 x = cc->geom.x, y = cc->geom.y;
 
-	cc->size->width_inc = MAX(1, cc->size->width_inc);
-	cc->size->height_inc = MAX(1, cc->size->height_inc);
+	if (cc->flags & CLIENT_FREEZE)
+		return;
 
 	client_raise(cc);
 	client_ptrsave(cc);
 
-	if (xu_ptr_grab(cc->win, MouseMask, Cursor_resize) < 0)
+	if (xu_ptr_grab(cc->win, MOUSEMASK, Cursor_resize) < 0)
 		return;
 
 	xu_ptr_setpos(cc->win, cc->geom.width, cc->geom.height);
 	mousefunc_sweep_draw(cc);
 
 	for (;;) {
-		XMaskEvent(X_Dpy, MouseMask|ExposureMask, &ev);
+		XMaskEvent(X_Dpy, MOUSEMASK|ExposureMask, &ev);
 
 		switch (ev.type) {
 		case Expose:
@@ -115,18 +107,15 @@ mousefunc_window_resize(struct client_ctx *cc, void *arg)
 				/* Recompute window output */
 				mousefunc_sweep_draw(cc);
 
-			/* don't sync more than 60 times / second */
-			if ((ev.xmotion.time - time) > (1000 / 60)) {
-				time = ev.xmotion.time;
-				XSync(X_Dpy, False);
+			/* don't resize more than 60 times / second */
+			if ((ev.xmotion.time - ltime) > (1000 / 60)) {
+				ltime = ev.xmotion.time;
 				client_resize(cc);
 			}
 			break;
 		case ButtonRelease:
-			if (time) {
-				XSync(X_Dpy, False);
+			if (ltime)
 				client_resize(cc);
-			}
 			XUnmapWindow(X_Dpy, sc->menuwin);
 			XReparentWindow(X_Dpy, sc->menuwin, sc->rootwin, 0, 0);
 			xu_ptr_ungrab();
@@ -137,7 +126,6 @@ mousefunc_window_resize(struct client_ctx *cc, void *arg)
 			if (cc->ptr.y > cc->geom.height)
 				cc->ptr.y = cc->geom.height - cc->bwidth;
 			client_ptrwarp(cc);
-
 			return;
 		}
 	}
@@ -148,39 +136,46 @@ void
 mousefunc_window_move(struct client_ctx *cc, void *arg)
 {
 	XEvent			 ev;
-	Time			 time = 0;
+	Time			 ltime = 0;
 	int			 px, py;
 
 	client_raise(cc);
 
-	if (xu_ptr_grab(cc->win, MouseMask, Cursor_move) < 0)
+	if (cc->flags & CLIENT_FREEZE)
+		return;
+
+	if (xu_ptr_grab(cc->win, MOUSEMASK, Cursor_move) < 0)
 		return;
 
 	xu_ptr_getpos(cc->win, &px, &py);
 
 	for (;;) {
-		XMaskEvent(X_Dpy, MouseMask|ExposureMask, &ev);
+		XMaskEvent(X_Dpy, MOUSEMASK|ExposureMask, &ev);
 
 		switch (ev.type) {
 		case Expose:
 			client_draw_border(cc);
 			break;
 		case MotionNotify:
-			cc->geom.x = ev.xmotion.x_root - px;
-			cc->geom.y = ev.xmotion.y_root - py;
+			cc->geom.x = ev.xmotion.x_root - px - cc->bwidth;
+			cc->geom.y = ev.xmotion.y_root - py - cc->bwidth;
 
-			/* don't sync more than 60 times / second */
-			if ((ev.xmotion.time - time) > (1000 / 60)) {
-				time = ev.xmotion.time;
-				XSync(X_Dpy, False);
+			cc->geom.x += client_snapcalc(cc->geom.x,
+			    cc->geom.width, cc->sc->xmax,
+			    cc->bwidth, Conf.snapdist);
+			cc->geom.y += client_snapcalc(cc->geom.y,
+			    cc->geom.height, cc->sc->ymax,
+			    cc->bwidth, Conf.snapdist);
+
+			/* don't move more than 60 times / second */
+			if ((ev.xmotion.time - ltime) > (1000 / 60)) {
+				ltime = ev.xmotion.time;
 				client_move(cc);
 			}
 			break;
 		case ButtonRelease:
-			if (time) {
-				XSync(X_Dpy, False);
+			if (ltime)
 				client_move(cc);
-			}
 			xu_ptr_ungrab();
 			return;
 		}
@@ -201,6 +196,12 @@ mousefunc_window_lower(struct client_ctx *cc, void *arg)
 	client_lower(cc);
 }
 
+void
+mousefunc_window_raise(struct client_ctx *cc, void *arg)
+{
+	client_raise(cc);
+}
+
 void
 mousefunc_window_hide(struct client_ctx *cc, void *arg)
 {
@@ -216,11 +217,13 @@ mousefunc_menu_group(struct client_ctx *cc, void *arg)
 void
 mousefunc_menu_unhide(struct client_ctx *cc, void *arg)
 {
+	struct screen_ctx	*sc;
 	struct client_ctx	*old_cc;
 	struct menu		*mi;
 	struct menu_q		 menuq;
 	char			*wname;
 
+	sc = cc->sc;
 	old_cc = client_current();
 
 	TAILQ_INIT(&menuq);
@@ -231,7 +234,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg)
 				continue;
 
 			mi = xcalloc(1, sizeof(*mi));
-			strlcpy(mi->text, wname, sizeof(mi->text));
+			(void)strlcpy(mi->text, wname, sizeof(mi->text));
 			mi->ctx = cc;
 			TAILQ_INSERT_TAIL(&menuq, mi, entry);
 		}
@@ -239,7 +242,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg)
 	if (TAILQ_EMPTY(&menuq))
 		return;
 
-	mi = menu_filter(&menuq, NULL, NULL, 0, NULL, NULL);
+	mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL);
 	if (mi != NULL) {
 		cc = (struct client_ctx *)mi->ctx;
 		client_unhide(cc);
@@ -258,21 +261,24 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg)
 void
 mousefunc_menu_cmd(struct client_ctx *cc, void *arg)
 {
-	struct menu	*mi;
-	struct menu_q	 menuq;
-	struct cmd	*cmd;
+	struct screen_ctx	*sc;
+	struct menu		*mi;
+	struct menu_q		 menuq;
+	struct cmd		*cmd;
+
+	sc = cc->sc;
 
 	TAILQ_INIT(&menuq);
 	TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
 		mi = xcalloc(1, sizeof(*mi));
-		strlcpy(mi->text, cmd->label, sizeof(mi->text));
+		(void)strlcpy(mi->text, cmd->label, sizeof(mi->text));
 		mi->ctx = cmd;
 		TAILQ_INSERT_TAIL(&menuq, mi, entry);
 	}
 	if (TAILQ_EMPTY(&menuq))
 		return;
 
-	mi = menu_filter(&menuq, NULL, NULL, 0, NULL, NULL);
+	mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL);
 	if (mi != NULL)
 		u_spawn(((struct cmd *)mi->ctx)->image);
 	else

parse.y

@@ -21,7 +21,11 @@
 
 %{
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
 #include <ctype.h>
+#include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
@@ -29,7 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "headers.h"
 #include "calmwm.h"
 
 TAILQ_HEAD(files, file)		 files = TAILQ_HEAD_INITIALIZER(files);
@@ -67,9 +70,10 @@ typedef struct {
 %token	FONTNAME STICKY GAP MOUSEBIND
 %token	AUTOGROUP BIND COMMAND IGNORE
 %token	YES NO BORDERWIDTH MOVEAMOUNT
-%token	COLOR
+%token	COLOR SNAPDIST
 %token	ACTIVEBORDER INACTIVEBORDER
 %token	GROUPBORDER UNGROUPBORDER
+%token	MENUBG MENUFG FONTCOLOR
 %token	ERROR
 %token	<v.string>		STRING
 %token	<v.number>		NUMBER
@@ -102,8 +106,8 @@ yesno		: YES				{ $$ = 1; }
 		;
 
 main		: FONTNAME STRING		{
-			free(conf->DefaultFontName);
-			conf->DefaultFontName = $2;
+			free(conf->font);
+			conf->font = $2;
 		}
 		| STICKY yesno {
 			if ($2 == 0)
@@ -117,42 +121,29 @@ main		: FONTNAME STRING		{
 		| MOVEAMOUNT NUMBER {
 			conf->mamount = $2;
 		}
+		| SNAPDIST NUMBER {
+			conf->snapdist = $2;
+		}
 		| COMMAND STRING string		{
 			conf_cmd_add(conf, $3, $2, 0);
 			free($2);
 			free($3);
 		}
 		| AUTOGROUP NUMBER STRING	{
-			struct autogroupwin *aw;
-			char *p;
-
 			if ($2 < 0 || $2 > 9) {
 				free($3);
 				yyerror("autogroup number out of range: %d", $2);
 				YYERROR;
 			}
 
-			aw = xcalloc(1, sizeof(*aw));
-
-			if ((p = strchr($3, ',')) == NULL) {
-				aw->name = NULL;
-				aw->class = xstrdup($3);
-			} else {
-				*(p++) = '\0';
-				aw->name = xstrdup($3);
-				aw->class = xstrdup(p);
-			}
-			aw->group = xstrdup(shortcut_to_name[$2]);
-
-			TAILQ_INSERT_TAIL(&conf->autogroupq, aw, entry);
-
+			group_make_autogroup(conf, $3, $2);
 			free($3);
 		}
 		| IGNORE STRING {
 			struct winmatch	*wm;
 
 			wm = xcalloc(1, sizeof(*wm));
-			strlcpy(wm->title, $2, sizeof(wm->title));
+			(void)strlcpy(wm->title, $2, sizeof(wm->title));
 			TAILQ_INSERT_TAIL(&conf->ignoreq, wm, entry);
 
 			free($2);
@@ -163,10 +154,10 @@ main		: FONTNAME STRING		{
 			free($3);
 		}
 		| GAP NUMBER NUMBER NUMBER NUMBER {
-			conf->gap_top = $2;
-			conf->gap_bottom = $3;
-			conf->gap_left = $4;
-			conf->gap_right = $5;
+			conf->gap.top = $2;
+			conf->gap.bottom = $3;
+			conf->gap.left = $4;
+			conf->gap.right = $5;
 		}
 		| MOUSEBIND STRING string	{
 			conf_mousebind(conf, $2, $3);
@@ -179,8 +170,8 @@ color		: COLOR colors
 		;
 
 colors		: ACTIVEBORDER STRING {
-			free(conf->color[CWM_COLOR_BORDOR_ACTIVE].name);
-			conf->color[CWM_COLOR_BORDOR_ACTIVE].name = $2;
+			free(conf->color[CWM_COLOR_BORDER_ACTIVE].name);
+			conf->color[CWM_COLOR_BORDER_ACTIVE].name = $2;
 		}
 		| INACTIVEBORDER STRING {
 			free(conf->color[CWM_COLOR_BORDER_INACTIVE].name);
@@ -194,6 +185,18 @@ colors		: ACTIVEBORDER STRING {
 			free(conf->color[CWM_COLOR_BORDER_UNGROUP].name);
 			conf->color[CWM_COLOR_BORDER_UNGROUP].name = $2;
 		}
+		| MENUBG STRING {
+			free(conf->color[CWM_COLOR_BG_MENU].name);
+			conf->color[CWM_COLOR_BG_MENU].name = $2;
+		}
+		| MENUFG STRING {
+			free(conf->color[CWM_COLOR_FG_MENU].name);
+			conf->color[CWM_COLOR_FG_MENU].name = $2;
+		}
+		| FONTCOLOR STRING {
+			free(conf->color[CWM_COLOR_FONT].name);
+			conf->color[CWM_COLOR_FONT].name = $2;
+		}
 		;
 %%
 
@@ -233,14 +236,18 @@ lookup(char *s)
 		{ "borderwidth",	BORDERWIDTH},
 		{ "color",		COLOR},
 		{ "command",		COMMAND},
+		{ "font",		FONTCOLOR},
 		{ "fontname",		FONTNAME},
 		{ "gap",		GAP},
 		{ "groupborder",	GROUPBORDER},
 		{ "ignore",		IGNORE},
 		{ "inactiveborder",	INACTIVEBORDER},
+		{ "menubg",		MENUBG},
+		{ "menufg",		MENUFG},
 		{ "mousebind",		MOUSEBIND},
 		{ "moveamount",		MOVEAMOUNT},
 		{ "no",			NO},
+		{ "snapdist",		SNAPDIST},
 		{ "sticky",		STICKY},
 		{ "ungroupborder",	UNGROUPBORDER},
 		{ "yes",		YES}
@@ -379,9 +386,10 @@ yylex(void)
 					return (0);
 				if (next == quotec || c == ' ' || c == '\t')
 					c = next;
-				else if (next == '\n')
+				else if (next == '\n') {
+					file->lineno++;
 					continue;
-				else
+				} else
 					lungetc(next);
 			} else if (c == quotec) {
 				*p = '\0';
@@ -470,8 +478,6 @@ pushfile(const char *name)
 	nfile->name = xstrdup(name);
 
 	if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-		if (errno != ENOENT)
-			warn("%s", nfile->name);
 		free(nfile->name);
 		free(nfile);
 		return (NULL);
@@ -510,7 +516,7 @@ parse_config(const char *filename, struct conf *xconf)
 		return (-1);
 	}
 
-	strlcpy(conf->conf_path, filename, sizeof(conf->conf_path));
+	(void)strlcpy(conf->conf_path, filename, sizeof(conf->conf_path));
 
 	conf_init(conf);
 
@@ -535,6 +541,8 @@ parse_config(const char *filename, struct conf *xconf)
 		xconf->flags = conf->flags;
 		xconf->bwidth = conf->bwidth;
 		xconf->mamount = conf->mamount;
+		xconf->snapdist = conf->snapdist;
+		xconf->gap = conf->gap;
 
 		while ((cmd = TAILQ_FIRST(&conf->cmdq)) != NULL) {
 			TAILQ_REMOVE(&conf->cmdq, cmd, entry);
@@ -561,17 +569,15 @@ parse_config(const char *filename, struct conf *xconf)
 			TAILQ_INSERT_TAIL(&xconf->mousebindingq, mb, entry);
 		}
 
-		strlcpy(xconf->termpath, conf->termpath,
+		(void)strlcpy(xconf->termpath, conf->termpath,
 		    sizeof(xconf->termpath));
-		strlcpy(xconf->lockpath, conf->lockpath,
+		(void)strlcpy(xconf->lockpath, conf->lockpath,
 		    sizeof(xconf->lockpath));
 
 		for (i = 0; i < CWM_COLOR_MAX; i++)
 			xconf->color[i].name = conf->color[i].name;
 
-		xconf->DefaultFontName = conf->DefaultFontName;
-
-		bcopy(&(conf->gap_top), &(xconf->gap_top), sizeof(int) * 4);
+		xconf->font = conf->font;
 	}
 
 	free(conf);

screen.c

@@ -15,20 +15,21 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
-extern struct screen_ctx	*Curscreen;
-
-void
-screen_init(void)
-{
-	TAILQ_INIT(&Screenq);
-}
-
 struct screen_ctx *
 screen_fromroot(Window rootwin)
 {
@@ -42,22 +43,13 @@ screen_fromroot(Window rootwin)
 	return (TAILQ_FIRST(&Screenq));
 }
 
-struct screen_ctx *
-screen_current(void)
-{
-	return (Curscreen);
-}
-
 void
-screen_updatestackingorder(void)
+screen_updatestackingorder(struct screen_ctx *sc)
 {
 	Window			*wins, w0, w1;
-	struct screen_ctx	*sc;
 	struct client_ctx	*cc;
 	u_int			 nwins, i, s;
 
-	sc = screen_current();
-
 	if (!XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins))
 		return;
 
@@ -83,10 +75,10 @@ screen_init_xinerama(struct screen_ctx *sc)
 		HasXinerama = 0;
 		sc->xinerama_no = 0;
 	}
-		
+
 	info = XineramaQueryScreens(X_Dpy, &no);
 	if (info == NULL) {
-		/*is xinerama is actually off, instead of a malloc failure? */
+		/* Is xinerama actually off, instead of a malloc failure? */
 		if (sc->xinerama == NULL)
 			HasXinerama = 0;
 		return;
@@ -109,9 +101,33 @@ screen_find_xinerama(struct screen_ctx *sc, int x, int y)
 
 	for (i = 0; i < sc->xinerama_no; i++) {
 		info = &sc->xinerama[i];
-		if (x > info->x_org && x < info->x_org + info->width &&
-		    y > info->y_org && y < info->y_org + info->height)
+		if (x >= info->x_org && x < info->x_org + info->width &&
+		    y >= info->y_org && y < info->y_org + info->height)
 			return (info);
 	}
 	return (NULL);
 }
+
+void
+screen_update_geometry(struct screen_ctx *sc, int width, int height)
+{
+	long	 geom[2], workareas[CALMWM_NGROUPS][4];
+	int	 i;
+
+	sc->xmax = geom[0] = width;
+	sc->ymax = geom[1] = height;
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_DESKTOP_GEOMETRY,
+	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)geom , 2);
+
+	/* x, y, width, height. */
+	for (i = 0; i < CALMWM_NGROUPS; i++) {
+		workareas[i][0] = sc->gap.left;
+		workareas[i][1] = sc->gap.top;
+		workareas[i][2] = width - (sc->gap.left + sc->gap.right);
+		workareas[i][3] = height - (sc->gap.top + sc->gap.bottom);
+	}
+
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_WORKAREA,
+	    XA_CARDINAL, 32, PropModeReplace,
+	    (unsigned char *)workareas, CALMWM_NGROUPS * 4);
+}

search.c

@@ -2,6 +2,7 @@
  * calmwm - the calm window manager
  *
  * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
+ *
  * 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.
@@ -14,11 +15,21 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
 #include <fnmatch.h>
-#include "headers.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 static int	strsubmatch(char *, char *, int);
@@ -32,13 +43,10 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
 {
 	struct winname	*wn;
 	struct menu	*mi, *tierp[4], *before = NULL;
-	int		 ntiers;
-
-	ntiers = sizeof(tierp) / sizeof(tierp[0]);
 
 	TAILQ_INIT(resultq);
 
-	memset(tierp, 0, sizeof(tierp));
+	(void)memset(tierp, 0, sizeof(tierp));
 
 	/*
 	 * In order of rank:
@@ -68,11 +76,7 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
 				}
 		}
 
-		/*
-		 * See if there is a match on the window class
-		 * name.
-		 */
-
+		/* Then if there is a match on the window class name. */
 		if (tier < 0 && strsubmatch(search, cc->app_class, 0)) {
 			cc->matchname = cc->app_class;
 			tier = 3;
@@ -86,16 +90,14 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
 		 * window.  Furthermore, this is denoted by a "!" when
 		 * printing the window name in the search menu.
 		 */
-		if (cc == client_current() && tier < ntiers - 1)
+		if (cc == client_current() && tier < nitems(tierp) - 1)
 			tier++;
 
-		/*
-		 * Clients that are hidden get ranked one up.
-		 */
+		/* Clients that are hidden get ranked one up. */
 		if (cc->flags & CLIENT_HIDDEN && tier > 0)
 			tier--;
 
-		assert(tier < ntiers);
+		assert(tier < nitems(tierp));
 
 		/*
 		 * If you have a tierp, insert after it, and make it
@@ -104,7 +106,6 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
 		 * Always make your current tierp the newly inserted
 		 * entry.
 		 */
-
 		for (t = tier; t >= 0 && ((before = tierp[t]) == NULL); t--)
 			;
 
@@ -133,7 +134,8 @@ search_print_client(struct menu *mi, int list)
 	if (list)
 		cc->matchname = cc->name;
 
-	snprintf(mi->print, sizeof(mi->print), "%c%s", flag, cc->matchname);
+	(void)snprintf(mi->print, sizeof(mi->print), "%c%s", flag,
+	    cc->matchname);
 
 	if (!list && cc->matchname != cc->name &&
 	    strlen(mi->print) < sizeof(mi->print) - 1) {
@@ -153,8 +155,8 @@ search_print_client(struct menu *mi, int list)
 			diff = strlen(cc->name);
 		}
 
-		strlcpy(buf, mi->print, sizeof(buf));
-		snprintf(mi->print, sizeof(mi->print),
+		(void)strlcpy(buf, mi->print, sizeof(buf));
+		(void)snprintf(mi->print, sizeof(mi->print),
 		    "%s:%.*s%s", buf, diff, cc->name, marker);
 	}
 }

strlcat.c

@@ -0,0 +1,61 @@
+/*	$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 */
+
+#ifndef HAVE_STRLCAT
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * 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,57 @@
+/*	$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 */
+
+#ifndef HAVE_STRLCPY
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * 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 */

util.c

@@ -15,15 +15,24 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 #define MAXARGLEN 20
 
-int
+void
 u_spawn(char *argstr)
 {
 	switch (fork()) {
@@ -33,12 +42,9 @@ u_spawn(char *argstr)
 		break;
 	case -1:
 		warn("fork");
-		return (-1);
 	default:
 		break;
 	}
-
-	return (0);
 }
 
 void
@@ -70,6 +76,6 @@ u_exec(char *argstr)
 	}
 
 	*ap = NULL;
-	setsid();
-	execvp(args[0], args);
+	(void)setsid();
+	(void)execvp(args[0], args);
 }

xevents.c

@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
 /*
@@ -24,7 +24,17 @@
  *   management of the xevent's.
  */
 
-#include "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 static void	 xev_handle_maprequest(XEvent *);
@@ -76,7 +86,8 @@ xev_handle_maprequest(XEvent *ee)
 		cc = client_new(e->window, screen_fromroot(xattr.root), 1);
 	}
 
-	client_ptrwarp(cc);
+	if ((cc->flags & CLIENT_IGNORE) == 0)
+		client_ptrwarp(cc);
 }
 
 static void
@@ -125,7 +136,7 @@ xev_handle_configurerequest(XEvent *ee)
 	XWindowChanges		 wc;
 
 	if ((cc = client_find(e->window)) != NULL) {
-		sc = CCTOSC(cc);
+		sc = cc->sc;
 
 		if (e->value_mask & CWWidth)
 			cc->geom.width = e->width;
@@ -151,7 +162,7 @@ xev_handle_configurerequest(XEvent *ee)
 		wc.border_width = cc->bwidth;
 
 		XConfigureWindow(X_Dpy, cc->win, e->value_mask, &wc);
-		xev_reconfig(cc);
+		xu_configure(cc);
 	} else {
 		/* let it do what it wants, it'll be ours when we map it. */
 		wc.x = e->x;
@@ -170,41 +181,35 @@ static void
 xev_handle_propertynotify(XEvent *ee)
 {
 	XPropertyEvent		*e = &ee->xproperty;
+	struct screen_ctx	*sc;
 	struct client_ctx	*cc;
-	long			 tmp;
 
 	if ((cc = client_find(e->window)) != NULL) {
 		switch (e->atom) {
 		case XA_WM_NORMAL_HINTS:
-			XGetWMNormalHints(X_Dpy, cc->win, cc->size, &tmp);
+			client_getsizehints(cc);
 			break;
 		case XA_WM_NAME:
 			client_setname(cc);
 			break;
+		case XA_WM_TRANSIENT_FOR:
+			client_transient(cc);
+			break;
 		default:
 			/* do nothing */
 			break;
 		}
+	} else {
+		TAILQ_FOREACH(sc, &Screenq, entry) 
+			if (sc->rootwin == e->window)
+				goto test;
+		return;
+
+test:
+		if (e->atom == _NET_DESKTOP_NAMES)
+			group_update_names(sc);
 	}
-}
 
-void
-xev_reconfig(struct client_ctx *cc)
-{
-	XConfigureEvent	 ce;
-
-	ce.type = ConfigureNotify;
-	ce.event = cc->win;
-	ce.window = cc->win;
-	ce.x = cc->geom.x;
-	ce.y = cc->geom.y;
-	ce.width = cc->geom.width;
-	ce.height = cc->geom.height;
-	ce.border_width = cc->bwidth;
-	ce.above = None;
-	ce.override_redirect = 0;
-
-	XSendEvent(X_Dpy, cc->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
 static void
@@ -228,7 +233,7 @@ static void
 xev_handle_buttonpress(XEvent *ee)
 {
 	XButtonEvent		*e = &ee->xbutton;
-	struct client_ctx	*cc;
+	struct client_ctx	*cc, fakecc;
 	struct screen_ctx	*sc;
 	struct mousebinding	*mb;
 
@@ -245,15 +250,13 @@ xev_handle_buttonpress(XEvent *ee)
 
 	if (mb == NULL)
 		return;
-
 	if (mb->context == MOUSEBIND_CTX_ROOT) {
 		if (e->window != sc->rootwin)
 			return;
-	} else if (mb->context == MOUSEBIND_CTX_WIN) {
-		cc = client_find(e->window);
-		if (cc == NULL)
-			return;
-	}
+		cc = &fakecc;
+		cc->sc = screen_fromroot(e->window);
+	} else if (cc == NULL) /* (mb->context == MOUSEBIND_CTX_WIN */
+		return;
 
 	(*mb->callback)(cc, e);
 }
@@ -271,7 +274,7 @@ static void
 xev_handle_keypress(XEvent *ee)
 {
 	XKeyEvent		*e = &ee->xkey;
-	struct client_ctx	*cc = NULL;
+	struct client_ctx	*cc = NULL, fakecc;
 	struct keybinding	*kb;
 	KeySym			 keysym, skeysym;
 	int			 modshift;
@@ -299,12 +302,14 @@ xev_handle_keypress(XEvent *ee)
 
 	if (kb == NULL)
 		return;
-
-	if ((kb->flags & (KBFLAG_NEEDCLIENT)) &&
-	    (cc = client_find(e->window)) == NULL &&
-	    (cc = client_current()) == NULL)
-		if (kb->flags & KBFLAG_NEEDCLIENT)
+	if (kb->flags & KBFLAG_NEEDCLIENT) {
+		if (((cc = client_find(e->window)) == NULL) &&
+		    (cc = client_current()) == NULL)
 			return;
+	} else {
+		cc = &fakecc;
+		cc->sc = screen_fromroot(e->window);
+	}
 
 	(*kb->callback)(cc, &kb->argument);
 }
@@ -369,14 +374,13 @@ xev_handle_randr(XEvent *ee)
 	TAILQ_FOREACH(sc, &Screenq, entry) {
 		if (sc->which == (u_int)i) {
 			XRRUpdateConfiguration(ee);
-			sc->xmax = rev->width;
-			sc->ymax = rev->height;
+			screen_update_geometry(sc, rev->width, rev->height);
 			screen_init_xinerama(sc);
 		}
 	}
 }
 
-/* 
+/*
  * Called when the keymap has changed.
  * Ungrab all keys, reload keymap and then regrab
  */
@@ -405,15 +409,14 @@ xev_handle_expose(XEvent *ee)
 		client_draw_border(cc);
 }
 
-
-volatile sig_atomic_t	_xev_quit = 0;
+volatile sig_atomic_t	xev_quit = 0;
 
 void
 xev_loop(void)
 {
 	XEvent		 e;
 
-	while (_xev_quit == 0) {
+	while (xev_quit == 0) {
 		XNextEvent(X_Dpy, &e);
 		if (e.type - Randr_ev == RRScreenChangeNotify)
 			xev_handle_randr(&e);

xmalloc.c

@@ -15,10 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 void *

xutil.c

@@ -15,10 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id$
+ * $OpenBSD$
  */
 
-#include "headers.h"
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };
@@ -48,9 +57,9 @@ void
 xu_btn_grab(Window win, int mask, u_int btn)
 {
 	int	i;
-	for (i = 0; i < sizeof(ign_mods)/sizeof(*ign_mods); i++)
+	for (i = 0; i < nitems(ign_mods); i++)
 		XGrabButton(X_Dpy, btn, (mask | ign_mods[i]), win,
-		    False, ButtonMask, GrabModeAsync,
+		    False, BUTTONMASK, GrabModeAsync,
 		    GrabModeSync, None, None);
 }
 
@@ -58,7 +67,7 @@ void
 xu_btn_ungrab(Window win, int mask, u_int btn)
 {
 	int	i;
-	for (i = 0; i < sizeof(ign_mods)/sizeof(*ign_mods); i++)
+	for (i = 0; i < nitems(ign_mods); i++)
 		XUngrabButton(X_Dpy, btn, (mask | ign_mods[i]), win);
 }
 
@@ -89,7 +98,7 @@ xu_key_grab(Window win, int mask, int keysym)
 	    (XKeycodeToKeysym(X_Dpy, code, 1) == keysym))
 		mask |= ShiftMask;
 
-	for (i = 0; i < sizeof(ign_mods)/sizeof(*ign_mods); i++)
+	for (i = 0; i < nitems(ign_mods); i++)
 		XGrabKey(X_Dpy, code, (mask | ign_mods[i]), win,
 		    True, GrabModeAsync, GrabModeAsync);
 }
@@ -105,34 +114,53 @@ xu_key_ungrab(Window win, int mask, int keysym)
 	    (XKeycodeToKeysym(X_Dpy, code, 1) == keysym))
 		mask |= ShiftMask;
 
-	for (i = 0; i < sizeof(ign_mods)/sizeof(*ign_mods); i++)
+	for (i = 0; i < nitems(ign_mods); i++)
 		XUngrabKey(X_Dpy, code, (mask | ign_mods[i]), win);
 }
 
 void
-xu_sendmsg(struct client_ctx *cc, Atom atm, long val)
+xu_configure(struct client_ctx *cc)
+{
+	XConfigureEvent	 ce;
+
+	ce.type = ConfigureNotify;
+	ce.event = cc->win;
+	ce.window = cc->win;
+	ce.x = cc->geom.x;
+	ce.y = cc->geom.y;
+	ce.width = cc->geom.width;
+	ce.height = cc->geom.height;
+	ce.border_width = cc->bwidth;
+	ce.above = None;
+	ce.override_redirect = 0;
+
+	XSendEvent(X_Dpy, cc->win, False, StructureNotifyMask, (XEvent *)&ce);
+}
+
+void
+xu_sendmsg(Window win, Atom atm, long val)
 {
 	XEvent	 e;
 
-	memset(&e, 0, sizeof(e));
+	(void)memset(&e, 0, sizeof(e));
 	e.xclient.type = ClientMessage;
-	e.xclient.window = cc->win;
+	e.xclient.window = win;
 	e.xclient.message_type = atm;
 	e.xclient.format = 32;
 	e.xclient.data.l[0] = val;
 	e.xclient.data.l[1] = CurrentTime;
 
-	XSendEvent(X_Dpy, cc->win, False, 0, &e);
+	XSendEvent(X_Dpy, win, False, 0, &e);
 }
 
 int
-xu_getprop(struct client_ctx *cc, Atom atm, Atom type, long len, u_char **p)
+xu_getprop(Window win, Atom atm, Atom type, long len, u_char **p)
 {
 	Atom	 realtype;
 	u_long	 n, extra;
 	int	 format;
 
-	if (XGetWindowProperty(X_Dpy, cc->win, atm, 0L, len, False, type,
+	if (XGetWindowProperty(X_Dpy, win, atm, 0L, len, False, type,
 	    &realtype, &format, &n, &extra, p) != Success || *p == NULL)
 		return (-1);
 
@@ -142,12 +170,44 @@ xu_getprop(struct client_ctx *cc, Atom atm, Atom type, long len, u_char **p)
 	return (n);
 }
 
+int
+xu_getstrprop(Window win, Atom atm, char **text) {
+	XTextProperty	 prop;
+	char		**list;
+	int		 nitems = 0;
+
+	*text = NULL;
+
+	XGetTextProperty(X_Dpy, win, &prop, atm);
+	if (!prop.nitems)
+		return (0);
+
+	if (Xutf8TextPropertyToTextList(X_Dpy, &prop, &list,
+	    &nitems) == Success && nitems > 0 && *list) {
+		if (nitems > 1) {
+			XTextProperty    prop2;
+			if (Xutf8TextListToTextProperty(X_Dpy, list, nitems,
+			    XUTF8StringStyle, &prop2) == Success) {
+				*text = xstrdup(prop2.value);
+				XFree(prop2.value);
+			}
+		} else {
+			*text = xstrdup(*list);
+		}
+		XFreeStringList(list);
+	}
+
+	XFree(prop.value);
+
+	return (nitems);
+}
+
 int
 xu_getstate(struct client_ctx *cc, int *state)
 {
 	long	*p = NULL;
 
-	if (xu_getprop(cc, WM_STATE, WM_STATE, 2L, (u_char **)&p) <= 0)
+	if (xu_getprop(cc->win, WM_STATE, WM_STATE, 2L, (u_char **)&p) <= 0)
 		return (-1);
 
 	*state = (int)*p;
@@ -176,7 +236,21 @@ char 		*atoms[CWM_NO_ATOMS] = {
 	"WM_TAKE_FOCUS",
 	"WM_PROTOCOLS",
 	"_MOTIF_WM_HINTS",
-	"_CWM_GRP",
+	"UTF8_STRING",
+	"_NET_SUPPORTED",
+	"_NET_SUPPORTING_WM_CHECK",
+	"_NET_WM_NAME",
+	"_NET_ACTIVE_WINDOW",
+	"_NET_CLIENT_LIST",
+	"_NET_NUMBER_OF_DESKTOPS",
+	"_NET_CURRENT_DESKTOP",
+	"_NET_DESKTOP_VIEWPORT",
+	"_NET_DESKTOP_GEOMETRY",
+	"_NET_VIRTUAL_ROOTS",
+	"_NET_SHOWING_DESKTOP",
+	"_NET_DESKTOP_NAMES",
+	"_NET_WM_DESKTOP",
+	"_NET_WORKAREA",
 };
 
 void
@@ -185,6 +259,31 @@ xu_getatoms(void)
 	XInternAtoms(X_Dpy, atoms, CWM_NO_ATOMS, False, cwm_atoms);
 }
 
+void
+xu_setwmname(struct screen_ctx *sc)
+{
+	/*
+	 * set up the _NET_SUPPORTED hint with all netwm atoms that we
+	 * know about.
+	 */
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_SUPPORTED, XA_ATOM, 32,
+	    PropModeReplace,  (unsigned char *)&_NET_SUPPORTED,
+	    CWM_NO_ATOMS - CWM_NETWM_START);
+	/*
+	 * netwm spec says that to prove that the hint is not stale you must
+	 * provide _NET_SUPPORTING_WM_CHECK containing a window (we use the
+	 * menu window). The property must be set on the root window and the
+	 * window itself, the window also must have _NET_WM_NAME set with the
+	 * window manager name.
+	 */
+	XChangeProperty(X_Dpy, sc->rootwin, _NET_SUPPORTING_WM_CHECK,
+	    XA_WINDOW, 32, PropModeReplace, (unsigned char *)&sc->menuwin, 1);
+	XChangeProperty(X_Dpy, sc->menuwin, _NET_SUPPORTING_WM_CHECK,
+	    XA_WINDOW, 32, PropModeReplace, (unsigned char *)&sc->menuwin, 1);
+	XChangeProperty(X_Dpy, sc->menuwin, _NET_WM_NAME, UTF8_STRING,
+	    8, PropModeReplace, WMNAME, strlen(WMNAME));
+}
+
 unsigned long
 xu_getcolor(struct screen_ctx *sc, char *name)
 {