X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=889daa5002c162ee03d87f1f75fdda2a69a12536;hb=184471b4bbd1736794a76d2b703659de0339322b;hp=b7c9455259a68bc529aa1dc28c716f5f6f15e3aa;hpb=83d23908d3438d7f1f62533a7c8d96fc1019df55;p=dwm.git

diff --git a/client.c b/client.c
index b7c9455..8110263 100644
--- a/client.c
+++ b/client.c
@@ -1,49 +1,265 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
-
+#include "dwm.h"
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
+#include <X11/Xutil.h>
+
+/* static functions */
+
+static void
+detachstack(Client *c) {
+	Client **tc;
+	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	*tc = c->snext;
+}
+
+static void
+grabbuttons(Client *c, Bool focused) {
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+
+	if(focused) {
+		XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
 
-#include "util.h"
-#include "wm.h"
+		XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
 
-#define CLIENT_MASK		(StructureNotifyMask | PropertyChangeMask | EnterWindowMask)
+		XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+		XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+	}
+	else
+		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+}
+
+static int
+xerrordummy(Display *dsply, XErrorEvent *ee) {
+	return 0;
+}
+
+/* extern functions */
 
 void
-update_name(Client *c)
-{
-	XTextProperty name;
-	int n;
-	char **list = NULL;
+ban(Client *c) {
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
+}
 
-	name.nitems = 0;
-	c->name[0] = 0;
-	XGetTextProperty(dpy, c->win, &name, net_atom[NetWMName]);
-	if(!name.nitems)
-		XGetWMName(dpy, c->win, &name);
-	if(!name.nitems)
+void
+configure(Client *c) {
+	XEvent synev;
+
+	synev.type = ConfigureNotify;
+	synev.xconfigure.display = dpy;
+	synev.xconfigure.event = c->win;
+	synev.xconfigure.window = c->win;
+	synev.xconfigure.x = c->x;
+	synev.xconfigure.y = c->y;
+	synev.xconfigure.width = c->w;
+	synev.xconfigure.height = c->h;
+	synev.xconfigure.border_width = c->border;
+	synev.xconfigure.above = None;
+	XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
+void
+focus(Client *c) {
+	Client *old;
+
+	if(!issel || (c && !isvisible(c)))
 		return;
-	if(name.encoding == XA_STRING)
-		strncpy(c->name, (char *)name.value, sizeof(c->name));
-	else {
-		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-				&& n > 0 && *list)
-		{
-			strncpy(c->name, *list, sizeof(c->name));
-			XFreeStringList(list);
+	if(!sel)
+		sel = c;
+	else if(sel != c) {
+		old = sel;
+		sel = c;
+		if(old) {
+			grabbuttons(old, False);
+			drawclient(old);
 		}
 	}
-	XFree(name.value);
+	if(c) {
+		detachstack(c);
+		c->snext = stack;
+		stack = c;
+		grabbuttons(c, True);
+		drawclient(c);
+		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+	}
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+Client *
+getclient(Window w) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(c->win == w)
+			return c;
+	return NULL;
+}
+
+Client *
+getctitle(Window w) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(c->twin == w)
+			return c;
+	return NULL;
 }
 
 void
-update_size(Client *c)
-{
-	XSizeHints size;
+killclient(Arg *arg) {
+	if(!sel)
+		return;
+	if(sel->proto & PROTODELWIN)
+		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+	else
+		XKillClient(dpy, sel->win);
+}
+
+void
+manage(Window w, XWindowAttributes *wa) {
+	Client *c;
+	Window trans;
+	XSetWindowAttributes twa;
+
+	c = emallocz(sizeof(Client));
+	c->tags = emallocz(ntags * sizeof(Bool));
+	c->win = w;
+	c->border = 0;
+	c->x = c->tx = wa->x;
+	c->y = c->ty = wa->y;
+	c->w = c->tw = wa->width;
+	c->h = wa->height;
+	c->th = bh;
+	updatesizehints(c);
+	if(c->x + c->w + 2 * BORDERPX > sw)
+		c->x = sw - c->w - 2 * BORDERPX;
+	if(c->x < sx)
+		c->x = sx;
+	if(c->y + c->h + 2 * BORDERPX > sh)
+		c->y = sh - c->h - 2 * BORDERPX;
+	if(c->h != sh && c->y < bh)
+		c->y = bh;
+	c->proto = getproto(c->win);
+	XSelectInput(dpy, c->win,
+		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+	XGetTransientForHint(dpy, c->win, &trans);
+	twa.override_redirect = 1;
+	twa.background_pixmap = ParentRelative;
+	twa.event_mask = ExposureMask | EnterWindowMask;
+	c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+			0, DefaultDepth(dpy, screen), CopyFromParent,
+			DefaultVisual(dpy, screen),
+			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
+	grabbuttons(c, False);
+	updatetitle(c);
+	settags(c, getclient(trans));
+	if(!c->isfloat)
+		c->isfloat = trans || c->isfixed;
+	resizetitle(c);
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	c->snext = stack;
+	stack = clients = c;
+	ban(c);
+	XMapWindow(dpy, c->win);
+	XMapWindow(dpy, c->twin);
+	if(isvisible(c))
+		focus(c);
+	arrange();
+}
+
+void
+resize(Client *c, Bool sizehints, Corner sticky) {
+	int bottom = c->y + c->h;
+	int right = c->x + c->w;
+	XWindowChanges wc;
+
+	if(sizehints) {
+		if(c->incw)
+			c->w -= (c->w - c->basew) % c->incw;
+		if(c->inch)
+			c->h -= (c->h - c->baseh) % c->inch;
+		if(c->minw && c->w < c->minw)
+			c->w = c->minw;
+		if(c->minh && c->h < c->minh)
+			c->h = c->minh;
+		if(c->maxw && c->w > c->maxw)
+			c->w = c->maxw;
+		if(c->maxh && c->h > c->maxh)
+			c->h = c->maxh;
+	}
+	if(sticky == TopRight || sticky == BotRight)
+		c->x = right - c->w;
+	if(sticky == BotLeft || sticky == BotRight)
+		c->y = bottom - c->h;
+	/* offscreen appearance fixes */
+	if(c->x + c->w < sx)
+		c->x = sx;
+	if(c->y + c->h < bh)
+		c->y = bh;
+	if(c->x > sw)
+		c->x = sw - c->w;
+	if(c->y > sh)
+		c->y = sh - c->h;
+	resizetitle(c);
+	wc.x = c->x;
+	wc.y = c->y;
+	wc.width = c->w;
+	wc.height = c->h;
+	if(c->w == sw && c->h == sh)
+		wc.border_width = 0;
+	else
+		wc.border_width = BORDERPX;
+	XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+	configure(c);
+	XSync(dpy, False);
+}
+
+void
+resizetitle(Client *c) {
+	c->tw = textw(c->name);
+	if(c->tw > c->w)
+		c->tw = c->w + 2 * BORDERPX;
+	c->tx = c->x + c->w - c->tw + 2 * BORDERPX;
+	c->ty = c->y;
+	if(isvisible(c))
+		XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
+	else
+		XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
+}
+
+void
+updatesizehints(Client *c) {
 	long msize;
+	XSizeHints size;
+
 	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
 		size.flags = PSize;
 	c->flags = size.flags;
@@ -71,156 +287,55 @@ update_size(Client *c)
 	}
 	else
 		c->minw = c->minh = 0;
+	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
+				c->maxw == c->minw && c->maxh == c->minh);
 }
 
 void
-focus(Client *c)
-{
-	Client **l, *old;
-
-	old = stack;
-	for(l=&stack; *l && *l != c; l=&(*l)->snext);
-	eassert(*l == c);
-	*l = c->snext;
-	c->snext = stack;
-	stack = c;
-	XRaiseWindow(dpy, c->win);
-	XRaiseWindow(dpy, c->title);
-	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-	if(old && old != c) {
-		XMapWindow(dpy, old->title);
-		draw_client(old);
-	}
-	XUnmapWindow(dpy, c->title);
-	draw_bar();
-	XFlush(dpy);
-}
-
-void
-manage(Window w, XWindowAttributes *wa)
-{
-	Client *c, **l;
-	XSetWindowAttributes twa;
-
-	c = emallocz(sizeof(Client));
-	c->win = w;
-	c->x = wa->x;
-	c->y = wa->y;
-	c->w = wa->width;
-	c->h = wa->height;
-	update_size(c);
-	XSetWindowBorderWidth(dpy, c->win, 1);
-	XSelectInput(dpy, c->win, CLIENT_MASK);
-	XGetTransientForHint(dpy, c->win, &c->trans);
-	twa.override_redirect = 1;
-	twa.background_pixmap = ParentRelative;
-	twa.event_mask = ExposureMask;
-
-	c->title = XCreateWindow(dpy, root, c->x, c->y, c->w, barrect.height,
-			0, DefaultDepth(dpy, screen), CopyFromParent,
-			DefaultVisual(dpy, screen),
-			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
-	update_name(c);
-
-	for(l=&clients; *l; l=&(*l)->next);
-	c->next = *l; /* *l == nil */
-	*l = c;
-	c->snext = stack;
-	stack = c;
-	XMapWindow(dpy, c->win);
-	XMapWindow(dpy, c->title);
-	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
-			GrabModeAsync, GrabModeSync, None, None);
-	resize(c);
-	focus(c);
-}
-
-void
-resize(Client *c)
-{
-	XConfigureEvent e;
-
-	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-	XMoveResizeWindow(dpy, c->title, c->x + c->w / 3, c->y, 2 * c->w / 3, barrect.height);
-	e.type = ConfigureNotify;
-	e.event = c->win;
-	e.window = c->win;
-	e.x = c->x;
-	e.y = c->y;
-	e.width = c->w;
-	e.height = c->h;
-	e.border_width = 0;
-	e.above = None;
-	e.override_redirect = False;
-	XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
-	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
-	XSelectInput(dpy, c->win, CLIENT_MASK);
-	XFlush(dpy);
-}
+updatetitle(Client *c) {
+	char **list = NULL;
+	int n;
+	XTextProperty name;
 
-static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
-{
-	return 0;
+	name.nitems = 0;
+	c->name[0] = 0;
+	XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]);
+	if(!name.nitems)
+		XGetWMName(dpy, c->win, &name);
+	if(!name.nitems)
+		return;
+	if(name.encoding == XA_STRING)
+		strncpy(c->name, (char *)name.value, sizeof c->name);
+	else {
+		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
+				&& n > 0 && *list)
+		{
+			strncpy(c->name, *list, sizeof c->name);
+			XFreeStringList(list);
+		}
+	}
+	XFree(name.value);
 }
 
 void
