[EGIT] [e16/e16] master 02/04: Cache visual in EVisualFindARGB()

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=0c33378819da1380041dd14beedc9c9cd95dea72

commit 0c33378819da1380041dd14beedc9c9cd95dea72
Author: Kim Woelders <k...@woelders.dk>
Date:   Tue Dec 8 17:58:48 2020 +0100

    Cache visual in EVisualFindARGB()
---
 src/x.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/x.c b/src/x.c
index 64ac8fd6..f37aa9c7 100644
--- a/src/x.c
+++ b/src/x.c
@@ -52,7 +52,7 @@
 EDisplay            Dpy;
 Display            *disp;
 
-#if USE_COMPOSITE
+#if USE_XRENDER
 static Visual      *argb_visual = NULL;
 static EX_Colormap  argb_cmap = NoXID;
 #endif
@@ -347,15 +347,8 @@ ECreateArgbWindow(Win parent, int x, int y, int w, int h, 
Win cwin)
      }
    else
      {
-       if (!argb_visual)
-         {
-            argb_visual = EVisualFindARGB();
-            argb_cmap =
-               XCreateColormap(disp, WinGetXwin(VROOT), argb_visual,
-                               AllocNone);
-         }
        depth = 32;
-       vis = argb_visual;
+       vis = EVisualFindARGB();
        cmap = argb_cmap;
      }
 
@@ -1963,6 +1956,9 @@ EVisualFindARGB(void)
    int                 i, num;
    Visual             *vis;
 
+   if (argb_visual)
+      return argb_visual;
+
    xvit.screen = Dpy.screen;
    xvit.depth = 32;
 #if __cplusplus
@@ -1987,6 +1983,9 @@ EVisualFindARGB(void)
 
    XFree(xvi);
 
+   argb_visual = vis;
+   argb_cmap = XCreateColormap(disp, WinGetXwin(VROOT), vis, AllocNone);
+
    return vis;
 }
 

--