fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-05 20:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

desktop-shell: Make activate_binding take a view instead of surface

Browse source 
In preparation for further refactoring. This patch also removes a
redundant NULL check. Since we pass views, and views will always have an
associated surface, there is no point of checking if it has.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Jonas Ådahl 2015-06-26 12:37:56 +08:00 • committed by Bryce Harrington
parent 43008c7620
commit cd0f1acff4
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop-shell/shell.c
View file

@ -5184,12 +5184,12 @@ is_black_surface (struct weston_surface *es, struct weston_surface **fs_surface)
static void
activate_binding(struct weston_seat *seat,
struct desktop_shell *shell,
struct weston_surface *focus)
struct weston_view *focus_view)
{
struct weston_surface *focus;
struct weston_surface *main_surface;
if (!focus)
return;
focus = focus_view->surface;
if (is_black_surface(focus, &main_surface))
focus = main_surface;
@ -5210,7 +5210,7 @@ click_to_activate_binding(struct weston_pointer *pointer, uint32_t time,
if (pointer->focus == NULL)
return;
activate_binding(pointer->seat, data, pointer->focus->surface);
activate_binding(pointer->seat, data, pointer->focus);
}
static void
@ -5222,7 +5222,7 @@ touch_to_activate_binding(struct weston_touch *touch, uint32_t time,
if (touch->focus == NULL)
return;
activate_binding(touch->seat, data, touch->focus->surface);
activate_binding(touch->seat, data, touch->focus);
}
static void