-unmanage(Client *c)
-{
-	Client **l;
+unmanage(Client *c) {
+	Client *nc;
 
+	/* The server grab construct avoids race conditions. */
 	XGrabServer(dpy);
-	XSetErrorHandler(dummy_error_handler);
-
+	XSetErrorHandler(xerrordummy);
+	detach(c);
+	detachstack(c);
+	if(sel == c) {
+		for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+		focus(nc);
+	}
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	XUnmapWindow(dpy, c->win);
-	XDestroyWindow(dpy, c->title);
-
-	for(l=&clients; *l && *l != c; l=&(*l)->next);
-	eassert(*l == c);
-	*l = c->next;
-	for(l=&stack; *l && *l != c; l=&(*l)->snext);
-	eassert(*l == c);
-	*l = c->snext;
+	XDestroyWindow(dpy, c->twin);
+	free(c->tags);
 	free(c);
-
-	XFlush(dpy);
-	XSetErrorHandler(error_handler);
+	XSync(dpy, False);
+	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	discard_events(EnterWindowMask);
-	if(stack)
-		focus(stack);
-}
-
-
-Client *
-getclient(Window w)
-{
-	Client *c;
-	for(c = clients; c; c = c->next)
-		if(c->win == w)
-			return c;
-	return NULL;
-}
-
-void
-draw_client(Client *c)
-{
-	if(!c)
-		return;
-	if(c == stack)
-		draw_bar();
-
-	brush.rect.x = brush.rect.y = 0;
-	brush.rect.width = 2 * c->w / 3;
-	brush.rect.height = barrect.height;
-
-	draw(dpy, &brush, True, c->name);
-	XCopyArea(dpy, brush.drawable, c->title, brush.gc, 0, 0,
-			brush.rect.width, brush.rect.height, 0, 0);
-	XFlush(dpy);
+	arrange();
 }