X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;h=078157a06b69a9e4c26f0135e71e4deef7bfda5c;hb=HEAD;hp=61dbec6d024d67f3a28ee10a9572e9576c3a0975;hpb=ec6f2d31293d8680a1f6dab8f53949b848bbae08;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 61dbec6..078157a 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -61,6 +61,9 @@
 #include "remote.h"
 #endif
 
+#define WINDOWED_DEFAULT_WIDTH 1024
+#define WINDOWED_DEFAULT_HEIGHT 768
+
 static int cached_tm_mday = -1;
 static struct weston_log_scope *log_scope;
 
@@ -70,6 +73,16 @@ to_ivi_compositor(struct weston_compositor *ec)
 	return weston_compositor_get_user_data(ec);
 }
 
+void
+ivi_process_destroy(struct wet_process *process, int status, bool call_cleanup)
+{
+        wl_list_remove(&process->link);
+        if (call_cleanup && process->cleanup)
+                process->cleanup(process, status, process->cleanup_data);
+        free(process->path);
+        free(process);
+}
+
 struct ivi_output_config *
 ivi_init_parsed_options(struct weston_compositor *compositor)
 {
@@ -90,6 +103,13 @@ ivi_init_parsed_options(struct weston_compositor *compositor)
 	return config;
 }
 
+static void
+screenshot_allow_all(struct wl_listener *l, struct weston_output_capture_attempt *att)
+{
+	att->authorized = true;
+}
+
+
 static void
 sigint_helper(int sig)
 {
@@ -118,14 +138,13 @@ struct {
 };
 
 bool
-get_backend_from_string(const char *name,
-		enum weston_compositor_backend *backend)
+get_backend_from_string(const char *name, enum weston_compositor_backend *backend)
 {
 	size_t i;
 
 	for (i = 0; i < ARRAY_LENGTH(backend_name_map); i++) {
 		if (strcmp(name, backend_name_map[i].short_name) == 0 ||
-				strcmp(name, backend_name_map[i].long_name) == 0) {
+		    strcmp(name, backend_name_map[i].long_name) == 0) {
 			*backend = backend_name_map[i].backend;
 			return true;
 		}
@@ -180,6 +199,9 @@ to_ivi_output(struct weston_output *o)
 	struct ivi_output *output;
 
 	listener = weston_output_get_destroy_listener(o, handle_output_destroy);
+	if (!listener)
+		return NULL;
+
 	output = wl_container_of(listener, output, output_destroy);
 
 	return output;
@@ -236,6 +258,14 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
 		return NULL;
 	}
 
+	/* simple_output_configure might assume we have an ivi_output created
+	 * by this point, which we do but we can only link it to a
+	 * weston_output through the destroy listener, so install it earlier
+	 * before actually running the callback handler */
+	output->output_destroy.notify = handle_output_destroy;
+	weston_output_add_destroy_listener(output->output,
+					   &output->output_destroy);
+
 	if (ivi->simple_output_configure) {
 		int ret = ivi->simple_output_configure(output->output);
 		if (ret < 0) {
@@ -255,12 +285,10 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
 		}
 	}
 
-	output->output_destroy.notify = handle_output_destroy;
-	weston_output_add_destroy_listener(output->output,
-					   &output->output_destroy);
 
 	wl_list_insert(&ivi->outputs, &output->link);
 	ivi_output_configure_app_id(output);
+
 	return output;
 }
 
@@ -312,63 +340,14 @@ add_head_destroyed_listener(struct weston_head *head)
 }
 
 static int
