system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-29 03:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Move caret window and rect to input shared memory.

Browse source
This commit is contained in:
Rémi Bernon 2024-02-19 23:07:58 +01:00 committed by Alexandre Julliard
parent 18d1af889e
commit 6253e8c1ea
3 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/wine/server_protocol.h
View file

@ -914,6 +914,8 @@ typedef volatile struct
user_handle_t capture;
user_handle_t menu_owner;
user_handle_t move_size;
user_handle_t caret;
rectangle_t caret_rect;
} input_shm_t;
typedef volatile union
@ -6618,7 +6620,7 @@ union generic_reply
/* ### protocol_version begin ### */
#define SERVER_PROTOCOL_VERSION 826
#define SERVER_PROTOCOL_VERSION 827
/* ### protocol_version end ### */

2
server/protocol.def
View file

@ -930,6 +930,8 @@ typedef volatile struct
user_handle_t capture; /* handle to the capture window */
user_handle_t menu_owner; /* handle to the menu owner */
user_handle_t move_size; /* handle to the moving/resizing window */
user_handle_t caret; /* handle to the caret window */
rectangle_t caret_rect; /* caret rectangle */
} input_shm_t;
typedef volatile union

62
server/queue.c
View file

@ -104,8 +104,6 @@ struct thread_input
{
struct object obj; /* object header */
struct desktop *desktop; /* desktop that this thread input belongs to */
user_handle_t caret; /* caret window */
rectangle_t caret_rect; /* caret rectangle */
int caret_hide; /* caret hide count */
int caret_state; /* caret on/off state */
user_handle_t cursor; /* current cursor */
@ -232,17 +230,17 @@ static unsigned int cursor_history_latest;
static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue );
static void free_message( struct message *msg );
/* set the caret window in a given thread input */
static void set_caret_window( struct thread_input *input, user_handle_t win )
/* set the caret window in a given thread input, requires write lock on the thread input shared member */
static void set_caret_window( struct thread_input *input, input_shm_t *shared, user_handle_t win )
{
if (!win || win != input->caret)
if (!win || win != shared->caret)
{
input->caret_rect.left = 0;
input->caret_rect.top = 0;
input->caret_rect.right = 0;
input->caret_rect.bottom = 0;
shared->caret_rect.left = 0;
shared->caret_rect.top = 0;
shared->caret_rect.right = 0;
shared->caret_rect.bottom = 0;
}
input->caret = win;
shared->caret = win;
input->caret_hide = 1;
input->caret_state = 0;
}
@ -257,7 +255,6 @@ static struct thread_input *create_thread_input( struct thread *thread )
input->cursor = 0;
input->cursor_count = 0;
list_init( &input->msg_list );
set_caret_window( input, 0 );
memset( input->keystate, 0, sizeof(input->keystate) );
input->keystate_lock = 0;
input->shared = NULL;
@ -283,6 +280,7 @@ static struct thread_input *create_thread_input( struct thread *thread )
shared->capture = 0;
shared->menu_owner = 0;
shared->move_size = 0;
set_caret_window( input, shared, 0 );
}
SHARED_WRITE_END;
}
@ -1323,10 +1321,10 @@ static inline void thread_input_cleanup_window( struct msg_queue *queue, user_ha
if (window == shared->active) shared->active = 0;
if (window == shared->menu_owner) shared->menu_owner = 0;
if (window == shared->move_size) shared->move_size = 0;
if (window == shared->caret) set_caret_window( input, shared, 0 );
}
SHARED_WRITE_END;
if (window == input->caret) set_caret_window( input, 0 );
}
/* check if the specified window can be set in the input data of a given queue */
@ -3664,10 +3662,10 @@ DECL_HANDLER(get_thread_input_data)
reply->active = input_shm->active;
reply->menu_owner = input_shm->menu_owner;
reply->move_size = input_shm->move_size;
reply->caret = input->caret;
reply->caret = input_shm->caret;
reply->cursor = input->cursor;
reply->show_count = input->cursor_count;
reply->rect = input->caret_rect;
reply->rect = input_shm->caret_rect;
}
/* foreground window is active window of foreground thread */
@ -3872,15 +3870,21 @@ DECL_HANDLER(set_caret_window)
if (queue && check_queue_input_window( queue, req->handle ))
{
struct thread_input *input = queue->input;
const input_shm_t *input_shm = input->shared;
user_handle_t caret = get_user_full_handle(req->handle);
reply->previous = input->caret;
reply->old_rect = input->caret_rect;
reply->previous = input_shm->caret;
reply->old_rect = input_shm->caret_rect;
reply->old_hide = input->caret_hide;
reply->old_state = input->caret_state;
set_caret_window( input, get_user_full_handle(req->handle) );
input->caret_rect.right = input->caret_rect.left + req->width;
input->caret_rect.bottom = input->caret_rect.top + req->height;
SHARED_WRITE_BEGIN( input_shm, input_shm_t )
{
set_caret_window( input, shared, caret );
shared->caret_rect.right = shared->caret_rect.left + req->width;
shared->caret_rect.bottom = shared->caret_rect.top + req->height;
}
SHARED_WRITE_END;
}
}
@ -3889,26 +3893,32 @@ DECL_HANDLER(set_caret_window)
DECL_HANDLER(set_caret_info)
{
struct msg_queue *queue = get_current_queue();
const input_shm_t *input_shm;
struct thread_input *input;
if (!queue) return;
input = queue->input;
reply->full_handle = input->caret;
reply->old_rect = input->caret_rect;
input_shm = input->shared;
reply->full_handle = input_shm->caret;
reply->old_rect = input_shm->caret_rect;
reply->old_hide = input->caret_hide;
reply->old_state = input->caret_state;
if (req->handle && get_user_full_handle(req->handle) != input->caret)
if (req->handle && get_user_full_handle(req->handle) != input_shm->caret)
{
set_error( STATUS_ACCESS_DENIED );
return;
}
if (req->flags & SET_CARET_POS)
{
input->caret_rect.right += req->x - input->caret_rect.left;
input->caret_rect.bottom += req->y - input->caret_rect.top;
input->caret_rect.left = req->x;
input->caret_rect.top = req->y;
SHARED_WRITE_BEGIN( input_shm, input_shm_t )
{
shared->caret_rect.right += req->x - shared->caret_rect.left;
shared->caret_rect.bottom += req->y - shared->caret_rect.top;
shared->caret_rect.left = req->x;
shared->caret_rect.top = req->y;
}
SHARED_WRITE_END;
}
if (req->flags & SET_CARET_HIDE)
{