2 May
2024
2 May
'24
8:24 a.m.
From: Rémi Bernon <rbernon(a)codeweavers.com>
Based on a patch by Huw Davies <huw(a)codeweavers.com>om>.
---
server/protocol.def | 1 +
server/queue.c | 17 +++++++++++------
server/user.h | 1 -
server/winstation.c | 1 +
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/server/protocol.def b/server/protocol.def
index c55f1d03136..afb508c425a 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -895,6 +895,7 @@ struct shared_cursor
{
int x; /* cursor position */
int y;
+ unsigned int last_change; /* time of last position change */
};
typedef volatile struct
diff --git a/server/queue.c b/server/queue.c
index 3780e35d83e..3ebf5e18de1 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -468,6 +468,7 @@ static int update_desktop_cursor_pos( struct desktop *desktop,
user_handle_t win
{
const desktop_shm_t *desktop_shm = get_shared_desktop( desktop->session_index );
int updated;
+ unsigned int time = get_tick_count();
x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left
);
y = max( min( y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top
);
@@ -477,11 +478,10 @@ static int update_desktop_cursor_pos( struct desktop *desktop,
user_handle_t win
updated = shared->cursor.x != x || shared->cursor.y != y;
shared->cursor.x = x;
shared->cursor.y = y;
+ shared->cursor.last_change = time;
}
SHARED_WRITE_END;
- desktop->cursor.last_change = get_tick_count();
-
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;
@@ -2005,7 +2005,7 @@ static int queue_mouse_message( struct desktop *desktop,
user_handle_t win, cons
struct rawinput_message raw_msg;
struct message *msg;
struct thread *foreground;
- unsigned int i, time, flags;
+ unsigned int i, time = get_tick_count(), flags;
struct hw_msg_source source = { IMDT_MOUSE, origin };
int wait = 0, x, y;
@@ -2026,10 +2026,15 @@ static int queue_mouse_message( struct desktop *desktop,
user_handle_t win, cons
WM_MOUSEHWHEEL /* 0x1000 = MOUSEEVENTF_HWHEEL */
};
- desktop->cursor.last_change = get_tick_count();
+ SHARED_WRITE_BEGIN( desktop_shm, desktop_shm_t )
+ {
+ shared->cursor.last_change = time;
+ }
+ SHARED_WRITE_END;
+
flags = input->mouse.flags;
time = input->mouse.time;
- if (!time) time = desktop->cursor.last_change;
+ if (!time) time = desktop_shm->cursor.last_change;
if (flags & MOUSEEVENTF_MOVE)
{
@@ -3699,7 +3704,7 @@ DECL_HANDLER(set_cursor)
reply->new_x = desktop_shm->cursor.x;
reply->new_y = desktop_shm->cursor.y;
reply->new_clip = desktop->cursor.clip;
- reply->last_change = desktop->cursor.last_change;
+ reply->last_change = desktop_shm->cursor.last_change;
}
/* Get the history of the 64 last cursor positions */
diff --git a/server/user.h b/server/user.h
index 229439fbe5e..3adfe29073b 100644
--- a/server/user.h
+++ b/server/user.h
@@ -58,7 +58,6 @@ struct global_cursor
{
rectangle_t clip; /* cursor clip rectangle */
unsigned int clip_flags; /* last cursor clip flags */
- unsigned int last_change; /* time of last position change */
user_handle_t win; /* window that contains the cursor */
};
diff --git a/server/winstation.c b/server/winstation.c
index d547e9b8d86..fcfcb8f419e 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -311,6 +311,7 @@ static struct desktop *create_desktop( const struct unicode_str *name,
unsigned
{
shared->cursor.x = 0;
shared->cursor.y = 0;
+ shared->cursor.last_change = 0;
}
SHARED_WRITE_END;
}
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/3103