summaryrefslogtreecommitdiffstats
path: root/libvo/x11_common.h
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2011-12-06 18:48:31 +0100
committerwm4 <wm4@mplayer2.org>2011-12-06 20:32:33 +0100
commit3df6dc718acc762df8f9fc5c44735aec795b7020 (patch)
tree350b6fd105d3a65532348e2729d33238c509718b /libvo/x11_common.h
parentd4de92e80897abb64dc8ccecb7823cbe291bb52d (diff)
downloadmpv-3df6dc718acc762df8f9fc5c44735aec795b7020.tar.bz2
mpv-3df6dc718acc762df8f9fc5c44735aec795b7020.tar.xz
x11: set window titles as UTF-8
Always set the X11 window title properties as UTF-8. This is a bit tricky for X11 window properties which are not specified to use UTF-8, such as WM_NAME. We also properly set WM_ICON_NAME, which means the window caption and the text used in the task bar (of the WM has one) will be the same on most window managers. Before this commit, WM_ICON_NAME was always hardcoded to "MPlayer", even if --title or --use-filename-title was used. Also update the window title only on reconfigure, like it is done in mplayer-svn commit 34380.
Diffstat (limited to 'libvo/x11_common.h')
-rw-r--r--libvo/x11_common.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index a4e5c56a8e..a8b13cc690 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -85,11 +85,14 @@ struct vo_x11_state {
Atom XA_NET_WM_STATE_STAYS_ON_TOP;
Atom XA_NET_WM_STATE_BELOW;
Atom XA_NET_WM_PID;
+ Atom XA_NET_WM_NAME;
+ Atom XA_NET_WM_ICON_NAME;
Atom XA_WIN_PROTOCOLS;
Atom XA_WIN_LAYER;
Atom XA_WIN_HINTS;
Atom XAWM_PROTOCOLS;
Atom XAWM_DELETE_WINDOW;
+ Atom XAUTF8_STRING;
};
#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV)