38fcf381be
It is only possible to remove a surface from the order.surface_list of a layer, when ivi_layout_layer_set_render_order is called with an empty array. Therefore, list of surfaces are cumulated if the API is called many times with different list of surfaces. Change how the flags are set: - Introduce the dirty parameter for triggering the render order change. - IVI_NOTIFICATION_REMOVE/ADD flags are set only at commit_layer_list. Checking wl_list_empty() on a link offers no information: if it returns true, wl_list_remove() is safe to do. If it returns false, you still do not know if wl_list_remove() is safe; the link could be part of a list, or the link could be "uninitialized" (e.g. just wl_list_remove()'d). (From Pekka Paalanen's comment at http://lists.freedesktop.org/archives/wayland-devel/2015-August/023987.html). Calling wl_list_init just before wl_list_insert is redundant, because the links of the list are not read before it is overwritten by wl_list_insert. Use assert to control if the ivilayer->order.surface_list is empty. Signed-off-by: Emre Ucan <eucan@de.adit-jv.com> [Pekka: wrapped the commit message] Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> [Earlier version Reviewed-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>]
230 lines
6.4 KiB
C
230 lines
6.4 KiB
C
/*
|
|
* Copyright (C) 2014 DENSO CORPORATION
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial
|
|
* portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#ifndef _ivi_layout_PRIVATE_H_
|
|
#define _ivi_layout_PRIVATE_H_
|
|
|
|
#include "compositor.h"
|
|
#include "ivi-layout-export.h"
|
|
|
|
struct ivi_layout_surface {
|
|
struct wl_list link;
|
|
struct wl_signal property_changed;
|
|
struct wl_list layer_list;
|
|
int32_t update_count;
|
|
uint32_t id_surface;
|
|
|
|
struct ivi_layout *layout;
|
|
struct weston_surface *surface;
|
|
|
|
struct weston_transform transform;
|
|
|
|
struct ivi_layout_surface_properties prop;
|
|
uint32_t event_mask;
|
|
|
|
struct {
|
|
struct ivi_layout_surface_properties prop;
|
|
struct wl_list link;
|
|
} pending;
|
|
|
|
struct {
|
|
struct wl_list link;
|
|
struct wl_list layer_list;
|
|
} order;
|
|
|
|
struct {
|
|
ivi_controller_surface_content_callback callback;
|
|
void *userdata;
|
|
} content_observer;
|
|
|
|
struct wl_signal configured;
|
|
};
|
|
|
|
struct ivi_layout_layer {
|
|
struct wl_list link;
|
|
struct wl_signal property_changed;
|
|
struct wl_list screen_list;
|
|
struct wl_list link_to_surface;
|
|
uint32_t id_layer;
|
|
|
|
struct ivi_layout *layout;
|
|
|
|
struct ivi_layout_layer_properties prop;
|
|
uint32_t event_mask;
|
|
|
|
struct {
|
|
struct ivi_layout_layer_properties prop;
|
|
struct wl_list surface_list;
|
|
struct wl_list link;
|
|
} pending;
|
|
|
|
struct {
|
|
int dirty;
|
|
struct wl_list surface_list;
|
|
struct wl_list link;
|
|
} order;
|
|
|
|
int32_t ref_count;
|
|
};
|
|
|
|
struct ivi_layout {
|
|
struct weston_compositor *compositor;
|
|
|
|
struct wl_list surface_list;
|
|
struct wl_list layer_list;
|
|
struct wl_list screen_list;
|
|
|
|
struct {
|
|
struct wl_signal created;
|
|
struct wl_signal removed;
|
|
} layer_notification;
|
|
|
|
struct {
|
|
struct wl_signal created;
|
|
struct wl_signal removed;
|
|
struct wl_signal configure_changed;
|
|
} surface_notification;
|
|
|
|
struct weston_layer layout_layer;
|
|
struct wl_signal warning_signal;
|
|
|
|
struct ivi_layout_transition_set *transitions;
|
|
struct wl_list pending_transition_list;
|
|
};
|
|
|
|
struct ivi_layout *get_instance(void);
|
|
|
|
struct ivi_layout_transition;
|
|
|
|
struct ivi_layout_transition_set {
|
|
struct wl_event_source *event_source;
|
|
struct wl_list transition_list;
|
|
};
|
|
|
|
typedef void (*ivi_layout_transition_destroy_user_func)(void *user_data);
|
|
|
|
struct ivi_layout_transition_set *
|
|
ivi_layout_transition_set_create(struct weston_compositor *ec);
|
|
|
|
void
|
|
ivi_layout_transition_move_resize_view(struct ivi_layout_surface *surface,
|
|
int32_t dest_x, int32_t dest_y,
|
|
int32_t dest_width, int32_t dest_height,
|
|
uint32_t duration);
|
|
|
|
void
|
|
ivi_layout_transition_visibility_on(struct ivi_layout_surface *surface,
|
|
uint32_t duration);
|
|
|
|
void
|
|
ivi_layout_transition_visibility_off(struct ivi_layout_surface *surface,
|
|
uint32_t duration);
|
|
|
|
|
|
void
|
|
ivi_layout_transition_move_layer(struct ivi_layout_layer *layer,
|
|
int32_t dest_x, int32_t dest_y,
|
|
uint32_t duration);
|
|
|
|
void
|
|
ivi_layout_transition_fade_layer(struct ivi_layout_layer *layer,
|
|
uint32_t is_fade_in,
|
|
double start_alpha, double end_alpha,
|
|
void *user_data,
|
|
ivi_layout_transition_destroy_user_func destroy_func,
|
|
uint32_t duration);
|
|
|
|
int32_t
|
|
is_surface_transition(struct ivi_layout_surface *surface);
|
|
|
|
/**
|
|
* methods of interaction between ivi-shell with ivi-layout
|
|
*/
|
|
struct weston_view *
|
|
ivi_layout_get_weston_view(struct ivi_layout_surface *surface);
|
|
void
|
|
ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,
|
|
int32_t width, int32_t height);
|
|
struct ivi_layout_surface*
|
|
ivi_layout_surface_create(struct weston_surface *wl_surface,
|
|
uint32_t id_surface);
|
|
void
|
|
ivi_layout_init_with_compositor(struct weston_compositor *ec);
|
|
int32_t
|
|
ivi_layout_surface_get_dimension(struct ivi_layout_surface *ivisurf,
|
|
int32_t *dest_width, int32_t *dest_height);
|
|
void
|
|
ivi_layout_surface_add_configured_listener(struct ivi_layout_surface* ivisurf,
|
|
struct wl_listener* listener);
|
|
/**
|
|
* methods of interaction between transition animation with ivi-layout
|
|
*/
|
|
int32_t
|
|
ivi_layout_commit_changes(void);
|
|
uint32_t
|
|
ivi_layout_get_id_of_surface(struct ivi_layout_surface *ivisurf);
|
|
int32_t
|
|
ivi_layout_surface_set_destination_rectangle(struct ivi_layout_surface *ivisurf,
|
|
int32_t x, int32_t y,
|
|
int32_t width, int32_t height);
|
|
int32_t
|
|
ivi_layout_surface_set_opacity(struct ivi_layout_surface *ivisurf,
|
|
wl_fixed_t opacity);
|
|
wl_fixed_t
|
|
ivi_layout_surface_get_opacity(struct ivi_layout_surface *ivisurf);
|
|
int32_t
|
|
ivi_layout_surface_set_visibility(struct ivi_layout_surface *ivisurf,
|
|
bool newVisibility);
|
|
bool
|
|
ivi_layout_surface_get_visibility(struct ivi_layout_surface *ivisurf);
|
|
struct ivi_layout_surface *
|
|
ivi_layout_get_surface_from_id(uint32_t id_surface);
|
|
int32_t
|
|
ivi_layout_layer_set_opacity(struct ivi_layout_layer *ivilayer,
|
|
wl_fixed_t opacity);
|
|
wl_fixed_t
|
|
ivi_layout_layer_get_opacity(struct ivi_layout_layer *ivilayer);
|
|
int32_t
|
|
ivi_layout_layer_set_visibility(struct ivi_layout_layer *ivilayer,
|
|
bool newVisibility);
|
|
int32_t
|
|
ivi_layout_layer_set_position(struct ivi_layout_layer *ivilayer,
|
|
int32_t dest_x, int32_t dest_y);
|
|
int32_t
|
|
ivi_layout_layer_get_position(struct ivi_layout_layer *ivilayer,
|
|
int32_t *dest_x, int32_t *dest_y);
|
|
int32_t
|
|
ivi_layout_layer_set_render_order(struct ivi_layout_layer *ivilayer,
|
|
struct ivi_layout_surface **pSurface,
|
|
int32_t number);
|
|
void
|
|
ivi_layout_transition_move_layer_cancel(struct ivi_layout_layer *layer);
|
|
int
|
|
load_controller_modules(struct weston_compositor *compositor, const char *modules,
|
|
int *argc, char *argv[]);
|
|
void
|
|
ivi_layout_surface_destroy(struct ivi_layout_surface *ivisurf);
|
|
#endif
|