X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=dff398a4aa2eac8da7fa67623207d3dced80b7ac;hb=b43989207a949cbc17182b451aa527afe542c98f;hp=46e6e83a27f62453debe601254dedc61bd9c91ac;hpb=8b59083eb13c0712e04d9a5b6d7bf4af5913c442;p=dwm.git

diff --git a/client.c b/client.c
index 46e6e83..dff398a 100644
--- a/client.c
+++ b/client.c
@@ -2,272 +2,120 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
-
-#include <math.h>
+#include "dwm.h"
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "wm.h"
-
-void (*arrange)(void *aux);
+/* static functions */
 
-void
-max(void *aux)
+static void
+resizetitle(Client *c)
 {
-	if(!stack)
-		return;
-	stack->x = sx;
-	stack->y = sy;
-	stack->w = sw - 2 * stack->border;
-	stack->h = sh - 2 * stack->border;
-	resize(stack);
-	discard_events(EnterWindowMask);
-}
+	int i;
 
-void
-floating(void *aux)
-{
-	Client *c;
+	c->tw = 0;
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i])
+			c->tw += textw(tags[i]);
+	c->tw += textw(c->name);
+	if(c->tw > c->w)
+		c->tw = c->w + 2;
+	c->tx = c->x + c->w - c->tw + 2;
+	c->ty = c->y;
+	if(isvisible(c))
+		XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+	else
+		XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
 
-	arrange = floating;
-	for(c = stack; c; c = c->snext)
-		resize(c);
-	discard_events(EnterWindowMask);
 }
 
-void
-grid(void *aux)
+static int
+xerrordummy(Display *dsply, XErrorEvent *ee)
 {
-	Client *c;
-	int n, cols, rows, gw, gh, i, j;
-    float rt, fd;
-
-	arrange = grid;
-	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 - 2)  / cols;
-	gh = (sh - 2) / rows;
-
-	for(i = j = 0, c = clients; c; c = c->next) {
-		c->x = i * gw;
-		c->y = j * gh;
-		c->w = gw;
-		c->h = gh;
-		resize(c);
-		if(++i == cols) {
-			j++;
-			i = 0;
-		}
-	}
-	discard_events(EnterWindowMask);
+	return 0;
 }
 
+/* extern functions */
+
 void
-sel(void *aux)
+ban(Client *c)
 {
-	const char *arg = aux;
-	Client *c = NULL;
-
-	if(!arg || !stack)
-		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;
-	craise(c);
-	focus(c);
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
 }
 
 void
-ckill(void *aux)
+focus(Client *c)
 {
-	Client *c = stack;
+	Client *old = sel;
 
-	if(!c)
+	if (!issel)
 		return;
-	if(c->proto & WM_PROTOCOL_DELWIN)
-		send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-	else
-		XKillClient(dpy, c->win);
+	if(sel && sel->ismax)
+		togglemax(NULL);
+	sel = c;
+	if(old && old != c)
+		drawtitle(old);
+	drawtitle(c);
+	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
 
-static void
-resize_title(Client *c)
+void
+focusnext(Arg *arg)
 {
-	int i;
+	Client *c;
+   
+	if(!sel)
+		return;
 
-	c->tw = 0;
-	for(i = 0; i < TLast; i++)
-		if(c->tags[i])
-			c->tw += textw(&brush.font, c->tags[i]) + brush.font.height;
-	c->tw += textw(&brush.font, c->name) + brush.font.height;
-	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);
+	if(!(c = getnext(sel->next)))
+		c = getnext(clients);
+	if(c) {
+		focus(c);
+		restack();
+	}
 }
 
 void
-update_name(Client *c)
+focusprev(Arg *arg)
 {
-	XTextProperty name;
-	int n;
-	char **list = NULL;
+	Client *c;
 
-	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)
+	if(!sel)
 		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);
-}
 
