mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11videosink: Fix for unhandled mouse double click events

Browse source 
Only window created with CS_DBLCLKS style can receive those mouse
double click events, so we need to use the style for internal/external
windows can get double click events.

Also, passthrough mouse events to parent window in the same message pumping
threads instead of manually forwarding each mouse event.

Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1172
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2286>
This commit is contained in:
Seungha Yang 2022-04-23 04:00:21 +09:00 committed by GStreamer Marge Bot
parent 0d65762411
commit 1e55e07cb8
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
subprojects/gst-plugins-bad/sys/d3d11/gstd3d11window_win32.cpp
View file

@ -467,7 +467,7 @@ gst_d3d11_window_win32_create_internal_window (GstD3D11WindowWin32 * self)
wc.lpfnWndProc = window_proc; wc.lpfnWndProc = window_proc;
wc.hInstance = hinstance; wc.hInstance = hinstance;
wc.hIcon = LoadIcon (NULL, IDI_WINLOGO); wc.hIcon = LoadIcon (NULL, IDI_WINLOGO);
wc.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW; wc.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
wc.hCursor = LoadCursor (NULL, IDC_ARROW); wc.hCursor = LoadCursor (NULL, IDC_ARROW);
wc.hbrBackground = (HBRUSH) GetStockObject (BLACK_BRUSH); wc.hbrBackground = (HBRUSH) GetStockObject (BLACK_BRUSH);
wc.lpszClassName = "GSTD3D11"; wc.lpszClassName = "GSTD3D11";
@ -690,14 +690,7 @@ gst_d3d11_window_win32_handle_window_proc (GstD3D11WindowWin32 * self,
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
case WM_MBUTTONUP: case WM_MBUTTONUP:
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
/* To handle mouse event only once, do this only for internal window */ gst_d3d11_window_win32_on_mouse_event (self, hWnd, uMsg, wParam, lParam);
if (self->internal_hwnd && self->internal_hwnd == hWnd)
gst_d3d11_window_win32_on_mouse_event (self, hWnd, uMsg, wParam,
lParam);
/* DefWindowProc will not chain up mouse event to parent window */
if (self->external_hwnd && self->external_hwnd != hWnd)
SendMessageA (self->external_hwnd, uMsg, wParam, lParam);
break; break;
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
if ((window->fullscreen_toggle_mode & if ((window->fullscreen_toggle_mode &
@ -771,7 +764,7 @@ window_proc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (!GST_IS_D3D11_WINDOW_WIN32 (handle)) { if (!GST_IS_D3D11_WINDOW_WIN32 (handle)) {
GST_WARNING ("%p is not d3d11window object", handle); GST_WARNING ("%p is not d3d11window object", handle);
goto done; return DefWindowProcA (hWnd, uMsg, wParam, lParam);
} }
self = GST_D3D11_WINDOW_WIN32 (handle); self = GST_D3D11_WINDOW_WIN32 (handle);
@ -780,6 +773,22 @@ window_proc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
gst_d3d11_window_win32_handle_window_proc (self, hWnd, uMsg, wParam, gst_d3d11_window_win32_handle_window_proc (self, hWnd, uMsg, wParam,
lParam); lParam);
switch (uMsg) {
case WM_SIZE:
/* We handled this event already */
return 0;
case WM_NCHITTEST:
/* To passthrough mouse event if external window is used.
* Only hit-test succeeded window can receive/handle some mouse events
* and we want such events to be handled by parent (application) window
*/
if (self->external_hwnd)
return (LRESULT) HTTRANSPARENT;
break;
default:
break;
}
} else if (uMsg == WM_GST_D3D11_DESTROY_INTERNAL_WINDOW) { } else if (uMsg == WM_GST_D3D11_DESTROY_INTERNAL_WINDOW) {
GST_INFO ("Handle destroy window message"); GST_INFO ("Handle destroy window message");
gst_d3d11_window_win32_destroy_internal_window (hWnd); gst_d3d11_window_win32_destroy_internal_window (hWnd);
@ -787,10 +796,6 @@ window_proc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return 0; return 0;
} }
if (uMsg == WM_SIZE)
return 0;
done:
return DefWindowProcA (hWnd, uMsg, wParam, lParam); return DefWindowProcA (hWnd, uMsg, wParam, lParam);
} }