#include "remote.h"
#endif
+#ifdef HAVE_WALTHAM
+#include <waltham-transmitter/transmitter_api.h>
+#endif
+
static int cached_tm_mday = -1;
static struct weston_log_scope *log_scope;
output = wl_container_of(listener, output, output_destroy);
assert(output->output == data);
+ if (output->fullscreen_view.fs->view) {
+ weston_surface_destroy(output->fullscreen_view.fs->view->surface);
+ output->fullscreen_view.fs->view = NULL;
+ }
+
output->output = NULL;
wl_list_remove(&output->output_destroy.link);
}
}
}
+#ifdef HAVE_WALTHAM
+static int
+load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config)
+{
+ struct weston_compositor *compositor = ivi->compositor;
+ int (*module_init)(struct weston_compositor *wc);
+
+ module_init = weston_load_module("waltham-transmitter.so",
+ "wet_module_init");
+ if (!module_init)
+ return -1;
+
+ if (module_init(compositor) < 0)
+ return -1;
+
+ ivi->waltham_transmitter_api = weston_get_transmitter_api(compositor);
+ if (!ivi->waltham_transmitter_api) {
+ weston_log("Failed to load waltham-transmitter plugin.\n");
+ return -1;
+ }
+
+ weston_log("waltham-transmitter plug-in loaded\n");
+ return 0;
+}
+#else
+static int
+load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config)
+{
+ return -1;
+}
+#endif
+
#ifdef HAVE_REMOTING
static int
drm_backend_remoted_output_configure(struct weston_output *output,
ivi_output->ivi = ivi;
ivi_output->name = _name;
ivi_output->config = remote_section;
+ ivi_output->type = OUTPUT_REMOTE;
if (remote_output_init(ivi_output, ivi->compositor,
remote_section, ivi->remoting_api)) {
}
}
+static void
+ivi_enable_waltham_outputs(struct ivi_compositor *ivi)
+{
+ struct weston_config_section *transmitter_section = NULL;
+ const char *sect_name;
+ struct weston_config *config = ivi->config;
+
+ while (weston_config_next_section(config, &transmitter_section, §_name)) {
+ if (strcmp(sect_name, "transmitter-output"))
+ continue;
+
+ struct ivi_output *ivi_output = NULL;
+ bool output_found = false;
+ char *_name = NULL;
+
+ weston_config_section_get_string(transmitter_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 = transmitter_section;
+
+ if (remote_output_init(ivi_output, ivi->compositor,
+ transmitter_section, ivi->remoting_api)) {
+ free(ivi_output->name);
+ free(ivi_output);
+ continue;
+ }
+
+ ivi_output->type = OUTPUT_WALTHAM;
+ 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_plugin(struct ivi_compositor *ivi, struct weston_config *config)
{
}
load_remoting_plugin(ivi, ivi->config);
+ load_waltham_plugin(ivi, ivi->config);
error:
free(config.gbm_format);
&compositor->kb_repeat_delay, 400);
weston_config_section_get_bool(section, "vt-switching",
- &vt_switching, true);
+ &vt_switching, false);
compositor->vt_switching = vt_switching;
/* agl-compositor.ini [core] */
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);
return EXIT_SUCCESS;
}
- if (debug)
- ivi.hide_cursor = true;
-
log_ctx = weston_log_ctx_compositor_create();
if (!log_ctx) {
fprintf(stderr, "Failed to initialize weston debug framework.\n");
if (!backend)
backend = choose_default_backend();
}
+ /* from [core] */
+ weston_config_section_get_bool(section, "hide-cursor", &ivi.hide_cursor, false);
+ weston_config_section_get_bool(section, "activate-by-default", &ivi.activate_by_default, true);
display = wl_display_create();
loop = wl_display_get_event_loop(display);
if (ivi.remoting_api)
ivi_enable_remote_outputs(&ivi);
- ivi_shell_init_black_fs(&ivi);
+ if (ivi.waltham_transmitter_api)
+ ivi_enable_waltham_outputs(&ivi);
if (create_listening_socket(display, socket_name) < 0)
goto error_compositor;
+ ivi_shell_init_black_fs(&ivi);
+
ivi.compositor->exit = handle_exit;
weston_compositor_wake(ivi.compositor);
ivi_shell_create_global(&ivi);
ivi_launch_shell_client(&ivi);
- ivi_screenshooter_create(&ivi);
+ if (debug)
+ ivi_screenshooter_create(&ivi);
ivi_agl_systemd_notify(&ivi);
wl_display_run(display);