callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-issue-5877' into 'gtk-3-24'

Browse Source 
GdkWin32: Use scaled coordinates for move_resize_drag()

See merge request GNOME/gtk!6132
This commit is contained in:
Chun-wei Fan 2023-06-30 04:06:58 +00:00
commit ce20f3c6e4
2 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gdk/win32/gdkdevicemanager-win32.c
View File

@ -498,17 +498,30 @@ winpointer_enumerate_devices (GdkDeviceManagerWin32 *device_manager)
UINT32 i = 0; UINT32 i = 0;
GList *current = NULL; GList *current = NULL;
do if (!getPointerDevices (&infos_count, NULL))
{ {
infos = g_new0 (POINTER_DEVICE_INFO, infos_count); WIN32_API_FAILED ("GetPointerDevices");
if (!getPointerDevices (&infos_count, infos)) return;
{ }
WIN32_API_FAILED ("GetPointerDevices");
g_free (infos); infos = g_new0 (POINTER_DEVICE_INFO, infos_count);
return;
} /* Note: the device count may increase between the two
* calls. In such case, the second call will fail with
* ERROR_INSUFFICIENT_BUFFER.
* However we'll also get a new WM_POINTERDEVICECHANGE
* notification, which will start the enumeration again.
* So do not treat ERROR_INSUFFICIENT_BUFFER as an
* error, rather return and do the necessary work later
*/
if (!getPointerDevices (&infos_count, infos))
{
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
WIN32_API_FAILED ("GetPointerDevices");
g_free (infos);
return;
} }
while (infos_count > 0 && !infos);
/* remove any gdk device not present anymore or update info */ /* remove any gdk device not present anymore or update info */
current = device_manager->winpointer_devices; current = device_manager->winpointer_devices;
@ -520,9 +533,11 @@ winpointer_enumerate_devices (GdkDeviceManagerWin32 *device_manager)
if (!winpointer_match_device_in_system_list (device, infos, infos_count)) if (!winpointer_match_device_in_system_list (device, infos, infos_count))
{ {
GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (device)); GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (device));
GdkDeviceTool *tool = (GDK_DEVICE (device))->last_tool;
gdk_device_update_tool (GDK_DEVICE (device), NULL); gdk_device_update_tool (GDK_DEVICE (device), NULL);
gdk_seat_default_remove_tool (GDK_SEAT_DEFAULT (seat), (GDK_DEVICE (device))->last_tool); gdk_seat_default_remove_tool (GDK_SEAT_DEFAULT (seat), tool);
g_clear_pointer (&tool, g_object_unref);
gdk_seat_default_remove_slave (GDK_SEAT_DEFAULT (seat), GDK_DEVICE (device)); gdk_seat_default_remove_slave (GDK_SEAT_DEFAULT (seat), GDK_DEVICE (device));
device_manager->winpointer_devices = g_list_delete_link (device_manager->winpointer_devices, device_manager->winpointer_devices = g_list_delete_link (device_manager->winpointer_devices,

51
gdk/win32/gdkevents-win32.c
View File

@ -2879,10 +2879,14 @@ gdk_event_translate (MSG *msg,
break; break;
} }
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam)) if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{ {
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam); pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam); pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE; pen_touch_input = TRUE;
last_digitizer_time = msg->time; last_digitizer_time = msg->time;
} }
@ -2909,10 +2913,14 @@ gdk_event_translate (MSG *msg,
break; break;
} }
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam)) if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{ {
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam); pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam); pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE; pen_touch_input = TRUE;
last_digitizer_time = msg->time; last_digitizer_time = msg->time;
} }
@ -2924,7 +2932,6 @@ gdk_event_translate (MSG *msg,
gdk_winpointer_input_events (display, window, NULL, msg); gdk_winpointer_input_events (display, window, NULL, msg);
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE) if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
{ {
gdk_win32_window_end_move_resize_drag (window); gdk_win32_window_end_move_resize_drag (window);
@ -2942,10 +2949,14 @@ gdk_event_translate (MSG *msg,
break; break;
} }
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam)) if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{ {
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam); pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam); pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE; pen_touch_input = TRUE;
last_digitizer_time = msg->time; last_digitizer_time = msg->time;
} }
@ -2958,8 +2969,6 @@ gdk_event_translate (MSG *msg,
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam) && mouse_window != window) if (IS_POINTER_PRIMARY_WPARAM (msg->wParam) && mouse_window != window)
crossing_cb = make_crossing_event; crossing_cb = make_crossing_event;
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE) if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
{ {
gdk_win32_window_do_move_resize_drag (window, current_root_x, current_root_y); gdk_win32_window_do_move_resize_drag (window, current_root_x, current_root_y);
@ -2981,10 +2990,14 @@ gdk_event_translate (MSG *msg,
break; break;
} }
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam)) if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{ {
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam); pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam); pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE; pen_touch_input = TRUE;
last_digitizer_time = msg->time; last_digitizer_time = msg->time;
} }
@ -3017,10 +3030,14 @@ gdk_event_translate (MSG *msg,
break; break;
} }
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam)) if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{ {
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam); pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam); pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE; pen_touch_input = TRUE;
last_digitizer_time = msg->time; last_digitizer_time = msg->time;
} }
@ -3047,10 +3064,14 @@ gdk_event_translate (MSG *msg,
break; break;
} }
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (IS_POINTER_PRIMARY_WPARAM (msg->wParam)) if (IS_POINTER_PRIMARY_WPARAM (msg->wParam))
{ {
current_root_x = pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam); pen_touch_cursor_position.x = GET_X_LPARAM (msg->lParam);
current_root_y = pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam); pen_touch_cursor_position.y = GET_Y_LPARAM (msg->lParam);
current_root_x = pen_touch_cursor_position.x / impl->window_scale;
current_root_y = pen_touch_cursor_position.y / impl->window_scale;
pen_touch_input = TRUE; pen_touch_input = TRUE;
last_digitizer_time = msg->time; last_digitizer_time = msg->time;
} }