"agl-shell-app-id",
&ivi_output->app_id,
NULL);
+
+ if (ivi_output->app_id == NULL)
+ return;
+
+ weston_log("Will place app_id %s on output %s\n",
+ ivi_output->app_id, ivi_output->name);
}
}
char *host = NULL;
char *pipeline = NULL;
int port, ret;
+ int32_t scale = 1;
+ uint32_t transform = WL_OUTPUT_TRANSFORM_NORMAL;
+ char *trans;
ret = api->set_mode(output, modeline);
if (ret < 0) {
return -1;
}
- /* FIXME: retrieve the scale and the transform from config file */
- weston_output_set_scale(output, 1);
- weston_output_set_transform(output, WL_OUTPUT_TRANSFORM_NORMAL);
+ weston_config_section_get_int(section, "scale", &scale, 1);
+ weston_output_set_scale(output, scale);
+
+ weston_config_section_get_string(section, "transform", &trans, "normal");
+ if (parse_transform(trans, &transform) < 0) {
+ weston_log("Invalid transform \"%s\" for output %s\n",
+ trans, output->name);
+ }
+ weston_output_set_transform(output, transform);
weston_config_section_get_string(section, "gbm-format",
&gbm_format, NULL);
}
-static void
-remote_output_init(struct weston_compositor *compositor,
+static int
+remote_output_init(struct ivi_output *ivi_output,
+ struct weston_compositor *compositor,
struct weston_config_section *section,
const struct weston_remoting_api *api)
{
- struct weston_output *output = NULL;
char *output_name, *modeline = NULL;
- int ret;
+ int ret = -1;
weston_config_section_get_string(section, "name", &output_name, NULL);
if (!output_name)
- return;
+ return ret;
weston_config_section_get_string(section, "mode", &modeline, "off");
if (strcmp(modeline, "off") == 0)
goto err;
- output = api->create_output(compositor, output_name);
- if (!output) {
+ ivi_output->output = api->create_output(compositor, output_name);
+ if (!ivi_output->output) {
weston_log("Cannot create remoted output \"%s\".\n",
output_name);
goto err;
}
- ret = drm_backend_remoted_output_configure(output, section,
+ ret = drm_backend_remoted_output_configure(ivi_output->output, section,
modeline, api);
if (ret < 0) {
weston_log("Cannot configure remoted output \"%s\".\n",
goto err;
}
- if (weston_output_enable(output) < 0) {
+ if (weston_output_enable(ivi_output->output) < 0) {
weston_log("Enabling remoted output \"%s\" failed.\n",
output_name);
goto err;
free(modeline);
free(output_name);
- weston_log("remoted output '%s' enabled\n", output->name);
- return;
+ weston_log("remoted output '%s' enabled\n", ivi_output->output->name);
+
+ return 0;
err:
free(modeline);
free(output_name);
- if (output)
- weston_output_destroy(output);
+ if (ivi_output->output)
+ weston_output_destroy(ivi_output->output);
+ return ret;
+}
+
+static void
+ivi_enable_remote_outputs(struct ivi_compositor *ivi)
+{
+ struct weston_config_section *remote_section = NULL;
+ const char *section_name;
+ struct weston_config *config = ivi->config;
+
+ while (weston_config_next_section(config, &remote_section, §ion_name)) {
+ if (strcmp(section_name, "remote-output"))
+ continue;
+
+ struct ivi_output *ivi_output = NULL;
+ bool output_found = false;
+ char *_name = NULL;
+
+ weston_config_section_get_string(remote_section,
+ "name", &_name, NULL);
+ wl_list_for_each(ivi_output, &ivi->outputs, link) {
+ if (!strcmp(ivi_output->name, _name)) {
+ output_found = true;
+ break;
+ }
+ }
+
+ if (output_found) {
+ free(_name);
+ continue;
+ }
+
+ ivi_output = zalloc(sizeof(*ivi_output));
+
+ ivi_output->ivi = ivi;
+ ivi_output->name = _name;
+ ivi_output->config = remote_section;
+
+ if (remote_output_init(ivi_output, ivi->compositor,
+ remote_section, ivi->remoting_api)) {
+ free(ivi_output->name);
+ free(ivi_output);
+ continue;
+ }
+
+ ivi_output->output_destroy.notify = handle_output_destroy;
+ weston_output_add_destroy_listener(ivi_output->output,
+ &ivi_output->output_destroy);
+
+ wl_list_insert(&ivi->outputs, &ivi_output->link);
+ ivi_output_configure_app_id(ivi_output);
+ }
}
static int
-load_remoting(struct ivi_compositor *ivi, struct weston_config *config)
+load_remoting_plugin(struct ivi_compositor *ivi, struct weston_config *config)
{
struct weston_compositor *compositor = ivi->compositor;
int (*module_init)(struct weston_compositor *wc);
- struct weston_config_section *remote_section = NULL;
- const char *section_name;
module_init = weston_load_module("remoting-plugin.so",
"weston_module_init");
ivi->remoting_api = weston_remoting_get_api(compositor);
if (!ivi->remoting_api)
return -1;
-
- while (weston_config_next_section(config, &remote_section, §ion_name)) {
- if (strcmp(section_name, "remote-output"))
- continue;
- remote_output_init(compositor, remote_section, ivi->remoting_api);
- }
-
return 0;
}
#else
static int
-load_remoting(struct weston_compositor *compositor, struct weston_config *config)
+load_remoting_plugin(struct weston_compositor *compositor, struct weston_config *config)
{
return -1;
}
goto error;
}
- load_remoting(ivi, ivi->config);
+ load_remoting_plugin(ivi, ivi->config);
error:
free(config.gbm_format);
" --log=FILE\t\tLog to the given file\n"
" -c, --config=FILE\tConfig file to load, defaults to agl-compositor.ini\n"
" --no-config\t\tDo not read agl-compositor.ini\n"
- " --debug\t\tEnable debug extension\n"
+ " --debug\t\tEnable debug extension(s)\n"
" -h, --help\t\tThis help message\n"
"\n");
exit(error_code);
int help = 0;
int version = 0;
int no_config = 0;
+ int debug = 0;
char *config_file = NULL;
struct weston_log_context *log_ctx = NULL;
struct weston_log_subscriber *logger;
{ WESTON_OPTION_BOOLEAN, "help", 'h', &help },
{ WESTON_OPTION_BOOLEAN, "version", 0, &version },
{ WESTON_OPTION_BOOLEAN, "no-config", 0, &no_config },
+ { WESTON_OPTION_BOOLEAN, "debug", 0, &debug },
{ WESTON_OPTION_STRING, "config", 'c', &config_file },
};
wl_list_init(&ivi.remote_pending_apps);
wl_list_init(&ivi.desktop_clients);
+
/* Prevent any clients we spawn getting our stdin */
os_fd_set_cloexec(STDIN_FILENO);
if (!backend)
backend = choose_default_backend();
}
+ /* from [core] */
+ weston_config_section_get_bool(section, "hide-cursor", &ivi.hide_cursor, false);
display = wl_display_create();
loop = wl_display_get_event_loop(display);
if (ivi_desktop_init(&ivi) < 0)
goto error_compositor;
+ ivi_seat_init(&ivi);
+
if (ivi_policy_init(&ivi) < 0)
goto error_compositor;
weston_compositor_flush_heads_changed(ivi.compositor);
+ if (ivi.remoting_api)
+ ivi_enable_remote_outputs(&ivi);
+
ivi_shell_init_black_fs(&ivi);
if (create_listening_socket(display, socket_name) < 0)
ivi_shell_create_global(&ivi);
ivi_launch_shell_client(&ivi);
+ if (debug)
+ ivi_screenshooter_create(&ivi);
ivi_agl_systemd_notify(&ivi);
wl_display_run(display);
Code Review / src / agl-compositor.git / blobdiff