diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-04 15:21:00 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-04 15:21:00 +0000 |
| commit | d62c80d3bd462257c6ebdef6d0eefc9dc6d677b4 (patch) | |
| tree | 50c548107999d8a45ce6cf46fdf3cb226686fec9 /Gui/wm | |
| parent | 8ecd9ea9064d81eb2147f2aa22df863619fcefb5 (diff) | |
| download | mpv-d62c80d3bd462257c6ebdef6d0eefc9dc6d677b4.tar.bz2 mpv-d62c80d3bd462257c6ebdef6d0eefc9dc6d677b4.tar.xz | |
fix xshape, mixer, fullscreen, etc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1853 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/wm')
| -rw-r--r-- | Gui/wm/ws.c | 12 |
1 files changed, 8 insertions, 4 deletions
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 } |