Weston 9.0 compatibility changes

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

diff --git a/src/compositor.c b/src/compositor.c
index 14be511..4ac0d95 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -39,7 +39,9 @@
 
 #include <libweston/backend-drm.h>
 #include <libweston/backend-wayland.h>
+#ifdef HAVE_BACKEND_HEADLESS
 #include <libweston/backend-headless.h>
+#endif
 #ifdef HAVE_BACKEND_X11
 #include <libweston/backend-x11.h>
 #endif
@@ -299,14 +301,14 @@ static int
 parse_transform(const char *transform, uint32_t *out)
 {
        static const struct { const char *name; uint32_t token; } transforms[] = {
-               { "normal",     WL_OUTPUT_TRANSFORM_NORMAL },
-               { "90",         WL_OUTPUT_TRANSFORM_90 },
-               { "180",        WL_OUTPUT_TRANSFORM_180 },
-               { "270",        WL_OUTPUT_TRANSFORM_270 },
-               { "flipped",    WL_OUTPUT_TRANSFORM_FLIPPED },
-               { "flipped-90", WL_OUTPUT_TRANSFORM_FLIPPED_90 },
-               { "flipped-180", WL_OUTPUT_TRANSFORM_FLIPPED_180 },
-               { "flipped-270", WL_OUTPUT_TRANSFORM_FLIPPED_270 },
+               { "normal",             WL_OUTPUT_TRANSFORM_NORMAL },
+               { "rotate-90",          WL_OUTPUT_TRANSFORM_90 },
+               { "rotate-180",         WL_OUTPUT_TRANSFORM_180 },
+               { "rotate-270",         WL_OUTPUT_TRANSFORM_270 },
+               { "flipped",            WL_OUTPUT_TRANSFORM_FLIPPED },
+               { "flipped-rotate-90",  WL_OUTPUT_TRANSFORM_FLIPPED_90 },
+               { "flipped-rotate-180", WL_OUTPUT_TRANSFORM_FLIPPED_180 },
+               { "flipped-rotate-270", WL_OUTPUT_TRANSFORM_FLIPPED_270 },
        };
 
        for (size_t i = 0; i < ARRAY_LENGTH(transforms); i++)
@@ -752,6 +754,10 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
                }
 
                ivi_output = zalloc(sizeof(*ivi_output));
+               if (!ivi_output) {
+                       free(_name);
+                       continue;
+               }
 
                ivi_output->ivi = ivi;
                ivi_output->name = _name;
@@ -804,6 +810,10 @@ ivi_enable_waltham_outputs(struct ivi_compositor *ivi)
                }
 
                ivi_output = zalloc(sizeof(*ivi_output));
+               if (!ivi_output) {
+                       free(_name);
+                       continue;
+               }
 
                ivi_output->ivi = ivi;
                ivi_output->name = _name;
@@ -1087,6 +1097,7 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 }
 #endif
 
+#ifdef HAVE_BACKEND_HEADLESS
 static int
 load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 {
@@ -1134,6 +1145,13 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 
        return 0;
 }
+#else
+static int
+load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+{
+       return -1;
+}
+#endif
 
 static int
 load_backend(struct ivi_compositor *ivi, const char *backend,
@@ -1248,7 +1266,7 @@ compositor_init_config(struct weston_compositor *compositor,
                                      &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] */
@@ -1627,18 +1645,19 @@ int wet_main(int argc, char *argv[])
 
        if (version) {
                printf(PACKAGE_STRING "\n");
-               return EXIT_SUCCESS;
+               ret = EXIT_SUCCESS;
+               goto exit_signals;
        }
 
-       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;
+               goto exit_signals;
        }
 
-        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);
@@ -1750,15 +1769,18 @@ int wet_main(int argc, char *argv[])
        wl_display_destroy_clients(display);
 
 error_compositor:
-       weston_compositor_tear_down(ivi.compositor);
+       free(backend);
+       backend = NULL;
+       free(modules);
+       modules = NULL;
 
-       weston_compositor_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_scope_destroy(log_scope);
+       log_scope = NULL;
+
+       weston_log_subscriber_destroy(logger);
+       weston_log_ctx_destroy(log_ctx);
 
        ivi_policy_destroy(ivi.policy);
 
@@ -1773,5 +1795,10 @@ error_signals:
        if (ivi.config)
                weston_config_destroy(ivi.config);
 
+exit_signals:
+       free(log);
+       free(config_file);
+       free(socket_name);
+       free(option_modules);
        return ret;
 }