#include <string.h>
static void
-handle_surface_destroy(struct wl_listener *listener, void *data)
+view_handle_surface_destroy(struct wl_listener *listener, void *data)
{
pepper_view_t *view = pepper_container_of(listener, pepper_view_t, surface_destroy_listener);
PEPPER_ASSERT(view->surface != NULL);
}
static void
-damage_region_transform(pixman_region32_t *region, pepper_matrix_t *matrix)
+view_geometry_dirty(pepper_view_t *view)
{
- /* TODO: */
+ pepper_list_t *l;
+
+ if (view->geometry_dirty)
+ return;
+
+ view->geometry_dirty = PEPPER_TRUE;
+ pepper_compositor_add_damage(view->compositor, &view->visible_region);
+
+ PEPPER_LIST_FOR_EACH(&view->children_list, l)
+ view_geometry_dirty((pepper_view_t *)l->item);
}
static void
-view_damage_below_consume(pepper_view_t *view)
+view_update_visibility(pepper_view_t *view)
{
- pepper_compositor_add_damage(view->compositor, &view->visible_region);
- pixman_region32_init(&view->visible_region);
+ pepper_bool_t visibility;
+
+ if (view->parent)
+ visibility = view->parent->visibility && view->mapped;
+ else
+ visibility = view->mapped;
+
+ if (visibility != view->visibility)
+ {
+ pepper_list_t *l;
+
+ view->visibility = visibility;
+
+ /* We simply treat a visibility change as a geometry change. */
+ view_geometry_dirty(view);
+
+ PEPPER_LIST_FOR_EACH(&view->children_list, l)
+ view_update_visibility((pepper_view_t *)l->item);
+ }
}
static void
-view_geometry_dirty(pepper_view_t *view)
+view_map(pepper_view_t *view)
{
- pepper_view_t *child;
-
- if (view->geometry_dirty)
+ if (view->mapped)
return;
- view->geometry_dirty = PEPPER_TRUE;
+ view->mapped = PEPPER_TRUE;
+ view_update_visibility(view);
+}
- view_damage_below_consume(view);
- view->need_damage = PEPPER_TRUE;
+static void
+view_unmap(pepper_view_t *view)
+{
+ if (!view->mapped)
+ return;
- wl_list_for_each(child, &view->child_list, parent_link)
- view_geometry_dirty(child);
+ view->mapped = PEPPER_FALSE;
+ view_update_visibility(view);
}
PEPPER_API pepper_object_t *
-pepper_compositor_add_view(pepper_object_t *comp,
- pepper_object_t *par, pepper_object_t *pos, pepper_object_t *sfc)
+pepper_compositor_add_surface_view(pepper_object_t *comp, pepper_object_t *sfc)
{
pepper_view_t *view;
pepper_compositor_t *compositor = (pepper_compositor_t *)comp;
- pepper_view_t *parent = (pepper_view_t *)par;
- pepper_view_t *position = (pepper_view_t *)pos;
- pepper_surface_t *surface = (pepper_surface_t *)sfc;
CHECK_MAGIC_AND_NON_NULL(comp, PEPPER_COMPOSITOR);
- CHECK_MAGIC_IF_NON_NULL(par, PEPPER_VIEW);
- CHECK_MAGIC_IF_NON_NULL(pos, PEPPER_VIEW);
CHECK_MAGIC_IF_NON_NULL(sfc, PEPPER_SURFACE);
view = (pepper_view_t *)pepper_object_alloc(sizeof(pepper_view_t), PEPPER_VIEW);
if (!view)
{
- PEPPER_ERROR("Failed to allocate memory.\n");
+ PEPPER_ERROR("Failed to allocate a pepper object.\n");
return NULL;
}
view->compositor = compositor;
- view->parent = parent;
- wl_list_init(&view->child_list);
+ view->x = 0.0;
+ view->y = 0.0;
+ view->w = 0.0;
+ view->h = 0.0;
+
pepper_matrix_init_identity(&view->transform);
- view->alpha = 1.0f;
+ pepper_matrix_init_identity(&view->matrix_to_parent);
+ pepper_matrix_init_identity(&view->matrix_to_global);
- view->surface = surface;
+ view->parent_link.item = (void *)view;
+ view->z_link.item = (void *)view;
- if (surface)
- {
- wl_list_insert(surface->view_list.next, &view->surface_link);
- view->surface_destroy_listener.notify = handle_surface_destroy;
- pepper_object_add_destroy_listener(&surface->base, &view->surface_destroy_listener);
- }
- else
+ pepper_list_init(&view->children_list);
+ pepper_list_insert(compositor->root_view_list.prev, &view->parent_link);
+ pepper_list_insert(compositor->view_list.prev, &view->z_link);
+
+ if (sfc)
{
- wl_list_init(&view->surface_link);
- }
+ pepper_surface_t *surface = (pepper_surface_t *)sfc;
- pixman_region32_init(&view->clip_region);
- pixman_region32_init(&view->visible_region);
+ view->surface = surface;
+ wl_list_insert(&surface->view_list, &view->surface_link);
- if (position)
- wl_list_insert(position->parent_link.next, &view->parent_link);
- else if (parent)
- wl_list_insert(parent->child_list.next, &view->parent_link);
- else
- wl_list_insert(compositor->root_view_list.next, &view->parent_link);
+ view->surface_destroy_listener.notify = view_handle_surface_destroy;
+ pepper_object_add_destroy_listener(&surface->base, &view->surface_destroy_listener);
- if (parent)
- view->container_list = &parent->child_list;
- else
- view->container_list = &compositor->root_view_list;
+ view->w = surface->w;
+ view->h = surface->h;
+ }
- view->compositor_link.item = (void *)view;
- view_geometry_dirty(view);
+ pixman_region32_init_rect(&view->bounding_region, 0, 0, view->w, view->h);
+ pixman_region32_init(&view->opaque_region);
+ pixman_region32_init(&view->visible_region);
return &view->base;
}
-PEPPER_API pepper_object_t *
-pepper_compositor_get_top_root_view(pepper_object_t *comp)
-{
- pepper_compositor_t *compositor = (pepper_compositor_t *)comp;
- CHECK_MAGIC_AND_NON_NULL(comp, PEPPER_COMPOSITOR);
-
- if (wl_list_empty(&compositor->root_view_list))
- return NULL;
-
- return &pepper_container_of(compositor->root_view_list.prev, pepper_view_t, parent_link)->base;
-}
-
-PEPPER_API pepper_object_t *
-pepper_compositor_get_bottom_root_view(pepper_object_t *comp)
-{
- pepper_compositor_t *compositor = (pepper_compositor_t *)comp;
- CHECK_MAGIC_AND_NON_NULL(comp, PEPPER_COMPOSITOR);
-
- if (wl_list_empty(&compositor->root_view_list))
- return NULL;
-
- return &pepper_container_of(compositor->root_view_list.next, pepper_view_t, parent_link)->base;
-}
-
-static void
-pepper_view_unmap(pepper_view_t *view)
-{
- pepper_view_t *child;
-
- if (!view->visibility)
- return;
-
- wl_list_for_each(child, &view->child_list, parent_link)
- pepper_view_unmap(child);
-
- view->visibility = PEPPER_FALSE;
- view_damage_below_consume(view);
-}
-
PEPPER_API void
pepper_view_destroy(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
- pepper_view_t *child, *next;
+ pepper_view_t *view = (pepper_view_t *)v;
+ pepper_list_t *l, *next;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
+ /* Destroy signal is emitted in here so that any children that are willing to survive this
+ * destruction can detach from their parent.
+ */
pepper_object_fini(&view->base);
- pepper_view_unmap(view);
+ view_unmap(view);
- /* Destroy all child views. */
- wl_list_for_each_safe(child, next, &view->child_list, parent_link)
- pepper_view_destroy(&child->base);
+ PEPPER_LIST_FOR_EACH_SAFE(&view->children_list, l, next)
+ pepper_view_destroy((pepper_object_t *)(l->item));
- wl_list_remove(&view->parent_link);
+ PEPPER_ASSERT(pepper_list_empty(&view->children_list));
+
+ pepper_list_remove(&view->parent_link, NULL);
+ pepper_list_remove(&view->z_link, NULL);
if (view->surface)
+ {
wl_list_remove(&view->surface_link);
+ wl_list_remove(&view->surface_destroy_listener.link);
+ }
- pixman_region32_fini(&view->clip_region);
+ pixman_region32_fini(&view->opaque_region);
+ pixman_region32_fini(&view->visible_region);
+ pixman_region32_fini(&view->bounding_region);
pepper_free(view);
}
PEPPER_API pepper_object_t *
pepper_view_get_compositor(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- return &view->compositor->base;
+ return &((pepper_view_t *)v)->compositor->base;
}
PEPPER_API pepper_object_t *
-pepper_view_get_parent(pepper_object_t *v)
+pepper_view_get_surface(pepper_object_t *v)
{
pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- return &view->parent->base;
+
+ if (view->surface)
+ return &((pepper_view_t *)view)->surface->base;
+
+ return NULL;
}
-PEPPER_API pepper_object_t *
-pepper_view_get_surface(pepper_object_t *v)
+PEPPER_API void
+pepper_view_set_parent(pepper_object_t *v, pepper_object_t *p)
{
pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *parent = (pepper_view_t *)p;
+
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- return &view->surface->base;
+ CHECK_MAGIC_IF_NON_NULL(p, PEPPER_VIEW);
+
+ if (view->parent == parent)
+ return;
+
+ view->parent = parent;
+ pepper_list_remove(&view->parent_link, NULL);
+
+ if (view->parent)
+ pepper_list_insert(view->parent->children_list.prev, &view->parent_link);
+ else
+ pepper_list_insert(view->compositor->root_view_list.prev, &view->parent_link);
+
+ view_geometry_dirty(view);
}
-PEPPER_API pepper_bool_t
-pepper_view_stack_above(pepper_object_t *v, pepper_object_t *blw)
+PEPPER_API pepper_object_t *
+pepper_view_get_parent(pepper_object_t *v)
{
pepper_view_t *view = (pepper_view_t *)v;
- pepper_view_t *below = (pepper_view_t *)blw;
-
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- CHECK_MAGIC_AND_NON_NULL(blw, PEPPER_VIEW);
+ return &view->parent->base;
+}
+
+static pepper_list_t *
+view_insert(pepper_view_t *view, pepper_list_t *pos, pepper_bool_t subtree)
+{
+ if (pos->next != &view->z_link)
+ {
+ pepper_list_remove(&view->z_link, NULL);
+ pepper_list_insert(pos, &view->z_link);
- if (view == below)
- return PEPPER_TRUE;
+ if (view->visibility)
+ pepper_compositor_add_damage(view->compositor, &view->visible_region);
+ }
- if (view->parent != below->parent)
- return PEPPER_FALSE;
+ pos = &view->z_link;
- wl_list_remove(&view->parent_link);
- wl_list_insert(below->parent_link.next, &view->parent_link);
+ if (subtree)
+ {
+ pepper_list_t *l;
- view_damage_below_consume(view);
- view->need_damage = PEPPER_TRUE;
+ PEPPER_LIST_FOR_EACH(&view->children_list, l)
+ pos = view_insert((pepper_view_t *)l->item, pos, subtree);
+ }
- return PEPPER_TRUE;
+ return pos;
}
PEPPER_API pepper_bool_t
-pepper_view_stack_below(pepper_object_t *v, pepper_object_t *abv)
+pepper_view_stack_above(pepper_object_t *v, pepper_object_t *b, pepper_bool_t subtree)
{
- pepper_view_t *view = (pepper_view_t *)v;
- pepper_view_t *above = (pepper_view_t *)abv;
+ pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *below = (pepper_view_t *)b;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- CHECK_MAGIC_AND_NON_NULL(abv, PEPPER_VIEW);
+ CHECK_MAGIC_AND_NON_NULL(b, PEPPER_VIEW);
- if (view == above)
- return PEPPER_TRUE;
-
- if (view->parent != above->parent)
- return PEPPER_FALSE;
+ view_insert(view, &below->z_link, subtree);
+ return PEPPER_TRUE;
+}
- wl_list_remove(&view->parent_link);
- wl_list_insert(above->parent_link.prev, &view->parent_link);
+PEPPER_API pepper_bool_t
+pepper_view_stack_below(pepper_object_t *v, pepper_object_t *a, pepper_bool_t subtree)
+{
+ pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *above = (pepper_view_t *)a;
- view_damage_below_consume(view);
- view->need_damage = PEPPER_TRUE;
+ CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
+ CHECK_MAGIC_AND_NON_NULL(a, PEPPER_VIEW);
+ view_insert(view, above->z_link.prev, subtree);
return PEPPER_TRUE;
}
PEPPER_API void
-pepper_view_stack_top(pepper_object_t *v)
+pepper_view_stack_top(pepper_object_t *v, pepper_bool_t subtree)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (view->container_list->prev == &view->parent_link)
- return;
-
- wl_list_remove(&view->parent_link);
- wl_list_insert(view->container_list->prev, &view->parent_link);
-
- view_damage_below_consume(view);
- view->need_damage = PEPPER_TRUE;
+ view_insert(view, view->compositor->view_list.prev, subtree);
}
PEPPER_API void
-pepper_view_stack_bottom(pepper_object_t *v)
+pepper_view_stack_bottom(pepper_object_t *v, pepper_bool_t subtree)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (view->container_list->next == &view->parent_link)
- return;
-
- wl_list_remove(&view->parent_link);
- wl_list_insert(view->container_list, &view->parent_link);
-
- view_damage_below_consume(view);
- view->need_damage = PEPPER_TRUE;
+ view_insert(view, &view->compositor->view_list, subtree);
}
PEPPER_API pepper_object_t *
pepper_view_get_above(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (view->parent_link.next == view->container_list)
- return NULL;
-
- return &pepper_container_of(view->parent_link.next, pepper_view_t, parent_link)->base;
+ return view->z_link.next->item;
}
PEPPER_API pepper_object_t *
pepper_view_get_below(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
- CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (view->parent_link.next == view->container_list)
- return NULL;
-
- return &pepper_container_of(view->parent_link.prev, pepper_view_t, parent_link)->base;
-}
-
-
-PEPPER_API pepper_object_t *
-pepper_view_get_top_child(pepper_object_t *v)
-{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (wl_list_empty(&view->child_list))
- return NULL;
-
- return &pepper_container_of(view->child_list.prev, pepper_view_t, parent_link)->base;
+ return view->z_link.prev->item;
}
-PEPPER_API pepper_object_t *
-pepper_view_get_bottom_child(pepper_object_t *v)
+PEPPER_API const pepper_list_t *
+pepper_view_get_children_list(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (wl_list_empty(&view->child_list))
- return NULL;
-
- return &pepper_container_of(view->child_list.next, pepper_view_t, parent_link)->base;
+ return &view->children_list;
}
PEPPER_API void
-pepper_view_resize(pepper_object_t *v, float w, float h)
+pepper_view_resize(pepper_object_t *v, double w, double h)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- if (w < 0.0f)
- w = 0.0f;
-
- if (h < 0.0f)
- h = 0.0f;
+ if (view->w == w && view->h == h)
+ return;
view->w = w;
view->h = h;
-
view_geometry_dirty(view);
}
PEPPER_API void
-pepper_view_get_size(pepper_object_t *v, float *w, float *h)
+pepper_view_get_size(pepper_object_t *v, double *w, double *h)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
if (w)
}
PEPPER_API void
-pepper_view_set_position(pepper_object_t *v, float x, float y)
+pepper_view_set_position(pepper_object_t *v, double x, double y)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
+ if (view->x == x && view->y == y)
+ return;
+
view->x = x;
view->y = y;
-
view_geometry_dirty(view);
}
PEPPER_API void
-pepper_view_get_position(pepper_object_t *v, float *x, float *y)
+pepper_view_get_position(pepper_object_t *v, double *x, double *y)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
if (x)
PEPPER_API void
pepper_view_set_transform(pepper_object_t *v, const pepper_matrix_t *matrix)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- memcpy(&view->transform, matrix, sizeof(pepper_matrix_t));
+ pepper_matrix_copy(&view->transform, matrix);
view_geometry_dirty(view);
}
PEPPER_API const pepper_matrix_t *
pepper_view_get_transform(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
return &view->transform;
}
PEPPER_API void
-pepper_view_set_visibility(pepper_object_t *v, pepper_bool_t visibility)
-{
- pepper_view_t *view = (pepper_view_t *)v;
- CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (view->visibility == visibility)
- return;
-
- view->visibility = visibility;
- view_damage_below_consume(view);
-}
-
-PEPPER_API pepper_bool_t
-pepper_view_get_visibility(pepper_object_t *v)
-{
- pepper_view_t *view = (pepper_view_t *)v;
- CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- return view->visibility;
-}
-
-PEPPER_API const pixman_region32_t *
-pepper_view_get_visible_region(pepper_object_t *v)
+pepper_view_map(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- return &view->visible_region;
+ view_map(view);
}
PEPPER_API void
-pepper_view_set_alpha(pepper_object_t *v, float alpha)
-{
- pepper_view_t *view = (pepper_view_t *)v;
- CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (alpha < 0.0f)
- alpha = 0.0f;
-
- if (alpha > 1.0f)
- alpha = 1.0f;
-
- if (view->alpha == alpha)
- return;
-
- view->alpha = alpha;
- view_damage_below_consume(view);
-}
-
-PEPPER_API float
-pepper_view_get_alpha(pepper_object_t *v)
+pepper_view_unmap(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- return view->alpha;
+ view_unmap(view);
}
-PEPPER_API void
-pepper_view_set_viewport(pepper_object_t *v, int x, int y, int w, int h)
-{
- pepper_view_t *view = (pepper_view_t *)v;
- CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (view->viewport.x == x && view->viewport.y == y &&
- view->viewport.w == w && view->viewport.h == h)
- return;
-
- view->viewport.x = x;
- view->viewport.y = y;
- view->viewport.w = w;
- view->viewport.h = h;
-
- view_damage_below_consume(view);
-}
-
-PEPPER_API void
-pepper_view_get_viewport(pepper_object_t *v, int *x, int *y, int *w, int *h)
+PEPPER_API pepper_bool_t
+pepper_view_is_mapped(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (x)
- *x = view->viewport.x;
-
- if (y)
- *y = view->viewport.y;
-
- if (w)
- *w = view->viewport.w;
-
- if (h)
- *h = view->viewport.h;
+ return view->mapped;
}
-PEPPER_API void
-pepper_view_set_clip_to_parent(pepper_object_t *v, pepper_bool_t clip)
+PEPPER_API pepper_bool_t
+pepper_view_is_visible(pepper_object_t *v)
{
- pepper_view_t *view = (pepper_view_t *)v;
+ pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (view->clip_to_parent == clip)
- return;
-
- view->clip_to_parent = clip;
- view_damage_below_consume(view);
+ return view->visibility;
}
-PEPPER_API pepper_bool_t
-pepper_view_get_clip_to_parent(pepper_object_t *v)
+PEPPER_API const pixman_region32_t *
+pepper_view_get_visible_region(pepper_object_t *v)
{
pepper_view_t *view = (pepper_view_t *)v;
CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- return view->clip_to_parent;
+ return &view->visible_region;
}
-PEPPER_API pepper_bool_t
-pepper_view_set_clip_region(pepper_object_t *v, const pixman_region32_t *region)
+static void
+view_update_bounding_region(pepper_view_t *view)
{
- pepper_view_t *view = (pepper_view_t *)v;
- CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
-
- if (!pixman_region32_copy(&view->clip_region, (pixman_region32_t *)region))
- return PEPPER_FALSE;
-
- view_damage_below_consume(view);
- return PEPPER_TRUE;
+ /* TODO: */
}
-PEPPER_API const pixman_region32_t *
-pepper_view_get_clip_region(pepper_object_t *v)
+static void
+view_update_opaque_region(pepper_view_t *view)
{
- pepper_view_t *view = (pepper_view_t *)v;
- CHECK_MAGIC_AND_NON_NULL(v, PEPPER_VIEW);
- return &view->clip_region;
+ /* TODO: */
}
static void
-view_update_bounding_region(pepper_view_t *view)
+damage_region_transform(pixman_region32_t *region, const pepper_matrix_t *matrix)
{
/* TODO: */
}
}
view_update_bounding_region(view);
+ view_update_opaque_region(view);
+
view->geometry_dirty = PEPPER_FALSE;
}
}
-static void
-view_list_add(pepper_view_t *view)
-{
- pepper_view_t *child;
-
- pepper_list_insert(&view->compositor->view_list, &view->compositor_link);
-
- wl_list_for_each(child, &view->child_list, parent_link)
- view_list_add(child);
-}
-
void
-pepper_compositor_update_view_list(pepper_compositor_t *compositor)
+pepper_compositor_update_views(pepper_compositor_t *compositor)
{
- pepper_view_t *view;
+ pepper_list_t *l;
pixman_region32_t visible;
pixman_region32_t opaque;
pixman_region32_t surface_damage;
- pepper_list_t *l;
+ pixman_region32_t damage;
pixman_region32_init(&visible);
pixman_region32_init(&opaque);
pixman_region32_init(&surface_damage);
-
- /* Make compositor's view list empty. */
- pepper_list_init(&compositor->view_list);
-
- /* Build z-ordered view list by traversing the view tree in depth-first order. */
- wl_list_for_each(view, &compositor->root_view_list, parent_link)
- view_list_add(view);
+ pixman_region32_init(&damage);
/* Update views from front to back. */
PEPPER_LIST_FOR_EACH_REVERSE(&compositor->view_list, l)
{
- view = l->item;
+ pepper_view_t *view = l->item;
+
view_update_geometry(view);
- /* Update visible region. */
- pixman_region32_subtract(&view->visible_region, &view->bounding_region, &opaque);
+ /* Calculate updated visible region. */
+ pixman_region32_subtract(&visible, &view->bounding_region, &opaque);
+ pixman_region32_subtract(&damage, &visible, &view->visible_region);
- /* Inflict damage caused by geometry and z-order change. */
- if (view->need_damage)
- {
- pepper_compositor_add_damage(view->compositor, &view->visible_region);
- view->need_damage = PEPPER_FALSE;
- }
+ /* Inflict damage for the visible region change. */
+ pepper_compositor_add_damage(view->compositor, &damage);
+
+ /* Update visible region of the view. */
+ pixman_region32_copy(&view->visible_region, &visible);
/* Inflict surface damage. */
if (pixman_region32_not_empty(&view->surface->damage_region))
{
pepper_surface_flush_damage(view->surface);
- /* Intersect surface damage region with viewport rectangle. */
- pixman_region32_intersect_rect(&surface_damage, &view->surface->damage_region,
- view->viewport.x, view->viewport.y,
- view->viewport.w, view->viewport.h);
-
- /* Translate surface damage to compensate viewport offset. */
- pixman_region32_translate(&surface_damage, -view->viewport.x, -view->viewport.y);
+ pixman_region32_copy(&surface_damage, &view->surface->damage_region);
/* Transform surface damage into global coordinate space. */
damage_region_transform(&surface_damage, &view->matrix_to_global);
+ /* Clip surface damage with view's bounding region. */
+ pixman_region32_intersect(&surface_damage, &surface_damage, &view->bounding_region);
+
/* Subtract area covered by opaque views. */
pixman_region32_subtract(&surface_damage, &surface_damage, &opaque);
/* Accumulate opaque region. */
pixman_region32_union(&opaque, &opaque, &view->opaque_region);
}
+
+ pixman_region32_fini(&visible);
+ pixman_region32_fini(&opaque);
+ pixman_region32_fini(&surface_damage);
+ pixman_region32_fini(&damage);
}
projects / platform / core / uifw / pepper.git / commitdiff