Skip to content

V
vlc-2-2
Commit a66bbe1e authored by Erwan Tulou's avatar Erwan Tulou
Browse files
Options

skins(Win32): Process events in the winProc (instead of the message loop) 

Events like WM_PAINT should be processed in the WinProc, because
some functions directly call the WinProc (e.g UpdateWindow())
parent a38c6d0f
Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 161 deletions
modules/gui/skins2/win32/win32_factory.cpp
View file @ a66bbe1e
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
#define MY_WM_TRAYACTION (WM_APP + 1) #define MY_WM_TRAYACTION (WM_APP + 1)
LRESULT CALLBACK Win32Proc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) LRESULT CALLBACK Win32Factory::Win32Proc( HWND hwnd, UINT uMsg,
WPARAM wParam, LPARAM lParam )
{ {
// Get pointer to thread info: should only work with the parent window // Get pointer to thread info: should only work with the parent window
intf_thread_t *p_intf = (intf_thread_t *)GetWindowLongPtr( hwnd, intf_thread_t *p_intf = (intf_thread_t *)GetWindowLongPtr( hwnd,
...@@ -58,6 +59,7 @@ LRESULT CALLBACK Win32Proc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) ...@@ -58,6 +59,7 @@ LRESULT CALLBACK Win32Proc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
} }
Win32Factory *pFactory = (Win32Factory*)Win32Factory::instance( p_intf ); Win32Factory *pFactory = (Win32Factory*)Win32Factory::instance( p_intf );
GenericWindow *pWin = pFactory->m_windowMap[hwnd];
if( hwnd == pFactory->getParentWindow() ) if( hwnd == pFactory->getParentWindow() )
{ {
...@@ -92,19 +94,29 @@ LRESULT CALLBACK Win32Proc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) ...@@ -92,19 +94,29 @@ LRESULT CALLBACK Win32Proc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
p_intf->p_sys->p_theme->getWindowManager().raiseAll(); p_intf->p_sys->p_theme->getWindowManager().raiseAll();
CmdDlgHidePopupMenu aCmdPopup( p_intf ); CmdDlgHidePopupMenu aCmdPopup( p_intf );
aCmdPopup.execute(); aCmdPopup.execute();
return 0;
} }
else if( (UINT)lParam == WM_RBUTTONDOWN ) else if( (UINT)lParam == WM_RBUTTONDOWN )
{ {
CmdDlgShowPopupMenu aCmdPopup( p_intf ); CmdDlgShowPopupMenu aCmdPopup( p_intf );
aCmdPopup.execute(); aCmdPopup.execute();
return 0;
} }
else if( (UINT)lParam == WM_LBUTTONDBLCLK ) else if( (UINT)lParam == WM_LBUTTONDBLCLK )
{ {
CmdRestore aCmdRestore( p_intf ); CmdRestore aCmdRestore( p_intf );
aCmdRestore.execute(); aCmdRestore.execute();
return 0;
} }
} }
} }
else if( pWin )
{
Win32Loop* pLoop =
(Win32Loop*) OSFactory::instance( p_intf )->getOSLoop();
if( pLoop )
return pLoop->processEvent( hwnd, uMsg, wParam, lParam );
}
// If hwnd does not match any window or message not processed // If hwnd does not match any window or message not processed
return DefWindowProc( hwnd, uMsg, wParam, lParam ); return DefWindowProc( hwnd, uMsg, wParam, lParam );
...@@ -131,7 +143,7 @@ bool Win32Factory::init() ...@@ -131,7 +143,7 @@ bool Win32Factory::init()
// Create window class // Create window class
WNDCLASS skinWindowClass; WNDCLASS skinWindowClass;
skinWindowClass.style = CS_DBLCLKS; skinWindowClass.style = CS_DBLCLKS;
skinWindowClass.lpfnWndProc = (WNDPROC) Win32Proc; skinWindowClass.lpfnWndProc = (WNDPROC)Win32Factory::Win32Proc;
skinWindowClass.lpszClassName = _T("SkinWindowClass"); skinWindowClass.lpszClassName = _T("SkinWindowClass");
skinWindowClass.lpszMenuName = NULL; skinWindowClass.lpszMenuName = NULL;
skinWindowClass.cbClsExtra = 0; skinWindowClass.cbClsExtra = 0;
...@@ -325,7 +337,6 @@ OSPopup *Win32Factory::createOSPopup() ...@@ -325,7 +337,6 @@ OSPopup *Win32Factory::createOSPopup()
int Win32Factory::getScreenWidth() const int Win32Factory::getScreenWidth() const
{ {
return GetSystemMetrics(SM_CXSCREEN); return GetSystemMetrics(SM_CXSCREEN);
} }
......
modules/gui/skins2/win32/win32_factory.hpp
View file @ a66bbe1e
...@@ -118,6 +118,10 @@ public: ...@@ -118,6 +118,10 @@ public:
HWND getParentWindow() { return m_hParentWindow; } HWND getParentWindow() { return m_hParentWindow; }
/// Callback function (Windows Procedure)
static LRESULT CALLBACK Win32Proc( HWND hwnd, UINT uMsg,
WPARAM wParam, LPARAM lParam );
private: private:
/// Handle of the instance /// Handle of the instance
HINSTANCE m_hInst; HINSTANCE m_hInst;
......
modules/gui/skins2/win32/win32_loop.cpp
View file @ a66bbe1e
...@@ -119,38 +119,40 @@ void Win32Loop::run() ...@@ -119,38 +119,40 @@ void Win32Loop::run()
// Compute windows message list // Compute windows message list
while( GetMessage( &msg, NULL, 0, 0 ) ) while( GetMessage( &msg, NULL, 0, 0 ) )
{ {
Win32Factory *pFactory = TranslateMessage( &msg );
(Win32Factory*)Win32Factory::instance( getIntf() );
GenericWindow *pWin = pFactory->m_windowMap[msg.hwnd];
if( pWin == NULL )
{
// We are probably getting a message for a tooltip (which has no
// associated GenericWindow), for a timer, or for the parent window
DispatchMessage( &msg ); DispatchMessage( &msg );
continue;
} }
}
LRESULT CALLBACK Win32Loop::processEvent( HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam )
{
Win32Factory *pFactory =
(Win32Factory*)Win32Factory::instance( getIntf() );
GenericWindow *pWin = pFactory->m_windowMap[hwnd];
GenericWindow &win = *pWin; GenericWindow &win = *pWin;
switch( msg.message ) switch( msg )
{ {
case WM_PAINT: case WM_PAINT:
{ {
PAINTSTRUCT Infos; PAINTSTRUCT Infos;
BeginPaint( msg.hwnd, &Infos ); BeginPaint( hwnd, &Infos );
EvtRefresh evt( getIntf(), EvtRefresh evt( getIntf(),
Infos.rcPaint.left, Infos.rcPaint.left,
Infos.rcPaint.top, Infos.rcPaint.top,
Infos.rcPaint.right - Infos.rcPaint.left + 1, Infos.rcPaint.right - Infos.rcPaint.left + 1,
Infos.rcPaint.bottom - Infos.rcPaint.top + 1 ); Infos.rcPaint.bottom - Infos.rcPaint.top + 1 );
EndPaint( msg.hwnd, &Infos );
win.processEvent( evt ); win.processEvent( evt );
break; EndPaint( hwnd, &Infos );
return 0;
} }
case WM_COMMAND: case WM_COMMAND:
{ {
EvtMenu evt( getIntf(), LOWORD( msg.wParam ) ); EvtMenu evt( getIntf(), LOWORD( wParam ) );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
{ {
...@@ -158,29 +160,29 @@ void Win32Loop::run() ...@@ -158,29 +160,29 @@ void Win32Loop::run()
TRACKMOUSEEVENT TrackEvent; TRACKMOUSEEVENT TrackEvent;
TrackEvent.cbSize = sizeof( TRACKMOUSEEVENT ); TrackEvent.cbSize = sizeof( TRACKMOUSEEVENT );
TrackEvent.dwFlags = TME_LEAVE; TrackEvent.dwFlags = TME_LEAVE;
TrackEvent.hwndTrack = msg.hwnd; TrackEvent.hwndTrack = hwnd;
TrackEvent.dwHoverTime = 1; TrackEvent.dwHoverTime = 1;
TrackMouseEvent( &TrackEvent ); TrackMouseEvent( &TrackEvent );
// Compute the absolute position of the mouse // Compute the absolute position of the mouse
int x = GET_X_LPARAM( msg.lParam ) + win.getLeft(); int x = GET_X_LPARAM( lParam ) + win.getLeft();
int y = GET_Y_LPARAM( msg.lParam ) + win.getTop(); int y = GET_Y_LPARAM( lParam ) + win.getTop();
EvtMotion evt( getIntf(), x, y ); EvtMotion evt( getIntf(), x, y );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_MOUSELEAVE: case WM_MOUSELEAVE:
{ {
EvtLeave evt( getIntf() ); EvtLeave evt( getIntf() );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
{ {
int x = GET_X_LPARAM( msg.lParam ) - win.getLeft(); int x = GET_X_LPARAM( lParam ) - win.getLeft();
int y = GET_Y_LPARAM( msg.lParam ) - win.getTop(); int y = GET_Y_LPARAM( lParam ) - win.getTop();
int mod = getMod( msg.wParam ); int mod = getMod( wParam );
if( GET_WHEEL_DELTA_WPARAM( msg.wParam ) > 0 ) if( GET_WHEEL_DELTA_WPARAM( wParam ) > 0 )
{ {
EvtScroll evt( getIntf(), x, y, EvtScroll::kUp, mod ); EvtScroll evt( getIntf(), x, y, EvtScroll::kUp, mod );
win.processEvent( evt ); win.processEvent( evt );
...@@ -190,61 +192,61 @@ void Win32Loop::run() ...@@ -190,61 +192,61 @@ void Win32Loop::run()
EvtScroll evt( getIntf(), x, y, EvtScroll::kDown, mod ); EvtScroll evt( getIntf(), x, y, EvtScroll::kDown, mod );
win.processEvent( evt ); win.processEvent( evt );
} }
break; return 0;
} }
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
{ {
SetCapture( msg.hwnd ); SetCapture( hwnd );
EvtMouse evt( getIntf(), GET_X_LPARAM( msg.lParam ), EvtMouse evt( getIntf(), GET_X_LPARAM( lParam ),
GET_Y_LPARAM( msg.lParam ), EvtMouse::kLeft, GET_Y_LPARAM( lParam ), EvtMouse::kLeft,
EvtMouse::kDown, getMod( msg.wParam ) ); EvtMouse::kDown, getMod( wParam ) );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
{ {
SetCapture( msg.hwnd ); SetCapture( hwnd );
EvtMouse evt( getIntf(), GET_X_LPARAM( msg.lParam ), EvtMouse evt( getIntf(), GET_X_LPARAM( lParam ),
GET_Y_LPARAM( msg.lParam ), EvtMouse::kRight, GET_Y_LPARAM( lParam ), EvtMouse::kRight,
EvtMouse::kDown, getMod( msg.wParam ) ); EvtMouse::kDown, getMod( wParam ) );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_LBUTTONUP: case WM_LBUTTONUP:
{ {
ReleaseCapture(); ReleaseCapture();
EvtMouse evt( getIntf(), GET_X_LPARAM( msg.lParam ), EvtMouse evt( getIntf(), GET_X_LPARAM( lParam ),
GET_Y_LPARAM( msg.lParam ), EvtMouse::kLeft, GET_Y_LPARAM( lParam ), EvtMouse::kLeft,
EvtMouse::kUp, getMod( msg.wParam ) ); EvtMouse::kUp, getMod( wParam ) );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_RBUTTONUP: case WM_RBUTTONUP:
{ {
ReleaseCapture(); ReleaseCapture();
EvtMouse evt( getIntf(), GET_X_LPARAM( msg.lParam ), EvtMouse evt( getIntf(), GET_X_LPARAM( lParam ),
GET_Y_LPARAM( msg.lParam ), EvtMouse::kRight, GET_Y_LPARAM( lParam ), EvtMouse::kRight,
EvtMouse::kUp, getMod( msg.wParam ) ); EvtMouse::kUp, getMod( wParam ) );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_LBUTTONDBLCLK: case WM_LBUTTONDBLCLK:
{ {
ReleaseCapture(); ReleaseCapture();
EvtMouse evt( getIntf(), GET_X_LPARAM( msg.lParam ), EvtMouse evt( getIntf(), GET_X_LPARAM( lParam ),
GET_Y_LPARAM( msg.lParam ), EvtMouse::kLeft, GET_Y_LPARAM( lParam ), EvtMouse::kLeft,
EvtMouse::kDblClick, getMod( msg.wParam ) ); EvtMouse::kDblClick, getMod( wParam ) );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_RBUTTONDBLCLK: case WM_RBUTTONDBLCLK:
{ {
ReleaseCapture(); ReleaseCapture();
EvtMouse evt( getIntf(), GET_X_LPARAM( msg.lParam ), EvtMouse evt( getIntf(), GET_X_LPARAM( lParam ),
GET_Y_LPARAM( msg.lParam ), EvtMouse::kRight, GET_Y_LPARAM( lParam ), EvtMouse::kRight,
EvtMouse::kDblClick, getMod( msg.wParam ) ); EvtMouse::kDblClick, getMod( wParam ) );
win.processEvent( evt ); win.processEvent( evt );
break; return 0;
} }
case WM_KEYDOWN: case WM_KEYDOWN:
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
...@@ -256,11 +258,11 @@ void Win32Loop::run() ...@@ -256,11 +258,11 @@ void Win32Loop::run()
// the modifier keys. // the modifier keys.
// Get VLC key code from the virtual key code // Get VLC key code from the virtual key code
int key = virtKeyToVlcKey[msg.wParam]; int key = virtKeyToVlcKey[wParam];
if( !key ) if( !key )
{ {
// This appears to be a "normal" (ascii) key // This appears to be a "normal" (ascii) key
key = tolower( MapVirtualKey( msg.wParam, 2 ) ); key = tolower( MapVirtualKey( wParam, 2 ) );
} }
if( key ) if( key )
...@@ -282,8 +284,8 @@ void Win32Loop::run() ...@@ -282,8 +284,8 @@ void Win32Loop::run()
// Get the state // Get the state
EvtKey::ActionType_t state; EvtKey::ActionType_t state;
if( msg.message == WM_KEYDOWN || if( msg == WM_KEYDOWN ||
msg.message == WM_SYSKEYDOWN ) msg == WM_SYSKEYDOWN )
{ {
state = EvtKey::kDown; state = EvtKey::kDown;
} }
...@@ -295,13 +297,12 @@ void Win32Loop::run() ...@@ -295,13 +297,12 @@ void Win32Loop::run()
EvtKey evt( getIntf(), key, state, mod ); EvtKey evt( getIntf(), key, state, mod );
win.processEvent( evt ); win.processEvent( evt );
} }
break; return 0;
} }
default: default:
TranslateMessage( &msg ); break;
DispatchMessage( &msg );
}
} }
return DefWindowProc( hwnd, msg, wParam, lParam );;
} }
......
modules/gui/skins2/win32/win32_loop.hpp
View file @ a66bbe1e
...@@ -48,6 +48,10 @@ public: ...@@ -48,6 +48,10 @@ public:
/// Exit the main loop /// Exit the main loop
virtual void exit(); virtual void exit();
/// called by the window procedure callback
virtual LRESULT CALLBACK processEvent( HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam );
private: private:
// Private because it is a singleton // Private because it is a singleton
Win32Loop( intf_thread_t *pIntf ); Win32Loop( intf_thread_t *pIntf );
......
modules/gui/skins2/win32/win32_window.cpp
View file @ a66bbe1e
...@@ -69,8 +69,10 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow, ...@@ -69,8 +69,10 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow,
m_hWnd = CreateWindowEx( WS_EX_APPWINDOW, "SkinWindowClass", m_hWnd = CreateWindowEx( WS_EX_APPWINDOW, "SkinWindowClass",
"default name", WS_POPUP | WS_CLIPCHILDREN, "default name", WS_POPUP | WS_CLIPCHILDREN,
0, 0, 0, 0, NULL, 0, hInst, NULL ); 0, 0, 0, 0, NULL, 0, hInst, NULL );
}
// Store with it a pointer to the interface thread
SetWindowLongPtr( m_hWnd, GWLP_USERDATA, (LONG_PTR)getIntf() );
}
else else
{ {
// top-level window (owned by the root window) // top-level window (owned by the root window)
...@@ -78,6 +80,9 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow, ...@@ -78,6 +80,9 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow,
m_hWnd = CreateWindowEx( 0, "SkinWindowClass", m_hWnd = CreateWindowEx( 0, "SkinWindowClass",
"default name", WS_POPUP | WS_CLIPCHILDREN, "default name", WS_POPUP | WS_CLIPCHILDREN,
0, 0, 0, 0, hWnd_owner, 0, hInst, NULL ); 0, 0, 0, 0, hWnd_owner, 0, hInst, NULL );
// Store with it a pointer to the interface thread
SetWindowLongPtr( m_hWnd, GWLP_USERDATA, (LONG_PTR)getIntf() );
} }
if( !m_hWnd ) if( !m_hWnd )
......
Markdown is supported
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