evas/cserve2: Merge Glyph_Data and mempool index

Glyphs were previously using 3 shared buffers, now reduce to 2:
- Memory pool (mempool) containing the glyph drawable data
- Index table (Shared_Index / array) containing only the
  indexes of the buffers in the mempool
- Glyph_Data table (array) containing the glyphs descriptors
  AS WELL as the buffer indexes.

So, we just merge the two index tables into one by using directly
objects of type Glyph_Data for the referencing of the mempool
buffers.

2 files changed, 8 insertions, 5 deletions

diff --git a/src/lib/evas/cserve2/evas_cs2.h b/src/lib/evas/cserve2/evas_cs2.h
index 35a0a3177f..a6e59945f2 100644
--- a/src/lib/evas/cserve2/evas_cs2.h
+++ b/src/lib/evas/cserve2/evas_cs2.h
@@ -379,14 +379,17 @@ struct _Font_Data {
    uint32_t dpi;
 };
 
-#define GLYPH_INDEX_ARRAY_TAG ('G' | 'L' << 8 | 'I' << 16 | 'D' << 24)
 #define GLYPH_DATA_ARRAY_TAG ('G' | 'L' << 8 | 'P' << 16 | 'H' << 24)
 struct _Glyph_Data {
+   // Index_Entry
    SHMOBJECT;
+   int32_t length;
+   int32_t offset;
+   int32_t shmid;
+   // Glyph data stuff
    uint32_t index;
-   string_t shm_id;
+   string_t mempool_id; // TODO: Merge with shmid? (Internally impossible atm)
    uint32_t buffer_id;
-   uint32_t offset;
    uint32_t size;
    uint32_t rows;
    uint32_t width;
diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index c052c279e5..67c597a0cf 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -597,9 +597,7 @@ static Eina_Bool
 _server_dispatch_until(unsigned int rid)
 {
    Eina_Bool failed;
-   fd_set rfds;
    unsigned int rrid;
-   struct timeval tv;
 
    while (1)
      {
@@ -608,6 +606,8 @@ _server_dispatch_until(unsigned int rid)
 #if TIMEOUT
         else if (failed)
           {
+             fd_set rfds;
+             struct timeval tv;
              int sel;
 
              if (socketfd == -1)