[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.65,1.66

[Filip Kalinski CVS]

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

Modified Files:
	ws.c 
Log Message:
- 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=<number>
- simplify vo_x11_fullscreen
- fs change code cleanup


Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ws.c	17 Jan 2003 22:39:42 -0000	1.65
+++ ws.c	7 Feb 2003 19:38:20 -0000	1.66
@@ -738,18 +738,12 @@
 #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 @@
  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 );