discomfitor pushed a commit to branch enlightenment-0.20.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=07c619b47c35eaea08451638b55d4a9a44126b60
commit 07c619b47c35eaea08451638b55d4a9a44126b60
Author: Derek Foreman <der...@osg.samsung.com>
Date: Fri Jun 24 15:41:44 2016 -0500
Fix wayland pixmap ids again
Wayland pixmap ids are a different data type for internal and
external windows. cast them both to 64-bits so they're the same
size regardless of arch.
ref d3ba524a62713ff58c1537524030c155d0713ca2
---
src/bin/e_win.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_win.c b/src/bin/e_win.c
index 31667eb..31150b5 100644
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@@ -96,7 +96,11 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
ctx->pointer = e_pointer_window_new(win, EINA_TRUE);
}
- ec = e_pixmap_find_client(type, win);
+ if (type == E_PIXMAP_TYPE_WL)
+ ec = e_pixmap_find_client(type, (int64_t)win);
+ else
+ ec = e_pixmap_find_client(type, win);
+
if (ec)
ctx->client = ec;
else
@@ -113,7 +117,11 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
title = "E";
ecore_evas_title_set(ee, title);
- cp = e_pixmap_new(type, win);
+ if (type == E_PIXMAP_TYPE_WL)
+ cp = e_pixmap_new(type, (int64_t)win);
+ else
+ cp = e_pixmap_new(type, win);
+
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_TRUE);
#ifdef HAVE_WAYLAND
if (wl_win_id >= 0)
--
