meson.build: Upgrade build and headers to libweston7

[src/agl-compositor.git] / src / desktop.c

diff --git a/src/desktop.c b/src/desktop.c
index ed6208f..eaace19 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -25,8 +25,8 @@
 
 #include "ivi-compositor.h"
 
-#include <libweston-6/compositor.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/libweston.h>
+#include <libweston-desktop/libweston-desktop.h>
 
 #if 0
 static struct weston_output *
@@ -102,15 +102,26 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
        struct weston_surface *wsurface =
                weston_desktop_surface_get_surface(dsurface);
 
+       struct ivi_output *output = surface->desktop.last_output;
+
        /* TODO */
        if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
                return;
 
+       /* reset the active surface as well */
+       if (output && output->active) {
+               output->active->view->is_mapped = false;
+               output->active->view->surface->is_mapped = false;
+
+               weston_layer_entry_remove(&output->active->view->layer_link);
+               output->active = NULL;
+       }
        if (weston_surface_is_mapped(wsurface)) {
                weston_desktop_surface_unlink_view(surface->view);
                weston_view_destroy(surface->view);
-               wl_list_remove(&surface->link);
        }
+
+       wl_list_remove(&surface->link);
        free(surface);
 }
 
@@ -120,8 +131,20 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 {
        struct ivi_surface *surface =
                weston_desktop_surface_get_user_data(dsurface);
-       if (surface->role == IVI_SURFACE_ROLE_DESKTOP)
+       weston_compositor_schedule_repaint(surface->ivi->compositor);
+
+       switch (surface->role) {
+       case IVI_SURFACE_ROLE_DESKTOP:
                ivi_layout_desktop_committed(surface);
+               break;
+       case IVI_SURFACE_ROLE_PANEL:
+               ivi_layout_panel_committed(surface);
+               break;
+       case IVI_SURFACE_ROLE_NONE:
+       case IVI_SURFACE_ROLE_BACKGROUND:
+       default: /* fall through */
+               break;
+       }
 }
 
 static void