X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/14d05e7c725a4a07136ceb123cf760272afc1a87..321e8d51edb8fe433e8e2ce8d5463c6999cc0576:/view.c
diff --git a/view.c b/view.c
index 90080fb..e7d7a99 100644
--- a/view.c
+++ b/view.c
@@ -1,23 +1,10 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
/* static */
-static Client *
-minclient(void) {
- Client *c, *min;
-
- if((clients && clients->isfloat) || arrange == dofloat)
- return clients; /* don't touch floating order */
- for(min = c = clients; c; c = c->next)
- if(c->weight < min->weight)
- min = c;
- return min;
-}
-
static Client *
nexttiled(Client *c) {
for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
@@ -25,32 +12,17 @@ nexttiled(Client *c) {
}
static void
-reorder(void) {
- Client *c, *newclients, *tail;
-
- newclients = tail = NULL;
- while((c = minclient())) {
- detach(c);
- if(tail) {
- c->prev = tail;
- tail->next = c;
- tail = c;
- }
- else
- tail = newclients = c;
- }
- clients = newclients;
-}
-
-static void
-togglemax(Client *c)
-{
+togglemax(Client *c) {
XEvent ev;
+
+ if(c->isfixed)
+ return;
+
if((c->ismax = !c->ismax)) {
- c->rx = c->x; c->x = sx;
- c->ry = c->y; c->y = bh;
- c->rw = c->w; c->w = sw - 2 * BORDERPX;
- c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
+ 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;
@@ -64,9 +36,7 @@ togglemax(Client *c)
/* extern */
-void (*arrange)(Arg *) = DEFMODE;
-Bool isvertical = VERTICALSTACK;
-StackPos stackpos = STACKPOS;
+void (*arrange)(void) = DEFMODE;
void
detach(Client *c) {
@@ -80,7 +50,7 @@ detach(Client *c) {
}
void
-dofloat(Arg *arg) {
+dofloat(void) {
Client *c;
for(c = clients; c; c = c->next) {
@@ -97,80 +67,50 @@ dofloat(Arg *arg) {
restack();
}
-/* This algorithm is based on a (M)aster area and a (S)tacking area.
- * It supports following arrangements:
- * MMMS MMMM SMMM
- * MMMS MMMM SMMM
- * MMMS SSSS SMMM
- */
void
-dotile(Arg *arg) {
- int h, i, n, w;
+dotile(void) {
+ unsigned int i, n, mpx, stackw, th;
Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
+ mpx = (waw * master) / 1000;
+ stackw = waw - mpx;
- if(isvertical) {
- if(stackpos == StackBottom) {
- w = sw;
- if(n > 1)
- h = (sh - bh) / (n - 1);
- else
- h = sh - bh;
- }
- else {
- w = sw - master;
- if(n > 1)
- h = (sh - bh) / (n - 1);
- else
- h = sh - bh;
- }
- }
- else { /* horizontal stack */
-
- }
-
- for(i = 0, c = clients; c; c = c->next) {
+ for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) {
if(c->isfloat) {
resize(c, True, TopLeft);
continue;
}
c->ismax = False;
- if(n == 1) {
- c->x = sx;
- c->y = sy + bh;
- c->w = sw - 2 * BORDERPX;
- c->h = sh - 2 * BORDERPX - bh;
+ c->x = wax;
+ c->y = way;
+ if(n == 1) { /* only 1 window */
+ c->w = waw - 2 * BORDERPX;
+ c->h = wah - 2 * BORDERPX;
}
- else if(i == 0) {
- c->x = sx;
- c->y = sy + bh;
- c->w = master - 2 * BORDERPX;
- c->h = sh - 2 * BORDERPX - bh;
+ else if(i == 0) { /* master window */
+ c->w = waw - stackw - 2 * BORDERPX;
+ c->h = wah - 2 * BORDERPX;
+ th = wah / (n - 1);
}
- else if(h > bh) {
- c->x = sx + master;
- c->y = sy + (i - 1) * h + bh;
- c->w = w - 2 * BORDERPX;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- else
- c->h = h - 2 * BORDERPX;
- }
- else { /* fallback if h < bh */
- c->x = sx + master;
- c->y = sy + bh;
- c->w = w - 2 * BORDERPX;
- c->h = sh - 2 * BORDERPX - bh;
+ else { /* tile window */
+ c->x += mpx;
+ c->w = stackw - 2 * BORDERPX;
+ if(th > bh) {
+ c->y = way + (i - 1) * th;
+ c->h = th - 2 * BORDERPX;
+ }
+ else /* fallback if th < bh */
+ c->h = wah - 2 * BORDERPX;
}
resize(c, False, TopLeft);
i++;
}
else
ban(c);
- }
+
if(!sel || !isvisible(sel)) {
for(c = stack; c && !isvisible(c); c = c->snext);
focus(c);
@@ -184,7 +124,6 @@ focusnext(Arg *arg) {
if(!sel)
return;
-
if(!(c = getnext(sel->next)))
c = getnext(clients);
if(c) {
@@ -199,7 +138,6 @@ focusprev(Arg *arg) {
if(!sel)
return;
-
if(!(c = getprev(sel->prev))) {
for(c = clients; c && c->next; c = c->next);
c = getprev(c);
@@ -221,27 +159,15 @@ isvisible(Client *c) {
}
void
-resizecol(Arg *arg) {
- unsigned int n;
- Client *c;
-
- for(n = 0, c = clients; c; c = c->next)
- if(isvisible(c) && !c->isfloat)
- n++;
- if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
- return;
-
- if(sel == getnext(clients)) {
- if(master + arg->i > sw - 100 || master + arg->i < 100)
- return;
- master += arg->i;
- }
+resizemaster(Arg *arg) {
+ if(arg->i == 0)
+ master = MASTER;
else {
- if(master - arg->i > sw - 100 || master - arg->i < 100)
+ if(master + arg->i > 950 || master + arg->i < 50)
return;
- master -= arg->i;
+ master += arg->i;
}
- arrange(NULL);
+ arrange();
}
void
@@ -257,11 +183,18 @@ restack(void) {
XRaiseWindow(dpy, sel->win);
XRaiseWindow(dpy, sel->twin);
}
- if(arrange != dofloat)
+ if(arrange != dofloat) {
+ if(!sel->isfloat) {
+ XLowerWindow(dpy, sel->twin);
+ XLowerWindow(dpy, sel->win);
+ }
for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+ if(c == sel)
+ continue;
XLowerWindow(dpy, c->twin);
XLowerWindow(dpy, c->win);
}
+ }
drawall();
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -271,7 +204,7 @@ void
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
if(sel)
- arrange(NULL);
+ arrange();
else
drawstatus();
}
@@ -284,8 +217,7 @@ toggleview(Arg *arg) {
for(i = 0; i < ntags && !seltag[i]; i++);
if(i == ntags)
seltag[arg->i] = True; /* cannot toggle last view */
- reorder();
- arrange(NULL);
+ arrange();
}
void
@@ -295,8 +227,7 @@ view(Arg *arg) {
for(i = 0; i < ntags; i++)
seltag[i] = False;
seltag[arg->i] = True;
- reorder();
- arrange(NULL);
+ arrange();
}
void
@@ -305,8 +236,7 @@ viewall(Arg *arg) {
for(i = 0; i < ntags; i++)
seltag[i] = True;
- reorder();
- arrange(NULL);
+ arrange();
}
void
@@ -316,18 +246,15 @@ zoom(Arg *arg) {
if(!sel)
return;
-
if(sel->isfloat || (arrange == dofloat)) {
togglemax(sel);
return;
}
-
for(n = 0, c = clients; c; c = c->next)
if(isvisible(c) && !c->isfloat)
n++;
if(n < 2 || (arrange == dofloat))
return;
-
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
return;
@@ -337,5 +264,5 @@ zoom(Arg *arg) {
c->next = clients;
clients = c;
focus(c);
- arrange(NULL);
+ arrange();
}