Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
applied Jukka's patch preventing some cornercases and making the EOF error message...
[dwm.git]
/
view.c
diff --git
a/view.c
b/view.c
index
b2f2614
..
e7d7a99
100644
(file)
--- 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 */
* 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));
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
}
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;
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;
@@
-64,7
+36,7
@@
togglemax(Client *c)
/* extern */
/* extern */
-void (*arrange)(
Arg *
) = DEFMODE;
+void (*arrange)(
void
) = DEFMODE;
void
detach(Client *c) {
void
detach(Client *c) {
@@
-78,7
+50,7
@@
detach(Client *c) {
}
void
}
void
-dofloat(
Arg *arg
) {
+dofloat(
void
) {
Client *c;
for(c = clients; c; c = c->next) {
Client *c;
for(c = clients; c; c = c->next) {
@@
-96,55
+68,49
@@
dofloat(Arg *arg) {
}
void
}
void
-dotile(
Arg *arg
) {
- unsigned int i, n, mpx, stackw,
stackh,
th;
+dotile(
void
) {
+ unsigned int i, n, mpx, stackw, 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 = (waw * master) / 1000;
+ stackw = waw - mpx;
- mpx = (sw * master) / 1000;
- stackw = sw - mpx;
- stackh = sh - bh;
-
- th = stackh;
- if(n > 1)
- th /= (n - 1);
-
- for(i = 0, c = clients; c; c = c->next, i++)
+ for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) {
if(c->isfloat) {
resize(c, True, TopLeft);
continue;
}
c->ismax = False;
if(isvisible(c)) {
if(c->isfloat) {
resize(c, True, TopLeft);
continue;
}
c->ismax = False;
- c->x =
s
x;
- c->y =
sy + bh
;
+ c->x =
wa
x;
+ c->y =
way
;
if(n == 1) { /* only 1 window */
if(n == 1) { /* only 1 window */
- c->w =
s
w - 2 * BORDERPX;
- c->h =
sh - 2 * BORDERPX - bh
;
+ c->w =
wa
w - 2 * BORDERPX;
+ c->h =
wah - 2 * BORDERPX
;
}
else if(i == 0) { /* master window */
}
else if(i == 0) { /* master window */
- c->w = mpx - 2 * BORDERPX;
- c->h = sh - bh - 2 * BORDERPX;
+ c->w = waw - stackw - 2 * BORDERPX;
+ c->h = wah - 2 * BORDERPX;
+ th = wah / (n - 1);
}
else { /* tile window */
c->x += mpx;
c->w = stackw - 2 * BORDERPX;
if(th > bh) {
}
else { /* tile window */
c->x += mpx;
c->w = stackw - 2 * BORDERPX;
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 = way + (i - 1) * 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);
}
resize(c, False, TopLeft);
+ i++;
}
else
ban(c);
}
else
ban(c);
+
if(!sel || !isvisible(sel)) {
for(c = stack; c && !isvisible(c); c = c->snext);
focus(c);
if(!sel || !isvisible(sel)) {
for(c = stack; c && !isvisible(c); c = c->snext);
focus(c);
@@
-158,7
+124,6
@@
focusnext(Arg *arg) {
if(!sel)
return;
if(!sel)
return;
-
if(!(c = getnext(sel->next)))
c = getnext(clients);
if(c) {
if(!(c = getnext(sel->next)))
c = getnext(clients);
if(c) {
@@
-173,7
+138,6
@@
focusprev(Arg *arg) {
if(!sel)
return;
if(!sel)
return;
-
if(!(c = getprev(sel->prev))) {
for(c = clients; c && c->next; c = c->next);
c = getprev(c);
if(!(c = getprev(sel->prev))) {
for(c = clients; c && c->next; c = c->next);
c = getprev(c);
@@
-195,27
+159,15
@@
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(NULL);
+ arrange();
}
void
}
void
@@
-252,7
+204,7
@@
void
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
if(sel)
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
if(sel)
- arrange(
NULL
);
+ arrange();
else
drawstatus();
}
else
drawstatus();
}
@@
-265,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 */
for(i = 0; i < ntags && !seltag[i]; i++);
if(i == ntags)
seltag[arg->i] = True; /* cannot toggle last view */
- reorder();
- arrange(NULL);
+ arrange();
}
void
}
void
@@
-276,8
+227,7
@@
view(Arg *arg) {
for(i = 0; i < ntags; i++)
seltag[i] = False;
seltag[arg->i] = True;
for(i = 0; i < ntags; i++)
seltag[i] = False;
seltag[arg->i] = True;
- reorder();
- arrange(NULL);
+ arrange();
}
void
}
void
@@
-286,12
+236,9
@@
viewall(Arg *arg) {
for(i = 0; i < ntags; i++)
seltag[i] = True;
for(i = 0; i < ntags; i++)
seltag[i] = True;
- reorder();
- arrange(NULL);
+ arrange();
}
}
-
-
void
zoom(Arg *arg) {
unsigned int n;
void
zoom(Arg *arg) {
unsigned int n;
@@
-299,18
+246,15
@@
zoom(Arg *arg) {
if(!sel)
return;
if(!sel)
return;
-
if(sel->isfloat || (arrange == dofloat)) {
togglemax(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;
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;
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
return;
@@
-320,5
+264,5
@@
zoom(Arg *arg) {
c->next = clients;
clients = c;
focus(c);
c->next = clients;
clients = c;
focus(c);
- arrange(
NULL
);
+ arrange();
}
}