X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=client.c;h=3b6a0e128baea6a97e0d5b8c19e34cd79b3b34cf;hp=537336caff514f5510031509375695fc197df682;hb=1f9614f82e14fa3a46e0db05346b41d6be611f88;hpb=6db5ffb6c9a9c0db5c425c64a96a3896a682c95e

diff --git a/client.c b/client.c
index 537336c..3b6a0e1 100644
--- a/client.c
+++ b/client.c
@@ -2,275 +2,425 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
+#include <X11/Xutil.h>
 
-#include "util.h"
-#include "wm.h"
+/* static functions */
+
+static void
+resizetitle(Client *c)
+{
+	int i;
+
+	c->bw = 0;
+	for(i = 0; i < TLast; i++)
+		if(c->tags[i])
+			c->bw += textw(c->tags[i]);
+	c->bw += textw(c->name);
+	if(c->bw > *c->w)
+		c->bw = *c->w + 2;
+	c->bx = *c->x + *c->w - c->bw + 2;
+	c->by = *c->y;
+	if(c->tags[tsel])
+		XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);
+	else
+		XMoveResizeWindow(dpy, c->title, c->bx + 2 * sw, c->by, c->bw, c->bh);
+
+}
+
+static int
+xerrordummy(Display *dsply, XErrorEvent *ee)
+{
+	return 0;
+}
+
+/* extern functions */
 
 void
-max(void *aux)
+ban(Client *c)
 {
-	if(!stack)
-		return;
-	stack->x = sx;
-	stack->y = bh;
-	stack->w = sw - 2;
-	stack->h = sh - bh - 2;
-	resize(stack);
+	XMoveWindow(dpy, c->win, *c->x + 2 * sw, *c->y);
+	XMoveWindow(dpy, c->title, c->bx + 2 * sw, c->by);
 }
 
 void
-arrange(void *aux)
+focus(Client *c)
 {
-	Client *c;
-	int n, cols, rows, gw, gh, i, j;
-    float rt, fd;
+	Client *old = sel;
+	XEvent ev;
 
-	if(!clients)
-		return;
-	for(n = 0, c = clients; c; c = c->next, n++);
-	rt = sqrt(n);
-	if(modff(rt, &fd) < 0.5)
-		rows = floor(rt);
-	else
-		rows = ceil(rt);
-	if(rows * rows < n)
-		cols = rows + 1;
-	else
-		cols = rows;
-
-	gw = (sw - 1)  / cols;
-	gh = (sh - bh - 1) / rows;
-
-	for(i = j = 0, c = clients; c; c = c->next) {
-		c->x = i * gw;
-		c->y = j * gh + bh;
-		c->w = gw;
-		c->h = gh;
-		resize(c);
-		if(++i == cols) {
-			j++;
-			i = 0;
-		}
-	}
+	sel = c;
+	if(old && old != c)
+		drawtitle(old);
+	drawtitle(c);
+	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+	XSync(dpy, False);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
-sel(void *aux)
+focusnext(Arg *arg)
 {
-	const char *arg = aux;
-	Client *c = NULL;
-
-	if(!arg || !stack)
+	Client *c;
+   
+	if(!sel)
 		return;
-	if(!strncmp(arg, "next", 5))
-		c = stack->snext ? stack->snext : stack;
-	else if(!strncmp(arg, "prev", 5))
-		for(c = stack; c && c->snext; c = c->snext);
-	if(!c)
-		c = stack;
-	raise(c);
-	focus(c);
+
+	if(!(c = getnext(sel->next, tsel)))
+		c = getnext(clients, tsel);
+	if(c) {
+		higher(c);
+		c->revert = sel;
+		focus(c);
+	}
 }
 
 void
-kill(void *aux)
+focusprev(Arg *arg)
 {
-	Client *c = stack;
+	Client *c;
 
-	if(!c)
+	if(!sel)
 		return;
-	if(c->proto & WM_PROTOCOL_DELWIN)
-		send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-	else
-		XKillClient(dpy, c->win);
+
+	if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+		higher(c);
+		focus(c);
+	}
 }
 
