X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/d22abeee867397c366f69cf89524b94e01c2e0e2..dddd58a8cdc9ffd9f207c45316e9f9a28b4bf519:/view.c?ds=sidebyside
diff --git a/view.c b/view.c
index 9ee4c78..7c56ac2 100644
--- a/view.c
+++ b/view.c
@@ -3,13 +3,11 @@
* See LICENSE file for license details.
*/
#include "dwm.h"
-#include <stdio.h>
/* static */
static Client *
-minclient()
-{
+minclient(void) {
Client *c, *min;
if((clients && clients->isfloat) || arrange == dofloat)
@@ -20,9 +18,14 @@ minclient()
return min;
}
+static Client *
+nexttiled(Client *c) {
+ for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+ return c;
+}
+
static void
-reorder()
-{
+reorder(void) {
Client *c, *newclients, *tail;
newclients = tail = NULL;
@@ -39,20 +42,33 @@ reorder()
clients = newclients;
}
-static Client *
-nexttiled(Client *c)
+static void
+togglemax(Client *c)
{
- for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
- return c;
+ XEvent ev;
+ 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;
+ }
+ else {
+ c->x = c->rx;
+ c->y = c->ry;
+ c->w = c->rw;
+ c->h = c->rh;
+ }
+ resize(c, True, TopLeft);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
/* extern */
void (*arrange)(Arg *) = DEFMODE;
+StackPos stackpos = STACKPOS;
void
-detach(Client *c)
-{
+detach(Client *c) {
if(c->prev)
c->prev->next = c->next;
if(c->next)
@@ -63,12 +79,9 @@ detach(Client *c)
}
void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
Client *c;
- maximized = False;
-
for(c = clients; c; c = c->next) {
if(isvisible(c)) {
resize(c, True, TopLeft);
@@ -76,28 +89,40 @@ dofloat(Arg *arg)
else
ban(c);
}
- if(!sel || !isvisible(sel))
- focus(getnext(clients));
+ if(!sel || !isvisible(sel)) {
+ for(c = stack; c && !isvisible(c); c = c->snext);
+ focus(c);
+ }
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 h, i, n, w;
+dotile(Arg *arg) {
+ int i, n, stackw, stackh, tw, th;
Client *c;
- maximized = False;
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+ n++;
- w = sw - mw;
- for(n = 0, c = clients; c; c = c->next)
- if(isvisible(c) && !c->isfloat)
- n++;
+ if(stackpos == StackBottom) {
+ stackw = sw;
+ stackh = sh - bh - master;
+ }
+ else {
+ stackw = sw - master;
+ stackh = sh - bh;
+ }
+ tw = stackw;
if(n > 1)
- h = (sh - bh) / (n - 1);
+ th = stackh / (n - 1);
else
- h = sh - bh;
+ th = stackh;
for(i = 0, c = clients; c; c = c->next) {
if(isvisible(c)) {
@@ -105,32 +130,77 @@ dotile(Arg *arg)
resize(c, True, TopLeft);
continue;
}
- if(n == 1) {
+ c->ismax = False;
+ if(n == 1) { /* only 1 window */
c->x = sx;
c->y = sy + bh;
- c->w = sw - 2;
- c->h = sh - 2 - bh;
+ c->w = sw - 2 * BORDERPX;
+ c->h = sh - 2 * BORDERPX - bh;
}
- else if(i == 0) {
- c->x = sx;
- c->y = sy + bh;
- c->w = mw - 2;
- c->h = sh - 2 - bh;
+ else if(i == 0) { /* master window */
+ switch(stackpos) {
+ case StackLeft:
+ c->x = sx + stackw;
+ c->y = sy + bh;
+ c->w = master - 2 * BORDERPX;
+ c->h = sh - bh - 2 * BORDERPX;
+ break;
+ case StackBottom:
+ c->x = sx;
+ c->y = sy + bh;
+ c->w = sw - 2 * BORDERPX;
+ c->h = master - 2 * BORDERPX;
+ break;
+ case StackRight:
+ c->x = sx;
+ c->y = sy + bh;
+ c->w = master - 2 * BORDERPX;
+ c->h = sh - bh - 2 * BORDERPX;
+ break;
+ }
}
- else if(h > bh) {
- c->x = sx + mw;
- c->y = sy + (i - 1) * h + bh;
- c->w = w - 2;
- if(i + 1 == n)
- c->h = sh - c->y - 2;
- else
- c->h = h - 2;
+ else if(th > bh) {
+ /* tile window */
+ c->w = tw - 2 * BORDERPX;
+ c->h = th - 2 * BORDERPX;
+ switch(stackpos) {
+ case StackLeft:
+ c->x = sx;
+ c->y = sy + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
+ break;
+ case StackBottom:
+ c->x = sx;
+ c->y = sy + master + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
+ break;
+ case StackRight:
+ c->x = sx + master;
+ c->y = sy + (i - 1) * th + bh;
+ if(i + 1 == n)
+ c->h = sh - c->y - 2 * BORDERPX;
+ break;
+ }
}
- else { /* fallback if h < bh */
- c->x = sx + mw;
- c->y = sy + bh;
- c->w = w - 2;
- c->h = sh - 2 - bh;
+ else { /* fallback if th < bh */
+ c->w = stackw - 2 * BORDERPX;
+ c->h = stackh - 2 * BORDERPX;
+ switch(stackpos) {
+ case StackLeft:
+ c->x = sx;
+ c->y = sy + bh;
+ break;
+ case StackBottom:
+ c->x = sx;
+ c->y = sy + master + bh;
+ break;
+ case StackRight:
+ c->x = sx + master;
+ c->y = sy + bh;
+ break;
+ }
}
resize(c, False, TopLeft);
i++;
@@ -138,14 +208,15 @@ dotile(Arg *arg)
else
ban(c);
}
- if(!sel || !isvisible(sel))
- focus(getnext(clients));
+ if(!sel || !isvisible(sel)) {
+ for(c = stack; c && !isvisible(c); c = c->snext);
+ focus(c);
+ }
restack();
}
void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
Client *c;
if(!sel)
@@ -160,8 +231,7 @@ focusnext(Arg *arg)
}
void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
Client *c;
if(!sel)
@@ -178,8 +248,7 @@ focusprev(Arg *arg)
}
Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
unsigned int i;
for(i = 0; i < ntags; i++)
@@ -189,36 +258,34 @@ isvisible(Client *c)
}
void
-resizecol(Arg *arg)
-{
+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 != dotile) || maximized)
+ if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
return;
if(sel == getnext(clients)) {
- if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+ if(master + arg->i > sw - MINW || master + arg->i < MINW)
return;
- mw += arg->i;
+ master += arg->i;
}
else {
- if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+ if(master - arg->i > sw - MINW || master - arg->i < MINW)
return;
- mw -= arg->i;
+ master -= arg->i;
}
arrange(NULL);
}
void
-restack()
-{
+restack(void) {
Client *c;
XEvent ev;
-
+
if(!sel) {
drawstatus();
return;
@@ -227,19 +294,25 @@ restack()
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));
}
void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
if(sel)
arrange(NULL);
@@ -248,8 +321,7 @@ togglemode(Arg *arg)
}
void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
unsigned int i;
seltag[arg->i] = !seltag[arg->i];
@@ -261,8 +333,19 @@ toggleview(Arg *arg)
}
void
-view(Arg *arg)
-{
+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);
+}
+
+void
+view(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
@@ -273,8 +356,7 @@ view(Arg *arg)
}
void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
@@ -283,16 +365,25 @@ viewall(Arg *arg)
arrange(NULL);
}
+
+
void
-zoom(Arg *arg)
-{
+zoom(Arg *arg) {
unsigned int n;
Client *c;
+ 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(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
+ if(n < 2 || (arrange == dofloat))
return;
if((c = sel) == nexttiled(clients))