summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-08-10 08:45:28 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-08-10 08:45:28 +0000
commitf0fa3b400ee621f8fbde9b23fe47c48b3a0ea060 (patch)
tree7f65d0a4b70fd64abbfcae11221e91990b9419c2 /legacy
parentef46a62d1495c54ba0499a59f67646b160b47eec (diff)
simplify unsetting/setting damage flag in ecore evas rendering to avoid altering previously set event mask flags
SVN revision: 75072
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c33
1 files changed, 3 insertions, 30 deletions
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
index e3966abf13..4bf407d61e 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
@@ -364,41 +364,14 @@ _ecore_evas_x_render(Ecore_Evas *ee)
364 { 364 {
365 if (ee->shaped) 365 if (ee->shaped)
366 { 366 {
367
367 /* if we have a damage pixmap - we can avoid exposures by 368 /* if we have a damage pixmap - we can avoid exposures by
368 * disabling them just for setting the mask */ 369 * disabling them just for setting the mask */
369 ecore_x_event_mask_set(ee->prop.window, 370 ecore_x_event_mask_unset(ee->prop.window, ECORE_X_EVENT_MASK_WINDOW_DAMAGE);
370 ECORE_X_EVENT_MASK_KEY_DOWN |
371 ECORE_X_EVENT_MASK_KEY_UP |
372 ECORE_X_EVENT_MASK_MOUSE_DOWN |
373 ECORE_X_EVENT_MASK_MOUSE_UP |
374 ECORE_X_EVENT_MASK_MOUSE_IN |
375 ECORE_X_EVENT_MASK_MOUSE_OUT |
376 ECORE_X_EVENT_MASK_MOUSE_MOVE |
377 //ECORE_X_EVENT_MASK_WINDOW_DAMAGE |
378 ECORE_X_EVENT_MASK_WINDOW_VISIBILITY |
379 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE |
380 ECORE_X_EVENT_MASK_WINDOW_FOCUS_CHANGE |
381 ECORE_X_EVENT_MASK_WINDOW_PROPERTY |
382 ECORE_X_EVENT_MASK_WINDOW_COLORMAP
383 );
384 ecore_x_window_shape_mask_set(ee->prop.window, 371 ecore_x_window_shape_mask_set(ee->prop.window,
385 ee->engine.x.mask); 372 ee->engine.x.mask);
386 /* and re-enable them again */ 373 /* and re-enable them again */
387 ecore_x_event_mask_set(ee->prop.window, 374 ecore_x_event_mask_set(ee->prop.window, ECORE_X_EVENT_MASK_WINDOW_DAMAGE);
388 ECORE_X_EVENT_MASK_KEY_DOWN |
389 ECORE_X_EVENT_MASK_KEY_UP |
390 ECORE_X_EVENT_MASK_MOUSE_DOWN |
391 ECORE_X_EVENT_MASK_MOUSE_UP |
392 ECORE_X_EVENT_MASK_MOUSE_IN |
393 ECORE_X_EVENT_MASK_MOUSE_OUT |
394 ECORE_X_EVENT_MASK_MOUSE_MOVE |
395 ECORE_X_EVENT_MASK_WINDOW_DAMAGE |
396 ECORE_X_EVENT_MASK_WINDOW_VISIBILITY |
397 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE |
398 ECORE_X_EVENT_MASK_WINDOW_FOCUS_CHANGE |
399 ECORE_X_EVENT_MASK_WINDOW_PROPERTY |
400 ECORE_X_EVENT_MASK_WINDOW_COLORMAP
401 );
402 } 375 }
403 ecore_x_xregion_set(ee->engine.x.damages, ee->engine.x.gc); 376 ecore_x_xregion_set(ee->engine.x.damages, ee->engine.x.gc);
404 ecore_x_pixmap_paste(ee->engine.x.pmap, ee->prop.window, 377 ecore_x_pixmap_paste(ee->engine.x.pmap, ee->prop.window,