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

diff --git a/client.c b/client.c
index 46e6e83..2ff1994 100644
--- a/client.c
+++ b/client.c
@@ -9,101 +9,204 @@
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "wm.h"
+#include "dwm.h"
 
-void (*arrange)(void *aux);
+static void (*arrange)(Arg *) = floating;
+
+static void
+center(Client *c)
+{
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
+}
+
+static Client *
+next(Client *c)
+{
+	for(; c && !c->tags[tsel]; c = c->next);
+	return c;
+}
 
 void
-max(void *aux)
+zoom(Arg *arg)
 {
-	if(!stack)
+	Client **l;
+
+	if(!sel)
 		return;
-	stack->x = sx;
-	stack->y = sy;
-	stack->w = sw - 2 * stack->border;
-	stack->h = sh - 2 * stack->border;
-	resize(stack);
+
+	for(l = &clients; *l && *l != sel; l = &(*l)->next);
+	*l = sel->next;
+
+	sel->next = clients; /* pop */
+	clients = sel;
+	arrange(NULL);
+	center(sel);
+	focus(sel);
+}
+
+void
+max(Arg *arg)
+{
+	if(!sel)
+		return;
+	sel->x = sx;
+	sel->y = sy;
+	sel->w = sw - 2 * sel->border;
+	sel->h = sh - 2 * sel->border;
+	craise(sel);
+	resize(sel);
 	discard_events(EnterWindowMask);
 }
 
 void
-floating(void *aux)
+view(Arg *arg)
+{
+	tsel = arg->i;
+	arrange(NULL);
+}
+
+void
+tag(Arg *arg)
+{
+	int i, n;
+	if(!sel)
+		return;
+
+	if(arg->i == tsel) {
+		for(n = i = 0; i < TLast; i++)
+			if(sel->tags[i])
+				n++;
+		if(n < 2)
+			return;
+	}
+
+	if(sel->tags[arg->i])
+		sel->tags[arg->i] = NULL; /* toggle tag */
+	else
+		sel->tags[arg->i] = tags[arg->i];
+	arrange(NULL);
+}
+
+static void
+ban_client(Client *c)
+{
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+}
+
+void
+floating(Arg *arg)
 {
 	Client *c;
 
 	arrange = floating;
-	for(c = stack; c; c = c->snext)
-		resize(c);
+	for(c = clients; c; c = c->next) {
+		if(c->tags[tsel])
+			resize(c);
+		else
+			ban_client(c);
+	}
+	if(sel && !sel->tags[tsel]) {
+		if((sel = next(clients))) {
+			craise(sel);
+			focus(sel);
+		}
+	}
 	discard_events(EnterWindowMask);
 }
 
 void
-grid(void *aux)
+tiling(Arg *arg)
 {
 	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;
+	arrange = tiling;
+	for(n = 0, c = clients; c; c = next(c->next), n++);
+	if(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;
+	}
 	else
-		cols = rows;
-
-	gw = (sw - 2)  / cols;
-	gh = (sh - 2) / rows;
+		cols = rows = gw = gh = 0;
 
 	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;
+		if(c->tags[tsel]) {
+			c->x = i * gw;
+			c->y = j * gh;
+			c->w = gw;
+			c->h = gh;
+			resize(c);
+			if(++i == cols) {
+				j++;
+				i = 0;
+			}
+		}
+		else
+			ban_client(c);
+	}
+	if(sel && !sel->tags[tsel]) {
+		if((sel = next(clients))) {
+			craise(sel);
+			focus(sel);
 		}
 	}
 	discard_events(EnterWindowMask);
 }
 
 void
-sel(void *aux)
+prevc(Arg *arg)
 {
-	const char *arg = aux;
-	Client *c = NULL;
+	Client *c;
 
-	if(!arg || !stack)
+	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;
-	craise(c);
-	focus(c);
+
+	if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+		craise(c);
+		center(c);
+		focus(c);
+	}
 }
 
 void
