main: Use a configuration option for hidding out the cursor

[src/agl-compositor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index de2188f..590977f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -101,6 +101,12 @@ ivi_output_configure_app_id(struct ivi_output *ivi_output)
                                                 "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);
        }
 }
 
@@ -564,6 +570,9 @@ drm_backend_remoted_output_configure(struct weston_output *output,
        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) {
@@ -573,9 +582,15 @@ drm_backend_remoted_output_configure(struct weston_output *output,
                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);
@@ -663,25 +678,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, &section_name)) {
                if (strcmp(section_name, "remote-output"))
@@ -691,7 +693,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;
@@ -710,7 +713,7 @@ load_remoting(struct ivi_compositor *ivi, struct weston_config *config)
                ivi_output->name = _name;
                ivi_output->config = remote_section;
 
-               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);
@@ -722,13 +725,32 @@ load_remoting(struct ivi_compositor *ivi, struct weston_config *config)
                                                   &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;
 }
@@ -781,7 +803,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
                goto error;
        }
 
-       load_remoting(ivi, ivi->config);
+       load_remoting_plugin(ivi, ivi->config);
 
 error:
        free(config.gbm_format);
@@ -1324,7 +1346,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);
@@ -1344,6 +1366,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;
@@ -1356,6 +1379,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 },
        };
 
@@ -1368,6 +1392,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);
 
@@ -1406,6 +1431,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);
@@ -1447,6 +1474,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;
 
@@ -1457,6 +1486,9 @@ int main(int argc, char *argv[])
 
        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)
@@ -1468,6 +1500,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);