-drm_configure_output(struct ivi_output *output)
+ivi_configure_windowed_output_from_config(struct ivi_output *output,
+					  struct ivi_output_config *defaults)
 {
 	struct ivi_compositor *ivi = output->ivi;
 	struct weston_config_section *section = output->config;
-	enum weston_drm_backend_output_mode mode =
-		WESTON_DRM_BACKEND_OUTPUT_PREFERRED;
-	char *modeline = NULL;
-	char *gbm_format = NULL;
-	char *seat = NULL;
-
-	if (section) {
-		char *m;
-		weston_config_section_get_string(section, "mode", &m, "preferred");
-
-		/* This should have been handled earlier */
-		assert(strcmp(m, "off") != 0);
-
-		if (ivi->cmdline.use_current_mode || strcmp(m, "current") == 0) {
-			mode = WESTON_DRM_BACKEND_OUTPUT_CURRENT;
-		} else if (strcmp(m, "preferred") != 0) {
-			modeline = m;
-			m = NULL;
-		}
-		free(m);
-
-		weston_config_section_get_string(section, "gbm-format",
-						 &gbm_format, NULL);
-
-		weston_config_section_get_string(section, "seat", &seat, "");
-	}
-
-	if (ivi->drm_api->set_mode(output->output, mode, modeline) < 0) {
-		weston_log("Cannot configure output using weston_drm_output_api.\n");
-		free(modeline);
-		return -1;
-	}
-	free(modeline);
-
-	ivi->drm_api->set_gbm_format(output->output, gbm_format);
-	free(gbm_format);
-
-	ivi->drm_api->set_seat(output->output, seat);
-	free(seat);
-
-	return 0;
-}
-
-#define WINDOWED_DEFAULT_WIDTH 1024
-#define WINDOWED_DEFAULT_HEIGHT 768
-
-static int
-windowed_configure_output(struct ivi_output *output)
-{
-	struct ivi_compositor *ivi = output->ivi;
-	struct weston_config_section *section = output->config;
-	int width = WINDOWED_DEFAULT_WIDTH;
-	int height = WINDOWED_DEFAULT_HEIGHT;
+	int width;
+	int height;
+	int scale;
 
 	if (section) {
 		char *mode;
@@ -377,18 +356,26 @@ windowed_configure_output(struct ivi_output *output)
 		if (!mode || sscanf(mode, "%dx%d", &width, &height) != 2) {
 			weston_log("Invalid mode for output %s. Using defaults.\n",
 				   output->name);
-			width = WINDOWED_DEFAULT_WIDTH;
-			height = WINDOWED_DEFAULT_HEIGHT;
+			width = defaults->width;
+			height = defaults->height;
 		}
 		free(mode);
+	} else {
+		width = defaults->width;
+		height = defaults->height;
 	}
 
+	scale = defaults->scale;
+
 	if (ivi->cmdline.width)
 		width = ivi->cmdline.width;
 	if (ivi->cmdline.height)
 		height = ivi->cmdline.height;
 	if (ivi->cmdline.scale)
-		weston_output_set_scale(output->output, ivi->cmdline.scale);
+		scale = ivi->cmdline.scale;
+
+	weston_output_set_scale(output->output, scale);
+	weston_output_set_transform(output->output, defaults->transform);
 
 	if (ivi->window_api->output_set_size(output->output, width, height) < 0) {
 		weston_log("Cannot configure output '%s' using weston_windowed_output_api.\n",
@@ -396,7 +383,9 @@ windowed_configure_output(struct ivi_output *output)
 		return -1;
 	}
 
-	weston_log("Configured windowed_output_api to %dx%d\n", width, height);
+
+	weston_log("Configured windowed_output_api to %dx%d, scale %d\n",
+		   width, height, scale);
 
 	return 0;
 }
@@ -443,19 +432,17 @@ parse_activation_area(const char *geometry, struct ivi_output *output)
 }
 
 static int
