[EGIT] [core/efl] master 04/06: ee_x: Rename draw_ok to draw_block and invert logic

[Derek Foreman]

derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=380a58a9d9b73c8eb4383aa880134bec8d208981

commit 380a58a9d9b73c8eb4383aa880134bec8d208981
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Thu Apr 12 13:39:29 2018 -0500

    ee_x: Rename draw_ok to draw_block and invert logic
    
    I want to use this in other engines, but no other engine initializes this
    properly, so draw_ok would be EINA_FALSE everywhere.  This way draw_block
    is EINA_FALSE after calloc in all engines that don't know about it.
    
    ref T6834
---
 src/lib/ecore_evas/ecore_evas_private.h         |  2 +-
 src/modules/ecore_evas/engines/x/ecore_evas_x.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/lib/ecore_evas/ecore_evas_private.h 
b/src/lib/ecore_evas/ecore_evas_private.h
index 3dbd61ea62..c419699296 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -213,7 +213,7 @@ struct _Ecore_Evas
    short       rotation;
    Eina_Bool   shaped  : 1;
    Eina_Bool   visible : 1;
-   Eina_Bool   draw_ok : 1;
+   Eina_Bool   draw_block : 1;
    Eina_Bool   should_be_visible : 1;
    Eina_Bool   alpha  : 1;
    Eina_Bool   transparent  : 1;
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c 
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index dd0cecc302..44de09f50a 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -670,7 +670,7 @@ _render_updates_process(Ecore_Evas *ee, Eina_List *updates)
                }
           }
      }
-   else if (((ee->visible) && (ee->draw_ok)) ||
+   else if (((ee->visible) && (!ee->draw_block)) ||
             ((ee->should_be_visible) && (ee->prop.fullscreen)) ||
             ((ee->should_be_visible) && (ee->prop.override)))
      {
@@ -1067,10 +1067,10 @@ _ecore_evas_x_event_visibility_change(void *data 
EINA_UNUSED, int type EINA_UNUS
      {
         /* FIXME: round trip */
         if (!ecore_x_screen_is_composited(edata->screen_num))
-          ee->draw_ok = 0;
+          ee->draw_block = EINA_TRUE;
      }
    else
-     ee->draw_ok = 1;
+     ee->draw_block = EINA_FALSE;
    return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -4219,6 +4219,7 @@ ecore_evas_software_x11_new_internal(const char 
*disp_name, Ecore_X_Window paren
    _ecore_evas_x_sync_set(ee);
 
    ee->engine.func->fn_render = _ecore_evas_x_render;
+   ee->draw_block = EINA_TRUE;
 
    ecore_x_input_multi_select(ee->prop.window);
    ecore_evas_done(ee, EINA_FALSE);
@@ -4435,7 +4436,7 @@ ecore_evas_software_x11_pixmap_new_internal(const char 
*disp_name, Ecore_X_Windo
    ee->engine.func->fn_render = _ecore_evas_x_render;
    _ecore_evas_register(ee);
 
-   ee->draw_ok = 1;
+   ee->draw_block = EINA_FALSE;
 
    /* ecore_x_input_multi_select(ee->prop.window); */
    /* ecore_event_window_register(ee->prop.window, ee, ee->evas, */
@@ -4863,6 +4864,8 @@ ecore_evas_gl_x11_pixmap_new_internal(const char 
*disp_name, Ecore_X_Window pare
    ee->engine.func->fn_render = _ecore_evas_x_render;
    _ecore_evas_register(ee);
 
+   ee->draw_block = EINA_TRUE;
+
    /* ecore_x_input_multi_select(ee->prop.window); */
    /* ecore_event_window_register(ee->prop.window, ee, ee->evas, */
    /*                             
(Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, */

--