[Mplayer-cvslog] CVS: main/Gui/mplayer menu.h,1.13,1.14 play.c,1.64,1.65

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var/tmp.root/cvs-serv32643/Gui/mplayer

Modified Files:
	menu.h play.c 
Log Message:
add XShape support for gui's submenu

Index: menu.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/menu.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- menu.h	23 May 2002 14:46:06 -0000	1.13
+++ menu.h	28 May 2002 14:12:32 -0000	1.14
@@ -80,6 +80,7 @@
 
  wsMoveWindow( &appMPlayer.menuWindow,False,x,y );
  wsMoveTopWindow( wsDisplay,appMPlayer.menuWindow.WindowID );
+ wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,1 );
  mplMenuRender=1;
  wsVisibleWindow( &appMPlayer.menuWindow,wsShowWindow );
  wsPostRedisplay( &appMPlayer.menuWindow );
@@ -131,6 +132,8 @@
  wsCreateWindow( &appMPlayer.menuWindow,
  appMPlayer.menuBase.x,appMPlayer.menuBase.y,appMPlayer.menuBase.width,appMPlayer.menuBase.height,
  wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,"MPlayer menu" );
+
+ wsSetShape( &appMPlayer.menuWindow,appMPlayer.menuBase.Mask.Image );
 
  #ifdef DEBUG
   mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu.h] menu: 0x%x\n",(int)appMPlayer.menuWindow.WindowID );

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- play.c	28 May 2002 12:54:57 -0000	1.64
+++ play.c	28 May 2002 14:12:32 -0000	1.65
@@ -182,6 +182,7 @@
     { mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_NEMDB ); return; }
    wsResizeWindow( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
    wsResizeImage( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
+   wsSetShape( &appMPlayer.menuWindow,appMPlayer.menuBase.Mask.Image );
    wsVisibleWindow( &appMPlayer.menuWindow,wsHideWindow );
   }