From d62c80d3bd462257c6ebdef6d0eefc9dc6d677b4 Mon Sep 17 00:00:00 2001 From: pontscho Date: Tue, 4 Sep 2001 15:21:00 +0000 Subject: fix xshape, mixer, fullscreen, etc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1853 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/wm/ws.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Gui/wm/ws.c') diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c index 101bdcd378..bfb828f785 100644 --- a/Gui/wm/ws.c +++ b/Gui/wm/ws.c @@ -1143,10 +1143,14 @@ void wsScreenSaverOff( Display * mDisplay ) 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 } -- cgit v1.2.3