Rebase against f4a66ad257df4605e73dfea792eec55a70a04e84.

This commit is contained in:
Alistair Leslie-Hughes
2020-10-14 08:12:47 +11:00
parent b49e874386
commit 3cea972271
11 changed files with 27 additions and 698 deletions

View File

@@ -1,4 +1,4 @@
From f20e406fad78eeebea4e07407e6b05e069c8475f Mon Sep 17 00:00:00 2001
From be8f547f53a1f8d35d9680a8cb2f0cfa808568b8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 12 Mar 2015 00:44:25 +0100
Subject: [PATCH] server: Introduce a helper function to update the
@@ -9,10 +9,10 @@ Subject: [PATCH] server: Introduce a helper function to update the
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/server/queue.c b/server/queue.c
index a65eab38bdc..b8943bc4b61 100644
index 7e7e6fbdf29..344e4298a56 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1295,9 +1295,9 @@ static void set_input_key_state( unsigned char *keystate, unsigned char key, int
@@ -1300,9 +1300,9 @@ static void set_input_key_state( unsigned char *keystate, unsigned char key, int
else keystate[key] &= ~0x80;
}
@@ -25,7 +25,7 @@ index a65eab38bdc..b8943bc4b61 100644
{
unsigned char key;
int down = 0;
@@ -1366,21 +1366,27 @@ static void update_desktop_mouse_state( struct desktop *desktop, unsigned int fl
@@ -1371,21 +1371,27 @@ static void update_desktop_mouse_state( struct desktop *desktop, unsigned int fl
if (flags & MOUSEEVENTF_MOVE)
update_desktop_cursor_pos( desktop, x, y );
if (flags & MOUSEEVENTF_LEFTDOWN)
@@ -61,7 +61,7 @@ index a65eab38bdc..b8943bc4b61 100644
}
/* release the hardware message currently being processed by the given thread */
@@ -1408,7 +1414,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i
@@ -1413,7 +1419,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i
}
if (clr_bit) clear_queue_bits( queue, clr_bit );
@@ -70,8 +70,8 @@ index a65eab38bdc..b8943bc4b61 100644
list_remove( &msg->entry );
free_message( msg );
}
@@ -1526,7 +1532,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
struct thread_input *input;
@@ -1542,7 +1548,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
struct hardware_msg_data *msg_data = msg->data;
unsigned int msg_code;
- update_input_key_state( desktop, desktop->keystate, msg->msg, msg->wparam );
@@ -79,7 +79,7 @@ index a65eab38bdc..b8943bc4b61 100644
last_input_time = get_tick_count();
if (msg->msg != WM_MOUSEMOVE) always_queue = 1;
@@ -1561,7 +1567,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
@@ -1581,7 +1587,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
win = find_hardware_message_window( desktop, input, msg, &msg_code, &thread );
if (!win || !thread)
{
@@ -88,7 +88,7 @@ index a65eab38bdc..b8943bc4b61 100644
free_message( msg );
return;
}
@@ -1899,7 +1905,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
@@ -1919,7 +1925,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
if ((device = current->process->rawinput_kbd) && (device->flags & RIDEV_NOLEGACY))
{
@@ -97,7 +97,7 @@ index a65eab38bdc..b8943bc4b61 100644
return 0;
}
@@ -2028,7 +2034,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
@@ -2048,7 +2054,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
if (!win || !win_thread)
{
/* no window at all, remove it */
@@ -106,7 +106,7 @@ index a65eab38bdc..b8943bc4b61 100644
list_remove( &msg->entry );
free_message( msg );
continue;
@@ -2044,7 +2050,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
@@ -2064,7 +2070,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
else
{
/* for another thread input, drop it */
@@ -116,5 +116,5 @@ index a65eab38bdc..b8943bc4b61 100644
free_message( msg );
}
--
2.27.0
2.28.0