Commit c6a16524 authored by ipkiss's avatar ipkiss
Browse files

* modules/video_output/directx/events.c: added an "Always on top" entry

  in the system menu.
parent 9a6b90b8
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* events.c: Windows DirectX video output events handler * events.c: Windows DirectX video output events handler
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: events.c,v 1.1 2002/08/04 17:23:43 sam Exp $ * $Id: events.c,v 1.2 2002/10/01 20:43:35 ipkiss Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -244,6 +244,7 @@ static int DirectXCreateWindow( vout_thread_t *p_vout ) ...@@ -244,6 +244,7 @@ static int DirectXCreateWindow( vout_thread_t *p_vout )
RECT rect_window; RECT rect_window;
COLORREF colorkey; COLORREF colorkey;
HDC hdc; HDC hdc;
HMENU hMenu;
HICON vlc_icon = NULL; HICON vlc_icon = NULL;
char vlc_path[_MAX_PATH+1]; char vlc_path[_MAX_PATH+1];
...@@ -366,6 +367,11 @@ static int DirectXCreateWindow( vout_thread_t *p_vout ) ...@@ -366,6 +367,11 @@ static int DirectXCreateWindow( vout_thread_t *p_vout )
* We need to use SetWindowLongPtr when it is available in mingw */ * We need to use SetWindowLongPtr when it is available in mingw */
SetWindowLong( p_vout->p_sys->hwnd, GWL_USERDATA, (LONG)p_vout ); SetWindowLong( p_vout->p_sys->hwnd, GWL_USERDATA, (LONG)p_vout );
/* append a "Always On Top" entry in the system menu */
hMenu = GetSystemMenu( p_vout->p_sys->hwnd, FALSE );
AppendMenu( hMenu, MF_SEPARATOR, 0, "" );
AppendMenu( hMenu, MF_STRING | MF_UNCHECKED, IDM_TOGGLE_ON_TOP, "Always on &Top");
/* now display the window */ /* now display the window */
ShowWindow(p_vout->p_sys->hwnd, SW_SHOW); ShowWindow(p_vout->p_sys->hwnd, SW_SHOW);
...@@ -545,8 +551,34 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message, ...@@ -545,8 +551,34 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
{ {
case SC_SCREENSAVE: /* catch the screensaver */ case SC_SCREENSAVE: /* catch the screensaver */
case SC_MONITORPOWER: /* catch the monitor turn-off */ case SC_MONITORPOWER: /* catch the monitor turn-off */
msg_Dbg( p_vout, "WinProc WM_SYSCOMMAND" ); msg_Dbg( p_vout, "WinProc WM_SYSCOMMAND" );
return 0; /* this stops them from happening */ return 0; /* this stops them from happening */
case IDM_TOGGLE_ON_TOP: /* toggle the "on top" status */
{
HMENU hMenu = GetSystemMenu( hwnd , FALSE );
msg_Dbg( p_vout, "WinProc WM_SYSCOMMAND: IDM_TOGGLE_ON_TOP");
// Check if the window is already on top
if( GetWindowLong( hwnd, GWL_EXSTYLE ) & WS_EX_TOPMOST )
{
CheckMenuItem( hMenu, IDM_TOGGLE_ON_TOP,
MF_BYCOMMAND | MFS_UNCHECKED );
SetWindowPos( hwnd, HWND_NOTOPMOST,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOMOVE );
}
else
{
CheckMenuItem( hMenu, IDM_TOGGLE_ON_TOP,
MF_BYCOMMAND | MFS_CHECKED );
SetWindowPos( hwnd, HWND_TOPMOST,
0, 0, 0, 0,
SWP_NOSIZE | SWP_NOMOVE );
}
return 0;
break;
}
} }
break; break;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout.h: Windows DirectX video output header file * vout.h: Windows DirectX video output header file
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout.h,v 1.1 2002/08/04 17:23:43 sam Exp $ * $Id: vout.h,v 1.2 2002/10/01 20:43:35 ipkiss Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -110,3 +110,4 @@ void DirectXUpdateOverlay( vout_thread_t *p_vout ); ...@@ -110,3 +110,4 @@ void DirectXUpdateOverlay( vout_thread_t *p_vout );
* Constants * Constants
*****************************************************************************/ *****************************************************************************/
#define WM_VLC_HIDE_MOUSE WM_APP #define WM_VLC_HIDE_MOUSE WM_APP
#define IDM_TOGGLE_ON_TOP WM_USER + 1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment