Enlightenment

Enlightenment CVS committal

Author  : jbickers
Project : e17
Module  : libs/imlib2

Dir     : e17/libs/imlib2/loaders


Modified Files:
	loader_lbm.c 


Log Message:
Fixed start-of-line HAM problem.
Added SHAM and CTBL load.
Added greyscale load.
Added IMLIB2_LBM_NOMASK check to disable masking.
Added colour gun scaling, e.g. 4-bit 0x0f scales to 8-bit 0xff, not 0xf0.
Changed RLE decompression by scanline instead of by byte.
Removed empty save() function altogether as per some other loaders.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/loaders/loader_lbm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- loader_lbm.c	26 Aug 2004 17:26:10 -0000	1.1
+++ loader_lbm.c	28 Aug 2004 20:59:59 -0000	1.2
@@ -1,9 +1,14 @@
 /*------------------------------------------------------------------------------
- * Reads regular Amiga IFF ILBM files. Does not handle sliced HAM, etc.
+ * Reads regular Amiga IFF ILBM files.
+ *
+ * Supports IMLIB2_LBM_NOMASK environment variable. If this is set to "1", then
+ * a transparency mask in an image will be ignored. On the Amiga a mask is often
+ * applied only when loading a brush rather than a picture, but this loader has
+ * no way to tell when the user wants this behaviour from the picture alone.
  *
  * Author:  John Bickers <jbickers@...>
  * Since:   2004-08-21
- * Version: 2004-08-23
+ * Version: 2004-08-28
  *------------------------------------------------------------------------------*/
 
 #ifdef HAVE_CONFIG_H
@@ -13,453 +18,444 @@
 #include "common.h"
 #include "image.h"
 
-char                load(ImlibImage * im, ImlibProgressFunction progress,
-                         char progress_granularity, char immediate_load);
-char                save(ImlibImage * im, ImlibProgressFunction progress,
-                         char progress_granularity);
-void                formats(ImlibLoader * l);
+char    load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity, char immediate_load);
+#if 0
+char    save(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity);
+#endif
+void    formats(ImlibLoader *l);
+
 
 #define L2RLONG(a) ((((long)((a)[0]) & 0xff) << 24) + (((long)((a)[1]) & 0xff) << 16) + (((long)((a)[2]) & 0xff) << 8) + ((long)((a)[3]) & 0xff))
 #define L2RWORD(a) ((((long)((a)[0]) & 0xff) << 8) + ((long)((a)[1]) & 0xff))
 
 typedef struct CHUNK {
-   long                size;
-   unsigned char      *data;
+    long    size;
+    unsigned char *data;
 } CHUNK;
 
-typedef struct BODY {
-   long                size;
-   unsigned char      *data;
-   int                 offset;
-   int                 count;
-   int                 rle;
-   int                 rletype;
-} BODY;
-
-static int          loadchunks(char *name, CHUNK * bmhd, CHUNK * camg,
-                               CHUNK * cmap, BODY * body);
-static unsigned char bodybyte(BODY *);
-static void         deplane(DATA32 * row, int w, CHUNK * bmhd, CHUNK * cmap,
-                            unsigned char *plane[], int depth, int mask,
-                            int ham, int hbrite);
+typedef struct ILBM {
+    CHUNK   bmhd;
+    CHUNK   camg;
+    CHUNK   cmap;
+    CHUNK   ctbl;
+    CHUNK   sham;
+    CHUNK   body;
+
+    int     depth;
+    int     mask;
+    int     ham;
+    int     hbrite;
+
+    int     row;
+
+    int     offset;
+    int     count;
+    int     rle;
+} ILBM;
+
+static void freeilbm(ILBM *);
+static int loadchunks(char *, ILBM *, int);
+static void bodyrow(unsigned char *, int, ILBM *);
+static unsigned char scalegun(unsigned char, int);
+static void scalecmap(ILBM *);
+static void deplane(DATA32 *, int, ILBM *, unsigned char **);
+
 
 /*------------------------------------------------------------------------------
- * Reads the given chunks out of a file, returns 0 if the file had a problem.
- *
- * Format FORMsizeILBMBMHDsize....CAMGsize....CMAPsize....BODYsize....
+ * Frees memory allocated as part of an ILBM structure.
  *------------------------------------------------------------------------------*/
-static int
-loadchunks(char *name, CHUNK * bmhd, CHUNK * camg, CHUNK * cmap, BODY * body)
+static void freeilbm(ILBM *ilbm)
 {
-   FILE               *f;
-   size_t              s;
-   long                formsize, pos, z;
-   int                 ok, seek;
-   char                buf[12];
-
-   if (bmhd)
-     {
-        bmhd->size = 0;
-        bmhd->data = NULL;
-     }
-   if (camg)
-     {
-        camg->size = 0;
-        camg->data = NULL;
-     }
-   if (cmap)
-     {
-        cmap->size = 0;
-        cmap->data = NULL;
-     }
-   if (body)
-     {
-        body->size = 0;
-        body->data = NULL;
-     }
-
-   ok = 0;
-
-   f = fopen(name, "rb");
-   if (f)
-     {
-        s = fread(buf, 1, 12, f);
-        if (s == 12 && !memcmp(buf, "FORM", 4) && !memcmp(buf + 8, "ILBM", 4))
-          {
-             formsize = L2RLONG(buf + 4);
-
-             while (1)
-               {
-                  pos = ftell(f);
-                  if (pos < 0 || pos >= formsize + 8)
-                     break;     /* Error or FORM data is finished. */
-                  seek = 1;
-
-                  s = fread(buf, 1, 8, f);
-                  if (s != 8)
-                     break;     /* Error or short file. */
-
-                  z = L2RLONG(buf + 4);
-                  if (z < 0)
-                     break;     /* Corrupt file. */
-
-                  if (!memcmp(buf, "BMHD", 4) && bmhd && !bmhd->data)
-                    {
-                       bmhd->size = z;
-                       bmhd->data = malloc(bmhd->size);
-                       if (!bmhd->data)
-                          break;
-
-                       s = fread(bmhd->data, 1, bmhd->size, f);
-                       if (s != bmhd->size)
-                          break;        /* Error or short file. */
-
-                       if (!cmap && !camg && !body)
-                         {
-                            ok = 1;
-                            break;
-                         }
+    if (ilbm->bmhd.data) free(ilbm->bmhd.data);
+    if (ilbm->camg.data) free(ilbm->camg.data);
+    if (ilbm->cmap.data) free(ilbm->cmap.data);
+    if (ilbm->ctbl.data) free(ilbm->ctbl.data);
+    if (ilbm->sham.data) free(ilbm->sham.data);
+    if (ilbm->body.data) free(ilbm->body.data);
 
-                       seek = 0;
-                    }
+    memset(ilbm, 0, sizeof(*ilbm));
+}
 
-                  if (!memcmp(buf, "CAMG", 4) && camg && !camg->data)
-                    {
-                       camg->size = z;
-                       camg->data = malloc(camg->size);
-                       if (!camg->data)
-                          break;
-
-                       s = fread(camg->data, 1, camg->size, f);
-                       if (s != camg->size)
-                          break;
 
-                       seek = 0;
-                    }
+/*------------------------------------------------------------------------------
+ * Reads the given chunks out of a file, returns 0 if the file had a problem.
+ *
+ * Format FORMsizeILBMtag.size....tag.size....tag.size....
+ *------------------------------------------------------------------------------*/
+static int loadchunks(char *name, ILBM *ilbm, int full)
+{
+CHUNK   *c;
+FILE    *f;
+size_t  s;
+long    formsize, pos, z;
+int     ok, seek;
+char    buf[12];
 
-                  if (!memcmp(buf, "CMAP", 4) && cmap && !cmap->data)
-                    {
-                       cmap->size = z;
-                       cmap->data = malloc(cmap->size);
-                       if (!cmap->data)
-                          break;
-
-                       s = fread(cmap->data, 1, cmap->size, f);
-                       if (s != cmap->size)
-                          break;
+    ok = 0;
 
-                       seek = 0;
+    f = fopen(name, "rb");
+    if (f) {
+        s = fread(buf, 1, 12, f);
+        if (s == 12 && !memcmp(buf, "FORM", 4) && !memcmp(buf + 8, "ILBM", 4)) {
+            memset(ilbm, 0, sizeof(*ilbm));
+            formsize = L2RLONG(buf + 4);
+
+            while (1) {
+                pos = ftell(f);
+                if (pos < 0 || pos >= formsize + 8) break;  /* Error or FORM data is finished. */
+                seek = 1;
+
+                s = fread(buf, 1, 8, f);
+                if (s != 8) break;                          /* Error or short file. */
+
+                z = L2RLONG(buf + 4);
+                if (z < 0) break;                           /* Corrupt file. */
+
+                c = NULL;
+                if (!memcmp(buf, "BMHD", 4)) c = &(ilbm->bmhd);
+                else if (full) {
+                    if (!memcmp(buf, "CAMG", 4)) c = &(ilbm->camg);
+                    else if (!memcmp(buf, "CMAP", 4)) c = &(ilbm->cmap);
+                    else if (!memcmp(buf, "CTBL", 4)) c = &(ilbm->ctbl);
+                    else if (!memcmp(buf, "SHAM", 4)) c = &(ilbm->sham);
+                    else if (!memcmp(buf, "BODY", 4)) c = &(ilbm->body);
+                }
+
+                if (c && !c->data) {
+                    c->size = z;
+                    c->data = malloc(c->size);
+                    if (!c->data) break;                    /* Out of memory. */
+
+                    s = fread(c->data, 1, c->size, f);
+                    if (s != c->size) break;                /* Error or short file. */
+
+                    seek = 0;
+                    if (!full) {                            /* Only BMHD required. */
+                        ok = 1;
+                        break;
                     }
+                }
 
-                  if (!memcmp(buf, "BODY", 4) && body && !body->data)
-                    {
-                       body->size = z;
-                       body->data = malloc(body->size);
-                       if (!body->data)
-                          break;
-
-                       s = fread(body->data, 1, body->size, f);
-                       if (s != body->size)
-                          break;
-
-                       if (bmhd && bmhd->data)
-                         {      /* BMHD must be before BODY. */
-                            ok = 1;
-                            break;
-                         }
-
-                       seek = 0;
-                    }
+                if (pos + 8 + z >= formsize + 8) break;     /* This was last chunk. */
 
-                  if (pos + 8 + z >= formsize + 8)
-                     break;     /* This was last chunk. */
+                if (seek && fseek(f, z, SEEK_CUR) != 0) break;
+            }
 
-                  if (seek && fseek(f, z, SEEK_CUR) != 0)
-                     break;
-               }
-          }
+          /* File may end strangely, especially if body size is uneven, but it's
+           * ok if we have the chunks we want. !full check is already done. */
+            if (ilbm->bmhd.data && ilbm->body.data) ok = 1;
+            if (!ok) freeilbm(ilbm);
+        }
         fclose(f);
-     }
+    }
 
-   if (!ok)
-     {
-        if (bmhd && bmhd->data)
-           free(bmhd->data);
-        if (camg && camg->data)
-           free(camg->data);
-        if (cmap && cmap->data)
-           free(cmap->data);
-        if (body && body->data)
-           free(body->data);
-     }
-
-   return ok;
+    return ok;
 }
 
+
 /*------------------------------------------------------------------------------
- * Returns a byte of data from a BODY chunk.
+ * Unpacks a row of possibly RLE data at a time.
  *
  * RLE compression depends on a count byte, followed by data bytes.
  *
  * 0x80 means skip.
  * 0xff to 0x81 means repeat one data byte (256 - count) + 1 times.
  * 0x00 to 0x7f means copy count + 1 data bytes.
+ *
+ * In theory RLE compression is not supposed to create runs across scanlines.
  *------------------------------------------------------------------------------*/
-static unsigned char
-bodybyte(BODY * body)
+static void bodyrow(unsigned char *p, int z, ILBM *ilbm)
 {
-   unsigned char       b;
+int     i, x, w;
+unsigned char b;
 
-   if (body->offset >= body->size)
-      return 0;
+    if (ilbm->offset >= ilbm->body.size) {
+        memset(p, 0, z);
+        return;
+    }
+
+    if (!ilbm->rle) {
+        w = ilbm->body.size - ilbm->offset;
+        if (w > z) w = z;
+        memcpy(p, ilbm->body.data + ilbm->offset, w);
+        if (w < z) memset(p + w, 0, z - w);
+        ilbm->offset += w;
+        return;
+    }
+
+    for (i = 0; i < z; ) {
+        b = ilbm->body.data[ilbm->offset++];
+        while (b == 0x80 && ilbm->offset < ilbm->body.size) b = ilbm->body.data[ilbm->offset++];
+        if (ilbm->offset >= ilbm->body.size) break;
+
+        if (b & 0x80) {
+            w = (0x100 - b) + 1;
+            if (w > z - i) w = z - i;
+            
+            b = ilbm->body.data[ilbm->offset++];
+            memset(p + i, b, w);
+            i += w;
+        }
+        else {
+            w = (b & 0x7f) + 1;
+            if (w > ilbm->body.size - ilbm->offset) w = ilbm->body.size - ilbm->offset; 
+            x = (w <= z - i)? w: z - i;
+            memcpy(p + i, ilbm->body.data + ilbm->offset, x);
+            i += x;
+            ilbm->offset += w;
+        }
+    }
+    
+    if (i < z) memset(p, 0, z - i);
+}
 
-   if (body->rle)
-     {
-        if (body->count == 0)
-          {
-             b = body->data[body->offset++];
-             while (b == 0x80 && body->offset < body->size)
-                b = body->data[body->offset++];
-
-             body->rletype = (b & 0x80);
-             if (body->rletype)
-                body->count = (0x100 - b) + 1;
-             else
-                body->count = (b & 0x7f) + 1;
-
-             if (body->offset >= body->size)
-                return 0;
-          }
-
-        body->count--;
-        if (body->rletype)
-          {
-             if (body->count == 0)
-                return body->data[body->offset++];
-             return body->data[body->offset];
-          }
 
-        return body->data[body->offset++];
-     }
+/*------------------------------------------------------------------------------
+ * Shifts a value to produce an 8-bit colour gun, and fills in the lower bits
+ * from the high bits of the value so that, for example, 4-bit 0x0f scales to
+ * 0xff, or 1-bit 0x01 scales to 0xff.
+ *------------------------------------------------------------------------------*/
+static unsigned char scalegun(unsigned char v, int sl)
+{
+int     sr;
+
+    switch (sl) {
+        case 1:
+        case 2:
+        case 3:
+            sr = 8 - sl;
+            return (v << sl) | (v >> sr);
+
+        case 4:
+            return (v << 4) | v;
+
+        case 5:
+            return v * 0x24;
+
+        case 6:
+            return v * 0x55;
+
+        case 7:
+            return v * 0xff;
+    }
+    return v;
+}
+
+
+/*------------------------------------------------------------------------------
+ * Scales the colours in a CMAP chunk if they all look like 4-bit colour, so
+ * that they use all 8-bits. This is done by copying the high nybble into the
+ * low nybble, so for example 0xf0 becomes 0xff.
+ *------------------------------------------------------------------------------*/
+static void scalecmap(ILBM *ilbm)
+{
+int     i;
+
+    if (!ilbm->cmap.data) return;
+
+    for (i = 0; i < ilbm->cmap.size; i++)
+        if (ilbm->cmap.data[i] & 0x0f) return;
 
-   return body->data[body->offset++];
+    for (i = 0; i < ilbm->cmap.size; i++)
+        ilbm->cmap.data[i] |= ilbm->cmap.data[i] >> 4;
 }
 
+
 /*------------------------------------------------------------------------------
  * Deplanes and converts an array of bitplanes to a single scanline of DATA32
  * (unsigned int) values. DATA32 is ARGB.
  *------------------------------------------------------------------------------*/
-static void
-deplane(DATA32 * row, int w, CHUNK * bmhd, CHUNK * cmap, unsigned char *plane[],
-        int depth, int mask, int ham, int hbrite)
+static void deplane(DATA32 *row, int w, ILBM *ilbm, unsigned char *plane[])
 {
-   unsigned long       l;
-   int                 i, o, x;
-   unsigned char       bit, r, g, b, a, v, h;
-
-   bit = 0x80;
-   o = 0;
-   for (x = 0; x < w; x++)
-     {
+unsigned long l;
+int     i, o, sl, x;
+unsigned char bit, r, g, b, a, v, h, *pal;
+
+    pal = NULL;
+    if (ilbm->sham.data && ilbm->sham.size >= 2 + (ilbm->row + 1) * 2 * 16)
+        pal = ilbm->sham.data + 2 + ilbm->row * 2 * 16;
+    if (ilbm->ctbl.data && ilbm->ctbl.size >= (ilbm->row + 1) * 2 * 16)
+        pal = ilbm->ctbl.data + ilbm->row * 2 * 16;
+
+    if (ilbm->ham) r = g = b = 0;
+
+    bit = 0x80;
+    o = 0;
+    for (x = 0; x < w; x++) {
         l = 0;
-        for (i = depth - 1; i >= 0; i--)
-          {
-             l = l << 1;
-             if (plane[i][o] & bit)
-                l = l | 1;
-          }
-        a = (mask == 0 || (mask == 1 && (plane[depth][o] & bit))
-             || mask == 2) ? 0xff : 0x00;
-
-        if (depth == 32)
-          {
-             a = (l >> 24) & 0xff;
-             b = (l >> 16) & 0xff;
-             g = (l >> 8) & 0xff;
-             r = l & 0xff;
-          }
-        else if (depth == 24)
-          {
-             b = (l >> 16) & 0xff;
-             g = (l >> 8) & 0xff;
-             r = l & 0xff;
-          }
-        else if (ham)
-          {
-             v = l & ((1 << (depth - 2)) - 1);
-             h = (l & ~v) >> (depth - 2);
-
-             if (x == 0 || h == 0x00)
-               {
-                  r = cmap->data[v * 3];
-                  g = cmap->data[v * 3 + 1];
-                  b = cmap->data[v * 3 + 2];
-               }
-             else if (h == 0x01)
-               {
-                  b = v << (8 - (depth - 2));
-               }
-             else if (h == 0x02)
-               {
-                  r = v << (8 - (depth - 2));
-               }
-             else if (h == 0x03)
-               {
-                  g = v << (8 - (depth - 2));
-               }
-          }
-        else if (hbrite)
-          {
-             v = l & ((1 << (depth - 1)) - 1);
-             h = (l & ~v) >> (depth - 1);
-
-             r = cmap->data[v * 3];
-             g = cmap->data[v * 3 + 1];
-             b = cmap->data[v * 3 + 2];
-
-             if (h)
-               {
-                  r = r >> 1;
-                  g = g >> 1;
-                  b = b >> 1;
-               }
-
-             if (mask == 2 && v == L2RWORD(bmhd->data + 12))
-                a = 0x00;
-          }
-        else
-          {
-             v = l & 0xff;
-             if ((v + 1) * 3 <= cmap->size)
-               {
-                  r = cmap->data[v * 3];
-                  g = cmap->data[v * 3 + 1];
-                  b = cmap->data[v * 3 + 2];
-               }
-             else
-                r = g = b = 0;
-
-             if (mask == 2 && v == L2RWORD(bmhd->data + 12))
-                a = 0x00;
-          }
-
-        row[x] =
-            ((unsigned long)a << 24) | ((unsigned long)r << 16) |
-            ((unsigned long)g << 8) | (unsigned long)b;
+        for (i = ilbm->depth - 1; i >= 0; i--) {
+            l = l << 1;
+            if (plane[i][o] & bit) l = l | 1;
+        }
+        a = (ilbm->mask == 0 || (ilbm->mask == 1 && (plane[ilbm->depth][o] & bit)) || ilbm->mask == 2)? 0xff: 0x00;
+
+        if (ilbm->depth == 32) {
+            a = (l >> 24) & 0xff;
+            b = (l >> 16) & 0xff;
+            g = (l >> 8) & 0xff;
+            r = l & 0xff;
+        }
+        else if (ilbm->depth == 24) {
+            b = (l >> 16) & 0xff;
+            g = (l >> 8) & 0xff;
+            r = l & 0xff;
+        }
+        else if (ilbm->ham) {
+            v = l & ((1 << (ilbm->depth - 2)) - 1);
+            h = (l & ~v) >> (ilbm->depth - 2);
+
+            if (h == 0x00) {
+                if (!pal) {
+                    if ((v + 1) * 3 <= ilbm->cmap.size) {
+                        r = ilbm->cmap.data[v * 3];
+                        g = ilbm->cmap.data[v * 3 + 1];
+                        b = ilbm->cmap.data[v * 3 + 2];
+                    }
+                    else r = g = b = 0;
+                }
+                else {
+                    r = scalegun(pal[v * 2] & 0x0f, 4);
+                    g = scalegun((pal[v * 2 + 1] & 0xf0) >> 4, 4);
+                    b = scalegun((pal[v * 2 + 1] & 0x0f), 4);
+                }
+            }
+            else if (h == 0x01) b = scalegun(v, 8 - (ilbm->depth - 2));
+            else if (h == 0x02) r = scalegun(v, 8 - (ilbm->depth - 2));
+            else g = scalegun(v, 8 - (ilbm->depth - 2));
+        }
+        else if (ilbm->hbrite) {
+            v = l & ((1 << (ilbm->depth - 1)) - 1);
+            h = (l & ~v) >> (ilbm->depth - 1);
+
+            if (!pal) {
+                if ((v + 1) * 3 <= ilbm->cmap.size) {
+                    r = ilbm->cmap.data[v * 3];
+                    g = ilbm->cmap.data[v * 3 + 1];
+                    b = ilbm->cmap.data[v * 3 + 2];
+                }
+                else r = g = b = 0;
+            }
+            else {
+                r = scalegun(pal[v * 2] & 0x0f, 4);
+                g = scalegun((pal[v * 2 + 1] & 0xf0) >> 4, 4);
+                b = scalegun((pal[v * 2 + 1] & 0x0f), 4);
+            }
+
+            if (h) {
+                r = r >> 1;
+                g = g >> 1;
+                b = b >> 1;
+            }
+
+            if (ilbm->mask == 2 && v == L2RWORD(ilbm->bmhd.data + 12)) a = 0x00;
+        }
+        else if (ilbm->cmap.size == 0 && !pal) {
+            v = l & ((1 << ilbm->depth) - 1);
+            r = scalegun(v, ilbm->depth);
+            g = r;
+            b = r;
+        }
+        else {
+            v = l & 0xff;
+            if (!pal) {
+                if ((v + 1) * 3 <= ilbm->cmap.size) {
+                    r = ilbm->cmap.data[v * 3];
+                    g = ilbm->cmap.data[v * 3 + 1];
+                    b = ilbm->cmap.data[v * 3 + 2];
+                }
+                else r = g = b = 0;
+            }
+            else {
+                r = scalegun(pal[v * 2] & 0x0f, 4);
+                g = scalegun((pal[v * 2 + 1] & 0xf0) >> 4, 4);
+                b = scalegun((pal[v * 2 + 1] & 0x0f), 4);
+            }
+
+            if (ilbm->mask == 2 && v == L2RWORD(ilbm->bmhd.data + 12)) a = 0x00;
+        }
+
+        row[x] = ((unsigned long)a << 24) | ((unsigned long)r << 16) | ((unsigned long)g << 8) | (unsigned long)b;
 
         bit = bit >> 1;
-        if (bit == 0)
-          {
-             o++;
-             bit = 0x80;
-          }
-     }
+        if (bit == 0) {
+            o++;
+            bit = 0x80;
+        }
+    }
 }
 
+
 /*------------------------------------------------------------------------------
  * Loads an image. If im->loader is non-zero, or immediate_load is non-zero, or
  * progress is non-zero, then the file is fully loaded, otherwise only the width
  * and height are read.
  *
- * Uses BMHD, CAMG, CMAP, and BODY chunks. Ignores others, e.g. DPI_ or ANNO.
+ * Imlib2 doesn't support reading comment chunks like ANNO.
  *------------------------------------------------------------------------------*/
-char
-load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
-     char immediate_load)
+char    load(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity, char immediate_load)
 {
-   int                 cancel, full, ham, hbrite, i, j, k, mask, n, rle, ok,
-       planes, y, z, prevy;
-   unsigned char      *plane[40];
-   char                per, pper;
-   BODY                body;
-   CHUNK               bmhd, camg, cmap;
+char    *env;
+int     cancel, full, i, j, k, n, ok, y, z, gran, nexty, prevy;
+unsigned char *plane[40];
+ILBM    ilbm;
 
   /*----------
    * Do nothing if the data is already loaded.
    *----------*/
-   if (im->data)
-      return 0;
+    if (im->data) return 0;
 
   /*----------
-   * Load the chunk(s) we're interested in. If full is not true, then
-   * we only want the image size and format.
+   * Load the chunk(s) we're interested in. If full is not true, then we only
+   * want the image size and format.
    *----------*/
-   full = (im->loader || immediate_load || progress);
-   if (full)
-      ok = loadchunks(im->real_file, &bmhd, &camg, &cmap, &body);
-   else
-      ok = loadchunks(im->real_file, &bmhd, NULL, NULL, NULL);
-   if (!ok)
-      return 0;
+    full = (im->loader || immediate_load || progress);
+    ok = loadchunks(im->real_file, &ilbm, full);
+    if (!ok) return 0;
 
   /*----------
    * Use and check header.
    *----------*/
-   ok = 0;
-   if (bmhd.size >= 20)
-     {
+    ok = 0;
+    if (ilbm.bmhd.size >= 20) {
         ok = 1;
 
-        im->w = L2RWORD(bmhd.data);
-        im->h = L2RWORD(bmhd.data + 2);
-
-        planes = bmhd.data[8];
-        if (planes < 1 || (planes > 8 && planes != 24 && planes != 32))
-           ok = 0;              /* Only 1 to 8, 24, or 32 planes. */
-
-        if (bmhd.data[10] > 1)
-           ok = 0;              /* Only NONE or RLE compression. */
-        rle = bmhd.data[10];
-
-        mask = bmhd.data[9];
-
-        if (mask || planes == 32)
-           SET_FLAG(im->flags, F_HAS_ALPHA);
-        else
-           UNSET_FLAG(im->flags, F_HAS_ALPHA);
-
-        if (!im->format)
-           im->format = strdup("lbm");
-
-        ham = 0;
-        hbrite = 0;
-        if (planes <= 8)
-          {
-             if (camg.size == 4)
-               {
-                  if (camg.data[2] & 0x08)
-                     ham = 1;
-                  if (camg.data[3] & 0x80)
-                     hbrite = 1;
-
-                  if (ham && full
-                      && (planes < 6 || cmap.size < 3 * (1 << (planes - 2))))
-                     ham = 0;
-                  if (hbrite && full
-                      && (planes < 5 || cmap.size < 3 * (1 << (planes - 1))))
-                     hbrite = 0;
-               }
-             else
-               {
-                  if (planes == 6 && full && cmap.size >= 3 * 16)
-                     ham = 1;
-                  if (full && !ham && planes > 1
-                      && cmap.size == 3 * (1 << (planes - 1)))
-                     hbrite = 1;
-               }
-          }
-     }
-   if (!full || !ok)
-     {
-        free(bmhd.data);
-        if (full && camg.data)
-           free(camg.data);
-        if (full && cmap.data)
-           free(cmap.data);
-        if (full && body.data)
-           free(body.data);
+        im->w = L2RWORD(ilbm.bmhd.data);
+        im->h = L2RWORD(ilbm.bmhd.data + 2);
+        if (im->w <= 0 || im->h <= 0) ok = 0;
+
+        ilbm.depth = ilbm.bmhd.data[8];
+        if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
+
+        ilbm.rle = ilbm.bmhd.data[10];
+        if (ilbm.rle < 0 || ilbm.rle > 1) ok = 0;       /* Only NONE or RLE compression. */
+
+        ilbm.mask = ilbm.bmhd.data[9];
+
+        if (ilbm.mask || ilbm.depth == 32) SET_FLAG(im->flags, F_HAS_ALPHA);
+        else UNSET_FLAG(im->flags, F_HAS_ALPHA);
+
+        env = getenv("IMLIB2_LBM_NOMASK");
+        if (env && (!strcmp(env, "true") || !strcmp(env, "1") || !strcmp(env, "yes") || !strcmp(env, "on"))) UNSET_FLAG(im->flags, F_HAS_ALPHA);
+
+        if (!im->format) im->format = strdup("lbm");
+
+        ilbm.ham = 0;
+        ilbm.hbrite = 0;
+        if (ilbm.depth <= 8) {
+            if (ilbm.camg.size == 4) {
+                if (ilbm.camg.data[2] & 0x08) ilbm.ham = 1;
+                if (ilbm.camg.data[3] & 0x80) ilbm.hbrite = 1;
+            }
+            else {                                      /* Only guess at ham and hbrite if CMAP is present. */
+                if (ilbm.depth == 6 && full && ilbm.cmap.size >= 3 * 16) ilbm.ham = 1;
+                if (full && !ilbm.ham && ilbm.depth > 1 && ilbm.cmap.size == 3 * (1 << (ilbm.depth - 1))) ilbm.hbrite = 1;
+            }
+        }
+    }
+    if (!full || !ok) {
+        freeilbm(&ilbm);
         return ok;
-     }
+    }
 
   /*----------
    * The source data is planar. Each plane is an even number of bytes wide. If
@@ -467,104 +463,88 @@
    * from each plane are interleaved, from top to bottom. The first plane is the
    * 0 bit.
    *----------*/
-   ok = 0;
-   cancel = 0;
-   plane[0] = NULL;
-
-   im->data = malloc(im->w * im->h * sizeof(DATA32));
-   if (im->data)
-     {
-        body.offset = 0;
-        body.count = 0;
-        body.rle = rle;
-        body.rletype = 0;
-
-        n = planes;
-        if (mask == 1)
-           n++;
+    ok = 0;
+    cancel = 0;
+    plane[0] = NULL;
+
+    im->data = malloc(im->w * im->h * sizeof(DATA32));
+    if (im->data) {
+        n = ilbm.depth;
+        if (ilbm.mask == 1) n++;
 
         plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
-        for (i = 1; i < n; i++)
-           plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
+        for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
 
         z = ((im->w + 15) / 16) * 2 * n;
 
-        pper = 0;
-        prevy = 0;
-
-        for (y = 0; y < im->h; y++)
-          {
-             for (i = 0; i < z; i++)
-                plane[0][i] = bodybyte(&body);
-
-             deplane(im->data + im->w * y, im->w, &bmhd, &cmap, plane, planes,
-                     mask, ham, hbrite);
-
-             if (progress)
-               {
-                  per = (char)((100 * y) / im->h);
-                  if (per - pper >= progress_granularity || y == im->h - 1)
-                    {
-                       if (!progress(im, per, 0, prevy, im->w, y + 1))
-                         {
-                            cancel = 1;
-                            break;
-                         }
-                       pper = per;
-                       prevy = y;
-                    }
-               }
-          }
+        if (progress) {
+            prevy = 0;
+            if (progress_granularity <= 0) progress_granularity = 1;
+            gran = progress_granularity;
+            nexty = ((im->h * gran) / 100);
+        }
+
+        scalecmap(&ilbm);
+
+        for (y = 0; y < im->h; y++) {
+            bodyrow(plane[0], z, &ilbm);
+
+            deplane(im->data + im->w * y, im->w, &ilbm, plane);
+            ilbm.row++;
+
+            if (progress && (y >= nexty || y == im->h - 1)) {
+                if (!progress(im, (char)((100 * (y + 1)) / im->h), 0, prevy, im->w, y + 1)) {
+                    cancel = 1;
+                    break;
+                }
+                prevy = y;
+                gran += progress_granularity;
+                nexty = ((im->h * gran) / 100);
+            }
+        }
 
         ok = !cancel;
-     }
+    }
 
   /*----------
    * We either had a successful decode, the user cancelled, or we couldn't get
    * the memory for im->data.
    *----------*/
-   if (!ok)
-     {
-        if (im->data)
-           free(im->data);
+    if (!ok) {
+        if (im->data) free(im->data);
         im->data = NULL;
-     }
+    }
 
-   if (plane[0])
-      free(plane[0]);
+    if (plane[0]) free(plane[0]);
 
-   free(bmhd.data);
-   if (camg.data)
-      free(camg.data);
-   if (cmap.data)
-      free(cmap.data);
-   if (body.data)
-      free(body.data);
+    freeilbm(&ilbm);
 
-   return (cancel) ? 2 : ok;
+    return (cancel)? 2: ok;
 }
 
