From 9e56e1ded6889335035c8ffbe2763d3d83978673 Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Mon, 13 Aug 2007 20:06:00 +0200 Subject: tags should be persistent now during X server run --- tag.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'tag.c') diff --git a/tag.c b/tag.c index bbed8721..5161ae21 100644 --- a/tag.c +++ b/tag.c @@ -3,6 +3,8 @@ #include #include #include +#include +#include #include /* static */ @@ -23,6 +25,7 @@ RULES static Regs *regs = NULL; static unsigned int nrules = 0; +static char prop[512]; /* extern */ @@ -65,16 +68,32 @@ isvisible(Client *c) { void settags(Client *c, Client *trans) { - char prop[512]; unsigned int i, j; regmatch_t tmp; Bool matched = trans != NULL; XClassHint ch = { 0 }; + XTextProperty name; - if(matched) + if(matched) { for(i = 0; i < ntags; i++) c->tags[i] = trans->tags[i]; + return; + } else { + /* check if window has set a property */ + name.nitems = 0; + XGetTextProperty(dpy, c->win, &name, dwmtags); + 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] == '+')) + matched = True; + } + if(matched) + return; + /* rule matching */ XGetClassHint(dpy, c->win, &ch); snprintf(prop, sizeof prop, "%s:%s:%s", ch.res_class ? ch.res_class : "", @@ -110,6 +129,12 @@ tag(const char *arg) { i = arg ? atoi(arg) : 0; if(i >= 0 && i < ntags) sel->tags[i] = True; + if(sel) { + for(i = 0; i < ntags && i < sizeof prop - 1; i++) + prop[i] = sel->tags[i] ? '+' : '-'; + prop[i] = '\0'; + XChangeProperty(dpy, sel->win, dwmtags, XA_STRING, 8, PropModeReplace, (unsigned char *)prop, i); + } arrange(); } -- cgit v1.2.3