-configure_output(struct ivi_output *output)
+drm_configure_output(struct ivi_output *output)
 {
 	struct ivi_compositor *ivi = output->ivi;
 	struct weston_config_section *section = output->config;
 	int32_t scale = 1;
 	uint32_t transform = WL_OUTPUT_TRANSFORM_NORMAL;
-
-	/*
-	 * This can happen with the wayland backend with 'sprawl'. The config
-	 * is hard-coded, so we don't need to do anything.
-	 */
-	if (!ivi->drm_api && !ivi->window_api)
-		return 0;
+	enum weston_drm_backend_output_mode mode =
+		WESTON_DRM_BACKEND_OUTPUT_PREFERRED;
+	char *modeline = NULL;
+	char *gbm_format = NULL;
+	char *seat = NULL;
 
 	if (section) {
 		char *t;
@@ -475,10 +462,41 @@ configure_output(struct ivi_output *output)
 	weston_output_set_scale(output->output, scale);
 	weston_output_set_transform(output->output, transform);
 
-	if (ivi->drm_api)
-		return drm_configure_output(output);
-	else
-		return windowed_configure_output(output);
+	if (section) {
+		char *m;
+		weston_config_section_get_string(section, "mode", &m, "preferred");
+
+		/* This should have been handled earlier */
+		assert(strcmp(m, "off") != 0);
+
+		if (ivi->cmdline.use_current_mode || strcmp(m, "current") == 0) {
+			mode = WESTON_DRM_BACKEND_OUTPUT_CURRENT;
+		} else if (strcmp(m, "preferred") != 0) {
+			modeline = m;
+			m = NULL;
+		}
+		free(m);
+
+		weston_config_section_get_string(section, "gbm-format",
+						 &gbm_format, NULL);
+
+		weston_config_section_get_string(section, "seat", &seat, "");
+	}
+
+	if (ivi->drm_api->set_mode(output->output, mode, modeline) < 0) {
+		weston_log("Cannot configure output using weston_drm_output_api.\n");
+		free(modeline);
+		return -1;
+	}
+	free(modeline);
+
+	ivi->drm_api->set_gbm_format(output->output, gbm_format);
+	free(gbm_format);
+
+	ivi->drm_api->set_seat(output->output, seat);
+	free(seat);
+
+	return 0;
 }
 
 /*
@@ -572,7 +590,7 @@ try_attach_enable_heads(struct ivi_output *output)
 
 	fail_len = try_attach_heads(output);
 
-	if (configure_output(output) < 0)
+	if (drm_configure_output(output) < 0)
 		return -1;
 
 	fail_len = try_enable_output(output, fail_len);
@@ -603,7 +621,7 @@ process_output(struct ivi_output *output)
 }
 
 static void
-head_disable(struct ivi_compositor *ivi, struct weston_head *head)
+drm_head_disable(struct ivi_compositor *ivi, struct weston_head *head)
 {
 	struct weston_output *output;
 	struct ivi_output *ivi_output;
@@ -673,7 +691,7 @@ find_controlling_output_config(struct weston_config *config,
 }
 
 static void
-head_prepare_enable(struct ivi_compositor *ivi, struct weston_head *head)
+drm_head_prepare_enable(struct ivi_compositor *ivi, struct weston_head *head)
 {
 	const char *name = weston_head_get_name(head);
 	struct weston_config_section *section;
@@ -712,7 +730,7 @@ head_prepare_enable(struct ivi_compositor *ivi, struct weston_head *head)
 }
 
 static void
-heads_changed(struct wl_listener *listener, void *arg)
+drm_heads_changed(struct wl_listener *listener, void *arg)
 {
 	struct weston_compositor *compositor = arg;
 	struct weston_head *head = NULL;
@@ -726,9 +744,9 @@ heads_changed(struct wl_listener *listener, void *arg)
 		bool non_desktop = weston_head_is_non_desktop(head);
 
 		if (connected && !enabled && !non_desktop)
-			head_prepare_enable(ivi, head);
+			drm_head_prepare_enable(ivi, head);
 		else if (!connected && enabled)
-			head_disable(ivi, head);
+			drm_head_disable(ivi, head);
 		else if (enabled && changed)
 			weston_log("Detected a monitor change on head '%s', "
 				   "not bothering to do anything about it.\n",
@@ -748,6 +766,90 @@ heads_changed(struct wl_listener *listener, void *arg)
 	}
 }
 
+static void
+simple_head_enable(struct ivi_compositor *ivi, struct weston_head *head)
+{
+	struct ivi_output *output;
+	struct weston_config_section *section;
+	char *output_name = NULL;
+	const char *name = weston_head_get_name(head);
+
+	section = find_controlling_output_config(ivi->config, name);
+	if (section) {
+		char *mode;
+
+		weston_config_section_get_string(section, "mode", &mode, NULL);
+		if (mode && strcmp(mode, "off") == 0) {
+			free(mode);
+			return;
+		}
+		free(mode);
+
+		weston_config_section_get_string(section, "name",
+						 &output_name, NULL);
+	} else {
+		output_name = strdup(name);
+	}
+
+	if (!output_name)
+		return;
+
+	output = ivi_ensure_output(ivi, output_name, section, head);
+	if (!output) {
+		weston_log("Failed to create output %s\n", output_name);
+		return;
+	}
+
+	add_head_destroyed_listener(head);
+}
+
+
+static void
+simple_head_disable(struct weston_head *head)
+{
+	struct weston_output *output;
+	struct wl_listener *listener;
+
+	listener = weston_head_get_destroy_listener(head, handle_head_destroy);
+	wl_list_empty(&listener->link);
+
+	output = weston_head_get_output(head);
+	assert(output);
+	weston_output_destroy(output);
+}
+
+
+static void
+simple_heads_changed(struct wl_listener *listener, void *arg)
+{
+	struct weston_compositor *compositor = arg;
+	struct ivi_compositor *ivi = to_ivi_compositor(compositor);
+	struct weston_head *head = NULL;
+	bool connected;
+	bool enabled;
+	bool changed;
+	bool non_desktop;
+
+	while ((head = weston_compositor_iterate_heads(ivi->compositor, head))) {
+		connected = weston_head_is_connected(head);
+		enabled = weston_head_is_enabled(head);
+		changed = weston_head_is_device_changed(head);
+		non_desktop = weston_head_is_non_desktop(head);
+
+		if (connected && !enabled && !non_desktop) {
+			simple_head_enable(ivi, head);
+		} else if (!connected && enabled) {
+			simple_head_disable(head);
+		} else if (enabled && changed) {
+			weston_log("Detected a monitor change on head '%s', "
+					"not bothering to do anything about it.\n",
+					weston_head_get_name(head));
+		}
+		weston_head_reset_device_changed(head);
+	}
+}
+
+
 #ifdef HAVE_REMOTING
 static int
 drm_backend_remoted_output_configure(struct weston_output *output,
@@ -996,13 +1098,15 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 	if (without_input)
 		ivi->compositor->require_input = !without_input;
 
-	ivi->heads_changed.notify = heads_changed;
+	ivi->heads_changed.notify = drm_heads_changed;
 	weston_compositor_add_heads_changed_listener(ivi->compositor,
 						     &ivi->heads_changed);
 
 	if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
-					    &config.base))
+					    &config.base)) {
+		weston_log("Failed to load DRM backend\n");
 		return -1;
+	}
 
 	ivi->drm_api = weston_drm_output_get_api(ivi->compositor);
 	if (!ivi->drm_api) {
@@ -1097,6 +1201,27 @@ windowed_create_outputs(struct ivi_compositor *ivi, int output_count,
 	return 0;
 }
 
+
+static int
+wayland_backend_output_configure(struct weston_output *output)
+{
+	struct ivi_output *ivi_output = to_ivi_output(output);
+
+	struct ivi_output_config defaults = {
+		.width = WINDOWED_DEFAULT_WIDTH,
+		.height = WINDOWED_DEFAULT_HEIGHT,
+		.scale = 1,
+		.transform = WL_OUTPUT_TRANSFORM_NORMAL
+	};
+
+	if (!ivi_output) {
+		weston_log("Failed to configure and enable Wayland output. No ivi-output available!\n");
+		return -1;
+	}
+
+	return ivi_configure_windowed_output_from_config(to_ivi_output(output), &defaults);
+}
+
 static int
 load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 		     enum weston_renderer_type renderer)
@@ -1129,8 +1254,17 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 	weston_config_section_get_int(section, "cursor-size",
 				      &config.cursor_size, 32);
 
-	ivi->backend = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_WAYLAND,
+	ivi->simple_output_configure = wayland_backend_output_configure;
+	ivi->heads_changed.notify = simple_heads_changed;
+	weston_compositor_add_heads_changed_listener(ivi->compositor,
+						     &ivi->heads_changed);
+
+	ivi->backend = weston_compositor_load_backend(ivi->compositor,
+						      WESTON_BACKEND_WAYLAND,
 						      &config.base);
+	if (!ivi->backend) {
+		weston_log("Failed to create Wayland backend!\n");
+	}
 
 	free(config.cursor_theme);
 	free(config.display_name);
@@ -1154,6 +1288,27 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 }
 
 #ifdef HAVE_BACKEND_X11
+static int
+x11_backend_output_configure(struct weston_output *output)
+{
+	struct ivi_output *ivi_output = to_ivi_output(output);
+
+	struct ivi_output_config defaults = {
+		.width = WINDOWED_DEFAULT_WIDTH,
+		.height = WINDOWED_DEFAULT_HEIGHT,
+		.scale = 1,
+		.transform = WL_OUTPUT_TRANSFORM_NORMAL
+	};
+
+	if (!ivi_output) {
+		weston_log("Failed to configure and enable X11 output. No ivi-output available!\n");
+		return -1;
+	}
+
+
+	return ivi_configure_windowed_output_from_config(ivi_output, &defaults);
+}
+
 static int
 load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 		 enum weston_renderer_type renderer)
@@ -1166,7 +1321,6 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 	};
 	int no_input = 0;
 	int output_count;
-	int ret;
 	bool force_pixman = false;
 
 	const struct weston_option options[] = {
@@ -1183,8 +1337,19 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 		config.renderer = WESTON_RENDERER_AUTO;
 	config.no_input = no_input;
 
-	if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_X11, &config.base))
+	ivi->simple_output_configure = x11_backend_output_configure;
+
+	ivi->heads_changed.notify = simple_heads_changed;
+	weston_compositor_add_heads_changed_listener(ivi->compositor,
+						     &ivi->heads_changed);
+
+	ivi->backend = weston_compositor_load_backend(ivi->compositor,
+						      WESTON_BACKEND_X11,
+						      &config.base);
+	if (!ivi->backend) {
+		weston_log("Failed to create X11 backend!\n");
 		return -1;
+	}
 
 	ivi->window_api = weston_windowed_output_get_api(ivi->compositor);
 	if (!ivi->window_api) {
@@ -1210,14 +1375,19 @@ weston_rdp_backend_config_init(struct weston_rdp_backend_config *config)
         config->base.struct_version = WESTON_RDP_BACKEND_CONFIG_VERSION;
         config->base.struct_size = sizeof(struct weston_rdp_backend_config);
 
+        config->renderer = WESTON_RENDERER_AUTO;
         config->bind_address = NULL;
         config->port = 3389;
         config->rdp_key = NULL;
         config->server_cert = NULL;
         config->server_key = NULL;
         config->env_socket = 0;
-        config->no_clients_resize = 1;
+        config->external_listener_fd = -1;
+        config->no_clients_resize = 0;
         config->force_no_compression = 0;
+        config->remotefx_codec = true;
+        config->refresh_rate = RDP_DEFAULT_FREQ;
+
 }
 
 static int
@@ -1273,6 +1443,8 @@ rdp_backend_output_configure(struct weston_output *output)
 	new_mode.width = width;
 	new_mode.height = height;
 
+	weston_log("Setting modeline to %dx%d\n", width, height);
+
 	api->output_set_mode(output, &new_mode);
 	weston_output_set_transform(output, transform);
 
@@ -1280,10 +1452,12 @@ rdp_backend_output_configure(struct weston_output *output)
 }
 
 static int
-load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv,
+		 enum weston_renderer_type renderer)
 {
 	struct weston_rdp_backend_config config = {};
 	struct weston_config_section *section;
+	bool no_remotefx_codec = false;
 
 	struct ivi_output_config *parsed_options = ivi_init_parsed_options(ivi->compositor);
 	if (!parsed_options)
@@ -1293,21 +1467,28 @@ load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 
 	const struct weston_option rdp_options[] = {
 		{ WESTON_OPTION_BOOLEAN, "env-socket", 0, &config.env_socket },
+		{ WESTON_OPTION_INTEGER, "external-listener-fd", 0, &config.external_listener_fd },
 		{ WESTON_OPTION_INTEGER, "width", 0, &parsed_options->width },
 		{ WESTON_OPTION_INTEGER, "height", 0, &parsed_options->height },
-		{ WESTON_OPTION_INTEGER, "transform", 0, &parsed_options->transform },
-		{ WESTON_OPTION_INTEGER, "scale", 0, &parsed_options->scale },
 		{ WESTON_OPTION_STRING,  "address", 0, &config.bind_address },
 		{ WESTON_OPTION_INTEGER, "port", 0, &config.port },
 		{ WESTON_OPTION_BOOLEAN, "no-clients-resize", 0, &config.no_clients_resize },
 		{ WESTON_OPTION_STRING,  "rdp4-key", 0, &config.rdp_key },
 		{ WESTON_OPTION_STRING,  "rdp-tls-cert", 0, &config.server_cert },
 		{ WESTON_OPTION_STRING,  "rdp-tls-key", 0, &config.server_key },
+		{ WESTON_OPTION_INTEGER, "scale", 0, &parsed_options->scale },
 		{ WESTON_OPTION_BOOLEAN, "force-no-compression", 0, &config.force_no_compression },
+		{ WESTON_OPTION_BOOLEAN, "no-remotefx-codec", 0, &no_remotefx_codec },
 	};
 
+	config.remotefx_codec = !no_remotefx_codec;
+	config.renderer = renderer;
+
 	section = weston_config_get_section(ivi->config, "rdp", NULL, NULL);
 
+	weston_config_section_get_int(section, "refresh-rate",
+			&config.refresh_rate, RDP_DEFAULT_FREQ);
+
 	weston_config_section_get_string(section, "tls-cert",
 			&config.server_cert, config.server_cert);
 
@@ -1316,10 +1497,19 @@ load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 
 
 	parse_options(rdp_options, ARRAY_LENGTH(rdp_options), argc, argv);
+	weston_log("No clients resize: %d\n", config.no_clients_resize);
 
 	ivi->simple_output_configure = rdp_backend_output_configure;
-	if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_RDP, &config.base))
+
+	ivi->heads_changed.notify = simple_heads_changed;
+	weston_compositor_add_heads_changed_listener(ivi->compositor,
+						     &ivi->heads_changed);
+
+	if (!weston_compositor_load_backend(ivi->compositor,
+					    WESTON_BACKEND_RDP, &config.base)) {
+		weston_log("Failed to create RDP backend\n");
 		return -1;
+	}
 
 	free(config.bind_address);
 	free(config.rdp_key);
@@ -1330,7 +1520,8 @@ load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 }
 #else
 static int
-load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv,
+		 enum weston_renderer_type renderer)
 {
 	return -1;
 }
@@ -1358,7 +1549,7 @@ load_backend(struct ivi_compositor *ivi, int *argc, char **argv,
 	case WESTON_BACKEND_DRM:
 		return load_drm_backend(ivi, argc, argv, renderer);
 	case WESTON_BACKEND_RDP:
-		return load_rdp_backend(ivi, argc, argv);
+		return load_rdp_backend(ivi, argc, argv, renderer);
 	case WESTON_BACKEND_WAYLAND:
 		return load_wayland_backend(ivi, argc, argv, renderer);
 	case WESTON_BACKEND_X11:
@@ -1654,7 +1845,7 @@ log_timestamp(char *buf, size_t len)
 
 	strftime(timestr, sizeof(timestr), "%H:%M:%S", brokendown_time);
 	/* if datestr is empty it prints only timestr*/
-	snprintf(buf, len, "%s[%s.%03li]", datestr,
+	snprintf(buf, len, "%s[%s.%03"PRIi64"]", datestr,
 			timestr, (tv.tv_usec / 1000));
 
 	return buf;
@@ -1860,6 +2051,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 	bool xwayland = false;
 	struct sigaction action;
 	char *renderer = NULL;
+	struct wet_process *process, *process_tmp;
 
 	const struct weston_option core_options[] = {
 		{ WESTON_OPTION_STRING, "renderer", 'r', &renderer },
@@ -2052,8 +2244,11 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 	ivi_launch_shell_client(&ivi, "shell-client-ext",
 				&ivi.shell_client_ext.client);
 
-	if (debug)
-		ivi_screenshooter_create(&ivi);
+	if (debug) {
+		weston_compositor_add_screenshot_authority(ivi.compositor,
+					   &ivi.screenshot_auth,
+					   screenshot_allow_all);
+	}
 	ivi_agl_systemd_notify(&ivi);
 
 	wl_display_run(display);
@@ -2078,6 +2273,9 @@ error_compositor:
 
 	ivi_policy_destroy(ivi.policy);
 
+        wl_list_for_each_safe(process, process_tmp, &ivi.child_process_list, link)
+                ivi_process_destroy(process, 0, false);
+
 error_signals:
 	for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i)
 		if (signals[i])