X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=4a2ffca342e57eebe8eda7f44f647d5b839712ed;hb=bdd8dd718496dc8e4330209c46c196442bcf7d3e;hp=613d6ee90ac69e5be767630ca2c438ecbbc6c55a;hpb=7536014f86a169ac6a021ef83e79eeb1cfb77b07;p=src%2Fagl-compositor.git diff --git a/src/main.c b/src/main.c index 613d6ee..4a2ffca 100644 --- a/src/main.c +++ b/src/main.c @@ -57,6 +57,10 @@ #include "remote.h" #endif +#ifdef HAVE_WALTHAM +#include +#endif + static int cached_tm_mday = -1; static struct weston_log_scope *log_scope; @@ -74,6 +78,11 @@ handle_output_destroy(struct wl_listener *listener, void *data) 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); } @@ -102,6 +111,9 @@ ivi_output_configure_app_id(struct ivi_output *ivi_output) &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); } @@ -555,6 +567,38 @@ heads_changed(struct wl_listener *listener, void *arg) } } +#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, @@ -675,25 +719,12 @@ err: return ret; } -static int -load_remoting(struct ivi_compositor *ivi, struct weston_config *config) +static void +ivi_enable_remote_outputs(struct ivi_compositor *ivi) { - 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"); - if (!module_init) - return -1; - - if (module_init(compositor) < 0) - return -1; - - ivi->remoting_api = weston_remoting_get_api(compositor); - if (!ivi->remoting_api) - return -1; + struct weston_config *config = ivi->config; while (weston_config_next_section(config, &remote_section, §ion_name)) { if (strcmp(section_name, "remote-output")) @@ -703,7 +734,8 @@ load_remoting(struct ivi_compositor *ivi, struct weston_config *config) bool output_found = false; char *_name = NULL; - weston_config_section_get_string(remote_section, "name", &_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; @@ -721,8 +753,9 @@ load_remoting(struct ivi_compositor *ivi, struct weston_config *config) ivi_output->ivi = ivi; ivi_output->name = _name; ivi_output->config = remote_section; + ivi_output->type = OUTPUT_REMOTE; - if (remote_output_init(ivi_output, compositor, + if (remote_output_init(ivi_output, ivi->compositor, remote_section, ivi->remoting_api)) { free(ivi_output->name); free(ivi_output); @@ -736,12 +769,82 @@ load_remoting(struct ivi_compositor *ivi, struct weston_config *config) wl_list_insert(&ivi->outputs, &ivi_output->link); ivi_output_configure_app_id(ivi_output); } +} + +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) +{ + struct weston_compositor *compositor = ivi->compositor; + int (*module_init)(struct weston_compositor *wc); + + module_init = weston_load_module("remoting-plugin.so", + "weston_module_init"); + if (!module_init) + return -1; + if (module_init(compositor) < 0) + return -1; + + ivi->remoting_api = weston_remoting_get_api(compositor); + if (!ivi->remoting_api) + return -1; 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; } @@ -794,7 +897,8 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[]) goto error; } - load_remoting(ivi, ivi->config); + load_remoting_plugin(ivi, ivi->config); + load_waltham_plugin(ivi, ivi->config); error: free(config.gbm_format); @@ -1337,7 +1441,7 @@ usage(int error_code) " --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); @@ -1357,6 +1461,7 @@ int main(int argc, char *argv[]) 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; @@ -1369,6 +1474,7 @@ int main(int argc, char *argv[]) { 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 }, }; @@ -1419,6 +1525,8 @@ int main(int argc, char *argv[]) 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); @@ -1460,6 +1568,8 @@ int main(int argc, char *argv[]) if (ivi_desktop_init(&ivi) < 0) goto error_compositor; + ivi_seat_init(&ivi); + if (ivi_policy_init(&ivi) < 0) goto error_compositor; @@ -1470,17 +1580,25 @@ int main(int argc, char *argv[]) weston_compositor_flush_heads_changed(ivi.compositor); - ivi_shell_init_black_fs(&ivi); + if (ivi.remoting_api) + ivi_enable_remote_outputs(&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); + if (debug) + ivi_screenshooter_create(&ivi); ivi_agl_systemd_notify(&ivi); wl_display_run(display);