hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-04 17:31:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reuse class hint in the status-bar.

Browse source 
The window's class hint is already retrieved by the manage_window
function, which is called when a new application is spawned. Therefore,
use it when displaying the application's class and name, instead of
fetching them again with XGetClassHint(3).

Besides, its error checking was incorrect, since it also returns zero on
error.
This commit is contained in:
Tiago Cunha 2012-05-12 21:52:20 +01:00
parent 21a44b58c7
commit 3ce4ba02b4
1 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
spectrwm.c
View file

@ -1353,32 +1353,24 @@ void
bar_class_name(char *s, ssize_t sz, struct ws_win *cur_focus)
{
int do_class, do_name;
Status status;
XClassHint *xch = NULL;
XClassHint *ch;
if ((title_name_enabled == 1 || title_class_enabled == 1) &&
cur_focus != NULL) {
if ((xch = XAllocClassHint()) == NULL)
goto out;
status = XGetClassHint(display, cur_focus->id, xch);
if (status == BadWindow || status == BadAlloc)
goto out;
do_class = (title_class_enabled && xch->res_class != NULL);
do_name = (title_name_enabled && xch->res_name != NULL);
if (do_class)
strlcat(s, xch->res_class, sz);
if (do_class && do_name)
strlcat(s, ":", sz);
if (do_name)
strlcat(s, xch->res_name, sz);
strlcat(s, " ", sz);
}
out:
if (xch) {
XFree(xch->res_name);
XFree(xch->res_class);
XFree(xch);
}
if (title_name_enabled == 0 && title_class_enabled == 0)
return;
if (cur_focus == NULL)
return;
ch = &cur_focus->ch;
do_class = (title_class_enabled && ch->res_class != NULL);
do_name = (title_name_enabled && ch->res_name != NULL);
if (do_class)
strlcat(s, ch->res_class, sz);
if (do_class && do_name)
strlcat(s, ":", sz);
if (do_name)
strlcat(s, ch->res_name, sz);
strlcat(s, " ", sz);
}
void