desktop-shell: Make activate() take a view instead of surface
In preparation for further refactorings.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/desktop-shell/exposay.c b/desktop-shell/exposay.c
index 7aa7630..bff424f 100644
--- a/desktop-shell/exposay.c
+++ b/desktop-shell/exposay.c
@@ -162,7 +162,7 @@
shell->exposay.column_current = esurface->column;
shell->exposay.cur_output = esurface->eoutput;
- activate(shell, view->surface, shell->exposay.seat, false);
+ activate(shell, view, shell->exposay.seat, false);
shell->exposay.focus_current = view;
}
@@ -570,10 +570,10 @@
* animating back the old state and then immediately transitioning
* to the new. */
if (switch_focus && shell->exposay.focus_current)
- activate(shell, shell->exposay.focus_current->surface,
+ activate(shell, shell->exposay.focus_current,
shell->exposay.seat, true);
else if (shell->exposay.focus_prev)
- activate(shell, shell->exposay.focus_prev->surface,
+ activate(shell, shell->exposay.focus_prev,
shell->exposay.seat, true);
wl_list_for_each(esurface, &shell->exposay.surface_list, link)