<html><head></head><body><div class="gmail_quote">Le 9 août 2017 15:48:11 GMT+03:00, Steve Lhomme <robux4@videolabs.io> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">It's now done internally and not in sync with the core anyway.<br />So we don't handle VOUT_DISPLAY_HIDE_MOUSE anymore.<br />---<br /> modules/video_output/win32/common.c | 3 ---<br /> modules/video_output/win32/direct3d11.c | 1 -<br /> modules/video_output/win32/direct3d9.c | 1 -<br /> modules/video_output/win32/directdraw.c | 1 -<br /> modules/video_output/win32/events.c | 13 -------------<br /> modules/video_output/win32/events.h | 1 -<br /> modules/video_output/win32/glwin32.c | 1 -<br /> modules/video_output/win32/wingdi.c | 1 -<br /> 8 files changed, 22 deletions(-)<br /><br />diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c<br />index 59e3411cb6..f19559379d 100644<br />--- a/modules/video_output/win32/common.c<br />+++ b/modules/video_output/win32/common.c<br />@@ -718,9 +718,6 @@ int CommonControl(vout_display_t *vd, int query, va_list args)<br /> return VLC_SUCCESS;<br /> }<br /> <br />- case VOUT_DISPLAY_HIDE_MOUSE:<br />- EventThreadMouseHide(sys->event);<br />- return VLC_SUCCESS;<br /> case VOUT_DISPLAY_RESET_PICTURES:<br /> vlc_assert_unreachable();<br /> #endif<br />diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c<br />index 1ac66d6d63..e6eb867ddf 100644<br />--- a/modules/video_output/win32/direct3d11.c<br />+++ b/modules/video_output/win32/direct3d11.c<br />@@ -540,7 +540,6 @@ static int Open(vlc_object_t *object)<br /> vd->fmt = fmt;<br /> <br /> vd->info.has_double_click = true;<br />- vd->info.needs_hide_mouse = true;<br /> vd->info.has_pictures_invalid = vd->info.is_slow;<br /> <br /> if (var_InheritBool(vd, "direct3d11-hw-blending") &&<br />diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c<br />index 9da418a542..f24a0036ee 100644<br />--- a/modules/video_output/win32/direct3d9.c<br />+++ b/modules/video_output/win32/direct3d9.c<br />@@ -271,7 +271,6 @@ static int Open(vlc_object_t *object)<br /> vout_display_info_t info = vd->info;<br /> info.is_slow = !is_d3d9_opaque(fmt.i_chroma);<br /> info.has_double_click = true;<br />- info.needs_hide_mouse = true;<br /> info.has_pictures_invalid = !is_d3d9_opaque(fmt.i_chroma);<br /> if (var_InheritBool(vd, "direct3d9-hw-blending") &&<br /> sys->d3dregion_format != D3DFMT_UNKNOWN &&<br />diff --git a/modules/video_output/win32/directdraw.c b/modules/video_output/win32/directdraw.c<br />index 0e6f568f64..be583127f9 100644<br />--- a/modules/video_output/win32/directdraw.c<br />+++ b/modules/video_output/win32/directdraw.c<br />@@ -233,7 +233,6 @@ static int Open(vlc_object_t *object)<br /> vout_display_info_t info = vd->info;<br /> info.is_slow = true;<br /> info.has_double_click = true;<br />- info.needs_hide_mouse = true;<br /> info.has_pictures_invalid = true;<br /> <br /> /* Interaction TODO support starting with wallpaper mode */<br />diff --git a/modules/video_output/win32/events.c b/modules/video_output/win32/events.c<br />index 30fe3f7b49..7608007692 100644<br />--- a/modules/video_output/win32/events.c<br />+++ b/modules/video_output/win32/events.c<br />@@ -48,7 +48,6 @@<br /> /*****************************************************************************<br /> * Local prototypes.<br /> *****************************************************************************/<br />-#define WM_VLC_HIDE_MOUSE (WM_APP + 0)<br /> #define WM_VLC_CHANGE_TEXT (WM_APP + 1)<br /> <br /> struct event_thread_t<br />@@ -234,10 +233,6 @@ static void *EventThread( void *p_this )<br /> {<br /> UpdateCursorMoved( p_event );<br /> }<br />- else if( msg.message == WM_VLC_HIDE_MOUSE )<br />- {<br />- UpdateCursor( p_event, false );<br />- }<br /> <br /> /* */<br /> switch( msg.message )<br />@@ -266,9 +261,6 @@ static void *EventThread( void *p_this )<br /> case WM_NCMOUSEMOVE:<br /> break;<br /> <br />- case WM_VLC_HIDE_MOUSE:<br />- break;<br />-<br /> case WM_LBUTTONDOWN:<br /> MousePressed( p_event, msg.hwnd, MOUSE_BUTTON_LEFT );<br /> break;<br />@@ -407,11 +399,6 @@ static void *EventThread( void *p_this )<br /> return NULL;<br /> }<br /> <br />-void EventThreadMouseHide( event_thread_t *p_event )<br />-{<br />- PostMessage( p_event->hwnd, WM_VLC_HIDE_MOUSE, 0, 0 );<br />-}<br />-<br /> void EventThreadUpdateTitle( event_thread_t *p_event, const char *psz_fallback )<br /> {<br /> char *psz_title = var_InheritString( p_event->vd, "video-title" );<br />diff --git a/modules/video_output/win32/events.h b/modules/video_output/win32/events.h<br />index af1414fcde..635f75c46d 100644<br />--- a/modules/video_output/win32/events.h<br />+++ b/modules/video_output/win32/events.h<br />@@ -51,7 +51,6 @@ void EventThreadDestroy( event_thread_t * );<br /> int EventThreadStart( event_thread_t *, event_hwnd_t *, const event_cfg_t * );<br /> void EventThreadStop( event_thread_t * );<br /> <br />-void EventThreadMouseHide( event_thread_t * );<br /> void EventThreadUpdateTitle( event_thread_t *, const char *psz_fallback );<br /> int EventThreadGetWindowStyle( event_thread_t * );<br /> void EventThreadUpdateWindowPosition( event_thread_t *, bool *pb_moved, bool *pb_resized,<br />diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c<br />index c6eb15650b..601a7ddccc 100644<br />--- a/modules/video_output/win32/glwin32.c<br />+++ b/modules/video_output/win32/glwin32.c<br />@@ -244,7 +244,6 @@ static int Open(vlc_object_t *object)<br /> <br /> vout_display_info_t info = vd->info;<br /> info.has_double_click = true;<br />- info.needs_hide_mouse = true;<br /> info.subpicture_chromas = subpicture_chromas;<br /> <br /> /* Setup vout_display now that everything is fine */<br />diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c<br />index 04cfb5855c..c875422f02 100644<br />--- a/modules/video_output/win32/wingdi.c<br />+++ b/modules/video_output/win32/wingdi.c<br />@@ -106,7 +106,6 @@ static int Open(vlc_object_t *object)<br /> vout_display_info_t info = vd->info;<br /> info.is_slow = false;<br /> info.has_double_click = true;<br />- info.needs_hide_mouse = true;<br /> info.has_pictures_invalid = true;<br /> <br /> /* */</pre></blockquote></div><br clear="all">LGTM.<br>
-- <br>
Rémi Denis-Courmont<br>
Typed on an inconvenient virtual keyboard</body></html>