+
 /*------------------------------------------------------------------------------
- * Does nothing. Perhaps save only in 24-bit format?
+ * Perhaps save only in 32-bit format? The IFF ILBM format has pretty much gone
+ * the way of the Amiga, who saves in this format any more?
  *------------------------------------------------------------------------------*/
-char
-save(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity)
+#if 0
+char    save(ImlibImage *im, ImlibProgressFunction progress, char progress_granularity)
 {
-   return 0;
+    return 0;
 }
+#endif
+
 
 /*------------------------------------------------------------------------------
  * Identifies the file extensions this loader handles. Standard code from other
  * loaders.
  *------------------------------------------------------------------------------*/
-void
-formats(ImlibLoader * l)
+void    formats(ImlibLoader *l)
 {
-   char               *list_formats[] = { "iff", "ilbm", "lbm" };
-   int                 i;
+char    *list_formats[] = { "iff", "ilbm", "lbm" };
+int     i;
 
-   l->num_formats = sizeof(list_formats) / sizeof(list_formats[0]);
-   l->formats = malloc(l->num_formats * sizeof(list_formats[0]));
-   for (i = 0; i < l->num_formats; i++)
-      l->formats[i] = strdup(list_formats[i]);
+    l->num_formats = sizeof(list_formats) / sizeof(list_formats[0]);
+    l->formats = malloc(l->num_formats * sizeof(list_formats[0]));
+    for (i = 0; i < l->num_formats; i++) l->formats[i] = strdup(list_formats[i]);
 }

Enlightenment CVS committal

Author  : fletch3k
Project : misc
Module  : enotes

Dir     : misc/enotes/src


Modified Files:
	main.c msgbox.c msgbox.h saveload.c settings.c usage.h 


Log Message:
Bug Fixes and the A-OK msg on control centre disabled

===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- main.c	26 Aug 2004 20:50:24 -0000	1.9
+++ main.c	28 Aug 2004 13:09:08 -0000	1.10
@@ -71,6 +71,10 @@
 		if (main_config->controlcentre == 1) {
 			setup_cc();
 			dml("Control Centre Setup", 1);
+		} else {
+			dml("No Control Centre - Displaying Notice", 1);
+			msgbox("E-Notes is Running",
+			       "Since the Control Centre is turned off,\nthis message is being displayed to say:\n\nE-Notes is running.");
 		}
 
 		/* Display the Introduction Note */
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/msgbox.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- msgbox.c	27 Aug 2004 20:40:37 -0000	1.5
+++ msgbox.c	28 Aug 2004 13:09:08 -0000	1.6
@@ -18,18 +18,6 @@
 /**
  * @param title: The titlebar content of the window.
  * @param content: The content string to display in the window.
- * @brief: Opens up a message box.
- */
-void
-msgbox(char *title, char *content)
-{
-	msgbox_manual(title, content, 0, 0, 300, 50);
-	return;
-}
-
-/**
- * @param title: The titlebar content of the window.
- * @param content: The content string to display in the window.
  * @param x: X co-ordinate to place the window at.
  * @param y: Y co-ordinate to place the window at.
  * @param width: Width of window.
@@ -37,23 +25,22 @@
  * @brief: Opens up a message box.
  */
 void
