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

cleaned up settags-handling

Browse Source
This commit is contained in:
Anselm R. Garbe
2007-08-18 13:48:05 +02:00
parent 7d156dee1e
commit 50be6c8b67
4 changed files with 90 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
tag.c
View File

@ -27,19 +27,6 @@ static Regs *regs = NULL;
static unsigned int nrules = 0;
static char prop[512];
static void
persistconfig(Client *c) {
unsigned int i;
for(i = 0; i < ntags && i < sizeof prop - 1; i++)
prop[i] = c->tags[i] ? '1' : '0';
if(i < sizeof prop - 1)
prop[i++] = c->isfloating ? '1' : '0';
prop[i] = '\0';
XChangeProperty(dpy, c->win, dwmconfig, XA_STRING, 8,
PropModeReplace, (unsigned char *)prop, i);
}
static unsigned int
idxoftag(const char *tag) {
unsigned int i;
@ -52,6 +39,37 @@ idxoftag(const char *tag) {
/* extern */
void
applyrules(Client *c) {
unsigned int i, j;
regmatch_t tmp;
Bool matched = False;
XClassHint ch = { 0 };
/* rule matching */
XGetClassHint(dpy, c->win, &ch);
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 < nrules; i++)
if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
c->isfloating = rules[i].isfloating;
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;
}
}
}
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
if(!matched)
for(i = 0; i < ntags; i++)
c->tags[i] = seltags[i];
}
void
compileregs(void) {
unsigned int i;
@ -89,60 +107,6 @@ isvisible(Client *c) {
return False;
}
void
settags(Client *c, Client *trans) {
unsigned int i, j;
regmatch_t tmp;
Bool matched = trans != NULL;
XClassHint ch = { 0 };
XTextProperty name;
if(matched) {
for(i = 0; i < ntags; i++)
c->tags[i] = trans->tags[i];
}
else {
/* check if window has set a property */
name.nitems = 0;
XGetTextProperty(dpy, c->win, &name, dwmconfig);
if(name.nitems && name.encoding == XA_STRING) {
strncpy(prop, (char *)name.value, sizeof prop - 1);
prop[sizeof prop - 1] = '\0';
XFree(name.value);
for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
if((c->tags[i] = prop[i] == '1'))
matched = True;
if(i < sizeof prop - 1 && prop[i] != '\0')
c->isfloating = prop[i] == '1';
}
}
if(!matched) {
/* rule matching */
XGetClassHint(dpy, c->win, &ch);
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 < nrules; i++)
if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
c->isfloating = rules[i].isfloating;
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;
}
}
}
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
}
if(!matched)
for(i = 0; i < ntags; i++)
c->tags[i] = seltags[i];
persistconfig(c);
}
void
tag(const char *arg) {
unsigned int i;
@ -154,7 +118,7 @@ tag(const char *arg) {
i = idxoftag(arg);
if(i >= 0 && i < ntags)
sel->tags[i] = True;
persistconfig(sel);
saveconfig(sel);
arrange();
}
@ -165,7 +129,7 @@ togglefloating(const char *arg) {
sel->isfloating = !sel->isfloating;
if(sel->isfloating) {
resize(sel, sel->x, sel->y, sel->w, sel->h, True);
persistconfig(sel);
saveconfig(sel);
}
arrange();
}
@ -181,7 +145,7 @@ toggletag(const char *arg) {
for(j = 0; j < ntags && !sel->tags[j]; j++);
if(j == ntags)
sel->tags[i] = True;
persistconfig(sel);
saveconfig(sel);
arrange();
}