summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-12-21 06:33:57 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-12-21 06:33:57 +0000
commitd05e3c5711565e30324d6f08085a2c37b24c2d0d (patch)
tree40fefef2af49abab9d24676d6f185a2f1987d103
parent2d98c78ff87746238293f00e16d3781d65ad44d1 (diff)
attempt to deal with new svn efl async render... in evas1.7
evas_sync() is an empty function so this has no effect on released efl, but it helps with svn efl. SVN revision: 81509
-rw-r--r--src/modules/comp/e_mod_comp.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/modules/comp/e_mod_comp.c b/src/modules/comp/e_mod_comp.c
index 48db4b255..5b5b18898 100644
--- a/src/modules/comp/e_mod_comp.c
+++ b/src/modules/comp/e_mod_comp.c
@@ -322,6 +322,7 @@ _e_mod_comp_win_shape_rectangles_apply(E_Comp_Win *cw,
322 return; 322 return;
323 } 323 }
324 324
325 evas_sync(evas_object_evas_get(cw->obj));
325 evas_object_image_native_surface_set(cw->obj, NULL); 326 evas_object_image_native_surface_set(cw->obj, NULL);
326 evas_object_image_alpha_set(cw->obj, 1); 327 evas_object_image_alpha_set(cw->obj, 1);
327 EINA_LIST_FOREACH(cw->obj_mirror, l, o) 328 EINA_LIST_FOREACH(cw->obj_mirror, l, o)
@@ -400,6 +401,7 @@ _e_mod_comp_win_shape_rectangles_apply(E_Comp_Win *cw,
400 return; 401 return;
401 } 402 }
402 403
404 evas_sync(evas_object_evas_get(cw->obj));
403 evas_object_image_alpha_set(cw->obj, 0); 405 evas_object_image_alpha_set(cw->obj, 0);
404 EINA_LIST_FOREACH(cw->obj_mirror, l, o) 406 EINA_LIST_FOREACH(cw->obj_mirror, l, o)
405 { 407 {
@@ -612,6 +614,7 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
612 cw->pw = 0; 614 cw->pw = 0;
613 cw->ph = 0; 615 cw->ph = 0;
614 } 616 }
617 evas_sync(evas_object_evas_get(cw->obj));
615 DBG("REND [0x%x] pixmap = [0x%x], %ix%i\n", cw->win, cw->pixmap, cw->pw, cw->ph); 618 DBG("REND [0x%x] pixmap = [0x%x], %ix%i\n", cw->win, cw->pixmap, cw->pw, cw->ph);
616 if ((cw->pw <= 0) || (cw->ph <= 0)) 619 if ((cw->pw <= 0) || (cw->ph <= 0))
617 { 620 {
@@ -680,6 +683,7 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
680/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */ 683/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */
681/* #endif */ 684/* #endif */
682 /* DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win)); */ 685 /* DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win)); */
686 evas_sync(evas_object_evas_get(cw->obj));
683 evas_object_image_size_set(cw->obj, cw->pw, cw->ph); 687 evas_object_image_size_set(cw->obj, cw->pw, cw->ph);
684 EINA_LIST_FOREACH(cw->obj_mirror, l, o) 688 EINA_LIST_FOREACH(cw->obj_mirror, l, o)
685 { 689 {
@@ -728,6 +732,7 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
728 } 732 }
729 else if (cw->pixmap) 733 else if (cw->pixmap)
730 { 734 {
735 evas_sync(evas_object_evas_get(cw->obj));
731 if (cw->native) 736 if (cw->native)
732 { 737 {
733 evas_object_image_native_surface_set(cw->obj, NULL); 738 evas_object_image_native_surface_set(cw->obj, NULL);
@@ -988,6 +993,7 @@ _e_mod_comp_win_release(E_Comp_Win *cw)
988 Eina_List *l; 993 Eina_List *l;
989 Evas_Object *o; 994 Evas_Object *o;
990 995
996 evas_sync(evas_object_evas_get(cw->obj));
991 if (cw->xim) 997 if (cw->xim)
992 { 998 {
993 evas_object_image_size_set(cw->obj, 1, 1); 999 evas_object_image_size_set(cw->obj, 1, 1);
@@ -2139,6 +2145,7 @@ _e_mod_comp_win_del(E_Comp_Win *cw)
2139 { 2145 {
2140 EINA_LIST_FREE(cw->obj_mirror, o) 2146 EINA_LIST_FREE(cw->obj_mirror, o)
2141 { 2147 {
2148 evas_sync(evas_object_evas_get(o));
2142 if (cw->xim) evas_object_image_data_set(o, NULL); 2149 if (cw->xim) evas_object_image_data_set(o, NULL);
2143 evas_object_event_callback_del(o, EVAS_CALLBACK_DEL, 2150 evas_object_event_callback_del(o, EVAS_CALLBACK_DEL,
2144 _e_mod_comp_cb_win_mirror_del); 2151 _e_mod_comp_cb_win_mirror_del);
@@ -2198,6 +2205,7 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
2198 { 2205 {
2199 DBG(" [0x%x] real hid - fix\n", cw->win); 2206 DBG(" [0x%x] real hid - fix\n", cw->win);
2200 cw->real_hid = 0; 2207 cw->real_hid = 0;
2208 evas_sync(evas_object_evas_get(cw->obj));
2201 if (cw->native) 2209 if (cw->native)
2202 { 2210 {
2203 evas_object_image_native_surface_set(cw->obj, NULL); 2211 evas_object_image_native_surface_set(cw->obj, NULL);
@@ -2243,6 +2251,7 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
2243 2251
2244 if ((!cw->redirected) || (!cw->pixmap)) 2252 if ((!cw->redirected) || (!cw->pixmap))
2245 { 2253 {
2254 evas_sync(evas_object_evas_get(cw->obj));
2246 // we redirect all subwindows anyway 2255 // we redirect all subwindows anyway
2247 // ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL); 2256 // ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
2248/* #ifdef HAVE_WAYLAND_CLIENTS */ 2257/* #ifdef HAVE_WAYLAND_CLIENTS */
@@ -2368,6 +2377,8 @@ _e_mod_comp_win_hide(E_Comp_Win *cw)
2368 ecore_timer_del(cw->ready_timeout); 2377 ecore_timer_del(cw->ready_timeout);
2369 cw->ready_timeout = NULL; 2378 cw->ready_timeout = NULL;
2370 } 2379 }
2380
2381 evas_sync(evas_object_evas_get(cw->obj));
2371 2382
2372 if (cw->native) 2383 if (cw->native)
2373 { 2384 {