-ckill(void *aux)
+nextc(Arg *arg)
 {
-	Client *c = stack;
+	Client *c;
+   
+	if(!sel)
+		return;
 
-	if(!c)
+	if(!(c = next(sel->next)))
+		c = next(clients);
+	if(c) {
+		craise(c);
+		center(c);
+		c->revert = sel;
+		focus(c);
+	}
+}
+
+void
+ckill(Arg *arg)
+{
+	if(!sel)
 		return;
-	if(c->proto & WM_PROTOCOL_DELWIN)
-		send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+	if(sel->proto & WM_PROTOCOL_DELWIN)
+		send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
 	else
-		XKillClient(dpy, c->win);
+		XKillClient(dpy, sel->win);
 }
 
 static void
@@ -114,8 +217,8 @@ resize_title(Client *c)
 	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;
+			c->tw += textw(c->tags[i]) + dc.font.height;
+	c->tw += textw(c->name) + dc.font.height;
 	if(c->tw > c->w)
 		c->tw = c->w + 2;
 	c->tx = c->x + c->w - c->tw + 2;
@@ -206,22 +309,18 @@ lower(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);
+	if(sel && sel != c) {
+		XSetWindowBorder(dpy, sel->win, dc.bg);
+		XMapWindow(dpy, sel->title);
+		draw_client(sel);
 	}
+	sel = c;
 	XUnmapWindow(dpy, c->title);
+	XSetWindowBorder(dpy, c->win, dc.fg);
 	draw_client(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	XFlush(dpy);
+	discard_events(EnterWindowMask);
 }
 
 void
@@ -238,9 +337,8 @@ manage(Window w, XWindowAttributes *wa)
 	c->h = wa->height;
 	c->th = th;
 	c->border = 1;
+	c->proto = win_proto(c->win);
 	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);
@@ -255,9 +353,12 @@ manage(Window w, XWindowAttributes *wa)
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
 	update_name(c);
-	for(l=&clients; *l; l=&(*l)->next);
+
+	for(l = &clients; *l; l = &(*l)->next);
 	c->next = *l; /* *l == nil */
 	*l = c;
+
+	XSetWindowBorderWidth(dpy, c->win, 1);
 	XMapRaised(dpy, c->win);
 	XMapRaised(dpy, c->title);
 	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
@@ -267,6 +368,7 @@ manage(Window w, XWindowAttributes *wa)
 	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
 	arrange(NULL);
+	center(c);
 	focus(c);
 }
 
@@ -360,7 +462,7 @@ resize(Client *c)
 }
 
 static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+dummy_error_handler(Display *dsply, XErrorEvent *err)
 {
 	return 0;
 }
@@ -376,18 +478,22 @@ unmanage(Client *c)
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->title);
 
-	for(l=&clients; *l && *l != c; l=&(*l)->next);
+	for(l = &clients; *l && *l != c; l = &(*l)->next);
 	*l = c->next;
-	for(l=&stack; *l && *l != c; l=&(*l)->snext);
-	*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);
 	XUngrabServer(dpy);
 	arrange(NULL);
-	if(stack)
-		focus(stack);
+	if(sel)
+		focus(sel);
 }
 
 Client *
@@ -414,24 +520,24 @@ void
 draw_client(Client *c)
 {
 	int i;
-	if(c == stack)
+	if(c == sel)
 		return;
 
-	brush.x = brush.y = 0;
-	brush.h = c->th;
+	dc.x = dc.y = 0;
+	dc.h = c->th;
 
-	brush.w = 0;
+	dc.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]);
+			dc.x += dc.w;
+			dc.w = textw(c->tags[i]) + dc.font.height;
+			draw(True, c->tags[i]);
 		}
 	}
-	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,
+	dc.x += dc.w;
+	dc.w = textw(c->name) + dc.font.height;
+	draw(True, c->name);
+	XCopyArea(dpy, dc.drawable, c->title, dc.gc,
 			0, 0, c->tw, c->th, 0, 0);
 	XFlush(dpy);
 }