aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorPavel Vaynerman <pv@etersoft.ru>2018-06-09 14:11:34 +0300
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-08-22 15:20:48 +0200
commit643e13bf3de6704f634d60342b738e0002f057b9 (patch)
treed397d26fa5bc5bd58e551c7a96cbd4cf55e2ba39 /nx-X11/programs/Xserver/hw
parent489c17313090b58b5a4f898a47f23d50372923f2 (diff)
downloadnx-libs-643e13bf3de6704f634d60342b738e0002f057b9.tar.gz
nx-libs-643e13bf3de6704f634d60342b738e0002f057b9.tar.bz2
nx-libs-643e13bf3de6704f634d60342b738e0002f057b9.zip
fix window title encoding (use utf8) for nxagent
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 6eae711f5..26d46b5cc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -441,8 +441,8 @@ Window nxagentCreateIconWindow(void)
}
}
- XSetWMProperties(nxagentDisplay, w,
- &windowName, &windowName,
+ Xutf8SetWMProperties(nxagentDisplay, w,
+ window_name, window_name,
NULL , 0 , sizeHints, wmHints, NULL);
if (sizeHints)
@@ -867,6 +867,9 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
int defaultVisualIndex = 0;
+ XTextProperty xtpWmName;
+ char* wmName = nxagentWindowName;
+
#ifdef TEST
fprintf(stderr, "nxagentOpenScreen: Called for screen index [%d].\n",
pScreen->myNum);
@@ -1910,6 +1913,9 @@ N/A
nxagentIconPixmap,
argv, argc, sizeHints);
+ if (Xutf8TextListToTextProperty(nxagentDisplay, &wmName, 1, XCompoundTextStyle, &xtpWmName) >= Success)
+ XSetWMName(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &xtpWmName);
+
if (sizeHints)
XFree(sizeHints);