Zynh0722/dwm
1
0
Fork 0
forked from mirror/dwm
Code Pull requests Activity

small bugfix

Browse source
This commit is contained in:
Anselm R. Garbe 2007-08-13 20:10:44 +02:00
parent 9e56e1ded6
commit b32cd4454b
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tag.c
View file

@ -27,6 +27,18 @@ static Regs *regs = NULL;
static unsigned int nrules = 0; static unsigned int nrules = 0;
static char prop[512]; static char prop[512];
static void
persisttags(Client *c)
{
unsigned int i;
for(i = 0; i < ntags && i < sizeof prop - 1; i++)
prop[i] = c->tags[i] ? '+' : '-';
prop[i] = '\0';
XChangeProperty(dpy, c->win, dwmtags, XA_STRING, 8,
PropModeReplace, (unsigned char *)prop, i);
}
/* extern */ /* extern */
void void
@ -77,7 +89,6 @@ settags(Client *c, Client *trans) {
if(matched) { if(matched) {
for(i = 0; i < ntags; i++) for(i = 0; i < ntags; i++)
c->tags[i] = trans->tags[i]; c->tags[i] = trans->tags[i];
return;
} }
else { else {
/* check if window has set a property */ /* check if window has set a property */
@ -91,8 +102,8 @@ settags(Client *c, Client *trans) {
if((c->tags[i] = prop[i] == '+')) if((c->tags[i] = prop[i] == '+'))
matched = True; matched = True;
} }
if(matched) }
return; if(!matched) {
/* rule matching */ /* rule matching */
XGetClassHint(dpy, c->win, &ch); XGetClassHint(dpy, c->win, &ch);
snprintf(prop, sizeof prop, "%s:%s:%s", snprintf(prop, sizeof prop, "%s:%s:%s",
@ -116,6 +127,7 @@ settags(Client *c, Client *trans) {
if(!matched) if(!matched)
for(i = 0; i < ntags; i++) for(i = 0; i < ntags; i++)
c->tags[i] = seltag[i]; c->tags[i] = seltag[i];
persisttags(c);
} }
void void
@ -129,12 +141,8 @@ tag(const char *arg) {
i = arg ? atoi(arg) : 0; i = arg ? atoi(arg) : 0;
if(i >= 0 && i < ntags) if(i >= 0 && i < ntags)
sel->tags[i] = True; sel->tags[i] = True;
if(sel) { if(sel)
for(i = 0; i < ntags && i < sizeof prop - 1; i++) persisttags(sel);
prop[i] = sel->tags[i] ? '+' : '-';
prop[i] = '\0';
XChangeProperty(dpy, sel->win, dwmtags, XA_STRING, 8, PropModeReplace, (unsigned char *)prop, i);
}
arrange(); arrange();
} }
@ -149,6 +157,8 @@ toggletag(const char *arg) {
for(j = 0; j < ntags && !sel->tags[j]; j++); for(j = 0; j < ntags && !sel->tags[j]; j++);
if(j == ntags) if(j == ntags)
sel->tags[i] = True; sel->tags[i] = True;
if(sel)
persisttags(sel);
arrange(); arrange();
} }