X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;fp=src%2Fcompositor.c;h=61dbec6d024d67f3a28ee10a9572e9576c3a0975;hb=ec6f2d31293d8680a1f6dab8f53949b848bbae08;hp=5fe4cf559b797e9494551579e7f38610b1579179;hpb=612ffac8382b8e51a5b30c09c8cf649dd15877e7;p=src%2Fagl-compositor.git diff --git a/src/compositor.c b/src/compositor.c index 5fe4cf5..61dbec6 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -152,96 +152,6 @@ get_renderer_from_string(const char *name, enum weston_renderer_type *renderer) return false; } - -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) {