[PATCH v2 0/2] MR3405: server: Use the capture window as cursor window if it is set.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306

--
  v2: server: Use the capture window as cursor window if it is set.
      server: Update the desktop cursor position / window on click.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3405

[PATCH v2 1/2] server: Update the desktop cursor position / window on click.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306
---
 server/queue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/queue.c b/server/queue.c
index fcc946ff0cb..e83bc3754ee 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1670,9 +1670,9 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
         break;
     case QS_MOUSEMOVE:
         prepend_cursor_history( msg->x, msg->y, msg->time, msg_data->info );
-        if (update_desktop_cursor_pos( desktop, msg->win, msg->x, msg->y )) always_queue = 1;
         /* fallthrough */
     case QS_MOUSEBUTTON:
+        if (update_desktop_cursor_pos( desktop, msg->win, msg->x, msg->y )) always_queue = 1;
         if (desktop->keystate[VK_LBUTTON] & 0x80)  msg->wparam |= MK_LBUTTON;
         if (desktop->keystate[VK_MBUTTON] & 0x80)  msg->wparam |= MK_MBUTTON;
         if (desktop->keystate[VK_RBUTTON] & 0x80)  msg->wparam |= MK_RBUTTON;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/3405

[PATCH v2 2/2] server: Use the capture window as cursor window if it is set.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306
---
 server/queue.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/queue.c b/server/queue.c
index e83bc3754ee..97588d3b1d7 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -446,6 +446,7 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t
 static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win, int x, int y )
 {
     struct thread_input *input;
+    user_handle_t capture;
     int updated;
 
     x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left );
@@ -455,7 +456,7 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win
     desktop->cursor.y = y;
     desktop->cursor.last_change = get_tick_count();
 
-    if (!win && (input = desktop->foreground_input)) win = input->capture;
+    if ((input = desktop->foreground_input) && (capture = input->capture)) win = capture;
     if (!win || !is_window_visible( win ) || is_window_transparent( win ))
         win = shallow_window_from_point( desktop, x, y );
     if (update_desktop_cursor_window( desktop, win )) updated = 1;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3405