staticfanfare
/
dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed Rule members, renamed RReg into Regexps

This commit is contained in:
Anselm R. Garbe 2007-02-19 14:52:19 +01:00
parent 4cdbd523e5
commit 2e95bc0413
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manage.c
View File

@ -16,20 +16,20 @@ unsigned int nmaster = NMASTER;
/* static */ /* static */
typedef struct { typedef struct {
const char *clpattern; const char *prop;
const char *tpattern; const char *tags;
Bool isfloat; Bool isfloat;
} Rule; } Rule;
typedef struct { typedef struct {
regex_t *clregex; regex_t *propregex;
regex_t *tregex; regex_t *tagregex;
} RReg; } Regexps;
TAGS TAGS
RULES RULES
static RReg *rreg = NULL; static Regexps *regexps = NULL;
static unsigned int len = 0; static unsigned int len = 0;
static Client * static Client *
@ -77,24 +77,24 @@ compileregexps(void) {
unsigned int i; unsigned int i;
regex_t *reg; regex_t *reg;
if(rreg) if(regexps)
return; return;
len = sizeof rule / sizeof rule[0]; len = sizeof rule / sizeof rule[0];
rreg = emallocz(len * sizeof(RReg)); regexps = emallocz(len * sizeof(Regexps));
for(i = 0; i < len; i++) { for(i = 0; i < len; i++) {
if(rule[i].clpattern) { if(rule[i].prop) {
reg = emallocz(sizeof(regex_t)); reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rule[i].clpattern, REG_EXTENDED)) if(regcomp(reg, rule[i].prop, REG_EXTENDED))
free(reg); free(reg);
else else
rreg[i].clregex = reg; regexps[i].propregex = reg;
} }
if(rule[i].tpattern) { if(rule[i].tags) {
reg = emallocz(sizeof(regex_t)); reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rule[i].tpattern, REG_EXTENDED)) if(regcomp(reg, rule[i].tags, REG_EXTENDED))
free(reg); free(reg);
else else
rreg[i].tregex = reg; regexps[i].tagregex = reg;
} }
} }
} }
@ -310,10 +310,10 @@ settags(Client *c, Client *trans) {
ch.res_class ? ch.res_class : "", ch.res_class ? ch.res_class : "",
ch.res_name ? ch.res_name : "", c->name); ch.res_name ? ch.res_name : "", c->name);
for(i = 0; i < len; i++) for(i = 0; i < len; i++)
if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 1, &tmp, 0)) { if(regexps[i].propregex && !regexec(regexps[i].propregex, prop, 1, &tmp, 0)) {
c->isfloat = rule[i].isfloat; c->isfloat = rule[i].isfloat;
for(j = 0; rreg[i].tregex && j < ntags; j++) { for(j = 0; regexps[i].tagregex && j < ntags; j++) {
if(!regexec(rreg[i].tregex, tags[j], 1, &tmp, 0)) { if(!regexec(regexps[i].tagregex, tags[j], 1, &tmp, 0)) {
matched = True; matched = True;
c->tags[j] = True; c->tags[j] = True;
} }