meson.build: Add an explicit weston dependency

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

diff --git a/src/compositor.c b/src/compositor.c
index 1f45a71..5ef3b34 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -49,7 +49,7 @@
 #include <libweston/windowed-output-api.h>
 #include <libweston/config-parser.h>
 #include <libweston/weston-log.h>
-#include <weston/weston.h>
+#include <weston.h>
 
 #include "shared/os-compatibility.h"
 #include "shared/helpers.h"
@@ -79,6 +79,95 @@ sigint_helper(int sig)
        raise(SIGUSR2);
 }
 
+void
+ivi_layout_save(struct ivi_compositor *ivi, struct ivi_output *output)
+{
+       struct ivi_output *new_output;
+       ivi->need_ivi_output_relayout = true;
+
+       new_output = zalloc(sizeof(*new_output));
+
+       new_output->ivi = ivi;
+       new_output->background = output->background;
+
+       new_output->top = output->top;
+       new_output->bottom = output->bottom;
+       new_output->left = output->left;
+       new_output->right = output->right;
+
+       new_output->active = output->active;
+       new_output->previous_active = output->previous_active;
+       new_output->name = strdup(output->name);
+       if (output->app_ids)
+               new_output->app_ids = strdup(output->app_ids);
+
+       new_output->area = output->area;
+       new_output->area_saved = output->area_saved;
+       new_output->area_activation = output->area_activation;
+
+       weston_log("saving output layout for output %s\n", new_output->name);
+
+       wl_list_insert(&ivi->saved_outputs, &new_output->link);
+}
+
+void
+ivi_layout_restore(struct ivi_compositor *ivi, struct ivi_output *n_output)
+{
+       struct ivi_output *output = NULL;
+       struct ivi_output *iter_output;
+
+       if (!ivi->need_ivi_output_relayout)
+               return;
+
+       ivi->need_ivi_output_relayout = false;
+
+       wl_list_for_each(iter_output, &ivi->saved_outputs, link) {
+               if (strcmp(n_output->name, iter_output->name) == 0) {
+                       output = iter_output;
+                       break;
+               }
+       }
+
+       if (!output)
+               return;
+
+       weston_log("restoring output layout for output %s\n", output->name);
+       n_output->background = output->background;
+
+       n_output->top = output->top;
+       n_output->bottom = output->bottom;
+       n_output->left = output->left;
+       n_output->right = output->right;
+
+       n_output->active = output->active;
+       n_output->previous_active = output->previous_active;
+       if (output->app_ids)
+               n_output->app_ids = strdup(output->app_ids);
+
+       n_output->area = output->area;
+       n_output->area_saved = output->area_saved;
+       n_output->area_activation = output->area_activation;
+
+       free(output->app_ids);
+       free(output->name);
+       wl_list_remove(&output->link);
+       free(output);
+}
+
+void
+ivi_layout_destroy_saved_outputs(struct ivi_compositor *ivi)
+{
+       struct ivi_output *output, *output_next;
+
+       wl_list_for_each_safe(output, output_next, &ivi->saved_outputs, link) {
+               free(output->app_ids);
+               free(output->name);
+
+               wl_list_remove(&output->link);
+               free(output);
+       }
+}
+
 static void
 handle_output_destroy(struct wl_listener *listener, void *data)
 {
@@ -93,6 +182,8 @@ handle_output_destroy(struct wl_listener *listener, void *data)
                output->fullscreen_view.fs->view = NULL;
        }
 
+       ivi_layout_save(output->ivi, output);
+
        output->output = NULL;
        wl_list_remove(&output->output_destroy.link);
 }
@@ -113,19 +204,19 @@ static void
 ivi_output_configure_app_id(struct ivi_output *ivi_output)
 {
        if (ivi_output->config) {
-               if (ivi_output->app_id != NULL)
+               if (ivi_output->app_ids != NULL)
                        return;
 
                weston_config_section_get_string(ivi_output->config,
                                                 "agl-shell-app-id",
-                                                &ivi_output->app_id,
+                                                &ivi_output->app_ids,
                                                 NULL);
 
-               if (ivi_output->app_id == NULL)
+               if (ivi_output->app_ids == NULL)
                        return;
 
                weston_log("Will place app_id %s on output %s\n",
-                               ivi_output->app_id, ivi_output->name);
+                               ivi_output->app_ids, ivi_output->name);
        }
 }
 
@@ -454,6 +545,8 @@ try_attach_enable_heads(struct ivi_output *output)
        for (size_t i = fail_len; i < output->add_len; ++i)
                add_head_destroyed_listener(output->add[i]);
 
+       ivi_layout_restore(output->ivi, output);
+
        output->add_len = fail_len;
        return 0;
 }
@@ -502,6 +595,7 @@ head_disable(struct ivi_compositor *ivi, struct weston_head *head)
                }
        }
        wl_list_remove(&ivi_output->link);
+       free(ivi_output->app_ids);
        free(ivi_output);
 }
 
@@ -1280,11 +1374,12 @@ choose_default_backend(void)
 }
 
 static int
-compositor_init_config(struct weston_compositor *compositor,
-                      struct weston_config *config)
+compositor_init_config(struct ivi_compositor *ivi)
 {
        struct xkb_rule_names xkb_names;
        struct weston_config_section *section;
+       struct weston_compositor *compositor = ivi->compositor;
+       struct weston_config *config = ivi->config;
        int repaint_msec;
        bool vt_switching;
        bool require_input;
@@ -1317,6 +1412,11 @@ compositor_init_config(struct weston_compositor *compositor,
        /* agl-compositor.ini [core] */
        section = weston_config_get_section(config, "core", NULL, NULL);
 
+       weston_config_section_get_bool(section, "disable-cursor",
+                                      &ivi->disable_cursor, false);
+       weston_config_section_get_bool(section, "activate-by-default",
+                                      &ivi->activate_by_default, true);
+
        weston_config_section_get_bool(section, "require-input", &require_input, true);
        compositor->require_input = require_input;
 
@@ -1681,6 +1781,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
        };
 
        wl_list_init(&ivi.outputs);
+       wl_list_init(&ivi.saved_outputs);
        wl_list_init(&ivi.surfaces);
        wl_list_init(&ivi.pending_surfaces);
        wl_list_init(&ivi.popup_pending_apps);
@@ -1733,11 +1834,6 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
                if (!backend)
                        backend = choose_default_backend();
        }
-       /* 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);
@@ -1779,7 +1875,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
                goto error_signals;
        }
 
-       if (compositor_init_config(ivi.compositor, ivi.config) < 0)
+       if (compositor_init_config(&ivi) < 0)
                goto error_compositor;
 
        if (load_backend(&ivi, backend, &argc, argv) < 0) {