2 * Copyright © 2019 Collabora, Ltd.
4 * Permission is hereby granted, free of charge, to any person obtaining
5 * a copy of this software and associated documentation files (the
6 * "Software"), to deal in the Software without restriction, including
7 * without limitation the rights to use, copy, modify, merge, publish,
8 * distribute, sublicense, and/or sell copies of the Software, and to
9 * permit persons to whom the Software is furnished to do so, subject to
10 * the following conditions:
12 * The above copyright notice and this permission notice (including the
13 * next paragraph) shall be included in all copies or substantial
14 * portions of the Software.
16 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
20 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
21 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
22 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
26 #include "ivi-compositor.h"
28 #include "shared/helpers.h"
33 #include <libweston/libweston.h>
34 #include <libweston-desktop/libweston-desktop.h>
36 #include "agl-shell-desktop-server-protocol.h"
38 #define AGL_COMP_DEBUG
40 static const char *ivi_roles_as_string[] = {
41 [IVI_SURFACE_ROLE_NONE] = "NONE",
42 [IVI_SURFACE_ROLE_BACKGROUND] = "BACKGROUND",
43 [IVI_SURFACE_ROLE_PANEL] = "PANEL",
44 [IVI_SURFACE_ROLE_DESKTOP] = "DESKTOP",
45 [IVI_SURFACE_ROLE_POPUP] = "POPUP",
46 [IVI_SURFACE_ROLE_SPLIT_H] = "SPLIT_H",
47 [IVI_SURFACE_ROLE_SPLIT_V] = "SPLIT_V",
48 [IVI_SURFACE_ROLE_FULLSCREEN] = "FULLSCREEN",
49 [IVI_SURFACE_ROLE_REMOTE] = "REMOTE",
53 ivi_layout_get_surface_role_name(struct ivi_surface *surf)
55 if (surf->role < 0 || surf->role >= ARRAY_LENGTH(ivi_roles_as_string))
56 return " unknown surface role";
58 return ivi_roles_as_string[surf->role];
62 ivi_background_init(struct ivi_compositor *ivi, struct ivi_output *output)
64 struct weston_output *woutput = output->output;
65 struct ivi_surface *bg = output->background;
66 struct weston_view *view;
69 weston_log("WARNING: Output does not have a background\n");
73 assert(bg->role == IVI_SURFACE_ROLE_BACKGROUND);
77 weston_view_set_output(view, woutput);
78 weston_view_set_position(view, woutput->x, woutput->y);
80 weston_log("(background) position view %p, x %d, y %d, on output %s\n", view,
81 woutput->x, woutput->y, output->name);
83 view->is_mapped = true;
84 view->surface->is_mapped = true;
86 weston_layer_entry_insert(&ivi->background.view_list, &view->layer_link);
90 ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output,
91 struct ivi_surface *panel)
93 struct weston_output *woutput = output->output;
94 struct weston_desktop_surface *dsurface;
95 struct weston_view *view;
96 struct weston_geometry geom;
103 assert(panel->role == IVI_SURFACE_ROLE_PANEL);
104 dsurface = panel->dsurface;
106 geom = weston_desktop_surface_get_geometry(dsurface);
108 weston_log("(panel) geom.width %d, geom.height %d, geom.x %d, geom.y %d\n",
109 geom.width, geom.height, geom.x, geom.y);
111 switch (panel->panel.edge) {
112 case AGL_SHELL_EDGE_TOP:
113 output->area.y += geom.height;
114 output->area.height -= geom.height;
116 case AGL_SHELL_EDGE_BOTTOM:
117 y += woutput->height - geom.height;
118 output->area.height -= geom.height;
120 case AGL_SHELL_EDGE_LEFT:
121 output->area.x += geom.width;
122 output->area.width -= geom.width;
124 case AGL_SHELL_EDGE_RIGHT:
125 x += woutput->width - geom.width;
126 output->area.width -= geom.width;
133 weston_view_set_output(view, woutput);
134 weston_view_set_position(view, x, y);
136 weston_log("(panel) edge %d position view %p, x %d, y %d\n",
137 panel->panel.edge, view, x, y);
139 view->is_mapped = true;
140 view->surface->is_mapped = true;
142 weston_log("panel type %d inited on output %s\n", panel->panel.edge,
145 weston_layer_entry_insert(&ivi->panel.view_list, &view->layer_link);
149 * Initializes all static parts of the layout, i.e. the background and panels.
152 ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output)
154 ivi_background_init(ivi, output);
158 output->area.width = output->output->width;
159 output->area.height = output->output->height;
161 ivi_panel_init(ivi, output, output->top);
162 ivi_panel_init(ivi, output, output->bottom);
163 ivi_panel_init(ivi, output, output->left);
164 ivi_panel_init(ivi, output, output->right);
166 weston_compositor_schedule_repaint(ivi->compositor);
168 weston_log("Usable area: %dx%d+%d,%d\n",
169 output->area.width, output->area.height,
170 output->area.x, output->area.y);
174 ivi_find_app(struct ivi_compositor *ivi, const char *app_id)
176 struct ivi_surface *surf;
179 wl_list_for_each(surf, &ivi->surfaces, link) {
180 id = weston_desktop_surface_get_app_id(surf->dsurface);
181 if (id && strcmp(app_id, id) == 0)
189 ivi_layout_activate_complete(struct ivi_output *output,
190 struct ivi_surface *surf)
192 struct ivi_compositor *ivi = output->ivi;
193 struct weston_output *woutput = output->output;
194 struct weston_view *view = surf->view;
196 if (weston_view_is_mapped(view)) {
197 weston_layer_entry_remove(&view->layer_link);
200 weston_view_set_output(view, woutput);
201 weston_view_set_position(view,
202 woutput->x + output->area.x,
203 woutput->y + output->area.y);
205 view->is_mapped = true;
206 view->surface->is_mapped = true;
208 if (output->active) {
209 output->active->view->is_mapped = false;
210 output->active->view->surface->is_mapped = false;
212 weston_layer_entry_remove(&output->active->view->layer_link);
214 output->previous_active = output->active;
215 output->active = surf;
217 weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
218 weston_view_update_transform(view);
220 /* force repaint of the entire output */
221 weston_output_damage(output->output);
224 * the 'remote' role now makes use of this part so make sure we don't
225 * trip the enum such that we might end up with a modified output for
228 if (surf->role == IVI_SURFACE_ROLE_DESKTOP) {
229 if (surf->desktop.pending_output)
230 surf->desktop.last_output = surf->desktop.pending_output;
231 surf->desktop.pending_output = NULL;
234 weston_log("Activation completed for app_id %s, role %s, output %s\n",
235 weston_desktop_surface_get_app_id(surf->dsurface),
236 ivi_layout_get_surface_role_name(surf), output->name);
240 ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi)
242 struct ivi_output *out;
244 wl_list_for_each(out, &ivi->outputs, link) {
248 if (!strcmp(app_id, out->app_id))
256 static struct ivi_output *
257 ivi_layout_find_bg_output(struct ivi_compositor *ivi)
259 struct ivi_output *out;
261 wl_list_for_each(out, &ivi->outputs, link) {
262 if (out->background &&
263 out->background->role == IVI_SURFACE_ROLE_BACKGROUND)
271 ivi_layout_desktop_committed(struct ivi_surface *surf)
273 struct weston_desktop_surface *dsurf = surf->dsurface;
274 struct weston_geometry geom = weston_desktop_surface_get_geometry(dsurf);
275 struct ivi_policy *policy = surf->ivi->policy;
276 struct ivi_output *output;
277 const char *app_id = weston_desktop_surface_get_app_id(dsurf);
279 assert(surf->role == IVI_SURFACE_ROLE_DESKTOP ||
280 surf->role == IVI_SURFACE_ROLE_REMOTE);
283 * we can't make use here of the ivi_layout_get_output_from_surface()
284 * due to the fact that we'll always land here when a surface performs
285 * a commit and pending_output will not bet set. This works in tandem
286 * with 'activated_by_default' at this point to avoid tripping over
287 * to a surface that continuously updates its content
289 if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
290 output = surf->desktop.pending_output;
292 output = surf->remote.output;
294 if (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) {
295 struct ivi_output *r_output;
297 if (policy && policy->api.surface_activate_by_default &&
298 !policy->api.surface_activate_by_default(surf, surf->ivi))
301 /* we can only activate it again by using the protocol */
302 if (surf->activated_by_default)
305 /* check first if there aren't any outputs being set */
306 r_output = ivi_layout_find_with_app_id(app_id, surf->ivi);
309 struct weston_view *view = r_output->fullscreen_view.fs->view;
310 if (view->is_mapped || view->surface->is_mapped)
311 remove_black_surface(r_output);
315 /* try finding an output with a background and use that */
317 r_output = ivi_layout_find_bg_output(surf->ivi);
319 /* if we couldn't still find an output by this point, there's
320 * something wrong so we abort with a protocol error */
322 wl_resource_post_error(surf->ivi->shell_client.resource,
323 AGL_SHELL_ERROR_INVALID_ARGUMENT,
324 "No valid output found to activate surface by default");
328 /* use the output of the bg to activate the app on start-up by
330 if (surf->view && r_output) {
331 if (app_id && r_output) {
332 weston_log("Surface with app_id %s, role %s activating by default\n",
333 weston_desktop_surface_get_app_id(surf->dsurface),
334 ivi_layout_get_surface_role_name(surf));
335 ivi_layout_activate(r_output, app_id);
336 surf->activated_by_default = true;
337 } else if (!app_id) {
339 * applications not setting an app_id, or
340 * setting an app_id but at a later point in
341 * time, might fall-back here so give them a
342 * chance to receive the configure event and
345 weston_log("Surface no app_id, role %s activating by default\n",
346 ivi_layout_get_surface_role_name(surf));
347 ivi_layout_activate_by_surf(r_output, surf);
348 surf->activated_by_default = true;
355 if (surf->role == IVI_SURFACE_ROLE_REMOTE && output) {
356 if (policy && policy->api.surface_activate_by_default &&
357 !policy->api.surface_activate_by_default(surf, surf->ivi))
360 /* we can only activate it again by using the protocol, but
361 * additionally the output is not reset when
362 * ivi_layout_activate_complete() terminates so we use the
363 * current active surface to avoid hitting this again and again
365 if (surf->activated_by_default && output->active == surf)
369 weston_log("Surface with app_id %s, role %s activating by default\n",
370 weston_desktop_surface_get_app_id(surf->dsurface),
371 ivi_layout_get_surface_role_name(surf));
372 ivi_layout_activate(output, app_id);
373 surf->activated_by_default = true;
378 if (!weston_desktop_surface_get_maximized(dsurf) ||
379 geom.width != output->area.width ||
380 geom.height != output->area.height)
383 ivi_layout_activate_complete(output, surf);
387 ivi_layout_fullscreen_committed(struct ivi_surface *surface)
389 struct ivi_compositor *ivi = surface->ivi;
390 struct ivi_policy *policy = ivi->policy;
392 struct weston_desktop_surface *dsurface = surface->dsurface;
393 struct weston_surface *wsurface =
394 weston_desktop_surface_get_surface(dsurface);
395 const char *app_id = weston_desktop_surface_get_app_id(dsurface);
397 struct ivi_output *output = surface->split.output;
398 struct weston_output *woutput = output->output;
400 struct weston_view *view = surface->view;
401 struct weston_geometry geom;
403 if (policy && policy->api.surface_activate_by_default &&
404 !policy->api.surface_activate_by_default(surface, surface->ivi) &&
405 !surface->activated_by_default)
408 if (surface->view->is_mapped)
411 geom = weston_desktop_surface_get_geometry(dsurface);
412 weston_log("(fs) geom x %d, y %d, width %d, height %d\n", geom.x, geom.y,
413 geom.width, geom.height);
415 assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
417 weston_desktop_surface_set_fullscreen(dsurface, true);
419 weston_view_set_output(view, woutput);
420 weston_view_set_position(view, woutput->x, woutput->y);
421 weston_layer_entry_insert(&ivi->fullscreen.view_list, &view->layer_link);
423 weston_view_update_transform(view);
424 weston_view_damage_below(view);
426 wsurface->is_mapped = true;
427 surface->view->is_mapped = true;
429 shell_advertise_app_state(ivi, app_id,
430 NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED);
432 weston_log("Activation completed for app_id %s, role %s, output %s\n",
433 app_id, ivi_layout_get_surface_role_name(surface), output->name);
437 ivi_layout_desktop_resize(struct ivi_surface *surface,
438 struct weston_geometry area)
440 struct weston_desktop_surface *dsurf = surface->dsurface;
441 struct weston_view *view = surface->view;
445 int width = area.width;
446 int height = area.height;
448 weston_desktop_surface_set_size(dsurf,
451 weston_view_set_position(view, x, y);
452 weston_view_update_transform(view);
453 weston_view_damage_below(view);
457 ivi_layout_split_committed(struct ivi_surface *surface)
459 struct ivi_compositor *ivi = surface->ivi;
460 struct ivi_policy *policy = ivi->policy;
462 struct weston_desktop_surface *dsurface = surface->dsurface;
463 struct weston_surface *wsurface =
464 weston_desktop_surface_get_surface(dsurface);
465 const char *app_id = weston_desktop_surface_get_app_id(dsurface);
467 struct ivi_output *output = surface->split.output;
468 struct weston_output *woutput = output->output;
470 struct weston_view *view = surface->view;
471 struct weston_geometry geom;
479 if (policy && policy->api.surface_activate_by_default &&
480 !policy->api.surface_activate_by_default(surface, surface->ivi) &&
481 !surface->activated_by_default)
484 if (surface->view->is_mapped)
487 geom = weston_desktop_surface_get_geometry(dsurface);
489 assert(surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
490 surface->role == IVI_SURFACE_ROLE_SPLIT_V);
492 /* save the previous area in order to recover it back when if this kind
493 * of surface is being destroyed/removed */
494 output->area_saved = output->area;
496 switch (surface->role) {
497 case IVI_SURFACE_ROLE_SPLIT_V:
498 if (geom.width == woutput->width &&
499 geom.height == woutput->height)
500 geom.width = (output->area.width / 2);
502 x += woutput->width - geom.width;
503 output->area.width -= geom.width;
505 width = woutput->width - x;
506 height = output->area.height;
510 case IVI_SURFACE_ROLE_SPLIT_H:
511 if (geom.width == woutput->width &&
512 geom.height == woutput->height)
513 geom.height = (output->area.height / 2);
516 output->area.y += geom.height;
517 output->area.height -= geom.height;
519 width = output->area.width;
520 height = output->area.height;
526 assert(!"Invalid split orientation\n");
529 weston_desktop_surface_set_size(dsurface,
532 /* resize the active surface first, output->area already contains
533 * correct area to resize to */
535 ivi_layout_desktop_resize(output->active, output->area);
537 weston_view_set_output(view, woutput);
538 weston_view_set_position(view, x, y);
539 weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
541 weston_view_update_transform(view);
542 weston_view_damage_below(view);
544 wsurface->is_mapped = true;
545 surface->view->is_mapped = true;
547 shell_advertise_app_state(ivi, app_id,
548 NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED);
550 weston_log("Activation completed for app_id %s, role %s, output %s\n",
551 app_id, ivi_layout_get_surface_role_name(surface), output->name);
555 ivi_layout_popup_committed(struct ivi_surface *surface)
557 struct ivi_compositor *ivi = surface->ivi;
558 struct ivi_policy *policy = ivi->policy;
560 struct weston_desktop_surface *dsurface = surface->dsurface;
561 struct weston_surface *wsurface =
562 weston_desktop_surface_get_surface(dsurface);
563 const char *app_id = weston_desktop_surface_get_app_id(dsurface);
565 struct ivi_output *output = surface->popup.output;
566 struct weston_output *woutput = output->output;
568 struct weston_view *view = surface->view;
570 if (policy && policy->api.surface_activate_by_default &&
571 !policy->api.surface_activate_by_default(surface, surface->ivi) &&
572 !surface->activated_by_default)
575 if (surface->view->is_mapped)
578 assert(surface->role == IVI_SURFACE_ROLE_POPUP);
580 weston_view_set_output(view, woutput);
581 weston_view_set_position(view, surface->popup.x, surface->popup.y);
583 /* only clip the pop-up dialog window if we have a valid
584 * width and height being passed on. Users might not want to have one
585 * set-up so only enfore it is really passed on. */
586 if (surface->popup.bb.width > 0 && surface->popup.bb.height > 0)
587 weston_view_set_mask(view, surface->popup.bb.x, surface->popup.bb.y,
588 surface->popup.bb.width, surface->popup.bb.height);
590 weston_layer_entry_insert(&ivi->popup.view_list, &view->layer_link);
592 weston_view_update_transform(view);
593 weston_view_damage_below(view);
595 wsurface->is_mapped = true;
596 surface->view->is_mapped = true;
598 shell_advertise_app_state(ivi, app_id,
599 NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED);
601 weston_log("Activation completed for app_id %s, role %s, output %s\n",
602 app_id, ivi_layout_get_surface_role_name(surface), output->name);
606 ivi_layout_popup_re_add(struct ivi_surface *surface)
608 assert(surface->role == IVI_SURFACE_ROLE_POPUP);
609 struct weston_view *view = surface->view;
611 if (weston_view_is_mapped(view)) {
612 struct weston_desktop_surface *dsurface = surface->dsurface;
613 struct weston_surface *wsurface =
614 weston_desktop_surface_get_surface(dsurface);
616 weston_layer_entry_remove(&view->layer_link);
618 wsurface->is_mapped = false;
619 view->is_mapped = false;
622 /* reset the activate by default in order to (still) allow the surface
623 * to be activaved using the request */
624 if (!surface->activated_by_default)
625 surface->activated_by_default = true;
627 ivi_layout_popup_committed(surface);
631 ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf)
633 struct ivi_compositor *ivi = surf->ivi;
634 struct ivi_surface *is;
636 if (surf->role != IVI_SURFACE_ROLE_SPLIT_H &&
637 surf->role != IVI_SURFACE_ROLE_SPLIT_V &&
638 surf->role != IVI_SURFACE_ROLE_FULLSCREEN)
641 /* reset the activate by default in order to (still) allow the surface
642 * to be activaved using the request */
643 if (!surf->activated_by_default)
644 surf->activated_by_default = true;
646 wl_list_for_each(is, &ivi->surfaces, link)
654 ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
656 struct ivi_compositor *ivi = output->ivi;
657 struct weston_desktop_surface *dsurf;
658 struct weston_view *view;
659 struct weston_geometry geom;
660 struct ivi_policy *policy = output->ivi->policy;
662 dsurf = surf->dsurface;
665 const char *app_id = weston_desktop_surface_get_app_id(dsurf);
670 if (policy && policy->api.surface_activate &&
671 !policy->api.surface_activate(surf, surf->ivi)) {
675 #ifdef AGL_COMP_DEBUG
676 weston_log("Activating app_id %s, type %s\n", app_id,
677 ivi_layout_get_surface_role_name(surf));
680 if (surf->role == IVI_SURFACE_ROLE_POPUP) {
681 ivi_layout_popup_re_add(surf);
685 /* do not 're'-activate surfaces that are split or active */
686 if (surf == output->active ||
687 ivi_layout_surface_is_split_or_fullscreen(surf))
690 if (surf->role == IVI_SURFACE_ROLE_REMOTE) {
691 struct ivi_output *remote_output =
692 ivi_layout_find_with_app_id(app_id, ivi);
694 /* if already active on a remote output do not
695 * attempt to activate it again */
696 if (remote_output && remote_output->active == surf)
701 geom = weston_desktop_surface_get_geometry(dsurf);
703 if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
704 surf->desktop.pending_output = output;
705 if (weston_desktop_surface_get_maximized(dsurf) &&
706 geom.width == output->area.width &&
707 geom.height == output->area.height) {
708 ivi_layout_activate_complete(output, surf);
712 weston_desktop_surface_set_maximized(dsurf, true);
713 weston_desktop_surface_set_size(dsurf,
715 output->area.height);
717 weston_log("Setting app_id %s, role %s, set to maximized (%dx%d)\n",
718 app_id, ivi_layout_get_surface_role_name(surf),
719 output->area.width, output->area.height);
721 * If the view isn't mapped, we put it onto the hidden layer so it will
722 * start receiving frame events, and will be able to act on our
725 if (!weston_view_is_mapped(view)) {
726 view->is_mapped = true;
727 view->surface->is_mapped = true;
729 weston_view_set_output(view, output->output);
730 weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
731 /* force repaint of the entire output */
733 weston_log("Placed app_id %s, type %s in hidden layer\n",
734 app_id, ivi_layout_get_surface_role_name(surf));
735 weston_output_damage(output->output);
740 ivi_layout_activate(struct ivi_output *output, const char *app_id)
742 struct ivi_surface *surf;
743 struct ivi_compositor *ivi = output->ivi;
745 surf = ivi_find_app(ivi, app_id);
749 ivi_layout_activate_by_surf(output, surf);
753 ivi_layout_get_output_from_surface(struct ivi_surface *surf)
755 struct ivi_output *ivi_output = NULL;
757 switch (surf->role) {
758 case IVI_SURFACE_ROLE_DESKTOP:
759 if (surf->desktop.pending_output)
760 ivi_output = surf->desktop.pending_output;
762 ivi_output = surf->desktop.last_output;
764 case IVI_SURFACE_ROLE_POPUP:
765 ivi_output = surf->popup.output;
767 case IVI_SURFACE_ROLE_BACKGROUND:
768 ivi_output = surf->bg.output;
770 case IVI_SURFACE_ROLE_PANEL:
771 ivi_output = surf->panel.output;
773 case IVI_SURFACE_ROLE_FULLSCREEN:
774 ivi_output = surf->fullscreen.output;
776 case IVI_SURFACE_ROLE_SPLIT_H:
777 case IVI_SURFACE_ROLE_SPLIT_V:
778 ivi_output = surf->split.output;
780 case IVI_SURFACE_ROLE_REMOTE:
781 ivi_output = surf->remote.output;
783 case IVI_SURFACE_ROLE_NONE:
792 ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
794 struct ivi_surface *surf;
795 struct ivi_output *ivi_output;
796 struct ivi_policy *policy = ivi->policy;
798 surf = ivi_find_app(ivi, app_id);
802 if (policy && policy->api.surface_deactivate &&
803 !policy->api.surface_deactivate(surf, surf->ivi)) {
807 ivi_output = ivi_layout_get_output_from_surface(surf);
808 weston_log("Deactiving %s, role %s\n", app_id,
809 ivi_layout_get_surface_role_name(surf));
811 if (surf->role == IVI_SURFACE_ROLE_DESKTOP) {
812 struct ivi_surface *previous_active;
814 previous_active = ivi_output->previous_active;
815 if (!previous_active) {
816 /* we don't have a previous active it means we should
818 if (ivi_output->active) {
819 struct weston_view *view;
821 view = ivi_output->active->view;
822 view->is_mapped = false;
823 view->surface->is_mapped = false;
825 weston_layer_entry_remove(&view->layer_link);
826 weston_output_damage(ivi_output->output);
829 struct weston_desktop_surface *dsurface;
830 const char *previous_active_app_id;
832 dsurface = previous_active->dsurface;
833 previous_active_app_id =
834 weston_desktop_surface_get_app_id(dsurface);
835 ivi_layout_activate(ivi_output, previous_active_app_id);
837 } else if (surf->role == IVI_SURFACE_ROLE_POPUP) {
838 struct weston_view *view = surf->view;
840 weston_layer_entry_remove(&view->layer_link);
841 weston_view_damage_below(view);