[MPlayer-cvslog] r33631 - in trunk/gui: mplayer/widgets.h wm/ws.c

[ib]

Author: ib
Date: Thu Jun 16 17:03:18 2011
New Revision: 33631

Log:
Use small icon for property KWM_WIN_ICON, if available.

This property will allow the window manager to select
from differently sized icons.

It is a preparation for this feature to come.

Modified:
   trunk/gui/mplayer/widgets.h
   trunk/gui/wm/ws.c

Modified: trunk/gui/mplayer/widgets.h
==============================================================================
--- trunk/gui/mplayer/widgets.h	Thu Jun 16 16:50:24 2011	(r33630)
+++ trunk/gui/mplayer/widgets.h	Thu Jun 16 17:03:18 2011	(r33631)
@@ -55,6 +55,8 @@ extern char *sbMPlayerDirInHome;
 extern char *sbMPlayerPrefixDir;
 
 typedef struct {
+    Pixmap small;
+    Pixmap small_mask;
     Pixmap normal;
     Pixmap normal_mask;
     int collection_size;

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Jun 16 16:50:24 2011	(r33630)
+++ trunk/gui/wm/ws.c	Thu Jun 16 17:03:18 2011	(r33631)
@@ -1550,8 +1550,8 @@ void wsSetIcon(Display *dsp, Window win,
     XFree(wm);
 
     iconatom = XInternAtom(dsp, "KWM_WIN_ICON", False);
-    data[0]  = icon->normal;
-    data[1]  = icon->normal_mask;
+    data[0]  = (icon->small ? icon->small : icon->normal);
+    data[1]  = (icon->small ? icon->small_mask : icon->normal_mask);
 
     XChangeProperty(dsp, win, iconatom, iconatom, 32, PropModeReplace, (unsigned char *)data, 2);