diff options
| author | joey <joey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-22 18:57:45 +0000 |
|---|---|---|
| committer | joey <joey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-22 18:57:45 +0000 |
| commit | 66dd2d906d3cf5aa3be03dce27c8f36894fb233c (patch) | |
| tree | 4c73a30107155b328ca70173df1a0b15c14c40d7 /libvo | |
| parent | 1b8e3babb84d8b5619e7eeae3c84276614ba5958 (diff) | |
| download | mpv-66dd2d906d3cf5aa3be03dce27c8f36894fb233c.tar.bz2 mpv-66dd2d906d3cf5aa3be03dce27c8f36894fb233c.tar.xz | |
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13091 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_directx.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index d889096855..d128a5def5 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -69,6 +69,7 @@ extern int vo_doublebuffering; //tribblebuffering extern int vo_fs; extern int vo_directrendering; extern int vo_ontop; +extern int vo_rootwin; extern int vidmode; /***************************************************************************** @@ -600,9 +601,9 @@ static uint32_t Directx_ManageDisplay() 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 @@ static uint32_t control(uint32_t request, void *data, ...) } 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; } |