Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
added comment to %u in config.default.h, added Button{4.5} support on mode label
[dwm.git]
/
view.c
diff --git
a/view.c
b/view.c
index
daf0711
..
06aed3e
100644
(file)
--- a/
view.c
+++ b/
view.c
@@
-1,55
+1,29
@@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI
-MMVII
Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
* See LICENSE file for license details.
*/
#include "dwm.h"
+#include <stdio.h>
/* static */
/* 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));
return c;
}
static Client *
nexttiled(Client *c) {
for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
return 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) {
XEvent ev;
static void
togglemax(Client *c) {
XEvent ev;
+
+ if(c->isfixed)
+ return;
if((c->ismax = !c->ismax)) {
if((c->ismax = !c->ismax)) {
- c->rx = c->x; c->x =
s
x;
- c->ry = c->y; c->y =
bh
;
- c->rw = c->w; c->w =
s
w - 2 * BORDERPX;
- c->rh = c->h; c->h =
sh - b
h - 2 * BORDERPX;
+ c->rx = c->x; c->x =
wa
x;
+ c->ry = c->y; c->y =
way
;
+ c->rw = c->w; c->w =
wa
w - 2 * BORDERPX;
+ c->rh = c->h; c->h =
wa
h - 2 * BORDERPX;
}
else {
c->x = c->rx;
}
else {
c->x = c->rx;
@@
-96,17
+70,16
@@
dofloat(void) {
void
dotile(void) {
void
dotile(void) {
- unsigned int i, n, m
px, stackw, stackh
, th;
+ unsigned int i, n, m
w, mh, tw
, th;
Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
- mpx = (sw * master) / 1000;
- stackw = sw - mpx;
- stackh = sh - bh;
- th = stackh;
- if(n > 1)
- th /= (n - 1);
+ /* window geoms */
+ mw = (n > nmaster) ? (waw * master) / 1000 : waw;
+ mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
+ tw = waw - mw;
+ th = (n > nmaster) ? wah / (n - nmaster) : 0;
for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) {
for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) {
@@
-115,28
+88,22
@@
dotile(void) {
continue;
}
c->ismax = False;
continue;
}
c->ismax = False;
- c->x = sx;
- c->y = sy + bh;
- if(n == 1) { /* only 1 window */
- c->w = sw - 2 * BORDERPX;
- c->h = sh - 2 * BORDERPX - bh;
- }
- else if(i == 0) { /* master window */
- c->w = mpx - 2 * BORDERPX;
- c->h = sh - bh - 2 * BORDERPX;
+ 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 */
}
else { /* tile window */
- c->x += m
px
;
- c->w =
stack
w - 2 * BORDERPX;
+ c->x += m
w
;
+ c->w =
t
w - 2 * BORDERPX;
if(th > bh) {
if(th > bh) {
- c->y = sy + (i - 1) * th + bh;
- if(i + 1 == n)
- c->h = sh - c->y - 2 * BORDERPX;
- else
- c->h = th - 2 * BORDERPX;
+ c->y += (i - nmaster) * th;
+ c->h = th - 2 * BORDERPX;
}
else /* fallback if th < bh */
}
else /* fallback if th < bh */
- c->h =
stack
h - 2 * BORDERPX;
+ c->h =
wa
h - 2 * BORDERPX;
}
resize(c, False, TopLeft);
i++;
}
resize(c, False, TopLeft);
i++;
@@
-181,6
+148,18
@@
focusprev(Arg *arg) {
}
}
}
}
+void
+incnmaster(Arg *arg) {
+ if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+ return;
+ nmaster += arg->i;
+ updatemodetext();
+ if(sel)
+ arrange();
+ else
+ drawstatus();
+}
+
Bool
isvisible(Client *c) {
unsigned int i;
Bool
isvisible(Client *c) {
unsigned int i;
@@
-192,25
+171,14
@@
isvisible(Client *c) {
}
void
}
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)) {
+resizemaster(Arg *arg) {
+ if(arg->i == 0)
+ master = MASTER;
+ else {
if(master + arg->i > 950 || master + arg->i < 50)
return;
master += arg->i;
}
if(master + arg->i > 950 || master + arg->i < 50)
return;
master += arg->i;
}
- else {
- if(master - arg->i > 950 || master - arg->i < 50)
- return;
- master -= arg->i;
- }
arrange();
}
arrange();
}
@@
-244,9
+212,18
@@
restack(void) {
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
+void
+togglefloat(Arg *arg) {
+ if (!sel || arrange == dofloat)
+ return;
+ sel->isfloat = !sel->isfloat;
+ arrange();
+}
+
void
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
void
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
+ updatemodetext();
if(sel)
arrange();
else
if(sel)
arrange();
else
@@
-261,28
+238,23
@@
toggleview(Arg *arg) {
for(i = 0; i < ntags && !seltag[i]; i++);
if(i == ntags)
seltag[arg->i] = True; /* cannot toggle last view */
for(i = 0; i < ntags && !seltag[i]; i++);
if(i == ntags)
seltag[arg->i] = True; /* cannot toggle last view */
- reorder();
arrange();
}
void
arrange();
}
void
-view(Arg *arg) {
- unsigned int i;
-
- for(i = 0; i < ntags; i++)
- seltag[i] = False;
- seltag[arg->i] = True;
- reorder();
- arrange();
+updatemodetext() {
+ snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+ bmw = textw(mtext);
}
void
}
void
-view
all
(Arg *arg) {
+view(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
unsigned int i;
for(i = 0; i < ntags; i++)
- seltag[i] = True;
- reorder();
+ seltag[i] = (arg->i == -1) ? True : False;
+ if(arg->i >= 0 && arg->i < ntags)
+ seltag[arg->i] = True;
arrange();
}
arrange();
}
@@
-297,11
+269,9
@@
zoom(Arg *arg) {
togglemax(sel);
return;
}
togglemax(sel);
return;
}
- for(n = 0, c = clients; c; c = c->next)
- if(isvisible(c) && !c->isfloat)
- n++;
- if(n < 2 || (arrange == dofloat))
- return;
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+ n++;
+
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
return;
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
return;