Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
making the bar appear at bottom
[dwm.git]
/
view.c
diff --git
a/view.c
b/view.c
index
bd43da9
..
29b6b63
100644
(file)
--- a/
view.c
+++ b/
view.c
@@
-1,46
+1,17
@@
-/* (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;
@@
-60,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));
}
@@
-85,10
+56,10
@@
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
);
+ 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);
@@
-99,48
+70,46
@@
dofloat(void) {
void
dotile(void) {
void
dotile(void) {
- unsigned int i, n, m
px, stack
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++;
- mpx = (waw * master) / 1000;
- stackw = waw - mpx;
+ /* 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 = waw - stackw - 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
px
;
- c->w =
stack
w - 2 * BORDERPX;
- if(th >
bh
) {
- c->y
= way + (i - 1
) * th;
+ c->x += m
w
;
+ c->w =
t
w - 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);
@@
-178,6
+147,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;
@@
-193,7
+174,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;
}
@@
-205,31
+187,32
@@
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));
}
XSync(dpy, False);
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;
@@
-247,7
+230,6
@@
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();
}
arrange();
}
@@
-256,19
+238,9
@@
view(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
unsigned int i;
for(i = 0; i < ntags; i++)
- seltag[i] = False;
- seltag[arg->i] = True;
- reorder();
- arrange();
-}
-
-void
-viewall(Arg *arg) {
- 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();
}
@@
-283,11
+255,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;