From: Rémi Bernon rbernon@codeweavers.com
--- server/queue.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/queue.c b/server/queue.c index e37afb4dc2d..dd52fc43716 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3277,14 +3277,16 @@ DECL_HANDLER(set_cursor) { struct msg_queue *queue = get_current_queue(); struct thread_input *input; + struct desktop *desktop;
if (!queue) return; input = queue->input; + desktop = input->desktop;
reply->prev_handle = input->cursor; reply->prev_count = input->cursor_count; - reply->prev_x = input->desktop->cursor.x; - reply->prev_y = input->desktop->cursor.y; + reply->prev_x = desktop->cursor.x; + reply->prev_y = desktop->cursor.y;
if (req->flags & SET_CURSOR_HANDLE) { @@ -3302,12 +3304,10 @@ DECL_HANDLER(set_cursor) } if (req->flags & SET_CURSOR_POS) { - set_cursor_pos( input->desktop, req->x, req->y ); + set_cursor_pos( desktop, req->x, req->y ); } if (req->flags & (SET_CURSOR_CLIP | SET_CURSOR_NOCLIP)) { - struct desktop *desktop = input->desktop; - /* only the desktop owner can set the message */ if (req->clip_msg && get_top_window_owner(desktop) == current->process) desktop->cursor.clip_msg = req->clip_msg; @@ -3315,10 +3315,10 @@ DECL_HANDLER(set_cursor) set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip, 0 ); }
- reply->new_x = input->desktop->cursor.x; - reply->new_y = input->desktop->cursor.y; - reply->new_clip = input->desktop->cursor.clip; - reply->last_change = input->desktop->cursor.last_change; + reply->new_x = desktop->cursor.x; + reply->new_y = desktop->cursor.y; + reply->new_clip = desktop->cursor.clip; + reply->last_change = desktop->cursor.last_change; }
/* Get the history of the 64 last cursor positions */