X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;h=15fd42a2a5d35effe4f35841f0ba2ed85f2b4bb8;hb=refs%2Fchanges%2F02%2F28202%2F1;hp=564153bc6270050bcbb8f5c60668d8f15c7e52dc;hpb=897449688a9c7f934d45acd1eaa09d766d6da67a;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 564153b..15fd42a 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -327,6 +327,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 +367,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 +487,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 *