From a3385947b2140bda6fb85d1db5f3cea11aacb58c Mon Sep 17 00:00:00 2001 From: filon Date: Fri, 7 Feb 2003 19:38:39 +0000 Subject: - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen - help (-fstype help) also availabible - support state BELOW (someone may want to use it...) and by -fstype none forcing of not changing window layer (user request) - drop icelayer option, it can be set by -fstype layer= - simplify vo_x11_fullscreen - fs change code cleanup git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9318 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/wm/ws.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'Gui/wm') diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c index 277452410d..e6fef14c0e 100644 --- a/Gui/wm/ws.c +++ b/Gui/wm/ws.c @@ -738,18 +738,12 @@ void wsFullScreen( wsTWindow * win ) #endif } - if ( net_wm_support != SUPPORT_FULLSCREEN || metacity_hack == 1 ) - { - vo_x11_decoration( wsDisplay,win->WindowID,decoration ); - vo_x11_sizehint( win->X,win->Y,win->Width,win->Height,0 ); - } + vo_x11_decoration( wsDisplay,win->WindowID,decoration ); + vo_x11_sizehint( win->X,win->Y,win->Width,win->Height,0 ); vo_x11_setlayer( wsDisplay,win->WindowID,win->isFullScreen ); - if ( net_wm_support != SUPPORT_FULLSCREEN || metacity_hack == 1 ) - { - if ( vo_wm_type == vo_wm_Unknown && !(vo_fsmode&16) ) - XWithdrawWindow( wsDisplay,win->WindowID,wsScreen ); - XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height ); - } + if ( vo_wm_type == 0 && !(vo_fsmode&16) ) + XWithdrawWindow( wsDisplay,win->WindowID,wsScreen ); + XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height ); XMapRaised( wsDisplay,win->WindowID ); XRaiseWindow( wsDisplay,win->WindowID ); XFlush( wsDisplay ); @@ -860,7 +854,7 @@ void wsResizeWindow( wsTWindow * win,int sx, int sy ) win->SizeHint.win_gravity=StaticGravity; win->SizeHint.base_width=sx; win->SizeHint.base_height=sy; - if ( vo_wm_type == vo_wm_Unknown ) XUnmapWindow( wsDisplay,win->WindowID ); + if ( vo_wm_type == 0 ) XUnmapWindow( wsDisplay,win->WindowID ); XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint ); XResizeWindow( wsDisplay,win->WindowID,sx,sy ); -- cgit v1.2.3