src: Further hotplug connector fixes

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

diff --git a/src/compositor.c b/src/compositor.c
index 564153b..1f45a71 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -87,7 +87,8 @@ handle_output_destroy(struct wl_listener *listener, void *data)
        output = wl_container_of(listener, output, output_destroy);
        assert(output->output == data);
 
-       if (output->fullscreen_view.fs->view) {
+       if (output->fullscreen_view.fs &&
+           output->fullscreen_view.fs->view) {
                weston_surface_destroy(output->fullscreen_view.fs->view->surface);
                output->fullscreen_view.fs->view = NULL;
        }
@@ -327,6 +328,23 @@ parse_transform(const char *transform, uint32_t *out)
        return -1;
 }
 
+static int
+parse_activation_area(const char *geometry, struct ivi_output *output)
+{
+       int n;
+       unsigned width, height, x, y;
+
+       n = sscanf(geometry, "%ux%u+%u,%u", &width, &height, &x, &y);
+       if (n != 4) {
+               return -1;
+       }
+       output->area_activation.width = width;
+       output->area_activation.height = height;
+       output->area_activation.x = x;
+       output->area_activation.y = y;
+       return 0;
+}
+
 static int
 configure_output(struct ivi_output *output)
 {
@@ -350,6 +368,10 @@ configure_output(struct ivi_output *output)
                if (parse_transform(t, &transform) < 0)
                        weston_log("Invalid transform \"%s\" for output %s\n",
                                   t, output->name);
+               weston_config_section_get_string(section, "activation-area", &t, "");
+               if (parse_activation_area(t, output) < 0)
+                       weston_log("Invalid activation-area \"%s\" for output %s\n",
+                                  t, output->name);
                free(t);
        }
 
@@ -466,8 +488,21 @@ head_disable(struct ivi_compositor *ivi, struct weston_head *head)
 
        weston_head_detach(head);
        if (count_heads(ivi_output->output) == 0) {
-               weston_output_disable(ivi_output->output);
+               if (ivi_output->output) {
+                       /* ivi_output->output destruction may be deferred in
+                        * some cases (see drm_output_destroy()), so we need to
+                        * forcibly trigger the destruction callback now, or
+                        * otherwise would later access data that we are about
+                        * to free
+                        */
+                       struct weston_output *save = ivi_output->output;
+
+                       handle_output_destroy(&ivi_output->output_destroy, save);
+                       weston_output_destroy(save);
+               }
        }
+       wl_list_remove(&ivi_output->link);
+       free(ivi_output);
 }
 
 static struct weston_config_section *
@@ -1795,7 +1830,12 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
        weston_compositor_wake(ivi.compositor);
 
        ivi_shell_create_global(&ivi);
-       ivi_launch_shell_client(&ivi);
+
+       ivi_launch_shell_client(&ivi, "shell-client",
+                               &ivi.shell_client.client);
+       ivi_launch_shell_client(&ivi, "shell-client-ext",
+                               &ivi.shell_client_ext.client);
+
        if (debug)
                ivi_screenshooter_create(&ivi);
        ivi_agl_systemd_notify(&ivi);