[Mplayer-cvslog] CVS: main/Gui/skin skin.c,1.16,1.17

Zoltan Ponekker pontscho at mplayerhq.hu
Tue May 28 16:12:35 CEST 2002


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

Modified Files:
	skin.c 
Log Message:
add XShape support for gui's submenu

Index: skin.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/skin/skin.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- skin.c	28 May 2002 11:55:17 -0000	1.16
+++ skin.c	28 May 2002 14:12:33 -0000	1.17
@@ -160,19 +160,6 @@
     }
    mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin]  %d,%d %dx%d\n",defList->sub.x,defList->sub.y,defList->sub.width,defList->sub.height );
   }
-/*
- if ( !strcmp( winList,"eq" ) )
-  {
-   defList->eq.x=x;
-   defList->eq.y=y;
-   defList->eq.type=itBase;
-   strcpy( tmp,path ); strcat( tmp,fname );
-   if ( skinBPRead( tmp,&defList->eq.Bitmap ) ) return 1;
-   defList->eq.width=defList->eq.Bitmap.Width;
-   defList->eq.height=defList->eq.Bitmap.Height;
-   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin]  width: %d height: %d\n",defList->eq.width,defList->eq.height );
-  }
-*/
  if ( !strcmp( winList,"menu" ) )
   {
    defList->menuBase.type=itBase;
@@ -180,6 +167,22 @@
    if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1;
    defList->menuBase.width=defList->menuBase.Bitmap.Width;
    defList->menuBase.height=defList->menuBase.Bitmap.Height;
+   #ifdef HAVE_XSHAPE
+    Convert32to1( &defList->menuBase.Bitmap,&defList->menuBase.Mask,0x00ff00ff );
+#if 0
+    {
+     if ( defList->menuBase.Mask.Image != NULL )
+      {
+       txSample d;
+       Convert1to32( &defList->menuBase.Mask,&d );
+       tgaWriteTexture( "debug.tga",&d );
+      }
+    }
+#endif
+    mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin]  mask: %dx%d\n",defList->menuBase.Mask.Width,defList->menuBase.Mask.Height );
+   #else
+    defList->menuBase.Mask.Image=NULL;
+   #endif
    mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin]  width: %d height: %d\n",defList->menuBase.width,defList->menuBase.height );
   }
  return 0;




More information about the MPlayer-cvslog mailing list