-void
-update_size(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;
+	if(!(c = getprev(sel->prev))) {
+		for(c = clients; c && c->next; c = c->next);
+		c = getprev(c);
 	}
-	else
-		c->basew = c->baseh = 0;
-	if(c->flags & PResizeInc) {
-		c->incw = size.width_inc;
-		c->inch = size.height_inc;
+	if(c) {
+		focus(c);
+		restack();
 	}
-	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
-craise(Client *c)
-{
-	XRaiseWindow(dpy, c->win);
-	XRaiseWindow(dpy, c->title);
 }
 
-void
-lower(Client *c)
+Client *
+getclient(Window w)
 {
-	XLowerWindow(dpy, c->title);
-	XLowerWindow(dpy, c->win);
-}
+	Client *c;
 
-void
-focus(Client *c)
-{
-	Client **l, *old;
-
-	old = stack;
-	for(l = &stack; *l && *l != c; l = &(*l)->snext);
-	if(*l)
-		*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);
+	for(c = clients; c; c = c->next)
+		if(c->win == w)
+			return c;
+	return NULL;
 }
 
-void
-manage(Window w, XWindowAttributes *wa)
+Client *
+getctitle(Window w)
 {
-	Client *c, **l;
-	XSetWindowAttributes twa;
-
-	c = emallocz(sizeof(Client));
-	c->win = w;
-	c->tx = c->x = wa->x;
-	c->ty = c->y = wa->y;
-	c->tw = c->w = wa->width;
-	c->h = wa->height;
-	c->th = th;
-	c->border = 1;
-	update_size(c);
-	XSetWindowBorderWidth(dpy, c->win, 1);
-	XSetWindowBorder(dpy, c->win, brush.border);
-	XSelectInput(dpy, c->win,
-			StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-	XGetTransientForHint(dpy, c->win, &c->trans);
-	twa.override_redirect = 1;
-	twa.background_pixmap = ParentRelative;
-	twa.event_mask = ExposureMask;
-
-	c->tags[tsel] = tags[tsel];
-	c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
-			0, DefaultDepth(dpy, screen), CopyFromParent,
-			DefaultVisual(dpy, screen),
-			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
+	Client *c;
 
-	update_name(c);
-	for(l=&clients; *l; l=&(*l)->next);
-	c->next = *l; /* *l == nil */
-	*l = c;
-	XMapRaised(dpy, c->win);
-	XMapRaised(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);
-	arrange(NULL);
-	focus(c);
+	for(c = clients; c; c = c->next)
+		if(c->title == w)
+			return c;
+	return NULL;
 }
 
 void
@@ -276,6 +124,8 @@ gravitate(Client *c, Bool invert)
 	int dx = 0, dy = 0;
 
 	switch(c->grav) {
+	default:
+		break;
 	case StaticGravity:
 	case NorthWestGravity:
 	case NorthGravity:
@@ -290,13 +140,13 @@ gravitate(Client *c, Bool invert)
 	case SouthEastGravity:
 	case SouthGravity:
 	case SouthWestGravity:
-		dy = -c->h;
-		break;
-	default:
+		dy = -(c->h);
 		break;
 	}
 
 	switch (c->grav) {
+	default:
+		break;
 	case StaticGravity:
 	case NorthWestGravity:
 	case WestGravity:
@@ -313,8 +163,6 @@ gravitate(Client *c, Bool invert)
 	case SouthEastGravity:
 		dx = -(c->w + c->border);
 		break;
-	default:
-		break;
 	}
 
 	if(invert) {
@@ -325,113 +173,294 @@ gravitate(Client *c, Bool invert)
 	c->y += dy;
 }
 
+void
+killclient(Arg *arg)
+{
+	if(!sel)
+		return;
+	if(sel->proto & PROTODELWIN)
+		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+	else
+		XKillClient(dpy, sel->win);
+}
 
 void
-resize(Client *c)
+manage(Window w, XWindowAttributes *wa)
 {
-	XConfigureEvent e;
-
-	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;
-	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 = c->border;
-	e.above = None;
-	e.override_redirect = False;
-	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
-	XFlush(dpy);
+	Client *c, *tc;
+	Window trans;
+	XSetWindowAttributes twa;
+
+	c = emallocz(sizeof(Client));
+	c->tags = emallocz(ntags * sizeof(Bool));
+	c->win = w;
+	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;
+
+	c->border = 0;
+	setsize(c);
+
+	if(c->x + c->w + 2 > sw)
+		c->x = sw - c->w - 2;
+	if(c->x < 0)
+		c->x = 0;
+	if(c->y + c->h + 2 > sh)
+		c->y = sh - c->h - 2;
+	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->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+			0, DefaultDepth(dpy, screen), CopyFromParent,
+			DefaultVisual(dpy, screen),
+			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
+
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
+
+	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);
+
+	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);
+
+	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);
+
+	settags(c);
+	if(!c->isfloat)
+		c->isfloat = trans
+			|| (c->maxw && c->minw &&
+				c->maxw == c->minw && c->maxh == c->minh);
+	settitle(c);
+	if(isvisible(c))
+		sel = c;
+	arrange(NULL);
+	XMapWindow(dpy, c->win);
+	XMapWindow(dpy, c->title);
+	if(isvisible(c))
+		focus(c);
 }
 
