Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
simplified unmanage
[dwm.git]
/
view.c
diff --git
a/view.c
b/view.c
index
9ba8e0b
..
5cbab08
100644
(file)
--- a/
view.c
+++ b/
view.c
@@
-3,38
+3,53
@@
* See LICENSE file for license details.
*/
#include "dwm.h"
* See LICENSE file for license details.
*/
#include "dwm.h"
+#include <stdio.h>
-/*
extern
*/
+/*
static
*/
-void (*arrange)(Arg *) = DEFMODE;
+static Client *
+minclient()
+{
+ Client *c, *min;
-void
-attach(Client *c)
+ 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 void
+reorder()
{
{
- Client *
first = getnext(clients)
;
+ Client *
c, *newclients, *tail
;
- if(!first) {
- if(clients) {
- for(first = clients; first->next; first = first->next);
- first->next = c;
- c->prev = first;
+ newclients = tail = NULL;
+ while((c = minclient())) {
+ detach(c);
+ if(tail) {
+ c->prev = tail;
+ tail->next = c;
+ tail = c;
}
else
}
else
- clients = c;
- }
- else if(first == clients) {
- c->next = clients;
- clients->prev = c;
- clients = c;
- }
- else {
- first->prev->next = c;
- c->prev = first->prev;
- first->prev = c;
- c->next = first;
+ tail = newclients = c;
}
}
+ clients = newclients;
+}
+
+static Client *
+nexttiled(Client *c)
+{
+ for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+ return c;
}
}
+/* extern */
+
+void (*arrange)(Arg *) = DEFMODE;
+
void
detach(Client *c)
{
void
detach(Client *c)
{
@@
-52,20
+67,19
@@
dofloat(Arg *arg)
{
Client *c;
{
Client *c;
+ maximized = False;
+
for(c = clients; c; c = c->next) {
for(c = clients; c; c = c->next) {
- c->ismax = False;
if(isvisible(c)) {
resize(c, True, TopLeft);
}
else
ban(c);
}
if(isvisible(c)) {
resize(c, True, TopLeft);
}
else
ban(c);
}
- if(!sel || !isvisible(sel))
- sel = getnext(clients);
- if(sel)
+ if(!sel || !isvisible(sel)) {
+ for(sel = stack; sel && !isvisible(sel); sel = sel->snext);
focus(sel);
focus(sel);
- else
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ }
restack();
}
restack();
}
@@
-75,6
+89,8
@@
dotile(Arg *arg)
int h, i, n, w;
Client *c;
int h, i, n, w;
Client *c;
+ maximized = False;
+
w = sw - mw;
for(n = 0, c = clients; c; c = c->next)
if(isvisible(c) && !c->isfloat)
w = sw - mw;
for(n = 0, c = clients; c; c = c->next)
if(isvisible(c) && !c->isfloat)
@@
-86,7
+102,6
@@
dotile(Arg *arg)
h = sh - bh;
for(i = 0, c = clients; c; c = c->next) {
h = sh - bh;
for(i = 0, c = clients; c; c = c->next) {
- c->ismax = False;
if(isvisible(c)) {
if(c->isfloat) {
resize(c, True, TopLeft);
if(isvisible(c)) {
if(c->isfloat) {
resize(c, True, TopLeft);
@@
-125,12
+140,10
@@
dotile(Arg *arg)
else
ban(c);
}
else
ban(c);
}
- if(!sel || !isvisible(sel))
- sel = getnext(clients);
- if(sel)
+ if(!sel || !isvisible(sel)) {
+ for(sel = stack; sel && !isvisible(sel); sel = sel->snext);
focus(sel);
focus(sel);
- else
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ }
restack();
}
restack();
}
@@
-180,52
+193,49
@@
isvisible(Client *c)
}
void
}
void
-res
tack(
)
+res
izecol(Arg *arg
)
{
{
- static unsigned int nwins = 0;
- static Window *wins = NULL;
- unsigned int f, fi, m, mi, n;
+ unsigned int n;
Client *c;
Client *c;
- XEvent ev;
- for(f = 0, m = 0, c = clients; c; c = c->next)
- if(isvisible(c)) {
- if(c->isfloat || arrange == dofloat)
- f++;
- else
- m++;
- }
- if(!(n = 2 * (f + m))) {
- drawstatus();
+ for(n = 0, c = clients; c; c = c->next)
+ if(isvisible(c) && !c->isfloat)
+ n++;
+ if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
return;
return;
+
+ if(sel == getnext(clients)) {
+ if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+ return;
+ mw += arg->i;
}
}
- if(nwins < n) {
- nwins = n;
- wins = erealloc(wins, nwins * sizeof(Window));
+ else {
+ if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+ return;
+ mw -= arg->i;
}
}
+ arrange(NULL);
+}
- fi = 0;
- mi = 2 * f;
- if(sel->isfloat || arrange == dofloat) {
- wins[fi++] = sel->twin;
- wins[fi++] = sel->win;
+void
+restack()
+{
+ Client *c;
+ XEvent ev;
+
+ if(!sel) {
+ drawstatus();
+ return;
}
}
-
else
{
-
wins[mi++] = sel->twin
;
-
wins[mi++] = sel->win
;
+
if(sel->isfloat || arrange == dofloat)
{
+
XRaiseWindow(dpy, sel->win)
;
+
XRaiseWindow(dpy, sel->twin)
;
}
}
- for(c = clients; c; c = c->next)
- if(isvisible(c) && c != sel) {
- if(c->isfloat || arrange == dofloat) {
- wins[fi++] = c->twin;
- wins[fi++] = c->win;
- }
- else {
- wins[mi++] = c->twin;
- wins[mi++] = c->win;
- }
+ if(arrange != dofloat)
+ for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+ XLowerWindow(dpy, c->twin);
+ XLowerWindow(dpy, c->win);
}
}
- XRestackWindows(dpy, wins, n);
drawall();
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
drawall();
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@
-250,6
+260,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(NULL);
}
@@
-261,22
+272,41
@@
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);
+}
+
+void
+viewall(Arg *arg)
+{
+ unsigned int i;
+
+ for(i = 0; i < ntags; i++)
+ seltag[i] = True;
+ reorder();
arrange(NULL);
}
void
zoom(Arg *arg)
{
arrange(NULL);
}
void
zoom(Arg *arg)
{
- Client *c = sel;
+ unsigned int n;
+ Client *c;
- if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+ for(n = 0, c = clients; c; c = c->next)
+ if(isvisible(c) && !c->isfloat)
+ n++;
+ if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
return;
return;
- if(
c == getnext
(clients))
- if(!(c =
getnext
(c->next)))
+ if(
(c = sel) == nexttiled
(clients))
+ if(!(c =
nexttiled
(c->next)))
return;
detach(c);
return;
detach(c);
- attach(c);
+ if(clients)
+ clients->prev = c;
+ c->next = clients;
+ clients = c;
focus(c);
arrange(NULL);
}
focus(c);
arrange(NULL);
}