Now that we have common function that peforms surface activation
(xdg-shell and input one) use it for touch and keyboard.
Bug-AGL: SPEC-4413
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I325e33da4c48f2741a7bb8f5ac706f838f9dabc4
{
struct weston_surface *focus_surface;
struct weston_surface *main_surface;
{
struct weston_surface *focus_surface;
struct weston_surface *main_surface;
- struct ivi_surface *surface;
+ struct ivi_surface *ivi_surface;
+ struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(seat);
focus_surface = focus_view->surface;
main_surface = weston_surface_get_main_surface(focus_surface);
focus_surface = focus_view->surface;
main_surface = weston_surface_get_main_surface(focus_surface);
- surface = to_ivi_surface(main_surface);
- if (!surface)
+ ivi_surface = to_ivi_surface(main_surface);
+ if (!ivi_surface)
- weston_seat_set_keyboard_focus(seat, focus_surface);
+ if (ivi_seat)
+ ivi_shell_activate_surface(ivi_surface, ivi_seat, flags);