-msgbox_manual(char *title, char *content, int x, int y, int width, int height)
+msgbox(char *title, char *content)
 {
 	MsgBox         *mb = malloc(sizeof(MsgBox));
 
 	/* Setup the Window */
-	mb->win=ewl_window_new();
-	ewl_window_title_set((Ewl_Window*)mb->win, title);
+	mb->win = ewl_window_new();
+	ewl_window_title_set((Ewl_Window *) mb->win, title);
 	ewl_widget_show(mb->win);
 
 	mb->vbox = ewl_vbox_new();
 	ewl_container_child_append((Ewl_Container *) mb->win, mb->vbox);
-	ewl_object_fill_policy_set((Ewl_Object *) mb->vbox, EWL_FLAG_FILL_FILL);
+	ewl_object_padding_set((Ewl_Object *) mb->vbox, 5, 10, 5, 10);
 	ewl_widget_show(mb->vbox);
 
 	mb->msg = ewl_text_new(content);
 	ewl_container_child_append((Ewl_Container *) mb->vbox, mb->msg);
-	ewl_object_fill_policy_set((Ewl_Object *) mb->msg, EWL_FLAG_FILL_FILL);
 	ewl_widget_show(mb->msg);
 
 	mb->hbox = ewl_hbox_new();
@@ -81,7 +68,7 @@
  * @brief: Closes the msgbox window ee.
  */
 void
-msgbox_close(MsgBox *p)
+msgbox_close(MsgBox * p)
 {
 	ewl_widget_destroy(p->win);
 	free(p);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/msgbox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- msgbox.h	27 Aug 2004 20:40:37 -0000	1.4
+++ msgbox.h	28 Aug 2004 13:09:08 -0000	1.5
@@ -33,12 +33,10 @@
 
 /* Making a Message Box */
 void            msgbox(char *title, char *content);
-void            msgbox_manual(char *title, char *content, int x, int y,
-			      int width, int height);
 
 /* Callbacks */
 void            msgbox_okbtn_clicked(Ewl_Widget * widget, void *ev_data,
 				     void *data);
-void            msgbox_close(MsgBox *p);
+void            msgbox_close(MsgBox * p);
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/saveload.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- saveload.c	27 Aug 2004 20:40:37 -0000	1.13
+++ saveload.c	28 Aug 2004 13:09:08 -0000	1.14
@@ -53,14 +53,16 @@
 	/* Setup the Window */
 	saveload->win = ewl_window_new();
 	ewl_window_title_set((Ewl_Window *) saveload->win, "E-Notes Save/Load");
-	ewl_object_fill_policy_set((Ewl_Object*)saveload->win, EWL_FLAG_FILL_ALL);
-	ewl_object_size_request((Ewl_Object*)saveload->win, 400,350);
+	ewl_object_fill_policy_set((Ewl_Object *) saveload->win,
+				   EWL_FLAG_FILL_ALL);
+	ewl_object_size_request((Ewl_Object *) saveload->win, 400, 350);
 	ewl_widget_show(saveload->win);
 
 	saveload->vbox = ewl_vbox_new();
 	ewl_container_child_append((Ewl_Container *) saveload->win,
 				   saveload->vbox);
-	ewl_object_fill_policy_set((Ewl_Object*)saveload->vbox, EWL_FLAG_FILL_ALL);
+	ewl_object_fill_policy_set((Ewl_Object *) saveload->vbox,
+				   EWL_FLAG_FILL_ALL);
 	ewl_widget_show(saveload->vbox);
 
 	ewl_callback_append(saveload->win, EWL_CALLBACK_CONFIGURE,
@@ -84,8 +86,10 @@
 	saveload->hbox = ewl_hbox_new();
 	ewl_container_child_append((Ewl_Container *) saveload->vbox,
 				   saveload->hbox);
-	ewl_object_fill_policy_set((Ewl_Object*)saveload->hbox,EWL_FLAG_FILL_VSHRINK);
-	ewl_object_fill_policy_set((Ewl_Object*)saveload->hbox,EWL_FLAG_FILL_HFILL);
+	ewl_object_fill_policy_set((Ewl_Object *) saveload->hbox,
+				   EWL_FLAG_FILL_VSHRINK);
+	ewl_object_fill_policy_set((Ewl_Object *) saveload->hbox,
+				   EWL_FLAG_FILL_HFILL);
 	ewl_widget_show(saveload->hbox);
 
 	saveload_setup_button(saveload->hbox, &saveload->savebtn, "Save.");
@@ -170,11 +174,12 @@
 	capt = (Ewl_Widget *) ewl_text_new(caption);
 	ewl_callback_append(capt, EWL_CALLBACK_CLICKED,
 			    (void *) ewl_saveload_listitem_click, NULL);
-	ewl_object_fill_policy_set((Ewl_Object*)capt, EWL_FLAG_FILL_ALL);
+	ewl_object_fill_policy_set((Ewl_Object *) capt, EWL_FLAG_FILL_ALL);
 	ewl_widget_show(capt);
 	d->saveload_row =
 		(Ewl_Row *) ewl_tree_row_add((Ewl_Tree *) tree, 0, &capt);
-	ewl_object_fill_policy_set((Ewl_Object*)d->saveload_row, EWL_FLAG_FILL_ALL);
+	ewl_object_fill_policy_set((Ewl_Object *) d->saveload_row,
+				   EWL_FLAG_FILL_ALL);
 	return;
 }
 
@@ -321,8 +326,8 @@
 	/* Setup the Window */
 	load->win = ewl_window_new();
 	ewl_window_title_set((Ewl_Window *) load->win, "E-Notes Load");
-	ewl_object_fill_policy_set((Ewl_Object*)load->win, EWL_FLAG_FILL_ALL);
-	ewl_object_size_request((Ewl_Object*)load->win, 400,350);
+	ewl_object_fill_policy_set((Ewl_Object *) load->win, EWL_FLAG_FILL_ALL);
+	ewl_object_size_request((Ewl_Object *) load->win, 400, 350);
 	ewl_widget_show(load->win);
 
 	load->vbox = ewl_vbox_new();
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- settings.c	27 Aug 2004 20:40:37 -0000	1.11
+++ settings.c	28 Aug 2004 13:09:08 -0000	1.12
@@ -50,13 +50,13 @@
 	/* Setup the Window */
 	s->win = ewl_window_new();
 	ewl_window_title_set((Ewl_Window *) s->win, "E-Notes Settings");
-	ewl_object_fill_policy_set((Ewl_Object*)s->win, EWL_FLAG_FILL_ALL);
-	ewl_object_size_request((Ewl_Object*)s->win, 400,350);
+	ewl_object_fill_policy_set((Ewl_Object *) s->win, EWL_FLAG_FILL_ALL);
+	ewl_object_size_request((Ewl_Object *) s->win, 400, 350);
 	ewl_widget_show(s->win);
 
 	s->vbox = ewl_vbox_new();
 	ewl_container_child_append((Ewl_Container *) s->win, s->vbox);
-	ewl_object_fill_policy_set((Ewl_Object*)s->vbox, EWL_FLAG_FILL_ALL);
+	ewl_object_fill_policy_set((Ewl_Object *) s->vbox, EWL_FLAG_FILL_ALL);
 	ewl_widget_show(s->vbox);
 
 	ewl_callback_append(s->win, EWL_CALLBACK_CONFIGURE, settings_move_embed,
@@ -75,8 +75,9 @@
 
 	s->hbox = ewl_hbox_new();
 	ewl_container_child_append((Ewl_Container *) s->vbox, s->hbox);
-	ewl_object_fill_policy_set ((Ewl_Object*) s->hbox, EWL_FLAG_FILL_VSHRINK);
-	ewl_object_fill_policy_set ((Ewl_Object*) s->hbox, EWL_FLAG_FILL_HFILL);
+	ewl_object_fill_policy_set((Ewl_Object *) s->hbox,
+				   EWL_FLAG_FILL_VSHRINK);
+	ewl_object_fill_policy_set((Ewl_Object *) s->hbox, EWL_FLAG_FILL_HFILL);
 	ewl_widget_show(s->hbox);
 
 	settings_setup_button(s->hbox, &(s->savebtn), "Save.");
@@ -281,6 +282,9 @@
 	xml_write_append_entry(p, "intro",
 			       ewl_entry_get_text((Ewl_Entry *) settings->intro.
 						  entry));
+	xml_write_append_entry(p, "controlcentre",
+			       ewl_entry_get_text((Ewl_Entry *) settings->
+						  cc.entry));
 	xml_write_append_entry(p, "debug",
 			       ewl_entry_get_text((Ewl_Entry *) settings->debug.
 						  entry));
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/usage.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- usage.h	26 Aug 2004 20:50:24 -0000	1.7
+++ usage.h	28 Aug 2004 13:09:08 -0000	1.8
@@ -54,7 +54,7 @@
 
 #define USAGE_VERSION "E-Notes Version:\n%s\n"
 
-#define OPTSTR "v?hc:r:t:i:R:d:A:w:"
+#define OPTSTR "v?hc:r:t:i:R:d:A:w:C:"
 
 static struct option long_options[] = {
 	{"help", 0, 0, '?'},

Enlightenment CVS committal

Author  : andreas99
Project : e16
Module  : tools

Dir     : e16/tools/e16menuedit2/src


Modified Files:
	Makefile.am callbacks.c file.c file.h 


Log Message:
Added support for non-yelp help system. Currently hardcoded on Mozilla.
This should be configurable...

===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am	16 Aug 2004 18:37:04 -0000	1.6
+++ Makefile.am	28 Aug 2004 12:27:57 -0000	1.7
@@ -22,5 +22,5 @@
         libglade_support.c\
         libglade_support.h
 
-e16menuedit2_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
+e16menuedit2_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) 
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- callbacks.c	16 Aug 2004 18:37:04 -0000	1.12
+++ callbacks.c	28 Aug 2004 12:27:59 -0000	1.13
@@ -286,7 +286,17 @@
 void on_menu_contents_activate (GtkMenuItem *menuitem,
                                 gpointer user_data)
 {
-  /* only yelp execution currenty in lang C
-     other languages and html fallback comes... */
-  run_yelp (PACKAGE".xml");
+  int help_error;
+
+  help_error = run_help ("yelp", YELP_HELP_DIR, PACKAGE".xml");
+
+  if (help_error)
+  {
+    help_error = run_help ("mozilla", PACKAGE_DOC_DIR, PACKAGE".html");
+
+    if (help_error)
+    {
+      g_print ("no help system or help file found!\n");
+    }
+  }
 }
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/file.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- file.c	16 Aug 2004 18:37:04 -0000	1.6
+++ file.c	28 Aug 2004 12:27:59 -0000	1.7
@@ -330,35 +330,84 @@
   return locale_dup;
 }
 
-int run_yelp (char *help_name)
+int run_help (char *help_app, char *help_dir, char *help_file)
 {
   gboolean spawn;
   gchar *argv_child[3];
-  char *locale = malloc (30);
-  int help_exist;
-  struct stat *buf;
-
-  strcpy (argv_child[0], "yelp");
-  argv_child[2] = NULL;
+  gchar *params;
+  char *locale;
+  char *locale_fallback;
+  char *locale_tmp;
+  gboolean help_missing = TRUE;
+  struct stat buf;
 
   locale = setlocale (LC_ALL, NULL);
 
-  argv_child[1] = g_strdup_printf ("%s/%s/%s",YELP_HELP_DIR, "C", help_name);
+  params = g_strdup_printf ("%s/%s/%s", help_dir,
+                            locale, help_file);
+  help_missing = stat (params, &buf);
 
-  help_exist = stat (argv_child[1], buf);
+  /* locale fallback 1 */
+  if (help_missing)
+  {
+    locale_fallback = get_fallback_locale (locale);
+    g_free (params);
+    params = g_strdup_printf ("%s/%s/%s", help_dir,
+                              locale_fallback, help_file);
+    help_missing = stat (params, &buf);
+
+    /* locale fallback 2 */
+    if (help_missing)
+    {
+      locale_tmp = strdup (locale_fallback);
+      g_free (locale_fallback);
+      locale_fallback = get_fallback_locale (locale_tmp);
+      g_free (locale_tmp);
+      g_free (params);
+      params = g_strdup_printf ("%s/%s/%s", help_dir,
+                                locale_fallback, help_file);
+      help_missing = stat (params, &buf);
+
+      /* locale fallback 3 */
+      if (help_missing)
+      {
+        locale_tmp = strdup (locale_fallback);
+        g_free (locale_fallback);
+        locale_fallback = get_fallback_locale (locale_tmp);
+        g_free (locale_tmp);
+        g_free (params);
+        params = g_strdup_printf ("%s/%s/%s", help_dir,
+                                  locale_fallback, help_file);
+        help_missing = stat (params, &buf);
+      }
+    }
+  }
 
-  if (!help_exist)
+  if (help_missing)
   {
-    spawn = g_spawn_async (NULL, argv_child, NULL,
-                           G_SPAWN_SEARCH_PATH, NULL,
-                           NULL, NULL, NULL);
+    /* no yelp files found */
+    return 1;
   }
   else
   {
-    g_print ("help doesn't exist for locale %s\n", locale);
-  }
+    argv_child[0] = help_app;
+    argv_child[1] = params;
+    argv_child[2] = NULL;
+
+    spawn = g_spawn_async (NULL, argv_child, NULL,
+                           G_SPAWN_SEARCH_PATH, NULL,
+                           NULL, NULL, NULL);
 
-  g_free (argv_child[1]);
+    if (!spawn)
+    {
+      /* no yelp application found */
+      return 2;
+    }
+
+    //g_free (argv_child[0]);
+    g_free (params);
+    g_free (locale_fallback);
+  }
 
   return 0;
 }
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/src/file.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- file.h	16 Aug 2004 18:37:04 -0000	1.5
+++ file.h	28 Aug 2004 12:27:59 -0000	1.6
@@ -51,6 +51,6 @@
 int version_cmp (char *ver1, char *ver2);
 char *pkg_config_version (char *package);
 char *get_fallback_locale (char *locale);
-int run_yelp (char *help_name);
+int run_help (char *help_app, char* help_dir, char *help_file);
 
 #endif /* _FILE_H */

Enlightenment CVS committal

Author  : doursse
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src


Modified Files:
	ewl_entry.c ewl_entry.h 


Log Message:
add ctrl-(right left) support in the entry
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- ewl_entry.c	20 Aug 2004 16:33:26 -0000	1.99
+++ ewl_entry.c	28 Aug 2004 07:33:40 -0000	1.100
@@ -557,6 +557,44 @@
 	DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
+/*
+ * Move the cursor to the previous word. This is internal, so the
+ * parameter is not checked.
+ */
+void ewl_entry_move_cursor_to_previous_word(Ewl_Entry * e)
+{
+	char                 *s;
+	int                   len = 0;
+	int                   bp;
+
+	DENTER_FUNCTION(DLEVEL_STABLE);
+	DCHECK_PARAM_PTR("e", e);
+  
+	len = ewl_text_length_get(EWL_TEXT(e->text));
+	bp = ewl_cursor_base_position_get(EWL_CURSOR(e->cursor));
+	
+	s = ewl_entry_get_text(e);
+
+	if ((bp >1) && (s[bp] != ' ') && (s[bp-1] == ' '))
+	  bp--;
+
+	if (bp >= 0)
+	  {
+	    if (s[bp] == ' ') {
+	      while ((--bp > 0) && (s[bp] == ' ')){}
+	    }
+	    while ((--bp > 0) && (s[bp] != ' ')){}
+	  }
+	if (bp <= len)
+		++bp;
+
+	ewl_cursor_base_set(EWL_CURSOR(e->cursor), bp);
+
+	ewl_widget_configure(EWL_WIDGET(e));
+
+	DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
 void ewl_entry_move_cursor_to_right(Ewl_Entry * e)
 {
 	char           *str;
@@ -587,6 +625,41 @@
 }
 
 /*
+ * Move the cursor to the next word. This is internal, so the
+ * parameter is not checked.
+ */
+void ewl_entry_move_cursor_to_next_word(Ewl_Entry * e)
+{
+	char                 *s;
+	int                   len = 0;
+	int                   bp;
+
+	DENTER_FUNCTION(DLEVEL_STABLE);
+	DCHECK_PARAM_PTR("e", e);
+  
+	len = ewl_text_length_get(EWL_TEXT(e->text));
+	bp = ewl_cursor_base_position_get(EWL_CURSOR(e->cursor));
+	
+	s = ewl_entry_get_text(e);
+
+	if (bp <= len)
+	  {
+	    if (s[bp] != ' ') {
+	      while ((++bp < len) && (s[bp] != ' ')){}
+	    }
+	    while ((++bp < len) && (s[bp] == ' ')){}
+	  }
+	if (bp > len)
+	  bp = len;
+
+	ewl_cursor_base_set(EWL_CURSOR(e->cursor), bp);
+
+	ewl_widget_configure(EWL_WIDGET(e));
+
+	DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/*
  * Position the cursor at the beginning of the widget. This is internal, so the
  * parameter is not checked.
  */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_entry.h	27 May 2004 20:15:16 -0000	1.35
+++ ewl_entry.h	28 Aug 2004 07:33:40 -0000	1.36
@@ -50,7 +50,9 @@
 void            ewl_entry_set_editable(Ewl_Entry *e, unsigned int edit);
 
 void ewl_entry_move_cursor_to_left(Ewl_Entry * e);
+void ewl_entry_move_cursor_to_previous_word(Ewl_Entry * e);
 void ewl_entry_move_cursor_to_right(Ewl_Entry * e);
+void ewl_entry_move_cursor_to_next_word(Ewl_Entry * e);
 void ewl_entry_move_cursor_to_home(Ewl_Entry * e);
 void ewl_entry_move_cursor_to_end(Ewl_Entry * e);
 void ewl_entry_insert_text(Ewl_Entry * e, char *s);

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : libs/ecore

Dir     : e17/libs/ecore/src/lib/ecore_x


Modified Files:
	Ecore_X.h ecore_x_window.c 


Log Message:
added ecore_x_window_configure
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- Ecore_X.h	27 Aug 2004 22:33:56 -0000	1.54
+++ Ecore_X.h	28 Aug 2004 09:58:39 -0000	1.55
@@ -701,6 +701,16 @@
     ECORE_X_WINDOW_TYPE_NORMAL
 } Ecore_X_Window_Type;
 
+typedef enum _Ecore_X_Window_Configure_Mask {
+   ECORE_X_WINDOW_CONFIGURE_MASK_X              = (1 << 0),
+   ECORE_X_WINDOW_CONFIGURE_MASK_Y              = (1 << 1),
+   ECORE_X_WINDOW_CONFIGURE_MASK_W              = (1 << 2),
+   ECORE_X_WINDOW_CONFIGURE_MASK_H              = (1 << 3),
+   ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH   = (1 << 4),
+   ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING        = (1 << 5),
+   ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE     = (1 << 6)
+} Ecore_X_Window_Configure_Mask;
+
 /* Window layer constants */
 #define ECORE_X_WINDOW_LAYER_BELOW 2
 #define ECORE_X_WINDOW_LAYER_NORMAL 4
@@ -748,6 +758,12 @@
 Ecore_X_Window   ecore_x_window_new(Ecore_X_Window parent, int x, int y, int w, int h);
 Ecore_X_Window   ecore_x_window_override_new(Ecore_X_Window parent, int x, int y, int w, int h);
 Ecore_X_Window   ecore_x_window_input_new(Ecore_X_Window parent, int x, int y, int w, int h);
+void             ecore_x_window_configure(Ecore_X_Window win,
+                                          Ecore_X_Window_Configure_Mask mask,
+                                          int x, int y, int w, int h,
+                                          int border_width,
+                                          Ecore_X_Window sibling,
+                                          int stack_mode);
 void             ecore_x_window_cursor_set(Ecore_X_Window win,
                                            Ecore_X_Cursor c);
 void             ecore_x_window_del(Ecore_X_Window win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_window.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ecore_x_window.c	26 Aug 2004 18:05:25 -0000	1.27
+++ ecore_x_window.c	28 Aug 2004 09:58:39 -0000	1.28
@@ -229,6 +229,29 @@
    ecore_x_window_prop_command_set(win, argc, argv);
 }
 
+void
+ecore_x_window_configure(Ecore_X_Window win,
+                         Ecore_X_Window_Configure_Mask mask,
+                         int x, int y, int w, int h,
+                         int border_width, Ecore_X_Window sibling,
+                         int stack_mode)
+{
+   XWindowChanges xwc;
+
+   if (!win)
+      return;
+
+   xwc.x = x;
+   xwc.y = y;
+   xwc.width = w;
+   xwc.height = h;
+   xwc.border_width = border_width;
+   xwc.sibling = sibling;
+   xwc.stack_mode = stack_mode;
+
+   XConfigureWindow(_ecore_x_disp, win, mask, &xwc);
+}
+
 /**
  * @defgroup Evas_X_Window_Destroy_Group X Window Destroy Functions
  *

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/lib/engines/common


Modified Files:
	evas_image_load.c 


Log Message:


reduce stat calls massively...

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_image_load.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas_image_load.c	22 Apr 2004 11:29:33 -0000	1.11
+++ evas_image_load.c	28 Aug 2004 08:41:12 -0000	1.12
@@ -833,29 +833,82 @@
 RGBA_Image *
 evas_common_load_image_from_file(const char *file, const char *key)
 {
-   char *real_file;
+//   char *real_file;
    RGBA_Image *im;
    int ok;
-   DATA64 mod_time;
+   char *p;
+//   DATA64 mod_time;
 
-   real_file = evas_file_path_resolve(file);
-   mod_time = 0;
-   if (real_file) mod_time = evas_file_modified_time(real_file);
-   else if (file) mod_time = evas_file_modified_time(file);
-   im = evas_common_image_find(file, key, mod_time);
+//   real_file = evas_file_path_resolve(file);
+//   mod_time = 0;
+//   if (real_file) mod_time = evas_file_modified_time(real_file);
+//   else if (file) mod_time = evas_file_modified_time(file);
+   im = evas_common_image_find(file, key, 0);
    if (im)
      {
 	evas_common_image_ref(im);
-	if (real_file) free(real_file);
+//	if (real_file) free(real_file);
 	return im;
      }
+   printf("@@@@@@@@@ IMAGE LOAD\n");
    im = evas_common_image_new();
    if (!im)
      {
-	if (real_file) free(real_file);
+//	if (real_file) free(real_file);
 	return NULL;
      }
    ok = -1;
+     {
+	p = strrchr(file, '.');
+	if (p)
+	  {
+	     p++;
+	     
+#ifdef BUILD_LOADER_PNG
+	     if (ok == -1)
+	       {
+		  if (!strcasecmp(p, "png"))
+		    {
+		       ok = load_image_file_head_png(im, file, key);
+		       if (ok != -1) im->info.format = 1;
+		    }
+	       }
+#endif
+#ifdef BUILD_LOADER_JPEG
+	     if (ok == -1)
+	       {
+		  if ((!strcasecmp(p, "jpg")) ||
+		      (!strcasecmp(p, "jpeg")) ||
+		      (!strcasecmp(p, "jfif")))
+		    {
+		       ok = load_image_file_head_jpeg(im, file, key);
+		       if (ok != -1) im->info.format = 2;
+		    }
+	       }
+#endif
+#ifdef BUILD_LOADER_EET
+	     if (ok == -1)
+	       {
+		  if (!strcasecmp(p, "eet"))
+		    {
+		       ok = load_image_file_head_eet(im, file, key);
+		       if (ok != -1) im->info.format = 3;
+		    }
+	       }
+#endif
+#ifdef BUILD_LOADER_EDB
+	     if (ok == -1)
+	       {
+		  if (!strcasecmp(p, "edb"))
+		    {
+		       ok = load_image_file_head_edb(im, file, key);
+		       if (ok != -1) im->info.format = 4;
+		    }
+	       }
+#endif
+	  }
+     }
+   
 #ifdef BUILD_LOADER_PNG
    if (ok == -1)
      {
@@ -887,18 +940,18 @@
    if (ok == -1)
      {
 	evas_common_image_free(im);
-	if (real_file) free(real_file);
+//	if (real_file) free(real_file);
 	return NULL;
      }
-   im->timestamp = mod_time;
+//   im->timestamp = mod_time;
    if (file)
      {
 	im->info.file = strdup(file);
-	im->info.real_file = real_file;
+//	im->info.real_file = real_file;
      }
    else
      {
-	if (real_file) free(real_file);	
+//	if (real_file) free(real_file);	
      }
    if (key)
      im->info.key = strdup(key);

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_lib.c 


Log Message:


reduce more stat calls

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- eet_lib.c	14 Jul 2004 16:37:29 -0000	1.12
+++ eet_lib.c	28 Aug 2004 08:41:19 -0000	1.13
@@ -1,6 +1,10 @@
 #include "Eet.h"
 #include "Eet_private.h"
 
+#ifdef HAVE_REALPATH
+#undef HAVE_REALPATH
+#endif
+
 #define EET_MAGIC_FILE                  0x1ee7ff00
 #define EET_MAGIC_FILE_HEADER           0x1ee7ff01
 #define EET_MAGIC_FILE_NODE             0x1ee7ff02

Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src


Modified Files:
	ewl_dialog.c ewl_filedialog.c ewl_filedialog.h 
	ewl_fileselector.c ewl_fileselector.h 


Log Message:
New filedialog code from caro. Expect this to evolve over the next few weeks.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_dialog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_dialog.c	27 Aug 2004 06:13:17 -0000	1.11
+++ ewl_dialog.c	28 Aug 2004 06:26:33 -0000	1.12
@@ -61,10 +61,12 @@
 
 	if (box) {
 		ewl_container_child_append(EWL_CONTAINER(dialog), box);
+		ewl_object_fill_policy_set(EWL_OBJECT(box), EWL_FLAG_FILL_ALL);
 		ewl_widget_show(box);
 	}
 
 	dialog->vbox = ewl_vbox_new();
+	ewl_object_fill_policy_set(EWL_OBJECT(dialog->vbox), EWL_FLAG_FILL_ALL);
 	if (dialog->vbox) {
 		ewl_container_child_append(EWL_CONTAINER(box),
 					   dialog->vbox);
@@ -226,26 +228,26 @@
 	switch (dialog->position) {
 	case EWL_POSITION_LEFT:
 		{
-			ewl_container_child_append(EWL_CONTAINER
-						   (dialog->vbox), w);
+			ewl_container_child_append(EWL_CONTAINER(dialog->vbox),
+						   w);
 			break;
 		}
 	case EWL_POSITION_TOP:
 		{
-			ewl_container_child_append(EWL_CONTAINER
-						   (dialog->vbox), w);
+			ewl_container_child_append(EWL_CONTAINER(dialog->vbox),
+						   w);
 			break;
 		}
 	case EWL_POSITION_RIGHT:
 		{
-			ewl_container_child_prepend(EWL_CONTAINER
-						    (dialog->vbox), w);
+			ewl_container_child_prepend(EWL_CONTAINER(dialog->vbox),
+						    w);
 			break;
 		}
 	default:
 		{
-			ewl_container_child_prepend(EWL_CONTAINER
-						    (dialog->vbox), w);
+			ewl_container_child_prepend(EWL_CONTAINER(dialog->vbox),
+						    w);
 			break;
 		}
 	}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_filedialog.c	19 Aug 2004 20:03:32 -0000	1.39
+++ ewl_filedialog.c	28 Aug 2004 06:26:33 -0000	1.40
@@ -1,12 +1,21 @@
 #include <Ewl.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <string.h>
+
+#include "ewl_fileselector.h"
+#include "ewl_filedialog.h"
+
 
 /**
  * @param type: type of dialog to display
  * @return Returns a new filedialog in success, NULL on failure.
  * @brief Create a new filedialog
  */
-Ewl_Widget     *ewl_filedialog_new(Ewl_Filedialog_Type type)
+Ewl_Widget *ewl_filedialog_new()
 {
 	Ewl_Filedialog *fd;
 
@@ -16,240 +25,109 @@
 	if (!fd)
 		DRETURN_PTR(NULL, DLEVEL_STABLE);
 
-	ewl_filedialog_init(fd, type);
+	ewl_filedialog_init(fd);
 
 	DRETURN_PTR(EWL_WIDGET(fd), DLEVEL_STABLE);
 }
 
-
 /**
  * @param fd: the filedialog
  * @param type: the filedialog type
  * @return Returns no value.
  * @brief Initialize a new filedialog
  */
-void
-ewl_filedialog_init(Ewl_Filedialog * fd, Ewl_Filedialog_Type type)
+void ewl_filedialog_init(Ewl_Filedialog * fd)
 {
-	Ewl_Widget     *w;
-	Ewl_Widget     *hbox;
-	Ewl_Widget     *vbox;
-	
+	Ewl_Widget *w;
+	Ewl_Widget *button;
+
 	DENTER_FUNCTION(DLEVEL_STABLE);
-	DCHECK_PARAM_PTR ("fd", fd);
+	DCHECK_PARAM_PTR("fd", fd);
 
 	w = EWL_WIDGET(fd);
 
-	/*
-	 * Initialize the widget to have the necessary box and filedialog
-	 * attributes.
-	 */
-	ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_VERTICAL);
-	ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_SHRINK |
-						  EWL_FLAG_FILL_FILL);
-	ewl_widget_appearance_set(EWL_WIDGET (w), "filedialog");
-	fd->type = type;
-
-	/*
-	 * Setup the internally used layout and display widgets.
-	 */
-	vbox = ewl_vbox_new ();
-	ewl_widget_internal_set(vbox, TRUE);
-	ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_SHRINK |
-						     EWL_FLAG_FILL_FILL);
-	ewl_container_child_append(EWL_CONTAINER(fd), vbox);
-	ewl_widget_show (vbox);
-
-	fd->path_label = ewl_text_new ("");
-	ewl_widget_internal_set(fd->path_label, TRUE);
-	ewl_container_child_append(EWL_CONTAINER(vbox), fd->path_label);
-	ewl_object_padding_set(EWL_OBJECT(fd->path_label), 2, 2, 2, 2);
-	ewl_widget_show (fd->path_label);
-
-	hbox = ewl_hbox_new();
-	ewl_box_homogeneous_set(EWL_BOX(hbox), FALSE);
-	ewl_widget_internal_set(hbox, TRUE);
-	ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
-	ewl_widget_show (hbox);
-
-	/*
-	 * This box will be redirected to, to allow users to pack additional
-	 * buttons and widgets inside the filedialog.
-	 */
-	/*
-	fd->decor_box = ewl_vbox_new();
-	ewl_widget_internal_set(fd->decor_box, TRUE);
-	ewl_object_fill_policy_set(EWL_OBJECT(fd->decor_box),
-			EWL_FLAG_FILL_VFILL);
-	ewl_box_set_spacing(EWL_BOX(fd->decor_box), 4);
-	ewl_object_set_padding(EWL_OBJECT(fd->decor_box), 10, 10, 10, 10);
-	ewl_object_alignment_set(EWL_OBJECT(fd->decor_box), EWL_FLAG_ALIGN_RIGHT);
-	ewl_container_child_append(EWL_CONTAINER(hbox), fd->decor_box);
-	ewl_widget_show(fd->decor_box);
-	*/
-
-	/*
-	 * Display the lists of directories and files.
-	 */
-	fd->selector = ewl_fileselector_new();
-	ewl_widget_internal_set(fd->selector, TRUE);
-	ewl_container_child_append(EWL_CONTAINER(hbox), fd->selector);
-	ewl_callback_append (EWL_WIDGET (fd->selector),
-			EWL_CALLBACK_VALUE_CHANGED,
-			ewl_filedialog_change_labels_cb, fd);
-	ewl_widget_show(fd->selector);
-
-	/*
-	 * Here we provide an entry for typing in filenames, and buttons for
-	 * accepting or canceling the selection.
-	 */
-	fd->button_box = ewl_hbox_new();
-	ewl_widget_internal_set(fd->button_box, TRUE);
-	ewl_object_fill_policy_set(EWL_OBJECT(fd->button_box),
-			EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
-	ewl_box_spacing_set(EWL_BOX(fd->button_box), 4);
-	ewl_object_padding_set(EWL_OBJECT(fd->button_box), 10, 10, 10, 10);
-	ewl_object_alignment_set(EWL_OBJECT(fd->button_box), EWL_FLAG_ALIGN_RIGHT);
-	ewl_container_child_append(EWL_CONTAINER(vbox), fd->button_box);
-	ewl_widget_show(fd->button_box);
-
-	fd->entry = ewl_entry_new ("");
-	ewl_widget_internal_set(fd->entry, TRUE);
-	ewl_container_child_append(EWL_CONTAINER(fd->button_box), fd->entry);
-	ewl_callback_append (fd->entry, EWL_CALLBACK_VALUE_CHANGED,
-			ewl_filedialog_change_path_cb, fd);
-	ewl_widget_show (fd->entry);
-
-
-	if (type == EWL_FILEDIALOG_TYPE_OPEN)
-		fd->ok = ewl_button_new("Open");
-	else
-		fd->ok = ewl_button_new("Save");
-	ewl_widget_internal_set(fd->ok, TRUE);
-	ewl_object_fill_policy_set(EWL_OBJECT(fd->ok), EWL_FLAG_FILL_NONE);
-	ewl_callback_append(fd->ok, EWL_CALLBACK_CLICKED, ewl_filedialog_ok_cb,
-			    fd);
-	ewl_container_child_append(EWL_CONTAINER(fd->button_box), fd->ok);
-	ewl_widget_show(fd->ok);
-
-	fd->cancel = ewl_button_new("Cancel");
-	ewl_widget_internal_set(fd->cancel, TRUE);
-	ewl_object_fill_policy_set(EWL_OBJECT(fd->cancel), EWL_FLAG_FILL_NONE);
-	ewl_callback_append(fd->cancel, EWL_CALLBACK_CLICKED,
-				    ewl_filedialog_cancel_cb, fd);
-	ewl_container_child_append(EWL_CONTAINER(fd->button_box), fd->cancel);
-	ewl_widget_show(fd->cancel);
-
-	/*
-	 * Redirect incoming widgets to the decoration box to allow for
-	 * special purpose widgets along the left side.
-	 */
-	/*
-	ewl_container_set_redirect(EWL_CONTAINER(fd),
-				   EWL_CONTAINER(fd->decor_box));
-				   */
+	ewl_dialog_init(EWL_DIALOG(w), EWL_POSITION_BOTTOM);
+	ewl_widget_appearance_set(w, "window");
+	ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_ALL);
+
+	/* the file selector */
+
+	fd->fs = ewl_fileselector_new();
+	if (fd->fs) {
+		char *tmp = getenv("HOME");
+		ewl_fileselector_configure_cb(EWL_FILESELECTOR(fd->fs), (tmp ? tmp : "/"));
+		ewl_dialog_widget_add(EWL_DIALOG(fd), fd->fs);
+		ewl_widget_show(fd->fs);
+	}
+
+	/* Buttons */
+
+	button = ewl_button_stock_with_id_new(EWL_STOCK_OPEN,
+					 EWL_RESPONSE_OPEN);
+	ewl_container_child_append(EWL_CONTAINER(fd), button);
+	ewl_widget_show(button);
+
+	button = ewl_button_stock_with_id_new(EWL_STOCK_CANCEL,
+					 EWL_RESPONSE_CANCEL);
+	ewl_container_child_append(EWL_CONTAINER(fd), button);
+	ewl_widget_show(button);
 
 	DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
 /**
+ * @param fd: the filedialog
+ * @return Returns the current path of filedialog
+ * @brief Retrieve the current filedialog path
+ */
+char *ewl_filedialog_path_get(Ewl_Filedialog * fd)
+{
+	return EWL_FILESELECTOR(fd->fs)->path;
+}
+
+/**
+ * @param fd: the filedialog
+ * @return Returns the selected filename including its path
+ * @brief Retrieve the selected filename
+ */
+char *ewl_filedialog_file_get(Ewl_Filedialog * fd)
+{
+	return EWL_FILESELECTOR(fd->fs)->file;
+}
+
+/**
  * @param fd: the filedialog to change paths
  * @param path: the new path used for the filedialog
  * @return Returns no value.
  * @brief Changes the current path of a filedialog.
  */
