X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/838a1ff950eb42e4137cfd7039a0e78227b2ef70..f315832f75ce9f419a2942bc29fcaa737e8b2883:/view.c
diff --git a/view.c b/view.c
index 561d4ef..e799094 100644
--- a/view.c
+++ b/view.c
@@ -3,25 +3,29 @@
* 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)
+ 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));
+ return c;
+}
static void
-reorder()
-{
+reorder(void) {
Client *c, *newclients, *tail;
newclients = tail = NULL;
@@ -38,13 +42,32 @@ reorder()
clients = newclients;
}
+static void
+togglemax(Client *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;
+ c->rh = c->h; c->h = sh - bh - 2;
+ }
+ 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;
void
-detach(Client *c)
-{
+detach(Client *c) {
if(c->prev)
c->prev->next = c->next;
if(c->next)
@@ -55,12 +78,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);
@@ -68,23 +88,21 @@ 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();
}
void
-dotile(Arg *arg)
-{
+dotile(Arg *arg) {
int h, i, n, w;
Client *c;
- maximized = False;
-
w = sw - mw;
- for(n = 0, c = clients; c; c = c->next)
- if(isvisible(c) && !c->isfloat)
- n++;
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+ n++;
if(n > 1)
h = (sh - bh) / (n - 1);
@@ -97,6 +115,7 @@ dotile(Arg *arg)
resize(c, True, TopLeft);
continue;
}
+ c->ismax = False;
if(n == 1) {
c->x = sx;
c->y = sy + bh;
@@ -130,14 +149,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)
@@ -152,8 +172,7 @@ focusnext(Arg *arg)
}
void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
Client *c;
if(!sel)
@@ -170,8 +189,7 @@ focusprev(Arg *arg)
}
Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
unsigned int i;
for(i = 0; i < ntags; i++)
@@ -181,15 +199,14 @@ 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)) {
@@ -206,62 +223,30 @@ resizecol(Arg *arg)
}
void
-restack()
-{
- static unsigned int nwins = 0;
- static Window *wins = NULL;
- unsigned int f, fi, m, mi, n;
+restack(void) {
Client *c;
XEvent ev;
- for(f = 0, m = 0, c = clients; c; c = c->next)
- if(isvisible(c)) {
- if(c->isfloat || arrange == dofloat)
- f++;
- else
- m++;
- }
- if(!(n = 2 * (f + m))) {
+ if(!sel) {
drawstatus();
return;
}
- if(nwins < n) {
- nwins = n;
- wins = erealloc(wins, nwins * sizeof(Window));
- }
-
- fi = 0;
- mi = 2 * f;
- if(sel) {
- if(sel->isfloat || arrange == dofloat) {
- wins[fi++] = sel->twin;
- wins[fi++] = sel->win;
- }
- else {
- wins[mi++] = sel->twin;
- wins[mi++] = sel->win;
- }
+ if(sel->isfloat || arrange == dofloat) {
+ XRaiseWindow(dpy, sel->win);
+ XRaiseWindow(dpy, sel->twin);
}
- for(c = clients; c; c = c->next)
- if(isvisible(c) && c != sel) {
- if(c->isfloat || arrange == dofloat) {
- wins[fi++] = c->twin;
- wins[fi++] = c->win;
- }
- else {
- wins[mi++] = c->twin;
- wins[mi++] = c->win;
- }
+ if(arrange != dofloat)
+ for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+ XLowerWindow(dpy, c->twin);
+ XLowerWindow(dpy, c->win);
}
- XRestackWindows(dpy, wins, n);
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);
@@ -270,8 +255,7 @@ togglemode(Arg *arg)
}
void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
unsigned int i;
seltag[arg->i] = !seltag[arg->i];
@@ -283,8 +267,7 @@ toggleview(Arg *arg)
}
void
-view(Arg *arg)
-{
+view(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
@@ -295,8 +278,7 @@ view(Arg *arg)
}
void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
@@ -306,30 +288,31 @@ viewall(Arg *arg)
}
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;
- /* this is somewhat tricky, it asserts to only zoom tiled clients */
- for(c = getnext(clients); c && c->isfloat; c = getnext(c->next));
- if(c) {
- if(c == sel)
- for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
- else
- c = sel;
- }
- if(!c)
- return;
+ if((c = sel) == nexttiled(clients))
+ if(!(c = nexttiled(c->next)))
+ return;
detach(c);
+ if(clients)
+ clients->prev = c;
c->next = clients;
- clients->prev = c;
clients = c;
focus(c);
arrange(NULL);