[Mplayer-cvslog] CVS: main/libvo vo_directx.c,1.33,1.34

[Joey Parrish CVS]

CVS change done by Joey Parrish CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv23215/libvo

Modified Files:
	vo_directx.c 
Log Message:
added -rootwin support to vo_directx
updated all man pages except chinese
also added mention of vo_quartz's rootwin to man pages where it was missing


Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vo_directx.c	19 Jul 2004 23:19:50 -0000	1.33
+++ vo_directx.c	22 Aug 2004 18:57:45 -0000	1.34
@@ -69,6 +69,7 @@
 extern int vo_fs;
 extern int vo_directrendering;
 extern int vo_ontop;
+extern int vo_rootwin;
 extern int vidmode;
 
 /*****************************************************************************
@@ -600,9 +601,9 @@
           RECT rdw=rd;
           AdjustWindowRect(&rdw,WS_OVERLAPPEDWINDOW|WS_SIZEBOX,FALSE);
 //          printf("window: %i %i %ix%i\n",rdw.left,rdw.top,rdw.right - rdw.left,rdw.bottom - rdw.top);      
-          SetWindowPos(hWnd,(vo_ontop)?HWND_TOPMOST:HWND_NOTOPMOST,rdw.left,rdw.top,rdw.right-rdw.left,rdw.bottom-rdw.top,SWP_NOOWNERZORDER); 
+          SetWindowPos(hWnd,(vo_ontop)?HWND_TOPMOST:(vo_rootwin?HWND_BOTTOM:HWND_NOTOPMOST),rdw.left,rdw.top,rdw.right-rdw.left,rdw.bottom-rdw.top,SWP_NOOWNERZORDER); 
     }
-    else SetWindowPos(hWndFS,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_NOOWNERZORDER);
+    else SetWindowPos(hWndFS,vo_rootwin?HWND_BOTTOM:HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_NOOWNERZORDER);
 
   	/*for nonoverlay mode we are finished, for overlay mode we have to display the overlay first*/
 	if(nooverlay)return 0;
@@ -1267,8 +1268,18 @@
 			}
 	        else
 			{
-			    if(!vo_fs){vo_fs=1;ShowWindow(hWndFS,SW_SHOW);}  
-                else {vo_fs=0; ShowWindow(hWndFS,SW_HIDE);}  
+			    if(!vo_fs)
+				{
+					vo_fs=1;
+					ShowWindow(hWndFS,SW_SHOW);
+					ShowWindow(hWnd,SW_HIDE);
+				}
+                else
+				{
+					vo_fs=0;
+					ShowWindow(hWndFS,SW_HIDE);
+					ShowWindow(hWnd,SW_SHOW);
+				}  
 				Directx_ManageDisplay();
                 break;				
 			}