kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wayland_shm: Minor clean up of _evas_shm_surface_post 

Some gratuitous cosmetic fixes
This commit is contained in:
Derek Foreman 2016-04-13 13:58:15 -05:00 committed by Mike Blumenkrantz
parent 2c33bae2d5
commit 11cf0206e4
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/modules/evas/engines/wayland_shm/evas_shm.c
View File

@ -541,49 +541,42 @@ _evas_shm_surface_data_get(Surface *s, int *w, int *h)
void void
_evas_shm_surface_post(Surface *s, Eina_Rectangle *rects, unsigned int count) _evas_shm_surface_post(Surface *s, Eina_Rectangle *rects, unsigned int count)
{ {
void (*damage)(struct wl_surface *, int32_t, int32_t, int32_t, int32_t);
/* struct wl_callback *frame_cb; */ /* struct wl_callback *frame_cb; */
Shm_Surface *surface; Shm_Surface *surf;
Shm_Leaf *leaf; Shm_Leaf *leaf;
unsigned int k;
LOGFN(__FILE__, __LINE__, __FUNCTION__); LOGFN(__FILE__, __LINE__, __FUNCTION__);
surface = s->surf.shm; surf = s->surf.shm;
leaf = surface->current; leaf = surf->current;
if (!leaf) return; if (!leaf) return;
if (!surface->surface) return; if (!surf->surface) return;
wl_surface_attach(surface->surface, leaf->data->buffer, 0, 0); wl_surface_attach(surf->surface, leaf->data->buffer, 0, 0);
if (surf->compositor_version >= WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION)
damage = wl_surface_damage_buffer;
else
damage = wl_surface_damage;
if ((rects) && (count > 0)) if ((rects) && (count > 0))
{ for (k = 0; k < count; k++)
unsigned int k = 0; damage(surf->surface, rects[k].x, rects[k].y, rects[k].w, rects[k].h);
for (; k < count; k++)
if (surface->compositor_version >= WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION)
wl_surface_damage_buffer(surface->surface,
rects[k].x, rects[k].y,
rects[k].w, rects[k].h);
else else
wl_surface_damage(surface->surface, damage(surf->surface, 0, 0, leaf->w, leaf->h);
rects[k].x, rects[k].y,
rects[k].w, rects[k].h);
}
else
if (surface->compositor_version >= WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION)
wl_surface_damage_buffer(surface->surface, 0, 0, leaf->w, leaf->h);
else
wl_surface_damage(surface->surface, 0, 0, leaf->w, leaf->h);
/* frame_cb = wl_surface_frame(surface->surface); */ /* frame_cb = wl_surface_frame(surface->surface); */
/* wl_callback_add_listener(frame_cb, &_shm_frame_listener, surface); */ /* wl_callback_add_listener(frame_cb, &_shm_frame_listener, surface); */
wl_surface_commit(surface->surface); wl_surface_commit(surf->surface);
leaf->busy = EINA_TRUE; leaf->busy = EINA_TRUE;
leaf->drawn = EINA_TRUE; leaf->drawn = EINA_TRUE;
leaf->age = 0; leaf->age = 0;
surface->current = NULL; surf->current = NULL;
} }
Surface * Surface *