[hackers] [tabbed][PATCH] Correct encodign detection for window properties

From: Nikita Zlobin <nick87720z_AT_gmail.com>
Date: Sat, 13 Jun 2020 23:14:36 +0500

Replacement for previous "Use utf8 for window properties".
Simple replacement of Xmb with Xutf8 stuff was too naive, since certain
xprop names have standartized type. For WM_NAME it's compound, not utf.
This patch adds more string type atoms from Xmu, as previous version did
not expect anything besides string & compound.
Rationale.
At least some desktop tools (non-mainstream) are in trouble with tabbed
own window name. At the moment of try I have only tint2 and rofi. First
just showes untitled, but second showes "Invalid encoding". But xfwm4 has
no problem with compound text names.

---
 tabbed.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tabbed.c b/tabbed.c
index eafe28a..c5cbbea 100644
--- a/tabbed.c
+++ b/tabbed.c
_AT_@ -50,6 +50,7 @@
 enum { ColFG, ColBG, ColLast };       /* color */
 enum { WMProtocols, WMDelete, WMName, WMState, WMFullscreen,
        XEmbed, WMSelectTab, WMLast }; /* default atoms */
+enum { StrCompound, StrUTF8, StrLast }; /* text style atoms */
 
 typedef union {
 	int i;
_AT_@ -160,6 +161,7 @@ static Bool running = True, nextfocus, doinitspawn = True,
 static Display *dpy;
 static DC dc;
 static Atom wmatom[WMLast];
+static Atom stratom[StrLast];
 static Window root, win;
 static Client **clients;
 static int nclients, sel = -1, lastsel = -1;
_AT_@ -616,7 +618,8 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size)
 
 	if (name.encoding == XA_STRING) {
 		strncpy(text, (char *)name.value, size - 1);
-	} else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
+	} else if (((name.encoding == stratom[StrCompound] && XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success) ||
+	            (name.encoding == stratom[StrUTF8]     && Xutf8TextPropertyToTextList(dpy, &name, &list, &n) >= Success))
 	           && n > 0 && *list) {
 		strncpy(text, *list, size - 1);
 		XFreeStringList(list);
_AT_@ -996,6 +999,9 @@ setup(void)
 	wmatom[WMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
 	wmatom[XEmbed] = XInternAtom(dpy, "_XEMBED", False);
 
+	stratom[StrCompound] = XInternAtom(dpy, "COMPOUND_TEXT", False);
+	stratom[StrUTF8] = XInternAtom(dpy, "UTF8_STRING", False);
+
 	/* init appearance */
 	wx = 0;
 	wy = 0;
_AT_@ -1257,9 +1263,13 @@ xsettitle(Window w, const char *str)
 {
 	XTextProperty xtp;
 
+	if (Xutf8TextListToTextProperty(dpy, (char **)&str, 1,
+	    XUTF8StringStyle, &xtp) == Success) {
+		XSetTextProperty(dpy, w, &xtp, wmatom[WMName]);
+		XFree(xtp.value);
+	}
 	if (XmbTextListToTextProperty(dpy, (char **)&str, 1,
 	    XCompoundTextStyle, &xtp) == Success) {
-		XSetTextProperty(dpy, w, &xtp, wmatom[WMName]);
 		XSetTextProperty(dpy, w, &xtp, XA_WM_NAME);
 		XFree(xtp.value);
 	}
-- 
2.26.2

Received on Sat Jun 13 2020 - 20:14:36 CEST