Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
simplifying regexps in config samples
[dwm.git]
/
view.c
diff --git
a/view.c
b/view.c
index
b3b412d
..
8164446
100644
(file)
--- a/
view.c
+++ b/
view.c
@@
-1,7
+1,8
@@
-/* (C)opyright MMVII Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI
-MMVI
I 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 */
@@
-30,7
+31,7
@@
togglemax(Client *c) {
c->w = c->rw;
c->h = c->rh;
}
c->w = c->rw;
c->h = c->rh;
}
- resize(c, True
, TopLeft
);
+ resize(c, True);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
@@
-54,11
+55,10
@@
dofloat(void) {
Client *c;
for(c = clients; c; c = c->next) {
Client *c;
for(c = clients; c; c = c->next) {
- if(isvisible(c)) {
- resize(c, True, TopLeft);
- }
+ if(isvisible(c))
+ resize(c, True);
else
else
-
ban(c
);
+
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y
);
}
if(!sel || !isvisible(sel)) {
for(c = stack; c && !isvisible(c); c = c->snext);
}
if(!sel || !isvisible(sel)) {
for(c = stack; c && !isvisible(c); c = c->snext);
@@
-69,47
+69,46
@@
dofloat(void) {
void
dotile(void) {
void
dotile(void) {
- unsigned int i, n, m
p
w, th;
+ unsigned int i, n, m
w, mh, t
w, 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++;
- mpw = (waw * master) / 1000;
+ /* window geoms */
+ mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
+ mw = (n > nmaster) ? (waw * master) / 1000 : waw;
+ th = (n > nmaster) ? wah / (n - nmaster) : 0;
+ tw = waw - mw;
for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) {
if(c->isfloat) {
for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) {
if(c->isfloat) {
- resize(c, True
, TopLeft
);
+ resize(c, True);
continue;
}
c->ismax = False;
c->x = wax;
c->y = way;
continue;
}
c->ismax = False;
c->x = wax;
c->y = way;
- if(n == 1) { /* only 1 window */
- c->w = waw - 2 * BORDERPX;
- c->h = wah - 2 * BORDERPX;
- }
- else if(i == 0) { /* master window */
- c->w = mpw - 2 * BORDERPX;
- c->h = wah - 2 * BORDERPX;
- th = wah / (n - 1);
+ 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
p
w;
- c->w =
(waw - mpw)
- 2 * BORDERPX;
- if(th >
bh
) {
- c->y += (i -
1
) * th;
+ c->x += mw;
+ c->w =
tw
- 2 * BORDERPX;
+ if(th >
2 * BORDERPX
) {
+ c->y += (i -
nmaster
) * th;
c->h = th - 2 * BORDERPX;
}
c->h = th - 2 * BORDERPX;
}
- else /* fallback if th <
bh
*/
+ else /* fallback if th <
= 2 * BORDERPX
*/
c->h = wah - 2 * BORDERPX;
}
c->h = wah - 2 * BORDERPX;
}
- resize(c, False
, TopLeft
);
+ resize(c, False);
i++;
}
else
i++;
}
else
- ban(c);
-
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
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);
@@
-147,6
+146,18
@@
focusprev(Arg *arg) {
}
}
}
}
+void
+incnmaster(Arg *arg) {
+ if((arrange == dofloat) || (nmaster + arg->i < 1)
+ || (wah / (nmaster + arg->i) <= 2 * BORDERPX))
+ return;
+ nmaster += arg->i;
+ if(sel)
+ arrange();
+ else
+ drawstatus();
+}
+
Bool
isvisible(Client *c) {
unsigned int i;
Bool
isvisible(Client *c) {
unsigned int i;
@@
-162,7
+173,8
@@
resizemaster(Arg *arg) {
if(arg->i == 0)
master = MASTER;
else {
if(arg->i == 0)
master = MASTER;
else {
- if(master + arg->i > 950 || master + arg->i < 50)
+ if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
+ || waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
return;
master += arg->i;
}
return;
master += arg->i;
}
@@
-174,34
+186,27
@@
restack(void) {
Client *c;
XEvent ev;
Client *c;
XEvent ev;
- if(!sel) {
- drawstatus();
+ drawstatus();
+ if(!sel)
return;
return;
- }
- if(sel->isfloat || arrange == dofloat) {
+ if(sel->isfloat || arrange == dofloat)
XRaiseWindow(dpy, sel->win);
XRaiseWindow(dpy, sel->win);
- XRaiseWindow(dpy, sel->twin);
- }
if(arrange != dofloat) {
if(arrange != dofloat) {
- if(!sel->isfloat) {
- XLowerWindow(dpy, sel->twin);
+ if(!sel->isfloat)
XLowerWindow(dpy, sel->win);
XLowerWindow(dpy, sel->win);
- }
for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
if(c == sel)
continue;
for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
if(c == sel)
continue;
- XLowerWindow(dpy, c->twin);
XLowerWindow(dpy, c->win);
}
}
XLowerWindow(dpy, c->win);
}
}
- drawall();
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
togglefloat(Arg *arg) {
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
togglefloat(Arg *arg) {
- if
(!sel || arrange == dofloat)
+ if(!sel || arrange == dofloat)
return;
sel->isfloat = !sel->isfloat;
arrange();
return;
sel->isfloat = !sel->isfloat;
arrange();
@@
-249,11
+254,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;