Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
simplified
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
a4deccf
..
266dd15
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-145,7
+145,6
@@
Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
void grabbuttons(Client *c, Bool focused);
unsigned int idxoftag(const char *tag);
void initfont(const char *fontstr);
void grabbuttons(Client *c, Bool focused);
unsigned int idxoftag(const char *tag);
void initfont(const char *fontstr);
-Bool isarrange(void (*func)());
Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
Bool isvisible(Client *c);
Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
Bool isvisible(Client *c);
@@
-198,9
+197,6
@@
int screen, sx, sy, sw, sh, wax, way, waw, wah;
int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos;
unsigned int blw = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos;
unsigned int blw = 0;
-unsigned int ltidx = 0; /* default */
-unsigned int nlayouts = 0;
-unsigned int nrules = 0;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
@@
-217,6
+213,8
@@
void (*handler[LASTEvent]) (XEvent *) = {
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
+Bool domwfact = True;
+Bool dozoom = True;
Bool otherwm, readin;
Bool running = True;
Bool selscreen = True;
Bool otherwm, readin;
Bool running = True;
Bool selscreen = True;
@@
-226,6
+224,7
@@
Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
+Layout *layout = NULL;
Window barwin, root;
Regs *regs = NULL;
Window barwin, root;
Regs *regs = NULL;
@@
-246,10
+245,10
@@
applyrules(Client *c) {
snprintf(buf, sizeof buf, "%s:%s:%s",
ch.res_class ? ch.res_class : "",
ch.res_name ? ch.res_name : "", c->name);
snprintf(buf, sizeof buf, "%s:%s:%s",
ch.res_class ? ch.res_class : "",
ch.res_name ? ch.res_name : "", c->name);
- for(i = 0; i <
nrules
; i++)
+ for(i = 0; i <
LENGTH(rules)
; i++)
if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
c->isfloating = rules[i].isfloating;
if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
c->isfloating = rules[i].isfloating;
- for(j = 0; regs[i].tagregex && j <
NTAGS
; j++) {
+ for(j = 0; regs[i].tagregex && j <
LENGTH(tags)
; j++) {
if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
matched = True;
c->tags[j] = True;
if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
matched = True;
c->tags[j] = True;
@@
-273,7
+272,7
@@
arrange(void) {
unban(c);
else
ban(c);
unban(c);
else
ban(c);
- layout
s[ltidx].
arrange();
+ layout
->
arrange();
focus(NULL);
restack();
}
focus(NULL);
restack();
}
@@
-308,7
+307,7
@@
buttonpress(XEvent *e) {
if(barwin == ev->window) {
x = 0;
if(barwin == ev->window) {
x = 0;
- for(i = 0; i <
NTAGS
; i++) {
+ for(i = 0; i <
LENGTH(tags)
; i++) {
x += textw(tags[i]);
if(ev->x < x) {
if(ev->button == Button1) {
x += textw(tags[i]);
if(ev->x < x) {
if(ev->button == Button1) {
@@
-334,20
+333,20
@@
buttonpress(XEvent *e) {
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- if(
isarrange(floating
) || c->isfloating)
+ if(
(floating == layout->arrange
) || c->isfloating)
restack();
else
togglefloating(NULL);
movemouse(c);
}
else if(ev->button == Button2) {
restack();
else
togglefloating(NULL);
movemouse(c);
}
else if(ev->button == Button2) {
- if((
ISTILE) && !c->isfixed
&& c->isfloating)
+ if((
floating != layout->arrange)
&& c->isfloating)
togglefloating(NULL);
else
zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
togglefloating(NULL);
else
zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
- if(
isarrange(floating
) || c->isfloating)
+ if(
(floating == layout->arrange
) || c->isfloating)
restack();
else
togglefloating(NULL);
restack();
else
togglefloating(NULL);
@@
-401,9
+400,8
@@
compileregs(void) {
if(regs)
return;
if(regs)
return;
- nrules = sizeof rules / sizeof rules[0];
- regs = emallocz(nrules * sizeof(Regs));
- for(i = 0; i < nrules; i++) {
+ regs = emallocz(LENGTH(rules) * sizeof(Regs));
+ for(i = 0; i < LENGTH(rules); i++) {
if(rules[i].prop) {
reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rules[i].prop, REG_EXTENDED))
if(rules[i].prop) {
reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rules[i].prop, REG_EXTENDED))
@@
-464,7
+462,7
@@
configurerequest(XEvent *e) {
c->ismax = False;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
c->ismax = False;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloating ||
isarrange(floating
)) {
+ if(c->isfixed || c->isfloating ||
(floating == layout->arrange
)) {
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
@@
-532,7
+530,7
@@
drawbar(void) {
int i, x;
dc.x = dc.y = 0;
int i, x;
dc.x = dc.y = 0;
- for(i = 0; i <
NTAGS
; i++) {
+ for(i = 0; i <
LENGTH(tags)
; i++) {
dc.w = textw(tags[i]);
if(seltags[i]) {
drawtext(tags[i], dc.sel);
dc.w = textw(tags[i]);
if(seltags[i]) {
drawtext(tags[i], dc.sel);
@@
-545,7
+543,7
@@
drawbar(void) {
dc.x += dc.w;
}
dc.w = blw;
dc.x += dc.w;
}
dc.w = blw;
- drawtext(layout
s[ltidx].
symbol, dc.norm);
+ drawtext(layout
->
symbol, dc.norm);
x = dc.x + dc.w;
dc.w = textw(stext);
dc.x = sw - dc.w;
x = dc.x + dc.w;
dc.w = textw(stext);
dc.x = sw - dc.w;
@@
-676,6
+674,7
@@
void
floating(void) { /* default floating layout */
Client *c;
floating(void) { /* default floating layout */
Client *c;
+ domwfact = dozoom = False;
for(c = clients; c; c = c->next)
if(isvisible(c))
resize(c, c->x, c->y, c->w, c->h, True);
for(c = clients; c; c = c->next)
if(isvisible(c))
resize(c, c->x, c->y, c->w, c->h, True);
@@
-842,8
+841,8
@@
unsigned int
idxoftag(const char *tag) {
unsigned int i;
idxoftag(const char *tag) {
unsigned int i;
- for(i = 0; (i <
NTAGS
) && (tags[i] != tag); i++);
- return (i <
NTAGS
) ? i : 0;
+ for(i = 0; (i <
LENGTH(tags)
) && (tags[i] != tag); i++);
+ return (i <
LENGTH(tags)
) ? i : 0;
}
void
}
void
@@
-888,12
+887,6
@@
initfont(const char *fontstr) {
dc.font.height = dc.font.ascent + dc.font.descent;
}
dc.font.height = dc.font.ascent + dc.font.descent;
}
-Bool
-isarrange(void (*func)())
-{
- return func == layouts[ltidx].arrange;
-}
-
Bool
isoccupied(unsigned int t) {
Client *c;
Bool
isoccupied(unsigned int t) {
Client *c;
@@
-923,7
+916,7
@@
Bool
isvisible(Client *c) {
unsigned int i;
isvisible(Client *c) {
unsigned int i;
- for(i = 0; i <
NTAGS
; i++)
+ for(i = 0; i <
LENGTH(tags)
; i++)
if(c->tags[i] && seltags[i])
return True;
return False;
if(c->tags[i] && seltags[i])
return True;
return False;
@@
-932,7
+925,6
@@
isvisible(Client *c) {
void
keypress(XEvent *e) {
KEYS
void
keypress(XEvent *e) {
KEYS
- unsigned int len = sizeof keys / sizeof keys[0];
unsigned int i;
KeyCode code;
KeySym keysym;
unsigned int i;
KeyCode code;
KeySym keysym;
@@
-940,7
+932,7
@@
keypress(XEvent *e) {
if(!e) { /* grabkeys */
XUngrabKey(dpy, AnyKey, AnyModifier, root);
if(!e) { /* grabkeys */
XUngrabKey(dpy, AnyKey, AnyModifier, root);
- for(i = 0; i <
len
; i++) {
+ for(i = 0; i <
LENGTH(keys)
; i++) {
code = XKeysymToKeycode(dpy, keys[i].keysym);
XGrabKey(dpy, code, keys[i].mod, root, True,
GrabModeAsync, GrabModeAsync);
code = XKeysymToKeycode(dpy, keys[i].keysym);
XGrabKey(dpy, code, keys[i].mod, root, True,
GrabModeAsync, GrabModeAsync);
@@
-955,7
+947,7
@@
keypress(XEvent *e) {
}
ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
}
ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
- for(i = 0; i <
len
; i++)
+ for(i = 0; i <
LENGTH(keys)
; i++)
if(keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
{
if(keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
{
@@
-1266,9
+1258,9
@@
restack(void) {
drawbar();
if(!sel)
return;
drawbar();
if(!sel)
return;
- if(sel->isfloating ||
isarrange(floating
))
+ if(sel->isfloating ||
(floating == layout->arrange
))
XRaiseWindow(dpy, sel->win);
XRaiseWindow(dpy, sel->win);
- if(
!isarrange(floating)
) {
+ if(
floating != layout->arrange
) {
wc.stack_mode = Below;
wc.sibling = barwin;
if(!sel->isfloating) {
wc.stack_mode = Below;
wc.sibling = barwin;
if(!sel->isfloating) {
@@
-1288,15
+1280,15
@@
restack(void) {
void
run(void) {
void
run(void) {
- char *p;
- int r, xfd;
fd_set rd;
fd_set rd;
+ int xfd;
XEvent ev;
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
xfd = ConnectionNumber(dpy);
readin = True;
XEvent ev;
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
xfd = ConnectionNumber(dpy);
readin = True;
+ stext[sizeof stext - 1] = '\0'; /* 0-terminator is never touched */
while(running) {
FD_ZERO(&rd);
if(readin)
while(running) {
FD_ZERO(&rd);
if(readin)
@@
-1308,22
+1300,12
@@
run(void) {
eprint("select failed\n");
}
if(FD_ISSET(STDIN_FILENO, &rd)) {
eprint("select failed\n");
}
if(FD_ISSET(STDIN_FILENO, &rd)) {
- switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
- case -1:
- strncpy(stext, strerror(errno), sizeof stext - 1);
- stext[sizeof stext - 1] = '\0';
- readin = False;
- break;
- case 0:
+ if((readin = (stext == fgets(stext, sizeof stext - 1, stdin))))
+ stext[strlen(stext) - 1] = '\0'; /* remove tailing '\n' */
+ else if(feof(stdin))
strncpy(stext, "EOF", 4);
strncpy(stext, "EOF", 4);
- readin = False;
- break;
- default:
- for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
- for(; p >= stext && *p != '\n'; --p);
- if(p > stext)
- strncpy(stext, p + 1, sizeof stext);
- }
+ else /* error occured */
+ strncpy(stext, strerror(errno), sizeof stext - 1);
drawbar();
}
while(XPending(dpy)) {
drawbar();
}
while(XPending(dpy)) {
@@
-1374,16
+1356,16
@@
setlayout(const char *arg) {
unsigned int i;
if(!arg) {
unsigned int i;
if(!arg) {
- if(++l
tidx == nlayouts
)
- l
tidx = 0;
;
+ if(++l
ayout == &layouts[LENGTH(layouts)]
)
+ l
ayout = &layouts[0]
;
}
else {
}
else {
- for(i = 0; i <
nlayouts
; i++)
+ for(i = 0; i <
LENGTH(layouts)
; i++)
if(!strcmp(arg, layouts[i].symbol))
break;
if(!strcmp(arg, layouts[i].symbol))
break;
- if(i ==
nlayouts
)
+ if(i ==
LENGTH(layouts)
)
return;
return;
- l
tidx = i
;
+ l
ayout = &layouts[i]
;
}
if(sel)
arrange();
}
if(sel)
arrange();
@@
-1395,7
+1377,7
@@
void
setmwfact(const char *arg) {
double delta;
setmwfact(const char *arg) {
double delta;
- if(!
(ISTILE)
)
+ if(!
domwfact
)
return;
/* arg handling, manipulate mwfact */
if(NULL == arg)
return;
/* arg handling, manipulate mwfact */
if(NULL == arg)
@@
-1476,8
+1458,8
@@
setup(void) {
/* init layouts */
mwfact = MWFACT;
/* init layouts */
mwfact = MWFACT;
-
nlayouts = sizeof layouts / sizeof
layouts[0];
- for(blw = i = 0; i <
nlayouts
; i++) {
+
layout = &
layouts[0];
+ for(blw = i = 0; i <
LENGTH(layouts)
; i++) {
j = textw(layouts[i].symbol);
if(j > blw)
blw = j;
j = textw(layouts[i].symbol);
if(j > blw)
blw = j;
@@
-1535,7
+1517,7
@@
tag(const char *arg) {
if(!sel)
return;
if(!sel)
return;
- for(i = 0; i <
NTAGS
; i++)
+ for(i = 0; i <
LENGTH(tags)
; i++)
sel->tags[i] = (NULL == arg);
sel->tags[idxoftag(arg)] = True;
arrange();
sel->tags[i] = (NULL == arg);
sel->tags[idxoftag(arg)] = True;
arrange();
@@
-1562,6
+1544,7
@@
tile(void) {
unsigned int i, n, nx, ny, nw, nh, mw, th;
Client *c, *mc;
unsigned int i, n, nx, ny, nw, nh, mw, th;
Client *c, *mc;
+ domwfact = dozoom = True;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
@@
-1591,8
+1574,8
@@
tile(void) {
else
nh = th - 2 * c->border;
}
else
nh = th - 2 * c->border;
}
- resize(c, nx, ny, nw, nh,
True
);
- if((
c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw
))
+ resize(c, nx, ny, nw, nh,
RESIZEHINTS
);
+ if((
RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)
))
/* client doesn't accept size constraints */
resize(c, nx, ny, nw, nh, False);
if(n > 1 && th != wah)
/* client doesn't accept size constraints */
resize(c, nx, ny, nw, nh, False);
if(n > 1 && th != wah)
@@
-1627,7
+1610,7
@@
togglemax(const char *arg) {
if(!sel || sel->isfixed)
return;
if((sel->ismax = !sel->ismax)) {
if(!sel || sel->isfixed)
return;
if((sel->ismax = !sel->ismax)) {
- if(
isarrange(floating
) || sel->isfloating)
+ if(
(floating == layout->arrange
) || sel->isfloating)
sel->wasfloating = True;
else {
togglefloating(NULL);
sel->wasfloating = True;
else {
togglefloating(NULL);
@@
-1656,8
+1639,8
@@
toggletag(const char *arg) {
return;
i = idxoftag(arg);
sel->tags[i] = !sel->tags[i];
return;
i = idxoftag(arg);
sel->tags[i] = !sel->tags[i];
- for(j = 0; j <
NTAGS
&& !sel->tags[j]; j++);
- if(j ==
NTAGS
)
+ for(j = 0; j <
LENGTH(tags)
&& !sel->tags[j]; j++);
+ if(j ==
LENGTH(tags)
)
sel->tags[i] = True; /* at least one tag must be enabled */
arrange();
}
sel->tags[i] = True; /* at least one tag must be enabled */
arrange();
}
@@
-1668,8
+1651,8
@@
toggleview(const char *arg) {
i = idxoftag(arg);
seltags[i] = !seltags[i];
i = idxoftag(arg);
seltags[i] = !seltags[i];
- for(j = 0; j <
NTAGS
&& !seltags[j]; j++);
- if(j ==
NTAGS
)
+ for(j = 0; j <
LENGTH(tags)
&& !seltags[j]; j++);
+ if(j ==
LENGTH(tags)
)
seltags[i] = True; /* at least one tag must be viewed */
arrange();
}
seltags[i] = True; /* at least one tag must be viewed */
arrange();
}
@@
-1835,7
+1818,7
@@
view(const char *arg) {
unsigned int i;
memcpy(prevtags, seltags, sizeof seltags);
unsigned int i;
memcpy(prevtags, seltags, sizeof seltags);
- for(i = 0; i <
NTAGS
; i++)
+ for(i = 0; i <
LENGTH(tags)
; i++)
seltags[i] = (NULL == arg);
seltags[idxoftag(arg)] = True;
arrange();
seltags[i] = (NULL == arg);
seltags[idxoftag(arg)] = True;
arrange();
@@
-1855,7
+1838,7
@@
void
zoom(const char *arg) {
Client *c;
zoom(const char *arg) {
Client *c;
- if(!sel || !
(ISTILE)
|| sel->isfloating)
+ if(!sel || !
dozoom
|| sel->isfloating)
return;
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
return;
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))