mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input: Don't pass surface coordinates to weston_pointer_set_focus 

We're always passing pointer->x, y converted to surface coordinates, or
garbage if view is NULL. Let's just stop passing those coordinates
entirely and calculate them in the function.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2022-10-28 14:06:24 -05:00 committed by Pekka Paalanen
parent fe0292d272
commit eed00f679e
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
desktop-shell/shell.c
View File

@ -303,13 +303,10 @@ shell_grab_start(struct shell_grab *grab,
shsurf->grabbed = 1;
weston_pointer_start_grab(pointer, &grab->grab);
if (shell->child.desktop_shell) {
struct weston_view *view = get_default_view(shell->grab_surface);
wl_fixed_t sx, sy;
weston_view_from_global_fixed(view, pointer->x, pointer->y, &sx, &sy);
weston_desktop_shell_send_grab_cursor(shell->child.desktop_shell,
cursor);
weston_pointer_set_focus(pointer, view, sx, sy);
weston_pointer_set_focus(pointer,
get_default_view(shell->grab_surface));
}
}

4
include/libweston/libweston.h
View File

@ -850,8 +850,8 @@ weston_pointer_send_frame(struct weston_pointer *pointer);
void
weston_pointer_set_focus(struct weston_pointer *pointer,
struct weston_view *view,
wl_fixed_t sx, wl_fixed_t sy);
struct weston_view *view);
void
weston_pointer_clear_focus(struct weston_pointer *pointer);
void

2
libweston/desktop/seat.c
View File

@ -103,7 +103,7 @@ weston_desktop_seat_popup_grab_pointer_focus(struct weston_pointer_grab *grab)
if (view != NULL &&
view->surface->resource != NULL &&
wl_resource_get_client(view->surface->resource) == seat->popup_grab.client)
weston_pointer_set_focus(pointer, view, sx, sy);
weston_pointer_set_focus(pointer, view);
else
weston_pointer_clear_focus(pointer);
}

23
libweston/input.c
View File

@ -465,7 +465,7 @@ default_grab_pointer_focus(struct weston_pointer_grab *grab)
&sx, &sy);
if (pointer->focus != view || pointer->sx != sx || pointer->sy != sy)
weston_pointer_set_focus(pointer, view, sx, sy);
weston_pointer_set_focus(pointer, view);
}
static void
@ -633,7 +633,7 @@ default_grab_pointer_button(struct weston_pointer_grab *grab,
pointer->x, pointer->y,
&sx, &sy);
weston_pointer_set_focus(pointer, view, sx, sy);
weston_pointer_set_focus(pointer, view);
}
}
@ -1422,15 +1422,12 @@ seat_send_updated_caps(struct weston_seat *seat)
WL_EXPORT void
weston_pointer_clear_focus(struct weston_pointer *pointer)
{
weston_pointer_set_focus(pointer, NULL,
wl_fixed_from_int(-1000000),
wl_fixed_from_int(-1000000));
weston_pointer_set_focus(pointer, NULL);
}
WL_EXPORT void
weston_pointer_set_focus(struct weston_pointer *pointer,
struct weston_view *view,
wl_fixed_t sx, wl_fixed_t sy)
struct weston_view *view)
{
struct weston_pointer_client *pointer_client;
struct weston_keyboard *kbd = weston_seat_get_keyboard(pointer->seat);
@ -1440,14 +1437,22 @@ weston_pointer_set_focus(struct weston_pointer *pointer,
uint32_t serial;
struct wl_list *focus_resource_list;
int refocus = 0;
wl_fixed_t sx, sy;
if (view) {
int ix = wl_fixed_to_int(sx);
int iy = wl_fixed_to_int(sy);
int ix;
int iy;
weston_view_from_global_fixed(view, pointer->x, pointer->y,
&sx, &sy);
ix = wl_fixed_to_int(sx);
iy = wl_fixed_to_int(sy);
if (!weston_view_takes_input_at_point(view, ix, iy))
weston_log("View focused with external coordinate %d, %d\n",
ix, iy);
} else {
sx = wl_fixed_from_int(-1000000);
sy = wl_fixed_from_int(-1000000);
}
if ((!pointer->focus && view) ||