-static void
-resize_title(Client *c)
+Client *
+getclient(Window w)
 {
-	c->tw = textw(&brush.font, c->name) + bh;
-	if(c->tw > c->w)
-		c->tw = c->w + 2;
-	c->tx = c->x + c->w - c->tw + 2;
-	c->ty = c->y;
-	XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+	Client *c;
+	for(c = clients; c; c = c->next)
+		if(c->win == w)
+			return c;
+	return NULL;
 }
 
-void
-update_name(Client *c)
+Client *
+getctitle(Window w)
 {
-	XTextProperty name;
-	int n;
-	char **list = NULL;
-
-	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)
-		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);
-	resize_title(c);
+	Client *c;
+	for(c = clients; c; c = c->next)
+		if(c->title == w)
+			return c;
+	return NULL;
 }
 
 void
-update_size(Client *c)
+gravitate(Client *c, Bool invert)
 {
-	XSizeHints size;
-	long msize;
-	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
-		size.flags = PSize;
-	c->flags = size.flags;
-	if(c->flags & PBaseSize) {
-		c->basew = size.base_width;
-		c->baseh = size.base_height;
+	int dx = 0, dy = 0;
+
+	switch(c->grav) {
+	case StaticGravity:
+	case NorthWestGravity:
+	case NorthGravity:
+	case NorthEastGravity:
+		dy = c->border;
+		break;
+	case EastGravity:
+	case CenterGravity:
+	case WestGravity:
+		dy = -(*c->h / 2) + c->border;
+		break;
+	case SouthEastGravity:
+	case SouthGravity:
+	case SouthWestGravity:
+		dy = -(*c->h);
+		break;
+	default:
+		break;
 	}
-	else
-		c->basew = c->baseh = 0;
-	if(c->flags & PResizeInc) {
-		c->incw = size.width_inc;
-		c->inch = size.height_inc;
-	}
-	else
-		c->incw = c->inch = 0;
-	if(c->flags & PMaxSize) {
-		c->maxw = size.max_width;
-		c->maxh = size.max_height;
+
+	switch (c->grav) {
+	case StaticGravity:
+	case NorthWestGravity:
+	case WestGravity:
+	case SouthWestGravity:
+		dx = c->border;
+		break;
+	case NorthGravity:
+	case CenterGravity:
+	case SouthGravity:
+		dx = -(*c->w / 2) + c->border;
+		break;
+	case NorthEastGravity:
+	case EastGravity:
+	case SouthEastGravity:
+		dx = -(*c->w + c->border);
+		break;
+	default:
+		break;
 	}
-	else
-		c->maxw = c->maxh = 0;
-	if(c->flags & PMinSize) {
-		c->minw = size.min_width;
-		c->minh = size.min_height;
+
+	if(invert) {
+		dx = -dx;
+		dy = -dy;
 	}
-	else
-		c->minw = c->minh = 0;
+	*c->x += dx;
+	*c->y += dy;
 }
 
 void
-raise(Client *c)
+higher(Client *c)
 {
 	XRaiseWindow(dpy, c->win);
 	XRaiseWindow(dpy, c->title);
 }
 
 void
-lower(Client *c)
+killclient(Arg *arg)
 {
-	XLowerWindow(dpy, c->title);
-	XLowerWindow(dpy, c->win);
+	if(!sel)
+		return;
+	if(sel->proto & WM_PROTOCOL_DELWIN)
+		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+	else
+		XKillClient(dpy, sel->win);
 }
 
 void
-focus(Client *c)
+lower(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;
-	if(old && old != c) {
-		XMapWindow(dpy, old->title);
-		draw_client(old);
-	}
-	XUnmapWindow(dpy, c->title);
-	draw_client(c);
-	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-	XFlush(dpy);
+	XLowerWindow(dpy, c->title);
+	XLowerWindow(dpy, c->win);
 }
 
 void
 manage(Window w, XWindowAttributes *wa)
 {
-	Client *c, **l;
+	int diff;
+	Client *c;
 	XSetWindowAttributes twa;
+	Window trans;
 
 	c = emallocz(sizeof(Client));
 	c->win = w;
-	c->tx = c->x = wa->x;
-	c->ty = c->y = wa->y;
-	if(c->y < bh)
-		c->ty = c->y += bh;
-	c->tw = c->w = wa->width;
-	c->h = wa->height;
-	c->th = bh;
-	update_size(c);
-	XSetWindowBorderWidth(dpy, c->win, 1);
-	XSetWindowBorder(dpy, c->win, brush.border);
+	c->bx = c->fx = c->tx = wa->x;
+	c->by = c->fy = c->ty = wa->y;
+	c->bw = c->fw = c->tw = wa->width;
+	c->fh = c->th = wa->height;
+	c->bh = bh;
+
+	diff = sw - c->fw;
+	c->fx = random() % (diff ? diff : 1);
+	diff = sh - c->fh - bh;
+	c->fy = random() % (diff ? diff : 1);
+
+	if(c->fy < bh)
+		c->by = c->fy = c->ty = bh;
+
+	c->border = 1;
+	c->proto = getproto(c->win);
+	setsize(c);
 	XSelectInput(dpy, c->win,
 			StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-	XGetTransientForHint(dpy, c->win, &c->trans);
+	XGetTransientForHint(dpy, c->win, &trans);
 	twa.override_redirect = 1;
 	twa.background_pixmap = ParentRelative;
 	twa.event_mask = ExposureMask;
 
-	c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+	c->title = XCreateWindow(dpy, root, c->bx, c->by, c->bw, c->bh,
 			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;
-	XMapRaised(dpy, c->win);
-	XMapRaised(dpy, c->title);
+
+	settags(c);
+
+	c->next = clients;
+	clients = c;
+
+	XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
+			GrabModeAsync, GrabModeSync, None, None);
 	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);
+
+	if(!c->isfloat)
+		c->isfloat = trans
+			|| ((c->maxw == c->minw) && (c->maxh == c->minh));
+
+	setgeom(c);
+	settitle(c);
+
+	arrange(NULL);
+
+	/* mapping the window now prevents flicker */
+	if(c->tags[tsel]) {
+		XMapRaised(dpy, c->win);
+		XMapRaised(dpy, c->title);
+		focus(c);
+	}
+	else {
+		XMapRaised(dpy, c->win);
+		XMapRaised(dpy, c->title);
+	}
+}
+
+void
+maximize(Arg *arg)
+{
+	if(!sel)
+		return;
+	*sel->x = sx;
+	*sel->y = sy + bh;
+	*sel->w = sw - 2 * sel->border;
+	*sel->h = sh - 2 * sel->border - bh;
+	higher(sel);
+	resize(sel, False, TopLeft);
+}
+
+void
+pop(Client *c)
+{
+	Client **l;
+	for(l = &clients; *l && *l != c; l = &(*l)->next);
+	*l = c->next;
+
+	c->next = clients; /* pop */
+	clients = c;
+	arrange(NULL);
 }
 
 void
-resize(Client *c)
+resize(Client *c, Bool inc, Corner sticky)
 {
 	XConfigureEvent e;
+	int right = *c->x + *c->w;
+	int bottom = *c->y + *c->h;
+
+	if(inc) {
+		if(c->incw)
+			*c->w -= (*c->w - c->basew) % c->incw;
+		if(c->inch)
+			*c->h -= (*c->h - c->baseh) % c->inch;
+	}
+	if(*c->x > sw) /* might happen on restart */
+		*c->x = sw - *c->w;
+	if(*c->y > sh)
+		*c->y = sh - *c->h;
+	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;
+
+	resizetitle(c);
+	XSetWindowBorderWidth(dpy, c->win, 1);
+	XMoveResizeWindow(dpy, c->win, *c->x, *c->y, *c->w, *c->h);
 
-	resize_title(c);
-	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 	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.x = *c->x;
+	e.y = *c->y;
+	e.width = *c->w;
+	e.height = *c->h;
+	e.border_width = c->border;
 	e.above = None;
 	e.override_redirect = False;
 	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
-	XFlush(dpy);
+	XSync(dpy, False);
 }
 
-static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+void
+setgeom(Client *c)
 {
-	return 0;
+	if((arrange == dotile) && !c->isfloat) {
+		c->x = &c->tx;
+		c->y = &c->ty;
+		c->w = &c->tw;
+		c->h = &c->th;
+	}
+	else {
+		c->x = &c->fx;
+		c->y = &c->fy;
+		c->w = &c->fw;
+		c->h = &c->fh;
+	}
+}
+
+void
+setsize(Client *c)
+{
+	XSizeHints size;
+	long msize;
+	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+		size.flags = PSize;
+	c->flags = size.flags;
+	if(c->flags & PBaseSize) {
+		c->basew = size.base_width;
+		c->baseh = size.base_height;
+	}
+	else
+		c->basew = c->baseh = 0;
+	if(c->flags & PResizeInc) {
+		c->incw = size.width_inc;
+		c->inch = size.height_inc;
+	}
+	else
+		c->incw = c->inch = 0;
+	if(c->flags & PMaxSize) {
+		c->maxw = size.max_width;
+		c->maxh = size.max_height;
+	}
+	else
+		c->maxw = c->maxh = 0;
+	if(c->flags & PMinSize) {
+		c->minw = size.min_width;
+		c->minh = size.min_height;
+	}
+	else
+		c->minw = c->minh = 0;
+	if(c->flags & PWinGravity)
+		c->grav = size.win_gravity;
+	else
+		c->grav = NorthWestGravity;
+}
+
+void
+settitle(Client *c)
+{
+	XTextProperty name;
+	int n;
+	char **list = NULL;
+
+	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);
+	resizetitle(c);
 }
 
 void
@@ -279,60 +429,42 @@ unmanage(Client *c)
 	Client **l;
 
 	XGrabServer(dpy);
-	XSetErrorHandler(dummy_error_handler);
+	XSetErrorHandler(xerrordummy);
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->title);
 
-	for(l=&clients; *l && *l != c; l=&(*l)->next);
-	eassert(*l == c);
+	for(l = &clients; *l && *l != c; l = &(*l)->next);
 	*l = c->next;
-	for(l=&stack; *l && *l != c; l=&(*l)->snext);
-	eassert(*l == c);
-	*l = c->snext;
+	for(l = &clients; *l; l = &(*l)->next)
+		if((*l)->revert == c)
+			(*l)->revert = NULL;
+	if(sel == c)
+		sel = sel->revert ? sel->revert : clients;
+
 	free(c);
 
-	XFlush(dpy);
-	XSetErrorHandler(error_handler);
+	XSync(dpy, False);
+	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	if(stack)
-		focus(stack);
+	arrange(NULL);
+	if(sel)
+		focus(sel);
 }
 
-Client *
-gettitle(Window w)
-{
-	Client *c;
-	for(c = clients; c; c = c->next)
-		if(c->title == w)
-			return c;
-	return NULL;
-}
-
-Client *
-getclient(Window w)
+void
+zoom(Arg *arg)
 {
 	Client *c;
-	for(c = clients; c; c = c->next)
-		if(c->win == w)
-			return c;
-	return NULL;
-}
 
-void
-draw_client(Client *c)
-{
-	if(c == stack) {
-		draw_bar();
+	if(!sel)
 		return;
-	}
 
-	brush.x = brush.y = 0;
-	brush.w = c->tw;
-	brush.h = c->th;
+	if(sel == getnext(clients, tsel) && sel->next)  {
+		if((c = getnext(sel->next, tsel)))
+			sel = c;
+	}
 
-	draw(dpy, &brush, True, c->name);
-	XCopyArea(dpy, brush.drawable, c->title, brush.gc,
-			0, 0, c->tw, c->th, 0, 0);
-	XFlush(dpy);
+	pop(sel);
+	focus(sel);
 }