summaryrefslogtreecommitdiffstats
path: root/src/main.c
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2020-06-01 18:31:22 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-06-15 10:08:32 +0000
commit8df7681a823e5e6f7ead5150abf65dd84d05aecd (patch)
tree3ff88fdab7364e080050b942aca1e9ded0ea6dcd /src/main.c
parentf235042e4cd88197ade414795382ba227f924332 (diff)
src/: Use agl-shell-app-id to set-up views on a different output
This makes it easier to specify the application directly in the configuration file, without the ned to modify the application code. Bug-AGL: SPEC-3280 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Ic38ca0aaf05ce8f1c4993341c9d767acfd25eb43
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index cad8a42..2bbb800 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,7 @@
#include <libweston/windowed-output-api.h>
#include <libweston/config-parser.h>
#include <libweston/weston-log.h>
+#include <weston/weston.h>
#include "shared/os-compatibility.h"
#include "shared/helpers.h"
@@ -85,6 +86,20 @@ to_ivi_output(struct weston_output *o)
return output;
}
+static void
+ivi_output_configure_app_id(struct ivi_output *ivi_output)
+{
+ if (ivi_output->config) {
+ if (ivi_output->app_id != NULL)
+ return;
+
+ weston_config_section_get_string(ivi_output->config,
+ "agl-shell-app-id",
+ &ivi_output->app_id,
+ NULL);
+ }
+}
+
static struct ivi_output *
ivi_ensure_output(struct ivi_compositor *ivi, char *name,
struct weston_config_section *config)
@@ -119,6 +134,7 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
&output->output_destroy);
wl_list_insert(&ivi->outputs, &output->link);
+ ivi_output_configure_app_id(output);
return output;
}