Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
removed useless inclusion
[dwm.git]
/
view.c
diff --git
a/view.c
b/view.c
index
21efa16
..
80d483a
100644
(file)
--- a/
view.c
+++ b/
view.c
@@
-3,25
+3,23
@@
* See LICENSE file for license details.
*/
#include "dwm.h"
* See LICENSE file for license details.
*/
#include "dwm.h"
-#include <stdio.h>
/* static */
static Client *
/* static */
static Client *
-minclient()
-{
+minclient() {
Client *c, *min;
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;
}
for(min = c = clients; c; c = c->next)
if(c->weight < min->weight)
min = c;
return min;
}
-
static void
static void
-reorder()
-{
+reorder() {
Client *c, *newclients, *tail;
newclients = tail = NULL;
Client *c, *newclients, *tail;
newclients = tail = NULL;
@@
-38,13
+36,18
@@
reorder()
clients = newclients;
}
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
/* extern */
void (*arrange)(Arg *) = DEFMODE;
void
-detach(Client *c)
-{
+detach(Client *c) {
if(c->prev)
c->prev->next = c->next;
if(c->next)
if(c->prev)
c->prev->next = c->next;
if(c->next)
@@
-55,9
+58,8
@@
detach(Client *c)
}
void
}
void
-dofloat(Arg *arg)
-{
- Client *c, *fc;
+dofloat(Arg *arg) {
+ Client *c;
maximized = False;
maximized = False;
@@
-68,16
+70,17
@@
dofloat(Arg *arg)
else
ban(c);
}
else
ban(c);
}
- if(!sel || !isvisible(sel))
- focus(getnext(clients));
+ if(!sel || !isvisible(sel)) {
+ for(c = stack; c && !isvisible(c); c = c->snext);
+ focus(c);
+ }
restack();
}
void
restack();
}
void
-dotile(Arg *arg)
-{
+dotile(Arg *arg) {
int h, i, n, w;
int h, i, n, w;
- Client *c
, *fc
;
+ Client *c;
maximized = False;
maximized = False;
@@
-130,14
+133,15
@@
dotile(Arg *arg)
else
ban(c);
}
else
ban(c);
}
- if(!sel || !isvisible(sel))
- focus(getnext(clients));
+ if(!sel || !isvisible(sel)) {
+ for(c = stack; c && !isvisible(c); c = c->snext);
+ focus(c);
+ }
restack();
}
void
restack();
}
void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
Client *c;
if(!sel)
Client *c;
if(!sel)
@@
-152,8
+156,7
@@
focusnext(Arg *arg)
}
void
}
void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
Client *c;
if(!sel)
Client *c;
if(!sel)
@@
-170,8
+173,7
@@
focusprev(Arg *arg)
}
Bool
}
Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
unsigned int i;
for(i = 0; i < ntags; i++)
unsigned int i;
for(i = 0; i < ntags; i++)
@@
-181,60
+183,54
@@
isvisible(Client *c)
}
void
}
void
-restack()
-{
- static unsigned int nwins = 0;
- static Window *wins = NULL;
- unsigned int f, fi, m, mi, n;
+resizecol(Arg *arg) {
+ 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));
}
void
drawall();
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
if(sel)
arrange(NULL);
arrange = (arrange == dofloat) ? dotile : dofloat;
if(sel)
arrange(NULL);
@@
-243,8
+239,7
@@
togglemode(Arg *arg)
}
void
}
void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
unsigned int i;
seltag[arg->i] = !seltag[arg->i];
unsigned int i;
seltag[arg->i] = !seltag[arg->i];
@@
-256,8
+251,7
@@
toggleview(Arg *arg)
}
void
}
void
-view(Arg *arg)
-{
+view(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
unsigned int i;
for(i = 0; i < ntags; i++)
@@
-268,8
+262,7
@@
view(Arg *arg)
}
void
}
void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
unsigned int i;
for(i = 0; i < ntags; i++)
@@
-279,19
+272,23
@@
viewall(Arg *arg)
}
void
}
void
-zoom(Arg *arg)
-{
- Client *c
= sel
;
+zoom(Arg *arg)
{
+ unsigned int n;
+ Client *c;
- if(!c || (arrange != dotile) || c->isfloat || maximized)
+ 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);
+ if(clients)
+ clients->prev = c;
c->next = clients;
c->next = clients;
- clients->prev = c;
clients = c;
focus(c);
arrange(NULL);
clients = c;
focus(c);
arrange(NULL);