Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
introduced Layout struct
[dwm.git]
/
screen.c
diff --git
a/screen.c
b/screen.c
index
4e97f09
..
3f186e6
100644
(file)
--- a/
screen.c
+++ b/
screen.c
@@
-9,9
+9,10
@@
#include <sys/types.h>
#include <X11/Xutil.h>
#include <sys/types.h>
#include <X11/Xutil.h>
-void (*arrange)(void) = DEFMODE;
unsigned int master = MASTER;
unsigned int nmaster = NMASTER;
unsigned int master = MASTER;
unsigned int nmaster = NMASTER;
+unsigned int blw = 0;
+Layout *lt = NULL;
/* static */
/* static */
@@
-24,39
+25,41
@@
typedef struct {
typedef struct {
regex_t *propregex;
regex_t *tagregex;
typedef struct {
regex_t *propregex;
regex_t *tagregex;
-} Reg
exp
s;
+} Regs;
+LAYOUTS
TAGS
RULES
TAGS
RULES
-static Regexps *regexps = NULL;
-static unsigned int len = 0;
+static Regs *regs = NULL;
+static unsigned int nrules = 0;
+static unsigned int nlayouts = 0;
/* extern */
void
/* extern */
void
-compilereg
exp
s(void) {
+compileregs(void) {
unsigned int i;
regex_t *reg;
unsigned int i;
regex_t *reg;
- if(reg
exp
s)
+ if(regs)
return;
return;
-
len
= sizeof rule / sizeof rule[0];
- reg
exps = emallocz(len * sizeof(Regexp
s));
- for(i = 0; i <
len
; i++) {
+
nrules
= sizeof rule / sizeof rule[0];
+ reg
s = emallocz(nrules * sizeof(Reg
s));
+ for(i = 0; i <
nrules
; i++) {
if(rule[i].prop) {
reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rule[i].prop, REG_EXTENDED))
free(reg);
else
if(rule[i].prop) {
reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rule[i].prop, REG_EXTENDED))
free(reg);
else
- reg
exp
s[i].propregex = reg;
+ regs[i].propregex = reg;
}
if(rule[i].tags) {
reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rule[i].tags, REG_EXTENDED))
free(reg);
else
}
if(rule[i].tags) {
reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rule[i].tags, REG_EXTENDED))
free(reg);
else
- reg
exp
s[i].tagregex = reg;
+ regs[i].tagregex = reg;
}
}
}
}
}
}
@@
-138,16
+141,29
@@
dotile(void) {
void
incnmaster(Arg *arg) {
void
incnmaster(Arg *arg) {
- if((arrange == dofloat) || (nmaster + arg->i < 1)
+ if((
lt->
arrange == dofloat) || (nmaster + arg->i < 1)
|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
return;
nmaster += arg->i;
if(sel)
|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
return;
nmaster += arg->i;
if(sel)
- arrange();
+
lt->
arrange();
else
drawstatus();
}
else
drawstatus();
}
+void
+initlayouts(void) {
+ unsigned int i, w;
+
+ lt = &layout[0];
+ nlayouts = sizeof layout / sizeof layout[0];
+ for(blw = i = 0; i < nlayouts; i++) {
+ w = textw(layout[i].symbol);
+ if(w > blw)
+ blw = w;
+ }
+}
+
Bool
isvisible(Client *c) {
unsigned int i;
Bool
isvisible(Client *c) {
unsigned int i;
@@
-160,7
+176,7
@@
isvisible(Client *c) {
void
resizemaster(Arg *arg) {
void
resizemaster(Arg *arg) {
- if(arrange != dotile)
+ if(
lt->
arrange != dotile)
return;
if(arg->i == 0)
master = MASTER;
return;
if(arg->i == 0)
master = MASTER;
@@
-170,7
+186,7
@@
resizemaster(Arg *arg) {
return;
master += arg->i;
}
return;
master += arg->i;
}
- arrange();
+
lt->
arrange();
}
void
}
void
@@
-181,9
+197,9
@@
restack(void) {
drawstatus();
if(!sel)
return;
drawstatus();
if(!sel)
return;
- if(sel->isfloat || arrange == dofloat)
+ if(sel->isfloat ||
lt->
arrange == dofloat)
XRaiseWindow(dpy, sel->win);
XRaiseWindow(dpy, sel->win);
- if(arrange != dofloat) {
+ if(
lt->
arrange != dofloat) {
if(!sel->isfloat)
XLowerWindow(dpy, sel->win);
for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
if(!sel->isfloat)
XLowerWindow(dpy, sel->win);
for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
@@
-212,11
+228,11
@@
settags(Client *c, Client *trans) {
snprintf(prop, sizeof prop, "%s:%s:%s",
ch.res_class ? ch.res_class : "",
ch.res_name ? ch.res_name : "", c->name);
snprintf(prop, sizeof prop, "%s:%s:%s",
ch.res_class ? ch.res_class : "",
ch.res_name ? ch.res_name : "", c->name);
- for(i = 0; i <
len
; i++)
- if(reg
exps[i].propregex && !regexec(regexp
s[i].propregex, prop, 1, &tmp, 0)) {
+ for(i = 0; i <
nrules
; i++)
+ if(reg
s[i].propregex && !regexec(reg
s[i].propregex, prop, 1, &tmp, 0)) {
c->isfloat = rule[i].isfloat;
c->isfloat = rule[i].isfloat;
- for(j = 0; reg
exp
s[i].tagregex && j < ntags; j++) {
- if(!regexec(reg
exp
s[i].tagregex, tags[j], 1, &tmp, 0)) {
+ for(j = 0; regs[i].tagregex && j < ntags; j++) {
+ if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
matched = True;
c->tags[j] = True;
}
matched = True;
c->tags[j] = True;
}
@@
-242,15
+258,15
@@
tag(Arg *arg) {
sel->tags[i] = (arg->i == -1) ? True : False;
if(arg->i >= 0 && arg->i < ntags)
sel->tags[arg->i] = True;
sel->tags[i] = (arg->i == -1) ? True : False;
if(arg->i >= 0 && arg->i < ntags)
sel->tags[arg->i] = True;
- arrange();
+
lt->
arrange();
}
void
togglefloat(Arg *arg) {
}
void
togglefloat(Arg *arg) {
- if(!sel || arrange == dofloat)
+ if(!sel ||
lt->
arrange == dofloat)
return;
sel->isfloat = !sel->isfloat;
return;
sel->isfloat = !sel->isfloat;
- arrange();
+
lt->
arrange();
}
void
}
void
@@
-263,14
+279,20
@@
toggletag(Arg *arg) {
for(i = 0; i < ntags && !sel->tags[i]; i++);
if(i == ntags)
sel->tags[arg->i] = True;
for(i = 0; i < ntags && !sel->tags[i]; i++);
if(i == ntags)
sel->tags[arg->i] = True;
- arrange();
+
lt->
arrange();
}
void
}
void
-togglemode(Arg *arg) {
- arrange = (arrange == dofloat) ? dotile : dofloat;
+togglelayout(Arg *arg) {
+ unsigned int i;
+
+ for(i = 0; i < nlayouts && lt != &layout[i]; i++);
+ if(i == nlayouts - 1)
+ lt = &layout[0];
+ else
+ lt = &layout[++i];
if(sel)
if(sel)
- arrange();
+
lt->
arrange();
else
drawstatus();
}
else
drawstatus();
}
@@
-283,7
+305,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 */
- arrange();
+
lt->
arrange();
}
void
}
void
@@
-294,5
+316,5
@@
view(Arg *arg) {
seltag[i] = (arg->i == -1) ? True : False;
if(arg->i >= 0 && arg->i < ntags)
seltag[arg->i] = True;
seltag[i] = (arg->i == -1) ? True : False;
if(arg->i >= 0 && arg->i < ntags)
seltag[arg->i] = True;
- arrange();
+
lt->
arrange();
}
}