X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=082cf1f820a50031c6e70d3da1747e5aca65b38a;hb=refs%2Fheads%2Fsandbox%2Fmvlad%2Fadd-waltham-support;hp=e0a9d7949c37973465df0e578cd8244594591637;hpb=81be1de53fd49b7a31e5fea217e88c038e22c3f9;p=src%2Fagl-compositor.git diff --git a/src/main.c b/src/main.c index e0a9d79..082cf1f 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; @@ -102,6 +106,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 +562,130 @@ 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; +} + +static char * +make_model(const char *addr, const char *port, int name) +{ + char *str; + + if (asprintf(&str, "transmitter-%s:%s-%d", addr, port, name) < 0) + return NULL; + + return str; +} + +static void +ivi_enable_waltham_outputs(struct ivi_compositor *ivi, struct weston_config *config) +{ + struct weston_config_section *transmitter_section = NULL; + const char *sect_name; + const struct weston_transmitter_api *api = ivi->waltham_transmitter_api; + struct weston_transmitter *transmitter = NULL; + + if (!api) + return; + + transmitter = api->transmitter_get(ivi->compositor); + if (!transmitter) + return; + + 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; + char *_server_address = NULL; + char *_port = NULL; + + weston_config_section_get_string(transmitter_section, + "output-name", &_name, NULL); + + weston_config_section_get_string(transmitter_section, + "server-address", &_server_address, NULL); + + weston_config_section_get_string(transmitter_section, + "port", &_port, NULL); + if (_name) { + weston_log("Found waltham output name %s\n", _name); + wl_list_for_each(ivi_output, &ivi->outputs, link) { + if (!strcmp(ivi_output->name, _name)) { + output_found = true; + break; + } + } + } + + char *transmitter_output_name = + make_model(_server_address, _port, 1); + + if (output_found) { + free(_name); + continue; + } + + ivi_output = zalloc(sizeof(*ivi_output)); + + ivi_output->ivi = ivi; + ivi_output->name = transmitter_output_name; + ivi_output->config = transmitter_section; + /* waltham creates the output */ + ivi_output->output = + api->get_weston_output(transmitter_output_name, + transmitter); + assert(ivi_output->output); + + ivi_output->output_destroy.notify = handle_output_destroy; + weston_output_add_destroy_listener(ivi_output->output, + &ivi_output->output_destroy); + + ivi_output->type = OUTPUT_WALTHAM; + + wl_list_insert(&ivi->outputs, &ivi_output->link); + ivi_output_configure_app_id(ivi_output); + + /* FIXME: handle it correctly? */ + /* free(transmitter_output_name); */ + } +} +#else +static int +load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config) +{ + return -1; +} + +static void +ivi_enable_waltham_outputs(struct ivi_compositor *ivi, struct weston_config *config) +{ +} +#endif + #ifdef HAVE_REMOTING static int drm_backend_remoted_output_configure(struct weston_output *output, @@ -1343,7 +1474,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); @@ -1363,6 +1494,8 @@ int main(int argc, char *argv[]) int help = 0; int version = 0; int no_config = 0; + int debug = 0; + int waltham = 0; char *config_file = NULL; struct weston_log_context *log_ctx = NULL; struct weston_log_subscriber *logger; @@ -1375,6 +1508,8 @@ 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_BOOLEAN, "waltham", 0, &waltham }, { WESTON_OPTION_STRING, "config", 'c', &config_file }, }; @@ -1387,6 +1522,7 @@ int main(int argc, char *argv[]) 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); @@ -1425,6 +1561,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); @@ -1466,6 +1604,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; @@ -1479,6 +1619,12 @@ int main(int argc, char *argv[]) if (ivi.remoting_api) ivi_enable_remote_outputs(&ivi); + if (waltham) { + load_waltham_plugin(&ivi, ivi.config); + ivi_enable_waltham_outputs(&ivi, ivi.config); + } + + ivi_shell_init_black_fs(&ivi); if (create_listening_socket(display, socket_name) < 0) @@ -1490,6 +1636,8 @@ int main(int argc, char *argv[]) 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);