summaryrefslogtreecommitdiffstats
path: root/video/out/x11_common.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-01 23:26:44 +0200
committerwm4 <wm4@nowhere>2013-09-01 23:27:33 +0200
commita5183a761c4456cbbd0d14e44f2136d476ab9eed (patch)
tree54f51092a593ac4c946bbc24fa784393a8a50542 /video/out/x11_common.h
parent71335183ecff94e3991c1835c301357a8ab27030 (diff)
downloadmpv-a5183a761c4456cbbd0d14e44f2136d476ab9eed.tar.bz2
mpv-a5183a761c4456cbbd0d14e44f2136d476ab9eed.tar.xz
x11: add window icon
The png file added to etc/ are taken from the link mentioned in commit 303096b, except that they have been converted to 16 bit, sRGB (with color profile info dropped, if there was one), and transparent pixels reset for better compression. The file x11_icon.bin is generated by gen-x11-icon.sh. I'm adding it to the git repo directly, because the script requires ImageMagick, and we don't want to make building even more complicated. The way how this is done is basically a compromise between effort required in x11_common.c and in gen-x11-icon.sh. Ideally, x11_icon.bin would be directly in the format as required by _NET_WM_ICON, but trying to write the binary width/height values from shell would probably be a nightmare, so here we go. The zlib code in x11_common.c is lifted from demux_mkv.c, with some modifications (like accepting a gzip header, because I don't know how to make gzip write raw compressed data).
Diffstat (limited to 'video/out/x11_common.h')
-rw-r--r--video/out/x11_common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index 53ca553a72..c2735ad82f 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -117,6 +117,7 @@ struct vo_x11_state {
Atom XA_NET_WM_PID;
Atom XA_NET_WM_NAME;
Atom XA_NET_WM_ICON_NAME;
+ Atom XA_NET_WM_ICON;
Atom XA_WIN_PROTOCOLS;
Atom XA_WIN_LAYER;
Atom XA_WIN_HINTS;