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

E Comp (wayland): Fix a few more instances of 

ecore_x_composite_name_window_pixmap_get when building w/ wayland
client support.



SVN revision: 67556
This commit is contained in:
Christopher Michael 2012-01-26 18:28:15 +00:00
parent aa1865a0d3
commit c7e037e842
1 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/comp/e_mod_comp.c
View File

@ -598,6 +598,9 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
(!cw->shaped) && (!cw->rects))
{
#ifdef HAVE_WAYLAND
DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win));
#endif
DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win));
evas_object_image_size_set(cw->obj, cw->pw, cw->ph);
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
@ -1114,6 +1117,11 @@ nocomp:
printf("^^^^ redirect2 %x\n", cw->win);
printf(" redr\n");
ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
#ifdef HAVE_WAYLAND
cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win);
#endif
if (!cw->pixmap)
cw->pixmap = ecore_x_composite_name_window_pixmap_get(cw->win);
if (cw->pixmap)
{
@ -2054,6 +2062,10 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
{
// we redirect all subwindows anyway
// ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
#ifdef HAVE_WAYLAND
cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win);
#endif
if (!cw->pixmap)
cw->pixmap = ecore_x_composite_name_window_pixmap_get(cw->win);
if (cw->pixmap)
{