forked from enlightenment/enlightenment
E Comp (wayland): Disable getting pixmap from Wayland (for now) as
this seems to break compositor for normal x11 users. SVN revision: 67568
This commit is contained in:
parent
c7e037e842
commit
7ab3b4cb9e
|
@ -513,11 +513,11 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
|
||||||
{
|
{
|
||||||
Ecore_X_Pixmap pm;
|
Ecore_X_Pixmap pm;
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND
|
/* #ifdef HAVE_WAYLAND */
|
||||||
pm = e_mod_comp_wl_pixmap_get(cw->win);
|
/* pm = e_mod_comp_wl_pixmap_get(cw->win); */
|
||||||
#endif
|
/* #endif */
|
||||||
|
|
||||||
if (!pm) pm = ecore_x_composite_name_window_pixmap_get(cw->win);
|
pm = ecore_x_composite_name_window_pixmap_get(cw->win);
|
||||||
if (pm)
|
if (pm)
|
||||||
{
|
{
|
||||||
Ecore_X_Pixmap oldpm;
|
Ecore_X_Pixmap oldpm;
|
||||||
|
@ -598,9 +598,9 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
|
||||||
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
|
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
|
||||||
(!cw->shaped) && (!cw->rects))
|
(!cw->shaped) && (!cw->rects))
|
||||||
{
|
{
|
||||||
#ifdef HAVE_WAYLAND
|
/* #ifdef HAVE_WAYLAND */
|
||||||
DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win));
|
/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */
|
||||||
#endif
|
/* #endif */
|
||||||
DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win));
|
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);
|
evas_object_image_size_set(cw->obj, cw->pw, cw->ph);
|
||||||
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
EINA_LIST_FOREACH(cw->obj_mirror, l, o)
|
||||||
|
@ -1118,11 +1118,11 @@ nocomp:
|
||||||
printf(" redr\n");
|
printf(" redr\n");
|
||||||
ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND
|
/* #ifdef HAVE_WAYLAND */
|
||||||
cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win);
|
/* cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win); */
|
||||||
#endif
|
/* #endif */
|
||||||
if (!cw->pixmap)
|
/* if (!cw->pixmap) */
|
||||||
cw->pixmap = ecore_x_composite_name_window_pixmap_get(cw->win);
|
cw->pixmap = ecore_x_composite_name_window_pixmap_get(cw->win);
|
||||||
if (cw->pixmap)
|
if (cw->pixmap)
|
||||||
{
|
{
|
||||||
ecore_x_pixmap_geometry_get(cw->pixmap, NULL, NULL, &(cw->pw), &(cw->ph));
|
ecore_x_pixmap_geometry_get(cw->pixmap, NULL, NULL, &(cw->pw), &(cw->ph));
|
||||||
|
@ -2062,11 +2062,11 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
|
||||||
{
|
{
|
||||||
// we redirect all subwindows anyway
|
// we redirect all subwindows anyway
|
||||||
// ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
// ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
||||||
#ifdef HAVE_WAYLAND
|
/* #ifdef HAVE_WAYLAND */
|
||||||
cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win);
|
/* cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win); */
|
||||||
#endif
|
/* #endif */
|
||||||
if (!cw->pixmap)
|
/* if (!cw->pixmap) */
|
||||||
cw->pixmap = ecore_x_composite_name_window_pixmap_get(cw->win);
|
cw->pixmap = ecore_x_composite_name_window_pixmap_get(cw->win);
|
||||||
if (cw->pixmap)
|
if (cw->pixmap)
|
||||||
{
|
{
|
||||||
ecore_x_pixmap_geometry_get(cw->pixmap, NULL, NULL, &(cw->pw), &(cw->ph));
|
ecore_x_pixmap_geometry_get(cw->pixmap, NULL, NULL, &(cw->pw), &(cw->ph));
|
||||||
|
|
Loading…
Reference in New Issue