From: Tiago Cunha <tcunha@gmx.com>
Date: Sat, 12 May 2012 20:52:20 +0000 (+0100)
Subject: Reuse class hint in the status-bar.
X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;h=3ce4ba02b4120821833b08ca9f7829c6b723c3e4;p=spectrwm.git

Reuse class hint in the status-bar.

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.
---

diff --git a/spectrwm.c b/spectrwm.c
index d88c1fb..796153b 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -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