Mercurial > mplayer.hg

diff Gui/wm/ws.c @ 1852:58dd326fcc4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix xshape, mixer, fullscreen, etc
author pontscho
date Tue, 04 Sep 2001 15:21:00 +0000
parents 62b8e85865a2
children f380ebc3ba89
line wrap: on
line diff
--- a/Gui/wm/ws.c	Mon Sep 03 16:32:03 2001 +0000
+++ b/Gui/wm/ws.c	Tue Sep 04 15:21:00 2001 +0000
@@ -1143,10 +1143,14 @@
 void wsSetShape( wsTWindow * win,char * data )
 {
 #ifdef HAVE_XSHAPE
- if ( ( !wsUseXShape )||( !data ) ) return;
- win->Mask=XCreateBitmapFromData( wsDisplay,win->WindowID,data,win->Width,win->Height );
- XShapeCombineMask( wsDisplay,win->WindowID,ShapeBounding,0,0,win->Mask,ShapeSet );
- XFreePixmap( wsDisplay,win->Mask );
+ if ( !wsUseXShape ) return;
+ if ( data )
+  {
+   win->Mask=XCreateBitmapFromData( wsDisplay,win->WindowID,data,win->Width,win->Height );
+   XShapeCombineMask( wsDisplay,win->WindowID,ShapeBounding,0,0,win->Mask,ShapeSet );
+   XFreePixmap( wsDisplay,win->Mask );
+  }
+  else XShapeCombineMask( wsDisplay,win->WindowID,ShapeBounding,0,0,None,ShapeSet );
 #endif
 }