-void ewl_filedialog_set_directory(Ewl_Filedialog *fd, char *path)
+void ewl_filedialog_path_set(Ewl_Filedialog * fd, char *path)
 {
-	struct stat          statbuf;
-	Ewl_Fileselector *fs = EWL_FILESELECTOR (fd->selector);
-	int i;
-
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DCHECK_PARAM_PTR("fd", fd);
-	DCHECK_PARAM_PTR("path", path);
-
-	i = stat (path, &statbuf);
-	if (!i && S_ISDIR(statbuf.st_mode)) {
-		ewl_fileselector_set_directory (EWL_FILESELECTOR (fs), path);
-	}
-
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
+	ewl_fileselector_path_set(EWL_FILESELECTOR(fd->fs), path);
 }
 
-void ewl_filedialog_change_labels_cb (Ewl_Widget * w, void *ev_data, 
-		void *user_data) 
+/*
+ * Internally used callback, override at your own risk.
+ */
+void ewl_filedialog_click_cb(Ewl_Widget * w, void *ev_data, Ewl_Filedialog * fd)
 {
-	char *path, *ptr = NULL;
-	char str[PATH_MAX + 50];
-	Ewl_Filedialog *fd = user_data; 
+	char *str = NULL;
 
-	DENTER_FUNCTION(DLEVEL_STABLE);
-
-	if (!ev_data) {
-		path = ewl_fileselector_get_path (EWL_FILESELECTOR (fd->selector));
+	switch (EWL_BUTTON_STOCK(w)->response_id) {
+	case (EWL_RESPONSE_OK):
+		{
+			str = ewl_fileselector_file_get(EWL_FILESELECTOR(fd->fs));
+			free(str);
+			ewl_widget_destroy(EWL_WIDGET(fd));
 
-		snprintf (str, sizeof (str), "Current dir: %s", path);
-		free(path);
-		ewl_text_text_set (EWL_TEXT (fd->path_label), str);
- 
-		path = ewl_fileselector_get_filename(EWL_FILESELECTOR(fd->selector));
-		if (!path) return;
-		ptr = strrchr(path, '/');
-		/* if we have a file */
-		if (ptr)
+			break;
+		}
+	case (EWL_RESPONSE_CANCEL):
 		{
-		  ptr++;
-		  ewl_entry_set_text (EWL_ENTRY(fd->entry), ptr);
+			ewl_widget_destroy(EWL_WIDGET(fd));
+			break;
 		}
-		/* if we just changed dirs, then clear it out */
-		else
-		  ewl_entry_set_text (EWL_ENTRY(fd->entry), "");
-		free(path);
 	}
-	else {
-		ewl_filedialog_ok_cb(w, NULL, fd);
-	}
-
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-
-void
-ewl_filedialog_change_path_cb(Ewl_Widget * w, void *ev_data, void *user_data)
-{
-	char *dir;
-	Ewl_Filedialog *fd = user_data;
-
-	DENTER_FUNCTION(DLEVEL_STABLE);
-
-	dir = ewl_entry_get_text (EWL_ENTRY (w));
-	if (dir)
-		ewl_filedialog_set_directory(fd, dir);
-
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_filedialog_ok_cb(Ewl_Widget * w, void *ev_data, void *user_data)
-{
-	char *path1, *path2;
-	char tmp[PATH_MAX];
-	Ewl_Filedialog *fd = user_data;
-
-	path1 = ewl_fileselector_get_path(EWL_FILESELECTOR(fd->selector));
-	path2 = ewl_entry_get_text(EWL_ENTRY(fd->entry));
-	snprintf(tmp, PATH_MAX, "%s/%s", path1, path2);
-	free(path1);
-	free(path2);
-	path1 = strdup(tmp);
 	ewl_callback_call_with_event_data(EWL_WIDGET(fd),
-					  EWL_CALLBACK_VALUE_CHANGED, path1);
-	free(path1);
-}
-
-void
-ewl_filedialog_cancel_cb(Ewl_Widget *w, void *ev_data, void *user_data)
-{
-	Ewl_Widget *fd = user_data;
-	ewl_callback_call(fd, EWL_CALLBACK_VALUE_CHANGED);
+					  EWL_CALLBACK_VALUE_CHANGED, str);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_filedialog.h	17 Feb 2004 05:18:38 -0000	1.14
+++ ewl_filedialog.h	28 Aug 2004 06:26:33 -0000	1.15
@@ -1,6 +1,10 @@
 #ifndef __EWL_FILEDIALOG_H__
 #define __EWL_FILEDIALOG_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * @defgroup Ewl_Filedialog Filedialog: A Dialog For Picking Files
  *
@@ -41,36 +45,32 @@
  */
 struct Ewl_Filedialog
 {
-	Ewl_Box        box;          /**< the box container */
-	Ewl_Filedialog_Type type;    /**< define what type of filedialog */
-	
-	Ewl_Widget     *selector;    /**< Ewl_Fileselector */
-	Ewl_Widget     *path_label;  /**< label to display current path */
-	Ewl_Widget     *entry;       /**< entry for manual input or current selected */
-	
-	Ewl_Widget     *decor_box;   /**< box to hold additional widgets */
-	Ewl_Widget     *button_box;  /**< box to hold the buttons */
-
-	Ewl_Widget     *ok;          /**< open/save button */
-	Ewl_Widget     *cancel;      /**< cancel button */
+	Ewl_Dialog     dialog; /**< the dialog containing the fileselector */
+	Ewl_Widget    *fs;     /**< Ewl_Fileselector */
 };
 
 
-Ewl_Widget *ewl_filedialog_new (Ewl_Filedialog_Type type);
-void ewl_filedialog_init (Ewl_Filedialog * fd, Ewl_Filedialog_Type type);
-void ewl_filedialog_set_directory(Ewl_Filedialog *fd, char *path);
+Ewl_Widget *ewl_filedialog_new      ();
+
+void        ewl_filedialog_init     (Ewl_Filedialog *fd);
+char       *ewl_filedialog_path_get (Ewl_Filedialog *fd);
+char       *ewl_filedialog_file_get (Ewl_Filedialog *fd);
+void        ewl_filedialog_path_set (Ewl_Filedialog *fd,
+			     char   *path);
 
 /*
- * Internally used callback, override at your own risk.
+ * Internally used callbacks, override at your own risk.
  */
-void ewl_filedialog_change_labels_cb (Ewl_Widget * w, void *ev_data, void *user_data);
-void ewl_filedialog_change_path_cb (Ewl_Widget * w, void *ev_data, void *user_data);
-void ewl_filedialog_ok_cb(Ewl_Widget * w, void *ev_data, void *user_data);
-void ewl_filedialog_cancel_cb(Ewl_Widget * w, void *ev_data, void *user_data);
+void ewl_filedialog_click_cb (Ewl_Widget *w, void *ev_data, Ewl_Filedialog *fd);
 
 
 /**
  * @}
  */
 
-#endif /* __EWL_FILEDIALOG_H__ */
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __EWL_FS_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewl_fileselector.c	19 Aug 2004 20:03:32 -0000	1.43
+++ ewl_fileselector.c	28 Aug 2004 06:26:33 -0000	1.44
@@ -1,64 +1,33 @@
 #include <Ewl.h>
 
-void ewl_fileselector_directory_adjust (Ewl_Fileselector *fs, char *path);
-void ewl_fileselector_path_down (char *dir);
-int ewl_fileselector_alphasort(const void *a, const void *b);
-
-/** Addition for Solaris compatablity in scandir dep. -benr **/
-/** Code written originally by Joerg-R. Hill for Viewmol used with permission and covered by GPL **/
-#ifdef HAVE_SUN
-
-#include<dirent.h>
-#include<stdlib.h>
-#include<string.h>
-#include<sys/types.h>
-
-int scandir(const char *dir, struct dirent ***namelist,
-            int (*select)(const struct dirent *),
-            int (*compar)(const struct dirent **, const struct dirent **))
-{
-  DIR *d;
-  struct dirent *entry;
-  register int i=0;
-  size_t entrysize;
-
-  if ((d=opendir(dir)) == NULL)
-     return(-1);
-
-  *namelist=NULL;
-  while ((entry=readdir(d)) != NULL)
-  {
-    if (select == NULL || (select != NULL && (*select)(entry)))
-    {
-      *namelist=(struct dirent **)realloc((void *)(*namelist),
-                 (size_t)((i+1)*sizeof(struct dirent *)));
-        if (*namelist == NULL) return(-1);
-        entrysize=sizeof(struct dirent)-sizeof(entry->d_name)+strlen(entry->d_name)+1;
-        (*namelist)[i]=(struct dirent *)malloc(entrysize);
-        if ((*namelist)[i] == NULL) return(-1);
-        memcpy((*namelist)[i], entry, entrysize);
-        i++;
-    }
-  }
-  if (closedir(d)) return(-1);
-  if (i == 0) return(-1);
-  if (compar != NULL)
-    qsort((void *)(*namelist), (size_t)i, sizeof(struct dirent *), compar);
+#include "../ewl-config.h"
 
-  return(i);
-}
+#include <stdio.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <string.h>
+#include <regex.h>
 
+#include "ewl_fileselector.h"
 
-#endif
-/* *************************************** */
+/*
+ * Internally used functions
+ */
 
+static void ewl_fileselector_tooltip_add(Ewl_Widget * w, Ewl_Fileselector_Data * d);
+static char *ewl_fileselector_str_append(char *s1, char *s2);
+static char *ewl_fileselector_path_up_get(char *path);
+static char *ewl_fileselector_path_home_get(void);
+static char* ewl_fileselector_size_string_get(off_t st_size);
+static char *ewl_fileselector_perm_string_get(mode_t st_mode);
+static void  ewl_fileselector_file_list_get(char *path, char *filter, Ecore_List *flist, Ecore_List *dlist);
 
 
 /**
  * @return Returns NULL on failure, or the new fileselector on success.
  * @brief Create a new fileselector
  */
-Ewl_Widget     *ewl_fileselector_new()
+Ewl_Widget *ewl_fileselector_new()
 {
 	Ewl_Fileselector *fs;
 
@@ -80,8 +49,12 @@
  */
 void ewl_fileselector_init(Ewl_Fileselector * fs)
 {
-	Ewl_Widget     *w;
-	char           *home;
+	char *tmp;
+	Ewl_Widget *w;
+	Ewl_Widget *hbox;
+	Ewl_Widget *misc;
+	Ewl_Widget *button;
+
 	char *head_dirs[1] = {
 		"Directories"
 	};
@@ -94,313 +67,616 @@
 
 	w = EWL_WIDGET(fs);
 
-	ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_HORIZONTAL);
-	ewl_widget_appearance_set(w, "fileselector");
-	ewl_box_homogeneous_set(EWL_BOX(w), TRUE);
-	ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_SHRINK |
-				                  EWL_FLAG_FILL_FILL);
-
-	fs->dirs = ewl_tree_new (1);
-	ewl_tree_headers_set (EWL_TREE (fs->dirs), head_dirs);
-	ewl_container_child_append(EWL_CONTAINER(w), fs->dirs);
-	ewl_object_padding_set(EWL_OBJECT(fs->dirs), 2, 2, 2, 2);
-	ewl_widget_show (fs->dirs);
-
-	fs->files = ewl_tree_new (1);
-	ewl_tree_headers_set (EWL_TREE (fs->files), head_files);
-	ewl_container_child_append(EWL_CONTAINER(w), fs->files);
-	ewl_object_padding_set(EWL_OBJECT(fs->files), 2, 2, 2, 2);
-	ewl_widget_show (fs->files);
-
-	ewl_callback_append(w, EWL_CALLBACK_REALIZE,
-			    ewl_fileselector_realize_cb, NULL);
-	ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
-			    ewl_fileselector_configure_cb, NULL);
+	ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_VERTICAL);
+	ewl_object_size_request(EWL_OBJECT(w), 500, 450);
+	ewl_object_fill_policy_set(EWL_OBJECT(w),
+				   EWL_FLAG_FILL_SHRINK |
+				   EWL_FLAG_FILL_HFILL);
+
+	/* The entry for the current directory */
+	/* and some icons */
+	hbox = ewl_hbox_new();
+	if (hbox) {
+		ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+					   EWL_FLAG_FILL_SHRINK |
+					   EWL_FLAG_FILL_HFILL);
+
+		fs->entry_dir = ewl_entry_new(NULL);
+		ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+					   EWL_FLAG_FILL_SHRINK |
+					   EWL_FLAG_FILL_HFILL);
+		ewl_container_child_prepend(EWL_CONTAINER(hbox),
+					    fs->entry_dir);
+		ewl_widget_show(fs->entry_dir);
+		// ewl_object_custom_w_set(EWL_OBJECT(fs->entry_dir), 200);
+
+		misc = ewl_spacer_new();
+		ewl_container_child_append(EWL_CONTAINER(hbox), misc);
+		ewl_object_fill_policy_set(EWL_OBJECT(misc),
+					   EWL_FLAG_FILL_FILL);
+		ewl_widget_show(misc);
+
+		button = ewl_button_new("");
+		ewl_object_fill_policy_set(EWL_OBJECT(button),
+					   EWL_FLAG_FILL_SHRINK);
+		ewl_callback_append(button, EWL_CALLBACK_CLICKED,
+				    EWL_CALLBACK_FUNCTION(ewl_fileselector_go_up_cb),
+				    fs);
+		ewl_container_child_append(EWL_CONTAINER(hbox), button);
+		ewl_widget_show(button);
+
+		misc = ewl_image_new(PACKAGE_DATA_DIR"/arrow_up.png", NULL);
+		ewl_object_fill_policy_set(EWL_OBJECT(misc),
+					   EWL_FLAG_FILL_SHRINK);
+		ewl_container_child_append(EWL_CONTAINER(button), misc);
+		ewl_widget_show(misc);
+
+		button = ewl_button_new("");
+		ewl_object_fill_policy_set(EWL_OBJECT(button),
+					   EWL_FLAG_FILL_SHRINK);
+		ewl_callback_append(button, EWL_CALLBACK_CLICKED,
+				    EWL_CALLBACK_FUNCTION
+				    (ewl_fileselector_go_home_cb), fs);
+		ewl_container_child_append(EWL_CONTAINER(hbox), button);
+		ewl_widget_show(button);
+
+		misc = ewl_image_new(PACKAGE_DATA_DIR"/home.png", NULL);
+		ewl_object_fill_policy_set(EWL_OBJECT(misc),
+					   EWL_FLAG_FILL_SHRINK);
+		ewl_container_child_append(EWL_CONTAINER(button), misc);
+		ewl_widget_show(misc);
+
+		ewl_container_child_append(EWL_CONTAINER(fs), hbox);
+		ewl_widget_show(hbox);
+	}
+
+	/* The lists for directories and files */
+	hbox = ewl_hbox_new();
+	if (hbox) {
+		ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+					   EWL_FLAG_FILL_SHRINK |
+					   EWL_FLAG_FILL_FILL);
+
+		fs->list_dirs = ewl_tree_new(1);
+		ewl_tree_headers_set(EWL_TREE(fs->list_dirs), head_dirs);
+		ewl_object_fill_policy_set(EWL_OBJECT(fs->list_dirs),
+					   EWL_FLAG_FILL_SHRINK |
+					   EWL_FLAG_FILL_FILL);
+		ewl_container_child_append(EWL_CONTAINER(hbox),
+					   fs->list_dirs);
+		ewl_widget_show(fs->list_dirs);
+
+		fs->list_files = ewl_tree_new(1);
+		ewl_tree_headers_set(EWL_TREE(fs->list_files), head_files);
+		ewl_object_fill_policy_set(EWL_OBJECT(fs->list_files),
+					   EWL_FLAG_FILL_SHRINK |
+					   EWL_FLAG_FILL_FILL);
+		ewl_container_child_append(EWL_CONTAINER(hbox),
+					   fs->list_files);
+		ewl_widget_show(fs->list_files);
+
+		ewl_container_child_append(EWL_CONTAINER(fs), hbox);
+		ewl_widget_show(hbox);
+	}
+
+	/* The file label and entry */
+	hbox = ewl_hbox_new();
+	if (hbox) {
+		ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+					   EWL_FLAG_FILL_SHRINK |
+					   EWL_FLAG_FILL_HFILL);
+
+		misc = ewl_text_new("File:");
+		ewl_container_child_append(EWL_CONTAINER(hbox), misc);
+		ewl_widget_show(misc);
+
+		fs->entry_file = ewl_entry_new(NULL);
+		ewl_container_child_append(EWL_CONTAINER(hbox),
+					   fs->entry_file);
+		ewl_widget_show(fs->entry_file);
+
+		ewl_container_child_append(EWL_CONTAINER(fs), hbox);
+		ewl_widget_show(hbox);
+	}
+
+	/* The filter label and entry */
+	hbox = ewl_hbox_new();
+	if (hbox) {
+		ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+					   EWL_FLAG_FILL_SHRINK |
+					   EWL_FLAG_FILL_HFILL);
 
