layout: Remove weston_output_damage dependecy

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

diff --git a/src/main.c b/src/main.c
index 6580abc..4111784 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -753,6 +753,7 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
                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)) {
@@ -770,6 +771,58 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
        }
 }
 
+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, &sect_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)
 {
@@ -1447,15 +1500,15 @@ int main(int argc, char *argv[])
                return EXIT_SUCCESS;
        }
 
-       log_ctx = weston_log_ctx_compositor_create();
+       log_ctx = weston_log_ctx_create();
        if (!log_ctx) {
                fprintf(stderr, "Failed to initialize weston debug framework.\n");
                return ret;
        }
 
-        log_scope = weston_compositor_add_log_scope(log_ctx, "log",
-                                                   "agl-compositor log\n",
-                                                   NULL, NULL, NULL);
+        log_scope = weston_log_ctx_add_log_scope(log_ctx, "log",
+                                                "agl-compositor log\n",
+                                                 NULL, NULL, NULL);
 
        log_file_open(log);
        weston_log_set_handler(vlog, vlog_continue);
@@ -1474,6 +1527,7 @@ int main(int argc, char *argv[])
        }
        /* 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);
@@ -1530,6 +1584,9 @@ int main(int argc, char *argv[])
        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;
 
@@ -1552,15 +1609,13 @@ int main(int argc, char *argv[])
        wl_display_destroy_clients(display);
 
 error_compositor:
-       weston_compositor_tear_down(ivi.compositor);
+       weston_compositor_destroy(ivi.compositor);
 
-       weston_compositor_log_scope_destroy(log_scope);
+       weston_log_scope_destroy(log_scope);
        log_scope = NULL;
 
-       weston_log_ctx_compositor_destroy(ivi.compositor);
-       weston_compositor_destroy(ivi.compositor);
-
-       weston_log_subscriber_destroy_log(logger);
+       weston_log_subscriber_destroy(logger);
+       weston_log_ctx_destroy(log_ctx);
 
        ivi_policy_destroy(ivi.policy);