X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/0c6062041035105c6266f6bedb286c1990516fa7..b18e6840152b300f2db8ff8dca16aee0839f864b:/client.c diff --git a/client.c b/client.c index d11ef7f..c03770b 100644 --- a/client.c +++ b/client.c @@ -7,7 +7,7 @@ /* static */ -static char prop[128]; +static char buf[128]; static void attachstack(Client *c) { @@ -182,23 +182,16 @@ killclient(const char *arg) { } Bool -loadprops(Client *c) { +getprops(Client *c) { unsigned int i; Bool result = False; - XTextProperty name; - - /* check if window has set a property */ - name.nitems = 0; - XGetTextProperty(dpy, c->win, &name, dwmprops); - 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')) + + if(gettextprop(c->win, dwmprops, buf, sizeof buf)) { + for(i = 0; i < ntags && i < sizeof buf - 1 && buf[i] != '\0'; i++) + if((c->tags[i] = buf[i] == '1')) result = True; - if(i < sizeof prop - 1 && prop[i] != '\0') - c->isfloating = prop[i] == '1'; + if(i < sizeof buf - 1 && buf[i] != '\0') + c->isfloating = buf[i] == '1'; } return result; } @@ -249,11 +242,11 @@ manage(Window w, XWindowAttributes *wa) { if(t) for(i = 0; i < ntags; i++) c->tags[i] = t->tags[i]; - if(!loadprops(c)) + if(!getprops(c)) applyrules(c); if(!c->isfloating) c->isfloating = (rettrans == Success) || c->isfixed; - saveprops(c); + setprops(c); attach(c); attachstack(c); XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */ @@ -325,16 +318,16 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { } void -saveprops(Client *c) { +setprops(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'; + for(i = 0; i < ntags && i < sizeof buf - 1; i++) + buf[i] = c->tags[i] ? '1' : '0'; + if(i < sizeof buf - 1) + buf[i++] = c->isfloating ? '1' : '0'; + buf[i] = '\0'; XChangeProperty(dpy, c->win, dwmprops, XA_STRING, 8, - PropModeReplace, (unsigned char *)prop, i); + PropModeReplace, (unsigned char *)buf, i); } void @@ -424,27 +417,6 @@ updatesizehints(Client *c) { void updatetitle(Client *c) { - char **list = NULL; - int n; - XTextProperty name; - - name.nitems = 0; - c->name[0] = 0; - XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]); - if(!name.nitems) - XGetWMName(dpy, c->win, &name); - if(!name.nitems) - return; - if(name.encoding == XA_STRING) - strncpy(c->name, (char *)name.value, sizeof c->name - 1); - else { - if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success - && n > 0 && *list) - { - strncpy(c->name, *list, sizeof c->name - 1); - XFreeStringList(list); - } - } - c->name[sizeof c->name - 1] = '\0'; - XFree(name.value); + if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name)) + gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name); }