From d6ccc8b025c94bb379c86290a146b17e0879fed4 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Fri, 5 Mar 2021 22:07:30 +0200 Subject: [PATCH] libweston: Rename weston_view_activate() to weston_view_activate_input() This way, we try to differentiate between input focus and window/surface activation. Signed-off-by: Marius Vlad --- desktop-shell/shell.c | 2 +- include/libweston/libweston.h | 6 +++--- kiosk-shell/kiosk-shell.c | 6 +++--- libweston/input.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 847859c6..46c0b446 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3866,7 +3866,7 @@ activate(struct desktop_shell *shell, struct weston_view *view, if (shsurf->output) lower_fullscreen_layer(shell, shsurf->output); - weston_view_activate(view, seat, flags); + weston_view_activate_input(view, seat, flags); if (shseat->focused_surface) { struct shell_surface *current_focus = diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h index 5b4d59c6..cff1a3d9 100644 --- a/include/libweston/libweston.h +++ b/include/libweston/libweston.h @@ -1626,9 +1626,9 @@ weston_view_from_global_fixed(struct weston_view *view, wl_fixed_t *vx, wl_fixed_t *vy); void -weston_view_activate(struct weston_view *view, - struct weston_seat *seat, - uint32_t flags); +weston_view_activate_input(struct weston_view *view, + struct weston_seat *seat, + uint32_t flags); void notify_modifiers(struct weston_seat *seat, uint32_t serial); diff --git a/kiosk-shell/kiosk-shell.c b/kiosk-shell/kiosk-shell.c index cee7067d..cfa0a95f 100644 --- a/kiosk-shell/kiosk-shell.c +++ b/kiosk-shell/kiosk-shell.c @@ -664,7 +664,7 @@ desktop_surface_removed(struct weston_desktop_surface *desktop_surface, wl_list_for_each(seat, &shell->compositor->seat_list, link) { struct weston_keyboard *keyboard = seat->keyboard_state; if (keyboard && keyboard->focus == surface) - weston_view_activate(focus_view, seat, 0); + weston_view_activate_input(focus_view, seat, 0); } } @@ -719,7 +719,7 @@ desktop_surface_committed(struct weston_desktop_surface *desktop_surface, surface->is_mapped = true; wl_list_for_each(seat, &shsurf->shell->compositor->seat_list, link) - weston_view_activate(shsurf->view, seat, 0); + weston_view_activate_input(shsurf->view, seat, 0); } if (!is_fullscreen && (sx != 0 || sy != 0)) { @@ -927,7 +927,7 @@ kiosk_shell_activate_view(struct kiosk_shell *shell, weston_surface_damage(view->surface); } - weston_view_activate(view, seat, flags); + weston_view_activate_input(view, seat, flags); } static void diff --git a/libweston/input.c b/libweston/input.c index f56bd7a0..6fb4bed3 100644 --- a/libweston/input.c +++ b/libweston/input.c @@ -1864,7 +1864,7 @@ inc_activate_serial(struct weston_compositor *c) } WL_EXPORT void -weston_view_activate(struct weston_view *view, +weston_view_activate_input(struct weston_view *view, struct weston_seat *seat, uint32_t flags) {