X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=4781b4e6c4448b05c970ca9687ccdfa01cf37bc5;hb=b3d7e07f18f0f69f8c3b3542615da62dfc4c6175;hp=6985dc7d03466425d5e18b82ef3c2ca1aff649c0;hpb=8a5f002c4182abf6dcaac354a3da04cc18830ad9;p=dwm.git

diff --git a/view.c b/view.c
index 6985dc7..4781b4e 100644
--- a/view.c
+++ b/view.c
@@ -2,52 +2,23 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-#include <stdio.h>
-
-/* static */
-
-static Client *
-nexttiled(Client *c) {
-	for(; c && (c->isfloat || !isvisible(c)); c = c->next);
-	return c;
-}
-
-static void
-togglemax(Client *c) {
-	XEvent ev;
-		
-	if(c->isfixed)
-		return;
-
-	if((c->ismax = !c->ismax)) {
-		c->rx = c->x; c->x = wax;
-		c->ry = c->y; c->y = way;
-		c->rw = c->w; c->w = waw - 2 * BORDERPX;
-		c->rh = c->h; c->h = wah - 2 * BORDERPX;
-	}
-	else {
-		c->x = c->rx;
-		c->y = c->ry;
-		c->w = c->rw;
-		c->h = c->rh;
-	}
-	resize(c, True);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
 
 /* extern */
 
 void (*arrange)(void) = DEFMODE;
 
 void
-detach(Client *c) {
-	if(c->prev)
-		c->prev->next = c->next;
-	if(c->next)
-		c->next->prev = c->prev;
-	if(c == clients)
-		clients = c->next;
-	c->next = c->prev = NULL;
+attach(Client *c) {
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
+}
+
+void
+attachstack(Client *c) {
+	c->snext = stack;
+	stack = c;
 }
 
 void
@@ -56,11 +27,15 @@ dofloat(void) {
 
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
+			if(c->isbanned)
+				XMoveWindow(dpy, c->win, c->x, c->y);
 			c->isbanned = False;
-			resize(c, True);
+			resize(c, c->x, c->y, c->w, c->h, True);
+		}
+		else {
+			c->isbanned = True;
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 		}
-		else
-			ban(c);
 	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -70,53 +45,21 @@ dofloat(void) {
 }
 
 void
-dotile(void) {
-	unsigned int i, n, mw, mh, tw, th;
-	Client *c;
-
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-		n++;
-	/* window geoms */
-	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
-	th = (n > nmaster) ? wah / (n - nmaster) : 0;
-	tw = waw - mw;
+detach(Client *c) {
+	if(c->prev)
+		c->prev->next = c->next;
+	if(c->next)
+		c->next->prev = c->prev;
+	if(c == clients)
+		clients = c->next;
+	c->next = c->prev = NULL;
+}
 
-	for(i = 0, c = clients; c; c = c->next)
-		if(isvisible(c)) {
-			c->isbanned = False;
-			if(c->isfloat) {
-				resize(c, True);
-				continue;
-			}
-			c->ismax = False;
-			c->x = wax;
-			c->y = way;
-			if(i < nmaster) {
-				c->y += i * mh;
-				c->w = mw - 2 * BORDERPX;
-				c->h = mh - 2 * BORDERPX;
-			}
-			else {  /* tile window */
-				c->x += mw;
-				c->w = tw - 2 * BORDERPX;
-				if(th > 2 * BORDERPX) {
-					c->y += (i - nmaster) * th;
-					c->h = th - 2 * BORDERPX;
-				}
-				else /* fallback if th <= 2 * BORDERPX */
-					c->h = wah - 2 * BORDERPX;
-			}
-			resize(c, False);
-			i++;
-		}
-		else
-			ban(c);
-	if(!sel || !isvisible(sel)) {
-		for(c = stack; c && !isvisible(c); c = c->snext);
-		focus(c);
-	}
-	restack();
+void
+detachstack(Client *c) {
+	Client **tc;
+	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	*tc = c->snext;
 }
 
 void
@@ -151,16 +94,14 @@ focusprev(Arg *arg) {
 	}
 }
 
-void
-incnmaster(Arg *arg) {
-	if((arrange == dofloat) || (nmaster + arg->i < 1)
-	|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
-		return;
-	nmaster += arg->i;
-	if(sel)
-		arrange();
-	else
-		drawstatus();
+Client *
+getclient(Window w) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(c->win == w)
+			return c;
+	return NULL;
 }
 
 Bool
@@ -173,17 +114,10 @@ isvisible(Client *c) {
 	return False;
 }
 
-void
-resizemaster(Arg *arg) {
-	if(arg->i == 0)
-		master = MASTER;
-	else {
-		if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
-		|| waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
-			return;
-		master += arg->i;
-	}
-	arrange();
+Client *
+nextmanaged(Client *c) {
+	for(; c && (c->isfloat || !isvisible(c)); c = c->next);
+	return c;
 }
 
 void
@@ -199,7 +133,7 @@ restack(void) {
 	if(arrange != dofloat) {
 		if(!sel->isfloat)
 			XLowerWindow(dpy, sel->win);
-		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+		for(c = nextmanaged(clients); c; c = nextmanaged(c->next)) {
 			if(c == sel)
 				continue;
 			XLowerWindow(dpy, c->win);
@@ -248,28 +182,3 @@ view(Arg *arg) {
 	arrange();
 }
 
-void
-zoom(Arg *arg) {
-	unsigned int n;
-	Client *c;
-
-	if(!sel)
-		return;
-	if(sel->isfloat || (arrange == dofloat)) {
-		togglemax(sel);
-		return;
-	}
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-		n++;
-
-	if((c = sel) == nexttiled(clients))
-		if(!(c = nexttiled(c->next)))
-			return;
-	detach(c);
-	if(clients)
-		clients->prev = c;
-	c->next = clients;
-	clients = c;
-	focus(c);
-	arrange();
-}