- add icon (nice, but very ugly hakk:)

- move all window to one group
- better multilanguage support
- some small bug fixed
- some warning fixed
- swap the two menu
- fix small network playing bug ( evPlay instead of evPlayNetwork :)
- add channel name selection for equalizer support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6652 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 24 insertions, 0 deletions

diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index 427549ede9..1441f4e82d 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -1292,4 +1292,27 @@ void wsSetShape( wsTWindow * win,char * data )
 #endif
 }
 
+void wsSetIcon( Display * dsp,Window win,Pixmap icon,Pixmap mask )
+{
+ XWMHints * wm;
+ long	    data[2];
+ Atom	    iconatom;
+ 
+ wm=XGetWMHints( dsp,win );
+ if ( !wm ) wm=XAllocWMHints();
+
+ wm->icon_pixmap=icon;
+ wm->icon_mask=mask;
+ wm->flags|=IconPixmapHint | IconMaskHint;
+
+ XSetWMHints( dsp,win,wm );
+
+ data[0]=icon;
+ data[1]=mask;
+ iconatom=XInternAtom( dsp,"KWM_WIN_ICON",0 );
+ XChangeProperty( dsp,win,iconatom,iconatom,32,PropModeReplace,(unsigned char *)data,2 );
+ 
+ XFree( wm );
+}
+
 #include "wsmkeys.h"
diff --git a/Gui/wm/ws.h b/Gui/wm/ws.h
index e4d7b485d5..4dc14ad4f0 100644
--- a/Gui/wm/ws.h
+++ b/Gui/wm/ws.h
@@ -232,6 +232,7 @@ extern void wsSetLayer( Display * wsDisplay,Window win, int layer );
 extern void wsFullScreen( wsTWindow * win );
 extern void wsPostRedisplay( wsTWindow * win );
 extern void wsSetShape( wsTWindow * win,char * data );
+extern void wsSetIcon( Display * dsp,Window win,Pixmap icon,Pixmap mask );
 
 // ----------------------------------------------------------------------------------------------
 //    Draw string at x,y with fc ( foreground color ) and bc ( background color ).