Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
use sel instead of seeking the list
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
8ae4c0e
..
a94cacc
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-89,7
+89,7
@@
struct Client {
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int bw, oldbw;
uint tags;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int bw, oldbw;
uint tags;
- Bool isbanned, isfixed, isfloating, is
moved, is
urgent;
+ Bool isbanned, isfixed, isfloating, isurgent;
Client *next;
Client *snext;
Window win;
Client *next;
Client *snext;
Window win;
@@
-168,6
+168,7
@@
static void killclient(const Arg *arg);
static void manage(Window w, XWindowAttributes *wa);
static void mappingnotify(XEvent *e);
static void maprequest(XEvent *e);
static void manage(Window w, XWindowAttributes *wa);
static void mappingnotify(XEvent *e);
static void maprequest(XEvent *e);
+static void monocle(void);
static void movemouse(const Arg *arg);
static Client *nexttiled(Client *c);
static void propertynotify(XEvent *e);
static void movemouse(const Arg *arg);
static Client *nexttiled(Client *c);
static void propertynotify(XEvent *e);
@@
-178,6
+179,7
@@
static void restack(void);
static void run(void);
static void scan(void);
static void setclientstate(Client *c, long state);
static void run(void);
static void scan(void);
static void setclientstate(Client *c, long state);
+static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setup(void);
static void spawn(const Arg *arg);
static void setmfact(const Arg *arg);
static void setup(void);
static void spawn(const Arg *arg);
@@
-186,8
+188,6
@@
static int textnw(const char *text, uint len);
static void tile(void);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
static void tile(void);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
-static void togglelayout(const Arg *arg);
-static void togglemax(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
static void unmanage(Client *c);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
static void unmanage(Client *c);
@@
-207,7
+207,7
@@
static void zoom(const Arg *arg);
static char stext[256];
static int screen, sx, sy, sw, sh;
static int by, bh, blw, wx, wy, ww, wh;
static char stext[256];
static int screen, sx, sy, sw, sh;
static int by, bh, blw, wx, wy, ww, wh;
-static uint seltags = 0;
+static uint seltags = 0
, sellt = 0
;
static int (*xerrorxlib)(Display *, XErrorEvent *);
static uint numlockmask = 0;
static void (*handler[LASTEvent]) (XEvent *) = {
static int (*xerrorxlib)(Display *, XErrorEvent *);
static uint numlockmask = 0;
static void (*handler[LASTEvent]) (XEvent *) = {
@@
-225,7
+225,6
@@
static void (*handler[LASTEvent]) (XEvent *) = {
[UnmapNotify] = unmapnotify
};
static Atom wmatom[WMLast], netatom[NetLast];
[UnmapNotify] = unmapnotify
};
static Atom wmatom[WMLast], netatom[NetLast];
-static Bool ismax = False;
static Bool otherwm, readin;
static Bool running = True;
static uint tagset[] = {1, 1}; /* after start, first tag is selected */
static Bool otherwm, readin;
static Bool running = True;
static uint tagset[] = {1, 1}; /* after start, first tag is selected */
@@
-235,7
+234,7
@@
static Client *stack = NULL;
static Cursor cursor[CurLast];
static Display *dpy;
static DC dc = {0};
static Cursor cursor[CurLast];
static Display *dpy;
static DC dc = {0};
-static Layout *lt
= NULL
;
+static Layout *lt
[] = { NULL, NULL }
;
static Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
static Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
@@
-275,22
+274,18
@@
arrange(void) {
for(c = clients; c; c = c->next)
if(c->tags & tagset[seltags]) { /* is visible */
for(c = clients; c; c = c->next)
if(c->tags & tagset[seltags]) { /* is visible */
- if(ismax && !c->isfixed) {
- XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
- c->ismoved = True;
- }
- else if(!lt->arrange || c->isfloating)
+ if(!lt[sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
c->isbanned = False;
}
else if(!c->isbanned) {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
resize(c, c->x, c->y, c->w, c->h, True);
c->isbanned = False;
}
else if(!c->isbanned) {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- c->isbanned =
c->ismoved =
True;
+ c->isbanned = True;
}
focus(NULL);
}
focus(NULL);
- if(lt
->arrange && !ismax
)
- lt->arrange();
+ if(lt
[sellt]->arrange
)
+ lt
[sellt]
->arrange();
restack();
}
restack();
}
@@
-360,7
+355,7
@@
cleanup(void) {
close(STDIN_FILENO);
view(&a);
close(STDIN_FILENO);
view(&a);
- lt = &foo;
+ lt
[sellt]
= &foo;
while(stack)
unmanage(stack);
if(dc.font.set)
while(stack)
unmanage(stack);
if(dc.font.set)
@@
-418,9
+413,7
@@
configurerequest(XEvent *e) {
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
- if(ismax && !c->isbanned && !c->isfixed)
- XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
- else if(c->isfloating || !lt->arrange) {
+ else if(c->isfloating || !lt[sellt]->arrange) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
@@
-433,8
+426,7
@@
configurerequest(XEvent *e) {
c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
if((c->y - sy + c->h) > sh && c->isfloating)
c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
if((c->y - sy + c->h) > sh && c->isfloating)
c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
- if((ev->value_mask & (CWX|CWY))
- && !(ev->value_mask & (CWWidth|CWHeight)))
+ if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
if(!c->isbanned)
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
configure(c);
if(!c->isbanned)
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
@@
-489,25
+481,23
@@
detachstack(Client *c) {
void
drawbar(void) {
int i, x;
void
drawbar(void) {
int i, x;
- Client *c;
dc.x = 0;
dc.x = 0;
- for(c = stack; c && c->isbanned; c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
if(tagset[seltags] & 1 << i) {
drawtext(tags[i], dc.sel, isurgent(i));
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
if(tagset[seltags] & 1 << i) {
drawtext(tags[i], dc.sel, isurgent(i));
- drawsquare(
c && c
->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
+ drawsquare(
sel && sel
->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
}
else {
drawtext(tags[i], dc.norm, isurgent(i));
}
else {
drawtext(tags[i], dc.norm, isurgent(i));
- drawsquare(
c && c
->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
+ drawsquare(
sel && sel
->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
}
dc.x += dc.w;
}
if(blw > 0) {
dc.w = blw;
}
dc.x += dc.w;
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt
->symbol, dc.norm, ismax
);
+ drawtext(lt
[sellt]->symbol, dc.norm, False
);
x = dc.x + dc.w;
}
else
x = dc.x + dc.w;
}
else
@@
-521,9
+511,9
@@
drawbar(void) {
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
- if(
c
) {
- drawtext(
c
->name, dc.sel, False);
- drawsquare(
c->isfixed, c
->isfloating, False, dc.sel);
+ if(
sel
) {
+ drawtext(
sel
->name, dc.sel, False);
+ drawsquare(
sel->isfixed, sel
->isfloating, False, dc.sel);
}
else
drawtext(NULL, dc.norm, False);
}
else
drawtext(NULL, dc.norm, False);
@@
-966,6
+956,14
@@
maprequest(XEvent *e) {
manage(ev->window, &wa);
}
manage(ev->window, &wa);
}
+void
+monocle(void) {
+ Client *c;
+
+ for(c = nexttiled(clients); c; c = nexttiled(c->next))
+ resize(c, wx, wy, ww, wh, resizehints);
+}
+
void
movemouse(const Arg *arg) {
int x1, y1, ocx, ocy, di, nx, ny;
void
movemouse(const Arg *arg) {
int x1, y1, ocx, ocy, di, nx, ny;
@@
-1008,10
+1006,10
@@
movemouse(const Arg *arg) {
ny = wy;
else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
ny = wy + wh - c->h - 2 * c->bw;
ny = wy;
else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
ny = wy + wh - c->h - 2 * c->bw;
- if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+ if(!c->isfloating && lt
[sellt]
->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL);
}
togglefloating(NULL);
}
- if(!lt->arrange || c->isfloating)
+ if(!lt
[sellt]
->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
break;
}
resize(c, nx, ny, c->w, c->h, False);
break;
}
@@
-1115,8
+1113,7
@@
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
h = bh;
if(w < bh)
w = bh;
h = bh;
if(w < bh)
w = bh;
- if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
- c->ismoved = False;
+ if(!c->isbanned || c->x != x || c->y != y || c->w != w || c->h != h) {
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
@@
-1166,11
+1163,11
@@
resizemouse(const Arg *arg) {
if(snap && nw >= wx && nw <= wx + ww
&& nh >= wy && nh <= wy + wh) {
if(snap && nw >= wx && nw <= wx + ww
&& nh >= wy && nh <= wy + wh) {
- if(!c->isfloating && lt->arrange
+ if(!c->isfloating && lt
[sellt]
->arrange
&& (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
togglefloating(NULL);
}
&& (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
togglefloating(NULL);
}
- if(!lt->arrange || c->isfloating)
+ if(!lt
[sellt]
->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
resize(c, c->x, c->y, nw, nh, True);
break;
}
@@
-1186,9
+1183,9
@@
restack(void) {
drawbar();
if(!sel)
return;
drawbar();
if(!sel)
return;
- if(
ismax || sel->isfloating || !lt
->arrange)
+ if(
sel->isfloating || !lt[sellt]
->arrange)
XRaiseWindow(dpy, sel->win);
XRaiseWindow(dpy, sel->win);
- if(
!ismax && lt
->arrange) {
+ if(
lt[sellt]
->arrange) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
@@
-1296,12
+1293,23
@@
setclientstate(Client *c, long state) {
PropModeReplace, (unsigned char *)data, 2);
}
PropModeReplace, (unsigned char *)data, 2);
}
+void
+setlayout(const Arg *arg) {
+ sellt ^= 1;
+ if(arg && arg->v && arg->v != lt[sellt])
+ lt[sellt] = (Layout *)arg->v;
+ if(sel)
+ arrange();
+ else
+ drawbar();
+}
+
/* arg > 1.0 will set mfact absolutly */
void
setmfact(const Arg *arg) {
float f;
/* arg > 1.0 will set mfact absolutly */
void
setmfact(const Arg *arg) {
float f;
- if(!arg || !lt->arrange)
+ if(!arg || !lt
[sellt]
->arrange)
return;
f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
if(f < 0.1 || f > 0.9)
return;
f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
if(f < 0.1 || f > 0.9)
@@
-1325,7
+1333,8
@@
setup(void) {
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.h = dc.font.height + 2;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.h = dc.font.height + 2;
- lt = layouts;
+ lt[0] = &layouts[0];
+ lt[1] = &layouts[1 % LENGTH(layouts)];
updategeom();
/* init atoms */
updategeom();
/* init atoms */
@@
-1476,34
+1485,24
@@
togglefloating(const Arg *arg) {
arrange();
}
arrange();
}
-void
-togglelayout(const Arg *arg) {
- if(arg && arg->v)
- lt = (Layout *)arg->v;
- else if(++lt == &layouts[LENGTH(layouts)])
- lt = &layouts[0];
- if(sel)
- arrange();
- else
- drawbar();
-}
-
-void
-togglemax(const Arg *arg) {
- ismax = !ismax;
- arrange();
-}
-
void
toggletag(const Arg *arg) {
void
toggletag(const Arg *arg) {
- if(sel && (sel->tags ^= (arg->ui & TAGMASK)))
+ uint mask = sel->tags ^ (arg->ui & TAGMASK);
+
+ if(sel && mask) {
+ sel->tags = mask;
arrange();
arrange();
+ }
}
void
toggleview(const Arg *arg) {
}
void
toggleview(const Arg *arg) {
- if((tagset[seltags] ^= (arg->ui & TAGMASK)))
+ uint mask = tagset[seltags] ^ (arg->ui & TAGMASK);
+
+ if(mask) {
+ tagset[seltags] = mask;
arrange();
arrange();
+ }
}
void
}
void
@@
-1685,7
+1684,7
@@
void
zoom(const Arg *arg) {
Client *c = sel;
zoom(const Arg *arg) {
Client *c = sel;
- if(
ismax || !lt->arrang
e || (sel && sel->isfloating))
+ if(
!lt[sellt]->arrange || lt[sellt]->arrange == monocl
e || (sel && sel->isfloating))
return;
if(c == nexttiled(clients))
if(!c || !(c = nexttiled(c->next)))
return;
if(c == nexttiled(clients))
if(!c || !(c = nexttiled(c->next)))