Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
removed ugly ban(), extended resize() that it only resets the size if necessary,...
[dwm.git]
/
view.c
diff --git
a/view.c
b/view.c
index
2143d70
..
1d483c4
100644
(file)
--- a/
view.c
+++ b/
view.c
@@
-2,49
+2,16
@@
* See LICENSE file for license details.
*/
#include "dwm.h"
* See LICENSE file for license details.
*/
#include "dwm.h"
+#include <stdio.h>
/* static */
static Client *
nexttiled(Client *c) {
/* static */
static Client *
nexttiled(Client *c) {
- for(
c = getnext(c); c && c->isfloat; c = getnext(c->next)
);
+ for(
; c && (c->isfloat || !isvisible(c)); c = c->next
);
return c;
}
return c;
}
-static Bool
-ismaster(Client *c) {
- Client *cl;
- unsigned int i;
-
- for(cl = nexttiled(clients), i = 0; cl && cl != c; cl = nexttiled(cl->next), i++);
- return i < nmaster;
-}
-
-static void
-pop(Client *c) {
- detach(c);
- if(clients)
- clients->prev = c;
- c->next = clients;
- clients = c;
-}
-
-static void
-swap(Client *c1, Client *c2) {
- Client tmp = *c1;
- Client *cp = c1->prev;
- Client *cn = c1->next;
-
- *c1 = *c2;
- c1->prev = cp;
- c1->next = cn;
- cp = c2->prev;
- cn = c2->next;
- *c2 = tmp;
- c2->prev = cp;
- c2->next = cn;
-}
-
static void
togglemax(Client *c) {
XEvent ev;
static void
togglemax(Client *c) {
XEvent ev;
@@
-53,30
+20,17
@@
togglemax(Client *c) {
return;
if((c->ismax = !c->ismax)) {
return;
if((c->ismax = !c->ismax)) {
- c->rx = c->x; c->x = wax;
- c->ry = c->y; c->y = way;
- c->rw = c->w; c->w = waw - 2 * BORDERPX;
- c->rh = c->h; c->h = wah - 2 * BORDERPX;
+ c->rx = c->x;
+ c->ry = c->y;
+ c->rw = c->w;
+ c->rh = c->h;
+ resize(c, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
}
}
- else {
- c->x = c->rx;
- c->y = c->ry;
- c->w = c->rw;
- c->h = c->rh;
- }
- resize(c, True, TopLeft);
+ else
+ resize(c, c->rx, c->ry, c->rw, c->rh, True);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
-static Client *
-topofstack() {
- Client *c;
- unsigned int i;
-
- for(c = nexttiled(clients), i = 0; c && i < nmaster; c = nexttiled(c->next), i++);
- return (i < nmaster) ? NULL : c;
-}
-
/* extern */
void (*arrange)(void) = DEFMODE;
/* extern */
void (*arrange)(void) = DEFMODE;
@@
-98,10
+52,14
@@
dofloat(void) {
for(c = clients; c; c = c->next) {
if(isvisible(c)) {
for(c = clients; c; c = c->next) {
if(isvisible(c)) {
- resize(c, True, TopLeft);
+ if(c->isbanned)
+ XMoveWindow(dpy, c->win, c->x, c->y);
+ c->isbanned = False;
+ }
+ else {
+ c->isbanned = True;
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
}
}
- else
- ban(c);
}
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);
@@
-112,47
+70,49
@@
dofloat(void) {
void
dotile(void) {
void
dotile(void) {
- unsigned int i, n, mw, mh, tw, th;
+ unsigned int i, n,
nx, ny, nw, nh,
mw, mh, tw, th;
Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
/* window geoms */
Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
/* window geoms */
- mw = (n > nmaster) ? (waw * master) / 1000 : waw;
mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-
tw = waw - m
w;
+
mw = (n > nmaster) ? (waw * master) / 1000 : wa
w;
th = (n > nmaster) ? wah / (n - nmaster) : 0;
th = (n > nmaster) ? wah / (n - nmaster) : 0;
+ tw = waw - mw;
for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) {
for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) {
- if(c->isfloat) {
- resize(c, True, TopLeft);
+ if(c->isbanned)
+ XMoveWindow(dpy, c->win, c->x, c->y);
+ c->isbanned = False;
+ if(c->isfloat)
continue;
continue;
- }
c->ismax = False;
c->ismax = False;
-
c->
x = wax;
-
c->
y = way;
+
n
x = wax;
+
n
y = way;
if(i < nmaster) {
if(i < nmaster) {
-
c->
y += i * mh;
-
c->
w = mw - 2 * BORDERPX;
-
c->
h = mh - 2 * BORDERPX;
+
n
y += i * mh;
+
n
w = mw - 2 * BORDERPX;
+
n
h = mh - 2 * BORDERPX;
}
else { /* tile window */
}
else { /* tile window */
-
c->
x += mw;
-
c->
w = tw - 2 * BORDERPX;
- if(th >
bh
) {
-
c->
y += (i - nmaster) * th;
-
c->
h = th - 2 * BORDERPX;
+
n
x += mw;
+
n
w = tw - 2 * BORDERPX;
+ if(th >
2 * BORDERPX
) {
+
n
y += (i - nmaster) * th;
+
n
h = th - 2 * BORDERPX;
}
}
- else /* fallback if th <
bh
*/
-
c->
h = wah - 2 * BORDERPX;
+ else /* fallback if th <
= 2 * BORDERPX
*/
+
n
h = wah - 2 * BORDERPX;
}
}
- resize(c,
False, TopLeft
);
+ resize(c,
nx, ny, nw, nh, False
);
i++;
}
i++;
}
- else
- ban(c);
-
+ else {
+ c->isbanned = True;
+ 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);
@@
-166,8
+126,9
@@
focusnext(Arg *arg) {
if(!sel)
return;
if(!sel)
return;
- if(!(c = getnext(sel->next)))
- c = getnext(clients);
+ for(c = sel->next; c && !isvisible(c); c = c->next);
+ if(!c)
+ for(c = clients; c && !isvisible(c); c = c->next);
if(c) {
focus(c);
restack();
if(c) {
focus(c);
restack();
@@
-180,9
+141,10
@@
focusprev(Arg *arg) {
if(!sel)
return;
if(!sel)
return;
- if(!(c = getprev(sel->prev))) {
+ for(c = sel->prev; c && !isvisible(c); c = c->prev);
+ if(!c) {
for(c = clients; c && c->next; c = c->next);
for(c = clients; c && c->next; c = c->next);
-
c = getprev(c
);
+
for(; c && !isvisible(c); c = c->prev
);
}
if(c) {
focus(c);
}
if(c) {
focus(c);
@@
-192,10
+154,14
@@
focusprev(Arg *arg) {
void
incnmaster(Arg *arg) {
void
incnmaster(Arg *arg) {
- if(nmaster + arg->i < 1)
+ if((arrange == dofloat) || (nmaster + arg->i < 1)
+ || (wah / (nmaster + arg->i) <= 2 * BORDERPX))
return;
nmaster += arg->i;
return;
nmaster += arg->i;
- arrange();
+ if(sel)
+ arrange();
+ else
+ drawstatus();
}
Bool
}
Bool
@@
-213,7
+179,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;
}
@@
-225,34
+192,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();
@@
-302,18
+262,15
@@
zoom(Arg *arg) {
}
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
}
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
- if(n <= nmaster || (arrange == dofloat))
- return;
- if(
ismaster((c = sel))) {
- if(!(c =
topofstack(
)))
+ if(
(c = sel) == nexttiled(clients))
+ if(!(c =
nexttiled(c->next
)))
return;
return;
- swap(c, sel);
- c = sel;
- }
- else
- pop(c);
-
+ detach(c);
+ if(clients)
+ clients->prev = c;
+ c->next = clients;
+ clients = c;
focus(c);
arrange();
}
focus(c);
arrange();
}