enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

redo wayland pixmap ids to use monotonic decreasing ints with no collisions 

using pointers for this turned out to have some corner case collisions, so
now just use something totally unrelated to the surface to ensure uniqueness
This commit is contained in:
Mike Blumenkrantz 2016-02-24 12:50:14 -05:00
parent f5148ddbf3
commit 6fe6fba44e
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/e_comp_wl.c
View File

@ -38,6 +38,8 @@ EINTERN Eina_Bool e_comp_wl_extensions_init(void);
static Eina_List *handlers = NULL;
static double _last_event_time = 0.0;
static int64_t surface_id = 0;
/* local functions */
static void
_e_comp_wl_configure_send(E_Client *ec, Eina_Bool edges)
@ -1486,10 +1488,15 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client *client, struct wl_reso
ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, (uintptr_t)id);
if (!ec)
{
E_Pixmap *ep;
E_Pixmap *ep = NULL;
/* try to create new pixmap */
if (!(ep = e_pixmap_new(E_PIXMAP_TYPE_WL, res)))
do
{
if (--surface_id >= 0) surface_id = -1;
ep = e_pixmap_find(E_PIXMAP_TYPE_WL, surface_id);
} while (ep);
if (!(ep = e_pixmap_new(E_PIXMAP_TYPE_WL, surface_id)))
{
ERR("Could not create new pixmap");
wl_resource_destroy(res);

26
src/bin/e_pixmap.c
View File

@ -26,7 +26,7 @@ struct _E_Pixmap
E_Client *client;
E_Pixmap_Type type;
uint64_t win;
int64_t win;
Ecore_Window parent;
int w, h;
@ -79,7 +79,7 @@ _e_pixmap_clear(E_Pixmap *cp, Eina_Bool cache)
{
ecore_x_pixmap_free(cp->pixmap);
cp->pixmap = 0;
ecore_x_e_comp_pixmap_set(cp->parent ?: cp->win, 0);
ecore_x_e_comp_pixmap_set(cp->parent ?: (Ecore_X_Window)cp->win, 0);
e_pixmap_image_clear(cp, cache);
}
#endif
@ -153,7 +153,7 @@ _e_pixmap_find(E_Pixmap_Type type, va_list *l)
Ecore_X_Window xwin;
#endif
#ifdef HAVE_WAYLAND
uintptr_t id;
intptr_t id;
#endif
E_Pixmap *cp;
@ -170,7 +170,7 @@ _e_pixmap_find(E_Pixmap_Type type, va_list *l)
break;
case E_PIXMAP_TYPE_WL:
#ifdef HAVE_WAYLAND
id = va_arg(*l, uintptr_t);
id = va_arg(*l, int64_t);
cp = eina_hash_find(aliases[type], &id);
if (!cp) cp = eina_hash_find(pixmaps[type], &id);
return cp;
@ -208,7 +208,7 @@ e_pixmap_new(E_Pixmap_Type type, ...)
Ecore_X_Window xwin;
#endif
#ifdef HAVE_WAYLAND
uintptr_t id;
int64_t id;
#endif
EINA_SAFETY_ON_TRUE_RETURN_VAL((type != E_PIXMAP_TYPE_WL) && (type != E_PIXMAP_TYPE_X), NULL);
@ -236,7 +236,7 @@ e_pixmap_new(E_Pixmap_Type type, ...)
break;
case E_PIXMAP_TYPE_WL:
#ifdef HAVE_WAYLAND
id = va_arg(l, uintptr_t);
id = va_arg(l, int64_t);
if (pixmaps[type])
{
cp = eina_hash_find(pixmaps[type], &id);
@ -247,7 +247,7 @@ e_pixmap_new(E_Pixmap_Type type, ...)
}
}
else
pixmaps[type] = eina_hash_pointer_new((Eina_Free_Cb)_e_pixmap_free);
pixmaps[type] = eina_hash_int64_new((Eina_Free_Cb)_e_pixmap_free);
cp = _e_pixmap_new(type);
cp->win = id;
eina_hash_add(pixmaps[type], &id, cp);
@ -372,7 +372,7 @@ e_pixmap_refresh(E_Pixmap *cp)
int pw, ph;
E_Comp_X_Client_Data *cd = NULL;
pixmap = ecore_x_composite_name_window_pixmap_get(cp->parent ?: cp->win);
pixmap = ecore_x_composite_name_window_pixmap_get(cp->parent ?: (Ecore_X_Window)cp->win);
if (cp->client)
{
cd = (E_Comp_X_Client_Data*)cp->client->comp_data;
@ -394,7 +394,7 @@ e_pixmap_refresh(E_Pixmap *cp)
ecore_x_pixmap_free(cp->pixmap);
cp->pixmap = pixmap;
cp->w = pw, cp->h = ph;
ecore_x_e_comp_pixmap_set(cp->parent ?: cp->win, cp->pixmap);
ecore_x_e_comp_pixmap_set(cp->parent ?: (Ecore_X_Window)cp->win, cp->pixmap);
e_pixmap_image_clear(cp, 0);
}
else
@ -519,7 +519,7 @@ e_pixmap_find_client(E_Pixmap_Type type, ...)
return (!cp) ? NULL : cp->client;
}
E_API uint64_t
E_API int64_t
e_pixmap_window_get(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 0);
@ -906,7 +906,7 @@ e_pixmap_alias(E_Pixmap *cp, E_Pixmap_Type type, ...)
Ecore_X_Window xwin;
#endif
#ifdef HAVE_WAYLAND
uintptr_t id;
int64_t id;
#endif
va_start(l, type);
@ -922,9 +922,9 @@ e_pixmap_alias(E_Pixmap *cp, E_Pixmap_Type type, ...)
break;
case E_PIXMAP_TYPE_WL:
#ifdef HAVE_WAYLAND
id = va_arg(l, uintptr_t);
id = va_arg(l, int64_t);
if (!aliases[type])
aliases[type] = eina_hash_pointer_new(NULL);
aliases[type] = eina_hash_int64_new(NULL);
eina_hash_set(aliases[type], &id, cp);
#endif
break;

2
src/bin/e_pixmap.h
View File

@ -36,7 +36,7 @@ E_API void e_pixmap_client_set(E_Pixmap *cp, E_Client *ec);
E_API E_Client *e_pixmap_client_get(E_Pixmap *cp);
E_API E_Pixmap *e_pixmap_find(E_Pixmap_Type type, ...);
E_API E_Client *e_pixmap_find_client(E_Pixmap_Type type, ...);
E_API uint64_t e_pixmap_window_get(E_Pixmap *cp);
E_API int64_t e_pixmap_window_get(E_Pixmap *cp);
E_API Ecore_Window e_pixmap_parent_window_get(E_Pixmap *cp);
E_API Eina_Bool e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns);
E_API void e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache);