isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

core: Drop X11 error trap from pointer warping code

Browse Source 
This code is backend-agnostic, and should not do anything special
about X11. Drop these error traps, and let the backend deal with
the possible errors.

Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1725
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1807>
This commit is contained in:
Carlos Garnacho 2021-03-29 13:53:07 +02:00
parent 1b1f852086
commit 1d82e0f236
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/window.c
View File

@ -6889,6 +6889,7 @@ warp_grab_pointer (MetaWindow *window,
MetaRectangle rect; MetaRectangle rect;
MetaRectangle display_rect = { 0 }; MetaRectangle display_rect = { 0 };
MetaDisplay *display; MetaDisplay *display;
ClutterSeat *seat;
display = window->display; display = window->display;
meta_display_get_size (display, meta_display_get_size (display,
@ -6921,8 +6922,6 @@ warp_grab_pointer (MetaWindow *window,
*x = CLAMP (*x, 0, display_rect.width - 1); *x = CLAMP (*x, 0, display_rect.width - 1);
*y = CLAMP (*y, 0, display_rect.height - 1); *y = CLAMP (*y, 0, display_rect.height - 1);
meta_x11_error_trap_push (display->x11_display);
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Warping pointer to %d,%d with window at %d,%d", "Warping pointer to %d,%d with window at %d,%d",
*x, *y, rect.x, rect.y); *x, *y, rect.x, rect.y);
@ -6938,19 +6937,8 @@ warp_grab_pointer (MetaWindow *window,
meta_window_get_frame_rect (window, meta_window_get_frame_rect (window,
&display->grab_anchor_window_pos); &display->grab_anchor_window_pos);
{
ClutterSeat *seat;
seat = clutter_backend_get_default_seat (clutter_get_default_backend ()); seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_seat_warp_pointer (seat, *x, *y); clutter_seat_warp_pointer (seat, *x, *y);
}
if (meta_x11_error_trap_pop_with_return (display->x11_display) != Success)
{
meta_verbose ("Failed to warp pointer for window %s",
window->desc);
return FALSE;
}
return TRUE; return TRUE;
} }