-	home = getenv("HOME");
+		misc = ewl_text_new("Filter:");
+		ewl_object_size_request(EWL_OBJECT(misc), 10, 50);
+		ewl_container_child_append(EWL_CONTAINER(hbox), misc);
+		ewl_widget_show(misc);
+
+		fs->entry_filter = ewl_entry_new("^[^\\.]");
+		ewl_callback_append(fs->entry_filter,
+				EWL_CALLBACK_VALUE_CHANGED, ewl_fileselector_filter_cb,
+				fs);
+		ewl_container_child_append(EWL_CONTAINER(hbox),
+					   fs->entry_filter);
+		ewl_widget_show(fs->entry_filter);
 
-	if (home)
-		ewl_fileselector_set_directory(fs, home);
+		ewl_container_child_append(EWL_CONTAINER(fs), hbox);
+		ewl_widget_show(hbox);
+	}
+
+	tmp = getenv("HOME");
+	ewl_fileselector_configure_cb(fs, (tmp ? tmp : "/"));
 
 	DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
 /**
  * @param fs: the fileselector
+ * @return Returns the current path of fileselector
+ * @brief Retrieve the current fileselector path
+ */
+char *ewl_fileselector_path_get(Ewl_Fileselector * fs)
+{
+	return strdup(fs->path);
+}
+
+/**
+ * @param fs: the fileselector
  * @return Returns the selected filename including its path
  * @brief Retrieve the selected filename
  */
