@@ -94,10 +94,16 @@ typedef struct menubar_t {

         font_t *ptrfont;

 } menubar_t;

+typedef struct listingdata_t {

+        xywh_t leftxywh;

+        xywh_t xywh;

+        char *name; /* first byte in the name is the type, next is the name, i.e. a directory is "dhome" and a file is "f.bashrc" (this is done for easier sorting) */

+} listingdata_t;

+

 typedef struct listing_t {

         int sizeelems;

         int usedelems;

-        char **elems; /* first byte in the elem is the type, next is the name, i.e. a directory is "dhome" and a file is "f.bashrc" */

+        listingdata_t *elems;

         int sizebuf;

         int usedbuf;

         char *buf;

@@ -229,7 +235,7 @@ fprintf(stderr,"SELECTED: \"%s\"->\"%s\"\n",sel_menu,sel_submenu);

      v2.x=(float) (im->font->height/2);

      v2.y=(float) ((im->font->height+im->font->height/2)*i+(im->font->height/4));

      DrawTextEx(im->font->font

-       ,listing.elems[j]

+       ,listing.elems[j].name

        ,v2

        ,im->font->height

        ,0

@@ -653,8 +659,10 @@ im_body_draw(body_t *body, int windowwidth, int windowheight)

 {

         int i,x,y,k,margin,righty;

         dirdata_t *dirdata;

+        listingdata_t *elem;

         Vector2 v2,m2;

         font_t *font,*fontbig,*fonthuge;

+        int is_leftside;

         if(body==NULL)

                 return(-1);

         font=body->ptrfont;

@@ -669,66 +677,90 @@ im_body_draw(body_t *body, int windowwidth, int windowheight)

         for(i=0,y=righty=body->xywh.y;i<body->sizedirdata;i++) {

                 if((dirdata=body->dirdata[i])==NULL)

                         continue;

-                /* draw left side if appropiate */

-                if(i==body->currentdirdata) {

+                /* two passes for each dirdata, first leftside, then rightside */

+                for(is_leftside=1;is_leftside>=0;is_leftside--) {

                         int x0,y0,x1,y1;

-                        /* draw left side */

-                        /* ...back arrow */

-                        v2.x=(float) (body->xywh.x+fontbig->height/2);

-                        v2.y=(float) (body->xywh.y+fontbig->height/4);

-                        m2=MeasureTextEx(fontbig->font,UTF8DOWNARROW,fontbig->height,0);

-                        FILLXYWH(body->backxywh,v2.x-fontbig->height/4,v2.y-fontbig->height/8,m2.x+fontbig->height/4,m2.x+fontbig->height/4);

+                        if(is_leftside && !(i==body->currentdirdata))

+                                continue; /* this element is not in leftside */

+                        if(is_leftside) {

+                                /* draw left side back arrow */

+                                v2.x=(float) (body->xywh.x+fontbig->height/2);

+                                v2.y=(float) (body->xywh.y+fontbig->height/4);

+                                m2=MeasureTextEx(fontbig->font,UTF8DOWNARROW,fontbig->height,0);

+                                FILLXYWH(body->backxywh,v2.x-fontbig->height/4,v2.y-fontbig->height/8,m2.x+fontbig->height/4,m2.x+fontbig->height/4);

 #if 0

 DrawTexture(fontbig->font.texture, 0, 0, WHITE); /* font glyphs -- see https://github.com/raysan5/raylib/issues/2022 */

 DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone */

 #endif

-                        DrawTextPro(fontbig->font,UTF8DOWNARROW,(Vector2){v2.x+m2.x,v2.y},(Vector2){0,0},90.0,fontbig->height,0,(Color){65,65,65,255});

-                        /* ...dirname */

-                        m2=MeasureTextEx(fontbig->font,dirdata->dirname,fontbig->height,0);

-                        v2.x=(float) (body->xywh.x+fontbig->height/2)+(body->leftsize-(body->xywh.x+fontbig->height)-m2.x)/2;

-                        v2.y=(float) (body->xywh.y+fontbig->height/4);

-                        DrawTextEx(fontbig->font

-                          ,dirdata->dirname

-                          ,v2

-                          ,fontbig->height

-                          ,0

-                          ,(Color){ 65, 65, 65, 255 }

-                        );

+                                DrawTextPro(fontbig->font,UTF8DOWNARROW,(Vector2){v2.x+m2.x,v2.y},(Vector2){0,0},90.0,fontbig->height,0,(Color){65,65,65,255});

+                        }

+                        if(is_leftside) {

+                                /* ...dirname */

+                                m2=MeasureTextEx(fontbig->font,dirdata->dirname,fontbig->height,0);

+                                v2.x=(float) (body->xywh.x+fontbig->height/2)+(body->leftsize-(body->xywh.x+fontbig->height)-m2.x)/2;

+                                v2.y=(float) (body->xywh.y+fontbig->height/4);

+                                DrawTextEx(fontbig->font

+                                  ,dirdata->dirname

+                                  ,v2

+                                  ,fontbig->height

+                                  ,0

+                                  ,(Color){ 65, 65, 65, 255 }

+                                );

+                        } else { /* rightside */

+                                /* ...bg */

+                                DrawRectangle(body->xywh.x+body->leftsize,righty,body->xywh.w-body->leftsize, dirdata->height,(i==body->currentdirdata)?((Color){ 168, 168, 168, 255 }):((Color){ 227, 227, 227, 255 }));

+                                /* ...bottom separator */

+                                DrawRectangle(body->xywh.x+body->leftsize,righty+dirdata->height-1,body->xywh.w-body->leftsize, 1, (Color){ 221, 221, 221, 255 } );

+                                /* ...dirname */

+                                DrawTextEx(fontbig->font

+                                  ,dirdata->dirname

+                                  ,(Vector2) {body->xywh.x+body->leftsize+fontbig->height/2,righty+fontbig->height/4}

+                                  ,fontbig->height

+                                  ,0

+                                  ,(Color){ 65, 65, 65, 255 }

+                                );

+                        }

                         /* directories */

-                        x0=body->xywh.x+font->height/2;

-                        x1=body->xywh.x+body->leftsize-font->height/2;

-                        y0=body->xywh.y+font->height/4+m2.y+font->height/2;

-                        y1=body->xywh.y+body->xywh.h-font->height/2;

+                        if(is_leftside) {

+                                x0=body->xywh.x+font->height/2;

+                                x1=body->xywh.x+body->leftsize-font->height/2;

+                                y0=body->xywh.y+font->height/4+m2.y+font->height/2;

+                                y1=body->xywh.y+body->xywh.h-DEFAULTDIRDATATRIANGLEW-font->height/2;

+                        } else {

+                                x0=body->xywh.x+body->leftsize+font->height/2;

+                                x1=body->xywh.x+body->xywh.w-font->height/2;

+                                y0=righty+fontbig->height/2+m2.y+font->height/4;

+                                y1=y0+margin*2+font->height-1;

+                        }

                         margin=font->height/4;

                         for(k=0,x=x0,y=y0;k<dirdata->listing.usedelems;k++) {

-                                m2=MeasureTextEx(font->font,dirdata->listing.elems[k]+1,font->height,0);

-                                if((x+margin*2+m2.x)>x1)

+                                elem=dirdata->listing.elems+k;

+                                if(elem->name[0]!='d' || strcmp(elem->name,"d.")==0 || strcmp(elem->name,"d..")==0)

+                                        continue;

+                                if(y>y1)

+                                        continue;

+                                m2=MeasureTextEx(font->font,elem->name+1,font->height,0);

+                                if((x+margin*2+m2.x)>x1) {

                                         x=x0,y+=font->height+margin*2+font->height/4;

-#warning TODO: store the bounding box of the element

-                                DrawRectangleLines(x,y,margin*2+m2.x,margin*2+font->height,((Color){0,0,0,255}));

-                                DrawTextEx(font->font,dirdata->listing.elems[k]+1,(Vector2){x+margin,y+margin},font->height,0,(Color){ 65, 65, 65, 255 });

+                                        if(y>y1)

+                                                continue;

+                                }

+                                FILLXYWH(elem->leftxywh,x,y,margin*2+m2.x,margin*2+font->height);

+                                DrawRectangleLines(UNROLLXYWH(elem->leftxywh),((Color){0,0,0,255}));

+                                DrawTextEx(font->font,elem->name+1,(Vector2){x+margin,y+margin},font->height,0,(Color){ 65, 65, 65, 255 });

                                 x+=margin*2+m2.x+font->height/4;

                         }

-#warning TODO

-                        /* draw right side "current" marker inside left side area */

-                        DrawTriangle((Vector2){((float)body->xywh.x)+body->leftsize,((float)righty)}, (Vector2){((float)body->xywh.x)+body->leftsize-DEFAULTDIRDATATRIANGLEW,((float)righty)+dirdata->height/2}, (Vector2){((float)body->xywh.x)+body->leftsize,((float)righty)+dirdata->height-1}, (Color){ 168, 168, 168, 255 } );

+#warning TODO SHOW FILES

+                        /* ...finishing touchs */

+                        if(is_leftside) {

+                                /* draw right side "current" marker inside left side area */

+                                DrawTriangle((Vector2){((float)body->xywh.x)+body->leftsize,((float)righty)}, (Vector2){((float)body->xywh.x)+body->leftsize-DEFAULTDIRDATATRIANGLEW,((float)righty)+dirdata->height/2}, (Vector2){((float)body->xywh.x)+body->leftsize,((float)righty)+dirdata->height-1}, (Color){ 168, 168, 168, 255 } );

+                        } else {

+                                /* advance to next element */

+                                righty+=dirdata->height;

+                        }

                 }

-                /* draw right side */

-                /* ...bg */

-                DrawRectangle(body->xywh.x+body->leftsize,righty,body->xywh.w-body->leftsize, dirdata->height,(i==body->currentdirdata)?((Color){ 168, 168, 168, 255 }):((Color){ 227, 227, 227, 255 }));

-                /* ...bottom separator */

-                DrawRectangle(body->xywh.x+body->leftsize,righty+dirdata->height-1,body->xywh.w-body->leftsize, 1, (Color){ 221, 221, 221, 255 } );

-                /* ...dirname */

-                DrawTextEx(fontbig->font

-                  ,dirdata->dirname

-                  ,(Vector2) {body->xywh.x+body->leftsize+fontbig->height/2,righty+fontbig->height/4}

-                  ,fontbig->height

-                  ,0

-                  ,(Color){ 65, 65, 65, 255 }

-                );

-                /* advance to next element */

-                righty+=dirdata->height;

         }

 #if 0

         /* example from menubar */

@@ -942,7 +974,7 @@ getcodepoints(int *sizecodepoints)

 static int

 strptrcmp(void *a,void *b)

 {

-        return(strcmp(*((char **)a),*((char **)b)));

+        return(strcmp(((listingdata_t *)a)->name,((listingdata_t *)b)->name));

 }

 int

@@ -956,6 +988,7 @@ listing_get(listing_t *listing, char *pathprefix, char *parampath, int flag_sort

         if(listing==NULL)

                 return(-1); /* sanity check failed */

         listing->usedelems=listing->usedbuf=0;

+        memset(listing->elems,0,sizeof(listingdata_t)*listing->sizeelems);

         if(pathprefix==NULL && parampath==NULL)

                 return(-1); /* nothing to fill */

         snprintf(path,sizeof(path),"%s%s%s",(pathprefix!=NULL)?pathprefix:"",SEP,(parampath!=NULL)?parampath:"");

@@ -998,12 +1031,13 @@ listing_get(listing_t *listing, char *pathprefix, char *parampath, int flag_sort

                 }

                 /* check for space for this elem (and get space if necessary) */

                 if(listing->usedelems==listing->sizeelems) {

-                        char **newelems;

-                        if((newelems=realloc(listing->elems,sizeof(char *)*(listing->sizeelems+BLOCKLISTINGELEMS)))==NULL) {

+                        listingdata_t *newelems;

+                        if((newelems=realloc(listing->elems,sizeof(listingdata_t)*(listing->sizeelems+BLOCKLISTINGELEMS)))==NULL) {

                                 closedir(d),d=NULL;

                                 return(-1); /* insuf. mem. */

                         }

                         listing->elems=newelems;

+                        memset(listing->elems+listing->sizeelems,0,sizeof(listingdata_t)*BLOCKLISTINGELEMS);

                         listing->sizeelems+=BLOCKLISTINGELEMS;

                 }

                 /* check for space for this elem data (and get space if necessary) */

@@ -1021,21 +1055,21 @@ listing_get(listing_t *listing, char *pathprefix, char *parampath, int flag_sort

                         }

                         /* the elem data buffer has a new pointer, fix previous entries */

                         for(i=0;i<listing->usedelems;i++) {

-                                off=(listing->elems[i])-listing->buf;

-                                listing->elems[i]=newbuf+off;

+                                off=(listing->elems[i].name)-listing->buf;

+                                listing->elems[i].name=newbuf+off;

                         }

                         listing->buf=newbuf;

                         listing->sizebuf+=BLOCKLISTINGELEMS;

                 }

                 /* store the data */

-                listing->elems[listing->usedelems++]=listing->buf+listing->usedbuf;

+                listing->elems[listing->usedelems++].name=listing->buf+listing->usedbuf;

                 listing->buf[listing->usedbuf++]=dtype;

                 memcpy(listing->buf+listing->usedbuf,de->d_name,l+1);

                 listing->usedbuf+=l+1;

         }

         closedir(d),d=NULL;

         if(flag_sort)

-                qsort(listing->elems,listing->usedelems,sizeof(char *),(int (*)(const void *, const void *)) strptrcmp);

+                qsort(listing->elems,listing->usedelems,sizeof(listingdata_t ),(int (*)(const void *, const void *)) strptrcmp);

         return(0);

 }