X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/2583a7c0d18749c391a7149f2f1ffb3efd91ba8d..f320cd203b13b277a33c76191db5626fa342b646:/view.c
diff --git a/view.c b/view.c
index 1bce54a..0c9ea6f 100644
--- a/view.c
+++ b/view.c
@@ -1,11 +1,8 @@
-/*
- * (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"
-#define MINDIM 100
-
/* static */
static Client *
@@ -45,9 +42,12 @@ reorder(void) {
}
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;
@@ -66,8 +66,7 @@ togglemax(Client *c)
/* extern */
-void (*arrange)(Arg *) = DEFMODE;
-StackPos stackpos = STACKPOS;
+void (*arrange)(void) = DEFMODE;
void
detach(Client *c) {
@@ -81,7 +80,7 @@ detach(Client *c) {
}
void
-dofloat(Arg *arg) {
+dofloat(void) {
Client *c;
for(c = clients; c; c = c->next) {
@@ -98,35 +97,21 @@ dofloat(Arg *arg) {
restack();
}
-/* This algorithm is based on a (M)aster area and a (S)tacking area.
- * It supports following arrangements:
- * SSMMM MMMMM MMMSS
- * SSMMM SSSSS MMMSS
- */
void
-dotile(Arg *arg) {
- int i, n, stackw, stackh, tw, th;
+dotile(void) {
+ unsigned int i, n, mpx, stackw, stackh, th;
Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
-
- if(stackpos == StackBottom) {
- stackw = sw;
- stackh = sh - bh - master;
- }
- else {
- stackw = sw - master;
- stackh = sh - bh;
- }
-
- tw = stackw;
+ mpx = (sw * master) / 1000;
+ stackw = sw - mpx;
+ stackh = sh - bh;
+ th = stackh;
if(n > 1)
- th = stackh / (n - 1);
- else
- th = stackh;
+ th /= (n - 1);
- 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);
@@ -140,53 +125,28 @@ dotile(Arg *arg) {
c->h = sh - 2 * BORDERPX - bh;
}
else if(i == 0) { /* master window */
- if(stackpos == StackLeft)
- c->x += stackw;
- switch(stackpos) {
- case StackLeft:
- case StackRight:
- c->w = master - 2 * BORDERPX;
- c->h = sh - bh - 2 * BORDERPX;
- break;
- case StackBottom:
- c->w = sw - 2 * BORDERPX;
- c->h = master - 2 * BORDERPX;
- break;
- }
+ c->w = mpx - 2 * BORDERPX;
+ c->h = sh - bh - 2 * BORDERPX;
}
else { /* tile window */
- if(stackpos == StackRight)
- c->x += master;
+ c->x += mpx;
+ c->w = stackw - 2 * BORDERPX;
if(th > bh) {
- switch(stackpos) {
- case StackLeft:
- case StackRight:
- c->y = sy + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- break;
- case StackBottom:
- c->y = sy + master + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- break;
- }
- c->w = tw - 2 * BORDERPX;
- c->h = th - 2 * BORDERPX;
+ c->y = sy + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
+ else
+ c->h = th - 2 * BORDERPX;
}
- else { /* fallback if th < bh */
- if(stackpos == StackBottom)
- c->y += master;
- c->w = stackw - 2 * BORDERPX;
+ else /* fallback if th < bh */
c->h = stackh - 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);
@@ -200,7 +160,6 @@ focusnext(Arg *arg) {
if(!sel)
return;
-
if(!(c = getnext(sel->next)))
c = getnext(clients);
if(c) {
@@ -215,7 +174,6 @@ focusprev(Arg *arg) {
if(!sel)
return;
-
if(!(c = getprev(sel->prev))) {
for(c = clients; c && c->next; c = c->next);
c = getprev(c);
@@ -237,29 +195,15 @@ isvisible(Client *c) {
}
void
-resizecol(Arg *arg) {
- int s;
- 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;
-
- s = stackpos == StackBottom ? sh - bh : sw;
- if(sel == getnext(clients)) {
- if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
- return;
- master += arg->i;
- }
+resizemaster(Arg *arg) {
+ if(arg->i == 0)
+ master = MASTER;
else {
- if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
+ if(master + arg->i > 950 || master + arg->i < 50)
return;
- master -= arg->i;
+ master += arg->i;
}
- arrange(NULL);
+ arrange();
}
void
@@ -296,7 +240,7 @@ void
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
if(sel)
- arrange(NULL);
+ arrange();
else
drawstatus();
}
@@ -310,19 +254,7 @@ toggleview(Arg *arg) {
if(i == ntags)
seltag[arg->i] = True; /* cannot toggle last view */
reorder();
- arrange(NULL);
-}
-
-void
-togglestackpos(Arg *arg) {
- if(arrange == dofloat)
- return;
- if(stackpos == StackBottom)
- stackpos = STACKPOS;
- else
- stackpos = StackBottom;
- master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
- arrange(NULL);
+ arrange();
}
void
@@ -333,7 +265,7 @@ view(Arg *arg) {
seltag[i] = False;
seltag[arg->i] = True;
reorder();
- arrange(NULL);
+ arrange();
}
void
@@ -343,11 +275,9 @@ viewall(Arg *arg) {
for(i = 0; i < ntags; i++)
seltag[i] = True;
reorder();
- arrange(NULL);
+ arrange();
}
-
-
void
zoom(Arg *arg) {
unsigned int n;
@@ -355,18 +285,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;
@@ -376,5 +303,5 @@ zoom(Arg *arg) {
c->next = clients;
clients = c;
focus(c);
- arrange(NULL);
+ arrange();
}