-char *ewl_fileselector_get_filename (Ewl_Fileselector *fs) 
+char *ewl_fileselector_file_get(Ewl_Fileselector * fs)
 {
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DRETURN_PTR(fs->item ? strdup(fs->item) : NULL, DLEVEL_STABLE);
+	return ewl_fileselector_str_append(fs->path, fs->file);
 }
 
 /**
- * @param fs: the fileselector
- * @return Returns the current path of fileselector
- * @brief Retrieve the current fileselector path
+ * @param fs: The fileselector
+ * @param path: the directory to process
+ * @return Returns nothing
+ * @brief Prosess the given directory / change the fileselector dir
  */
-char *ewl_fileselector_get_path (Ewl_Fileselector *fs)
+void ewl_fileselector_path_set(Ewl_Fileselector * fs, char *path)
 {
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DRETURN_PTR(fs->path ? strdup(fs->path) : NULL, DLEVEL_STABLE);
+	ewl_fileselector_configure_cb(fs, path);
 }
 
+/*
+ * Internally used functions
+ */
 
-void ewl_fileselector_realize_cb(Ewl_Widget * w, void *ev_data, void *user_data)
+/* if non NULL, result must be freed */
+static char *ewl_fileselector_str_append(char *s1, char *s2)
 {
-	Ewl_Fileselector *fs;
-
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DCHECK_PARAM_PTR("w", w);
+	char *s;
+	int l = strlen(s1) + strlen(s2) + 1;
 
-	fs = EWL_FILESELECTOR(w);
+	s = (char *) malloc(sizeof(char) * l);
+	s = memcpy(s, s1, strlen(s1));
+	memcpy(s + strlen(s1), s2, strlen(s2));
+	s[l - 1] = '\0';
 
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
+	return s;
 }
 
+/* if non NULL, result must be freed */
+char *ewl_fileselector_path_up_get(char *path)
+{
+	char *new_path;
+	int l;
 
-void
-ewl_fileselector_configure_cb(Ewl_Widget * w, void *ev_data, void *user_data)
+	if ((!path) || (strlen(path) == 0))
+		return NULL;
+
+	l = strlen(path) - 1;
+	if (path[l] == '/')
+		l--;
+
+	if (l < 0)
+		return "/";
+
+	while ((l >= 0) && (path[l] != '/'))
+		l--;
+
+	if (l < 0)
+		return "/";
+	else {
+		l++;
+		new_path = (char *) malloc(sizeof(char) * (l + 1));
+		new_path = memcpy(new_path, path, l);
+		new_path[l] = '\0';
+		return new_path;
+	}
+}
+
+/* if non NULL, result must be freed */
+char *ewl_fileselector_path_home_get()
 {
-	Ewl_Fileselector *fs;
+	char *path;
+	char *new_path;
 
-	DENTER_FUNCTION(DLEVEL_STABLE);
+	path = getenv("HOME");
+	if ((!path) || (strlen(path) == 0))
+		path = "/";
+	if (path[strlen(path)] != '/')
+		new_path = ewl_fileselector_str_append(path, "/");
+	else
+		new_path = path;
 
-	fs = EWL_FILESELECTOR(w);
+	return new_path;
+}
 
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
+char *ewl_fileselector_size_string_get(off_t st_size)
+{
+	double dsize;
+	char size[1024];
+
+	dsize = (double) st_size;
+
+	if (dsize < 1024)
+		sprintf(size, "%'.0f B", dsize);
+	else {
+		dsize /= 1024.0;
+		if (dsize < 1024)
+			sprintf(size, "%'.1f KB", dsize);
+		else {
+			dsize /= 1024.0;
+			if (dsize < 1024)
+				sprintf(size, "%'.1f MB", dsize);
+			else {
+				dsize /= 1024.0;
+				sprintf(size, "%'.1f GB", dsize);
+			}
+		}
+	}
+
+	return strdup(size);
 }
 
