mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: Rename weston_view_activate() to weston_view_activate_input()

Browse Source 
This way, we try to differentiate between input focus and window/surface
activation.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
dev
Marius Vlad 4 years ago
parent f3584cf995
commit d6ccc8b025
4 changed files with 8 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      desktop-shell/shell.c
  2. 6
      include/libweston/libweston.h
  3. 6
      kiosk-shell/kiosk-shell.c
  4. 2
      libweston/input.c

2
desktop-shell/shell.c
Unescape View File

@ -3866,7 +3866,7 @@ activate(struct desktop_shell *shell, struct weston_view *view,
if (shsurf->output) if (shsurf->output)
lower_fullscreen_layer(shell, 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) { if (shseat->focused_surface) {
struct shell_surface *current_focus = struct shell_surface *current_focus =

6
include/libweston/libweston.h
Unescape View File

@ -1626,9 +1626,9 @@ weston_view_from_global_fixed(struct weston_view *view,
wl_fixed_t *vx, wl_fixed_t *vy); wl_fixed_t *vx, wl_fixed_t *vy);
void void
weston_view_activate(struct weston_view *view, weston_view_activate_input(struct weston_view *view,
struct weston_seat *seat, struct weston_seat *seat,
uint32_t flags); uint32_t flags);
void void
notify_modifiers(struct weston_seat *seat, uint32_t serial); notify_modifiers(struct weston_seat *seat, uint32_t serial);

6
kiosk-shell/kiosk-shell.c
Unescape View File

@ -664,7 +664,7 @@ desktop_surface_removed(struct weston_desktop_surface *desktop_surface,
wl_list_for_each(seat, &shell->compositor->seat_list, link) { wl_list_for_each(seat, &shell->compositor->seat_list, link) {
struct weston_keyboard *keyboard = seat->keyboard_state; struct weston_keyboard *keyboard = seat->keyboard_state;
if (keyboard && keyboard->focus == surface) 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; surface->is_mapped = true;
wl_list_for_each(seat, &shsurf->shell->compositor->seat_list, link) 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)) { 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_surface_damage(view->surface);
} }
weston_view_activate(view, seat, flags); weston_view_activate_input(view, seat, flags);
} }
static void static void

2
libweston/input.c
Unescape View File

@ -1864,7 +1864,7 @@ inc_activate_serial(struct weston_compositor *c)
} }
WL_EXPORT void WL_EXPORT void
weston_view_activate(struct weston_view *view, weston_view_activate_input(struct weston_view *view,
struct weston_seat *seat, struct weston_seat *seat,
uint32_t flags) uint32_t flags)
{ {

Write Preview
Loading…
Cancel
Save