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

more overhead. screw u composite! screw you!. i now know what is needed... 

and  whats there now is not pretty.



SVN revision: 46074
This commit is contained in:
Carsten Haitzler 2010-02-11 11:09:18 +00:00
parent b98aa59ac4
commit 2c22b1f6c1
1 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,9 +925,9 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
cw->visible = 1;
DBG(" [0x%x] sho ++++++++++\n", cw->win);
if ((cw->input_only) || (cw->invalid)) return;
/*
if (cw->redirected)
// if (cw->redirected)
{
/*
if (cw->native) evas_object_image_native_surface_set(cw->obj, NULL);
if (cw->pixmap) ecore_x_pixmap_free(cw->pixmap);
evas_object_image_size_set(cw->obj, 1, 1);
@ -937,8 +937,41 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
cw->native = 0;
ecore_x_composite_unredirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
cw->redirected = 0;
*/
if (cw->pixmap) ecore_x_pixmap_free(cw->pixmap);
evas_object_image_size_set(cw->obj, cw->pw, cw->ph);
// ecore_x_window_resize(cw->win, cw->w + 10, cw->h + 10);
cw->pixmap = ecore_x_composite_name_window_pixmap_get(cw->win);
if (cw->pixmap)
ecore_x_pixmap_geometry_get(cw->pixmap, NULL, NULL, &(cw->pw), &(cw->ph));
else
{
cw->pw = 0;
cw->ph = 0;
}
if ((cw->pw <= 0) || (cw->ph <= 0))
{
ecore_x_pixmap_free(cw->pixmap);
cw->pixmap = 0;
}
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
(!cw->shaped) && (!cw->shape_changed) && (cw->pixmap))
{
Evas_Native_Surface ns;
ns.data.x11.visual = cw->vis;
ns.data.x11.pixmap = cw->pixmap;
evas_object_image_native_surface_set(cw->obj, &ns);
DBG("NATIVE SHOW1 [0x%x] %x %ix%i\n", cw->win, cw->pixmap, cw->pw, cw->ph);
cw->native = 1;
}
// ecore_x_window_resize(cw->win, cw->w, cw->h);
if (cw->pixmap) ecore_x_pixmap_free(cw->pixmap);
cw->pixmap = 0;
cw->pw = 0;
cw->ph = 0;
cw->native = 0;
}
*/
if (!cw->redirected)
{
ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
@ -1062,6 +1095,17 @@ _e_mod_comp_win_hide(E_Comp_Win *cw)
ecore_x_pixmap_free(cw->pixmap);
cw->pixmap = 0;
}
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
(!cw->shaped) && (!cw->shape_changed) && (cw->pixmap))
{
Evas_Native_Surface ns;
ns.data.x11.visual = cw->vis;
ns.data.x11.pixmap = cw->pixmap;
evas_object_image_native_surface_set(cw->obj, &ns);
DBG("NATIVE SHOW1 [0x%x] %x %ix%i\n", cw->win, cw->pixmap, cw->pw, cw->ph);
cw->native = 1;
}
cw->dmg_updates = 0;
}
return;