-/**
- * @param fs: The fileselector
- * @param path: the directory to process
- * @return Returns nothing
- * @brief Prosess the given directory / change the fileselector dir
- */
-void ewl_fileselector_set_directory(Ewl_Fileselector * fs, char *path)
+char *ewl_fileselector_perm_string_get(mode_t st_mode)
 {
-	struct dirent        **dentries;
-	int                  num, i;
-	char                 file[PATH_MAX];
-	struct stat          statbuf;
-	Ewl_Widget           *items[1];
-	Ewl_Widget           *row = NULL;
-	
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DCHECK_PARAM_PTR("fs", fs);
-	DCHECK_PARAM_PTR("path", path);
+	char *perm;
+	int i;
 
-	if (fs->path && !strcmp(fs->path, path))
-		DRETURN(DLEVEL_STABLE);
+	perm = (char *) malloc(sizeof(char) * 10);
+
+	for (i = 0; i < 9; i++)
+		perm[i] = '-';
+	perm[9] = '\0';
+
+	if ((S_IRUSR & st_mode) == S_IRUSR)
+		perm[0] = 'r';
+	if ((S_IWUSR & st_mode) == S_IWUSR)
+		perm[1] = 'w';
+	if ((S_IXUSR & st_mode) == S_IXUSR)
+		perm[2] = 'x';
+
+	if ((S_IRGRP & st_mode) == S_IRGRP)
+		perm[3] = 'r';
+	if ((S_IWGRP & st_mode) == S_IWGRP)
+		perm[4] = 'w';
+	if ((S_IXGRP & st_mode) == S_IXGRP)
+		perm[5] = 'x';
+
+	if ((S_IROTH & st_mode) == S_IROTH)
+		perm[6] = 'r';
+	if ((S_IWOTH & st_mode) == S_IWOTH)
+		perm[7] = 'w';
+	if ((S_IXOTH & st_mode) == S_IXOTH)
+		perm[8] = 'x';
+
+	return perm;
+}
+
+void ewl_fileselector_file_list_get(char *path, char *filter, Ecore_List * flist, Ecore_List * dlist)
+{
+	regex_t preg;
+	Ewl_Fileselector_Data *d;
+	struct dirent *lecture;
+	DIR *rep;
+	struct stat buf;
+	char *name;
+	char *path2;
+	int len;
+
+	if (filter) {
+		if (regcomp(&preg, filter, REG_NOSUB | REG_EXTENDED))
+			filter = NULL;
+	}
 
-	if ((num = scandir(path, &dentries, 0, ewl_fileselector_alphasort)) < 0) {
-		perror("ewl_fileselector_set_directory - scandir");
-		return;
+	/* Check if path is finished by a / and add it if there's none */
+	if (path[strlen(path) - 1] == '/')
+		path2 = strdup(path);
+	else {
+		path2 = (char *) malloc(sizeof(char) * (strlen(path) + 2));
+		memcpy(path2, path, strlen(path));
+		path2[strlen(path)] = '/';
+		path2[strlen(path) + 1] = '\0';
 	}
 
-	/* 
-	 * Empty the trees before adding data.
-	 */
-	ewl_container_reset (EWL_CONTAINER (fs->dirs));
-	ewl_container_reset (EWL_CONTAINER (fs->files));
+	rep = opendir(path2);
+	if (!rep) {
+		free(path2);
+		DRETURN(DLEVEL_STABLE);
+	}
 
-	fs->path = strdup (path);
-	
-	while (num--) {
-		snprintf(file, PATH_MAX, "%s/%s", path, dentries[num]->d_name);
-
-		i = stat (file, &statbuf);
-		if (i == -1) {
-			perror("ewl_fileselector_set_directory - stat 1");
-			continue;
-		}
+	while ((lecture = readdir(rep))) {
+		int match = 0;
 
-		if (dentries[num]->d_name[0] == '.' && 
-				(strlen(dentries[num]->d_name) > 2 || 
-					dentries[num]->d_name[1] != '.'))
-			continue;
-		
-		items[0] = ewl_text_new (dentries[num]->d_name);
-		ewl_object_fill_policy_set(EWL_OBJECT(items[0]),
-					   EWL_FLAG_FILL_HFILL);
-		ewl_widget_show (items[0]);
-		
-		if (S_ISDIR(statbuf.st_mode)) {
-			ewl_callback_append(items[0], EWL_CALLBACK_CLICKED,
-					    ewl_fileselector_directory_clicked_single_cb,
-					    fs);
-			row = ewl_tree_row_add (EWL_TREE (fs->dirs), NULL,
-						items);
-			ewl_callback_append(items[0],
-					    EWL_CALLBACK_DOUBLE_CLICKED,
-					    ewl_fileselector_directory_clicked_cb,
-					    fs);
-		}
-		else if (S_ISREG(statbuf.st_mode)) {
-			ewl_callback_append(items[0],
-					    EWL_CALLBACK_DOUBLE_CLICKED,
-					    ewl_fileselector_file_open_cb,
-					    fs);
-			ewl_callback_append(items[0], EWL_CALLBACK_CLICKED,
-					    ewl_fileselector_file_clicked_cb,
-					    fs);
-			row = ewl_tree_row_add (EWL_TREE (fs->files), NULL, items);
+		if (!(strcmp(lecture->d_name, "..")))
+			match = 1;
+		else if (strcmp(lecture->d_name, ".")) {
+			if (filter && !regexec(&preg, lecture->d_name, 0,
+						NULL, 0))
+				match = 1;
 		}
 
-		if (!row)
-			continue;
+		if (match) {
+			len = strlen(path2) + strlen(lecture->d_name) + 1;
+			name = (char *) malloc(sizeof(char) * len);
+			memcpy(name, path2, strlen(path2));
+			memcpy(name + strlen(path2),
+			       lecture->d_name, strlen(lecture->d_name));
+			name[len - 1] = '\0';
+			stat(name, &buf);
+			if (S_ISDIR(buf.st_mode) && dlist) {
+				d = ewl_fileselector_data_new(lecture->d_name,
+						    buf.st_size,
+						    buf.st_mtime,
+						    buf.st_mode);
+				ecore_list_append(dlist, d);
+			} else if (flist) {
+				d = ewl_fileselector_data_new(lecture->d_name,
+						    buf.st_size,
+						    buf.st_mtime,
+						    buf.st_mode);
+				ecore_list_append(flist, d);
+			}
+
+			free(name);
+		}
 	}
+	closedir(rep);
 
-	ewl_callback_call(EWL_WIDGET(fs), EWL_CALLBACK_VALUE_CHANGED);
-	
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
+	if (filter)
+		regfree(&preg);
+	free(path2);
+
+	return;
 }
 
-void ewl_fileselector_file_clicked_cb(Ewl_Widget * w, void *ev_data,
-		void *user_data)
+/*
+ * Internally used callbacks, override at your own risk.
+ */
+void
+ewl_fileselector_tooltip_destroy_cb(Ewl_Widget * w, void *ev_data, void *user_data)
 {
-	char *tmp;
-	Ewl_Fileselector *fs;
-	char file[PATH_MAX];
-	
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DCHECK_PARAM_PTR("w", w);
+	if (user_data)
+		ewl_widget_destroy(EWL_WIDGET(user_data));
+}
 
-	fs = EWL_FILESELECTOR (user_data);
+void ewl_fileselector_select_file_cb(Ewl_Widget * w, void *ev_data, Ewl_Fileselector * fs)
+{
+	char *file;
 
-	tmp = ewl_text_text_get(EWL_TEXT(w));
-	if (!strcmp (tmp, "/"))
-		snprintf (file, PATH_MAX, "/%s", tmp);
-	else
-		snprintf (file, PATH_MAX, "%s/%s", fs->path, tmp);
+	file = (char *) ewl_widget_data_get(EWL_WIDGET(w), "FILE");
+	fs->file = file;
+	ewl_entry_set_text(EWL_ENTRY(fs->entry_file), file);
+}
 
-	fs->item = strdup (file);
-	ewl_callback_call(EWL_WIDGET(fs), EWL_CALLBACK_VALUE_CHANGED);
+void ewl_fileselector_select_dir_cb(Ewl_Widget * w, void *ev_data, Ewl_Fileselector * fs)
+{
+	char *path;
+	char *new_path;
 
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
+	path = (char *) ewl_widget_data_get(EWL_WIDGET(w), "DIR");
+	if (!strcmp(path, ".."))
+		new_path = ewl_fileselector_path_up_get(fs->path);
+	else
+		new_path = ewl_fileselector_str_append(fs->path, path);
+	path = ewl_fileselector_str_append(new_path, "/");
+	free(new_path);
+	ewl_fileselector_configure_cb(EWL_FILESELECTOR(fs), path);
 }
 
-void ewl_fileselector_file_open_cb(Ewl_Widget * w, void *ev_data,
-		void *user_data)
+void ewl_fileselector_go_up_cb(Ewl_Widget * w, void *ev_data, Ewl_Fileselector * fs)
 {
-	char *tmp;
-	Ewl_Fileselector *fs;
-	char file[PATH_MAX];
-	
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DCHECK_PARAM_PTR("w", w);
+	char *path;
 
-	fs = EWL_FILESELECTOR (user_data);
-
-	tmp = ewl_text_text_get(EWL_TEXT(w));
-	if (!strcmp (tmp, "/"))
-		snprintf (file, PATH_MAX, "/%s", tmp);
-	else
-		snprintf (file, PATH_MAX, "%s/%s", fs->path, tmp);
+	path = ewl_fileselector_path_up_get(fs->path);
+	ewl_fileselector_configure_cb(EWL_FILESELECTOR(fs), path);
+}
 
-	fs->item = strdup (file);
-	ewl_callback_call_with_event_data(EWL_WIDGET(fs),
-			EWL_CALLBACK_VALUE_CHANGED, fs->item);
+void ewl_fileselector_go_home_cb(Ewl_Widget * w, void *ev_data, Ewl_Fileselector * fs)
+{
+	char *path;
 
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
+	path = ewl_fileselector_path_home_get();
+	ewl_fileselector_configure_cb(EWL_FILESELECTOR(fs), path);
 }
 
-void ewl_fileselector_directory_adjust (Ewl_Fileselector *fs, char *path)
+void ewl_fileselector_configure_cb(Ewl_Fileselector * fs, char *path)
 {
-	char *ptr;
-	char dir[PATH_MAX];
+	char *filter;
+	Ewl_Fileselector_Data *d;
+	Ewl_Widget *parent_win;
+	Ewl_Container *cont;
+	Ewl_Widget *prow = NULL;
+	Ecore_List *dirs, *files;
+	char *path2;
+	char *title;
 
-	DENTER_FUNCTION(DLEVEL_STABLE);
+	ewl_container_reset(EWL_CONTAINER(fs->list_dirs));
+	ewl_container_reset(EWL_CONTAINER(fs->list_files));
+	ewl_entry_set_text(EWL_ENTRY(fs->entry_file), "");
 
-	dir[0] = '\0';
-	ptr = strrchr(path, '/');
-	if (ptr) {
-		ptr++;
-		if (!strcmp (ptr, "..")) {
-			ptr--;
-
-			if (ptr != path) {
-				*ptr = '\0';
-				ptr = strrchr(path, '/');
-				ptr++;
-				*ptr = '\0';
-
-				if (strcmp(path, "/")) {
-					ptr--;
-					*ptr = '\0';
-				}
-			} else {
-				*++ptr = '\0';
-			}
-		}
-		snprintf (dir, PATH_MAX, "%s", path);
+	/*
+	 * Setup a regex for matching files.
+	 */
+	filter = ewl_entry_get_text(EWL_ENTRY(fs->entry_filter));
+
+	if (path[strlen(path) - 1] == '/')
+		path2 = strdup(path);
+	else {
+		path2 = (char *) malloc(sizeof(char) * (strlen(path) + 2));
+		memcpy(path2, path, strlen(path));
+		path2[strlen(path)] = '/';
+		path2[strlen(path) + 1] = '\0';
 	}
 
-	IF_FREE(fs->item);
-	fs->item = strdup (dir);
+	fs->path = path2;
+	fs->file = NULL;
+	ewl_entry_set_text(EWL_ENTRY(fs->entry_dir), path2);
+
+	files = ecore_list_new();
+	dirs = ecore_list_new();
+	ewl_fileselector_file_list_get(path2, filter, files, dirs);
+
+	parent_win = EWL_WIDGET(ewl_embed_widget_find(EWL_WIDGET(fs)));
+	cont = ewl_container_redirect_get(EWL_CONTAINER(parent_win));
+	if (cont) {
+		ewl_container_redirect_set(EWL_CONTAINER(parent_win), NULL);
+	}
 
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
+	title = malloc(PATH_MAX);
+	if (!title)
+		DRETURN(DLEVEL_STABLE);
 
-void ewl_fileselector_directory_clicked_single_cb(Ewl_Widget * w, 
-		void *ev_data, void *user_data)
-{
-	Ewl_Fileselector *fs;
-	char *format;
-	char path[PATH_MAX];
+	snprintf(title, PATH_MAX, "Files (%d)", ecore_list_nodes(files));
+	ewl_tree_headers_set(EWL_TREE(fs->list_files), &title);
 
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DCHECK_PARAM_PTR("w", w);
+	ecore_list_goto_first(files);
+	while ((d = ecore_list_current(files))) {
+		prow = ewl_tree_text_row_add(EWL_TREE(fs->list_files),
+					     NULL, &d->name);
 
-	fs = EWL_FILESELECTOR (user_data);
+		ewl_widget_data_set(EWL_WIDGET(prow), "FILE", d);
 
-	if (!strcmp(fs->path, "/"))
-		format = "%s%s";
-	else
-		format = "%s/%s";
+		ewl_fileselector_tooltip_add(EWL_WIDGET(prow), d);
+
+		ewl_callback_append(EWL_WIDGET(prow),
+				    EWL_CALLBACK_CLICKED,
+				    EWL_CALLBACK_FUNCTION
+				    (ewl_fileselector_select_file_cb), fs);
 
-	snprintf(path, PATH_MAX, format, fs->path,
-		 ewl_text_text_get(EWL_TEXT(w)));
+		ecore_list_next(files);
+	}
 
-	ewl_fileselector_directory_adjust (fs, path);
+	snprintf(title, PATH_MAX, "Directories (%d)", ecore_list_nodes(dirs));
+	ewl_tree_headers_set(EWL_TREE(fs->list_dirs), &title);
+
+	ecore_list_goto_first(dirs);
+	while ((d = ecore_list_current(dirs))) {
+		Ewl_Widget *hbox;
+		Ewl_Widget *label;
+		Ewl_Widget *image;
+
+		hbox = ewl_hbox_new();
+		ewl_box_spacing_set(EWL_BOX(hbox), 5);
+		label = ewl_text_new(d->name);
+		image = ewl_image_new(PACKAGE_DATA_DIR"/stock_open_24.png",
+				      NULL);
+		ewl_object_fill_policy_set(EWL_OBJECT(image),
+					   EWL_FLAG_FILL_SHRINK);
+		ewl_object_fill_policy_set(EWL_OBJECT(label),
+					   EWL_FLAG_FILL_SHRINK);
+		ewl_container_child_append(EWL_CONTAINER(hbox), image);
+		ewl_container_child_append(EWL_CONTAINER(hbox), label);
+		ewl_widget_show(image);
+		ewl_widget_show(label);
+		ewl_widget_show(hbox);
+
+		prow =
+		    ewl_tree_row_add(EWL_TREE(fs->list_dirs), NULL, &hbox);
+		ewl_widget_data_set(EWL_WIDGET(prow), "DIR", d->name);
+
+		ewl_fileselector_tooltip_add(EWL_WIDGET(prow),
+				   ecore_list_current(dirs));
+
+		ewl_callback_append(EWL_WIDGET(prow), EWL_CALLBACK_CLICKED,
+				    EWL_CALLBACK_FUNCTION
+				    (ewl_fileselector_select_dir_cb), fs);
+
+		ecore_list_next(dirs);
+	}
+
+	if (cont)
+		ewl_container_redirect_set(EWL_CONTAINER(parent_win),
+					   cont);
+
+	ecore_list_destroy(files);
+	ecore_list_destroy(dirs);
 
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
-void ewl_fileselector_directory_clicked_cb(Ewl_Widget * w, void *ev_data,
-				    void *user_data)
+void ewl_fileselector_filter_cb(Ewl_Widget * entry, void *ev_data, void *user_data)
 {
-	char *dir;
-	char path[PATH_MAX];
-	char *format;
-	Ewl_Fileselector *fs;
-	
-	DENTER_FUNCTION(DLEVEL_STABLE);
-	DCHECK_PARAM_PTR("w", w);
-	
-	fs = EWL_FILESELECTOR (user_data);
+	Ewl_Fileselector *fs = user_data;
+	ewl_fileselector_configure_cb(fs, ewl_fileselector_path_get(fs));
+}
 
-	dir = ewl_text_text_get(EWL_TEXT(w));
 
-	if (!strcmp(fs->path, "/"))
-		format = "%s%s";
-	else
-		format = "%s/%s";
-	snprintf(path, PATH_MAX, format, fs->path, dir);
+/* Private: data for a file */
 
-	IF_FREE(dir);
-	ewl_fileselector_directory_adjust (fs, path);
-	ewl_fileselector_set_directory (fs, path);
+/* Allocate a new data. Must be freed after used */
+Ewl_Fileselector_Data
+*ewl_fileselector_data_new(const char *name, off_t size, time_t time, mode_t mode)
+{
+	Ewl_Fileselector_Data *d;
+	char *n;
 
-	DLEAVE_FUNCTION(DLEVEL_STABLE);
+	n = strdup(name);
+
+	d = (Ewl_Fileselector_Data *) malloc(sizeof(Ewl_Fileselector_Data));
+	d->name = n;
+	d->size = size;
+	d->time = time;
+	d->mode = mode;
+
+	return d;
 }
 
-int ewl_fileselector_alphasort (const void *a, const void *b)
+/* Free an allocated data */
+void ewl_fileselector_data_free(Ewl_Fileselector_Data * d)
 {
-  struct dirent **ad = (struct dirent **)a;
-  struct dirent **bd = (struct dirent **)b;
-  return (strcmp((*bd)->d_name, (*ad)->d_name));
+	if (d) {
+		if (d->name)
+			free(d->name);
+		free(d);
+	}
 }
 
+static void ewl_fileselector_tooltip_add(Ewl_Widget * w, Ewl_Fileselector_Data * d)
+{
+	Ewl_Widget *parent_win;
+	Ewl_Widget *tooltip;
+	char *str;
+	char *name, *size, *perm;
+
+	parent_win = EWL_WIDGET(ewl_embed_widget_find(w));
+
+	tooltip = ewl_tooltip_new(w);
+	ewl_tooltip_delay_set(EWL_TOOLTIP(tooltip), 1.0);
+	ewl_container_child_append(EWL_CONTAINER(parent_win), tooltip);
+
+	name = d->name;
+	size = ewl_fileselector_size_string_get(d->size);
+	perm = ewl_fileselector_perm_string_get(d->mode);
+	str = (char *) malloc(sizeof(char) * (strlen(name) +
+					      strlen(size) +
+					      strlen(perm) + 3));
+	str = memcpy(str, name, strlen(name));
+	str[strlen(name)] = '\n';
+	memcpy(str + strlen(name) + 1, size, strlen(size));
+	str[strlen(name) + strlen(size) + 1] = '\n';
+	memcpy(str + strlen(name) + strlen(size) + 2, perm, strlen(perm));
+	str[strlen(name) + strlen(size) + strlen(perm) + 2] = '\0';
+	ewl_tooltip_text_set(EWL_TOOLTIP(tooltip), str);
+
+	/* destroy tooltip when the row is destroyed */
+	ewl_callback_append(EWL_WIDGET(w), EWL_CALLBACK_DESTROY,
+			    EWL_CALLBACK_FUNCTION
+			    (ewl_fileselector_tooltip_destroy_cb), tooltip);
+
+	free(size);
+	free(perm);
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_fileselector.h	17 Feb 2004 05:18:38 -0000	1.16
+++ ewl_fileselector.h	28 Aug 2004 06:26:33 -0000	1.17
@@ -20,6 +20,34 @@
  * @themekey /fileselector/group
  */
 
+
+#include <sys/stat.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* Private: data for a file */
+
+typedef struct Ewl_Fileselector_Data Ewl_Fileselector_Data;
+
+struct Ewl_Fileselector_Data
+{
+  char  *name; /* name of the file */
+  off_t  size; /* size of the file (bytes) */
+  time_t time; /* last modification */
+  mode_t mode; /* mode of the file (permissions) */
+};
+
+Ewl_Fileselector_Data *ewl_fileselector_data_new(const char *name, off_t  size,
+				       time_t time, mode_t mode);
+void  ewl_fileselector_data_free (Ewl_Fileselector_Data *d);
+
+
+
+  /* The File Selector */
+
 /**
  * The Ewl_Fileselector provides a fileselector
  */
@@ -37,42 +65,40 @@
  */
 struct Ewl_Fileselector
 {
-	Ewl_Box         box;   /* the vbox containing the trees */
-	Ewl_Widget     *dirs;	 /* directory table */
-	Ewl_Widget     *files; /* file table */
-
-	char           *path;  /* current fileselector path */
-	char           *item;  /* current selected item in the fileselector */
+  Ewl_Box        box;         /* the box containing the widgets */
+  Ewl_Widget    *list_dirs;   /* directory table */
+  Ewl_Widget    *list_files;  /* file table */
+  Ewl_Widget    *entry_dir;
+  Ewl_Widget    *entry_file;
+  Ewl_Widget    *entry_filter;
+  
+  char          *path;  /* current fileselector path */
+  char          *file;  /* current selected item in the fileselector */
 };
 
 
 Ewl_Widget *ewl_fileselector_new();
 
-void ewl_fileselector_init(Ewl_Fileselector * fs);
-void ewl_fileselector_set_directory(Ewl_Fileselector * fs, char *path);
-
-char *ewl_fileselector_get_filename (Ewl_Fileselector *fs);
-char *ewl_fileselector_get_path (Ewl_Fileselector *fs);
-
+void ewl_fileselector_init(Ewl_Fileselector *fs);
+char *ewl_fileselector_path_get(Ewl_Fileselector *fs);
+char *ewl_fileselector_file_get(Ewl_Fileselector *fs);
+void ewl_fileselector_path_set(Ewl_Fileselector *fs, char   *path);
 
 /*
  * Internally used callbacks, override at your own risk.
  */
-void ewl_fileselector_realize_cb(Ewl_Widget * w, void *ev_data,
-		void *user_data);
-void ewl_fileselector_configure_cb(Ewl_Widget * w, void *ev_data,
-		void *user_data);
-void ewl_fileselector_file_clicked_cb(Ewl_Widget * w, void *ev_data, 
-		void *user_data);
-void ewl_fileselector_file_open_cb(Ewl_Widget * w, void *ev_data,
-		void *user_data);
-void ewl_fileselector_directory_clicked_single_cb(Ewl_Widget * w, 
-		void *ev_data, void *user_data);
-void ewl_fileselector_directory_clicked_cb(Ewl_Widget * w, void *ev_data, 
-		void *user_data);
 
-/**
- * @}
- */
+void ewl_fileselector_select_file_cb(Ewl_Widget *w, void *ev_data, Ewl_Fileselector *fs);
+void ewl_fileselector_select_dir_cb(Ewl_Widget *w, void *ev_data, Ewl_Fileselector *fs);
+void ewl_fileselector_go_up_cb(Ewl_Widget *w, void *ev_data, Ewl_Fileselector *fs);
+void ewl_fileselector_go_home_cb(Ewl_Widget *w, void *ev_data, Ewl_Fileselector *fs);
+void ewl_fileselector_configure_cb(Ewl_Fileselector *fs, char *path);
+
+void ewl_fileselector_filter_cb(Ewl_Widget *entry, void *ev_data, void *user_data);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 
-#endif				/* __EWL_FILESELECTOR_H__ */
+#endif /* __EWL_FILESELECTOR_H__ */

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/imlib2

Dir     : e17/libs/imlib2/loaders


Modified Files:
	loader_bmp.c 


Log Message:


more bmp fixes

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/loaders/loader_bmp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- loader_bmp.c	26 Aug 2004 17:26:10 -0000	1.14
+++ loader_bmp.c	28 Aug 2004 03:34:05 -0000	1.15
@@ -111,6 +111,11 @@
       fseek(f, 8, SEEK_CUR);
       ReadleLong(f, &offset);
       ReadleLong(f, &headSize);
+      if (offset >= size)
+        {
+           fclose(f);
+           return 0;
+        }
       if (headSize == 12)
         {
            ReadleShort(f, &tmpShort);
@@ -139,6 +144,12 @@
            fclose(f);
            return 0;
         }
+      
+      if ((w > 8192) || (h > 8192))
+	{
+	   fclose(f);
+	   return 0;
+	}
 
       if (bitcount < 16)
         {

Enlightenment CVS committal

Author  : atmosphere
Project : e17
Module  : apps/iconbar

Dir     : e17/apps/iconbar


Added Files:
	iconbar.spec 


Log Message:
add spec file from jim perrin