-static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+void
+resize(Client *c, Bool sizehints, Corner sticky)
 {
-	return 0;
+	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;
+
+	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 = 1;
+	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+	XSync(dpy, False);
 }
 
 void
-unmanage(Client *c)
+setsize(Client *c)
+{
+	long msize;
+	XSizeHints size;
+
+	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)
 {
-	Client **l;
+	char **list = NULL;
+	int n;
+	XTextProperty name;
+
+	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
+togglemax(Arg *arg)
+{
+	int ox, oy, ow, oh;
+	XEvent ev;
+
+	if(!sel)
+		return;
+
+	if((sel->ismax = !sel->ismax)) {
+		ox = sel->x;
+		oy = sel->y;
+		ow = sel->w;
+		oh = sel->h;
+		sel->x = sx;
+		sel->y = sy + bh;
+		sel->w = sw - 2;
+		sel->h = sh - 2 - bh;
+
+		restack();
+		resize(sel, arrange == dofloat, TopLeft);
+
+		sel->x = ox;
+		sel->y = oy;
+		sel->w = ow;
+		sel->h = oh;
+	}
+	else
+		resize(sel, False, TopLeft);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+unmanage(Client *c)
+{
 	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);
-	*l = c->next;
-	for(l=&stack; *l && *l != c; l=&(*l)->snext);
-	*l = c->snext;
+	if(c->prev)
+		c->prev->next = c->next;
+	if(c->next)
+		c->next->prev = c->prev;
+	if(c == clients)
+		clients = c->next;
+	if(sel == c)
+		sel = getnext(clients);
+	free(c->tags);
 	free(c);
 
-	XFlush(dpy);
-	XSetErrorHandler(error_handler);
+	XSync(dpy, False);
+	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
+	if(sel)
+		focus(sel);
 	arrange(NULL);
-	if(stack)
-		focus(stack);
-}
-
-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)
-{
-	int i;
-	if(c == stack)
+	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
 		return;
 
-	brush.x = brush.y = 0;
-	brush.h = c->th;
-
-	brush.w = 0;
-	for(i = 0; i < TLast; i++) {
-		if(c->tags[i]) {
-			brush.x += brush.w;
-			brush.w = textw(&brush.font, c->tags[i]) + brush.font.height;
-			draw(dpy, &brush, True, c->tags[i]);
-		}
+	if(sel == getnext(clients))  {
+		if((c = getnext(sel->next)))
+			sel = c;
+		else
+			return;
 	}
-	brush.x += brush.w;
-	brush.w = textw(&brush.font, c->name) + brush.font.height;
-	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->prev->next = sel->next;
+	if(sel->next)
+		sel->next->prev = sel->prev;
+	sel->prev = NULL;
+	clients->prev = sel;
+	sel->next = clients;
+	clients = sel;
+	focus(sel);
+	arrange(NULL);
 }