@@ -9,6 +9,7 @@

  *      20250213 Support sticky drop-down menus.

  *      20250216 Modularize menu handling.

  *      20250222 Able to list files.

+ *      20250223 Draw pane titles and main dir list.

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -29,13 +30,23 @@

 #define DEFAULTWIDTH 1280

 #define DEFAULTHEIGHT 768

+#define UTF8DOWNARROW "\xe2\x86\x86" /* U+2186 in UTF-8 */

+

 #define LEFTSIZE 720

-#define RIGHTELEMHEIGHT 280

+#define DEFAULTDIRDATAHEIGHT 150

+#define DEFAULTDIRDATATRIANGLEW 35

+

+#define FONTSIZE 18

+#define FONTBIGSIZE 32

+#define FONTHUGESIZE 48

+

+#define ROOTDIR "/var/www/default/animeshot/"

 #define SEP "/"

 #define BLOCKLISTINGBUF 2048

 #define BLOCKLISTINGELEMS 1024

+#define BLOCKDIRDATA 16

 #ifndef FILLXY

 #define FILLXY(xywh,valx,valy) (xywh).x=(valx),(xywh).y=(valy)

@@ -65,7 +76,6 @@ typedef struct font_t {

         int height;

 } font_t;

-

 typedef struct menudata_t {

         char *title;

         xywh_t xywh;

@@ -78,8 +88,10 @@ typedef struct menudata_t {

 } menudata_t;

 typedef struct menubar_t {

+        int height;

         int sizemenudata;

         menudata_t **menudata;

+        font_t *ptrfont;

 } menubar_t;

 typedef struct listing_t {

@@ -97,33 +109,54 @@ typedef struct dirdata_t {

         listing_t listing;

 } dirdata_t;

-typedef struct im_t {

-        int windowinit;

-        int w;

-        int h;

+typedef struct body_t {

+        char *rootdir;

+        xywh_t xywh;

+        xywh_t backxywh;

+        int leftsize;

         int sizedirdata;

         dirdata_t **dirdata;

         int currentdirdata;

         int leftscrollpos;

         int rightscrollpos;

+        font_t *ptrfont;

+        font_t *ptrfontbig;

+        font_t *ptrfonthuge;

+} body_t;

+

+typedef struct im_t {

+        int windowinit;

+        int w;

+        int h;

         menubar_t *menubar;

+        body_t *body;

         font_t *font;

+        font_t *fontbig;

+        font_t *fonthuge;

 } im_t;

-im_t *im_init(char *menus);

+im_t *im_init(char *menus, char *rootdir);

 void im_free(im_t *im);

-font_t *im_font_init(void);

+font_t *im_font_init(int size);

 void im_font_free(font_t *font);

-menubar_t *im_menubar_init(char *menus);

+menubar_t *im_menubar_init(char *menus, font_t *font);

 void im_menubar_free(menubar_t *menubar);

 int im_menubar_mouse(menubar_t *menubar, Vector2 mousepos, int lmbpressed, int lmbreleased, int lmbdown, int *click_avail, char **sel_menu, char **sel_submenu);

-int im_menubar_draw(menubar_t *menubar, font_t *font, int windowwidth, int windowheight);

+int im_menubar_draw(menubar_t *menubar, int windowwidth, int windowheight);

-int listing_get(listing_t *listing, char *path, int flag_sort);

+body_t *im_body_init(int x, int y, font_t *font, font_t *fontbig, font_t *fonthuge, int leftsize, char *rootdir);

+void im_body_free(body_t *body);

+

+int im_body_add(body_t *body,char *dir);

+

+int im_body_mouse(body_t *body, Vector2 mousepos, int lmbpressed, int lmbreleased, int lmbdown, int *click_avail);

+int im_body_draw(body_t *body, int windowwidth, int windowheight);

+

+int listing_get(listing_t *listing, char *pathprefix, char *path, int flag_sort);

 void listing_freedata(listing_t *listing);

 int imutil_menu_count(char *menus);

@@ -144,7 +177,7 @@ main(int argc, char *argv[])

         int lmbpressed,lmbreleased,lmbdown;

         int click_avail;

         char *sel_menu,*sel_submenu;

-        if((im=im_init("Fichero\nAjustes\nSalir\n\nEditar\nNuevo directorio\n\nAyuda\nInformación sobre el programa\n\n"))==NULL) {

+        if((im=im_init("Fichero\nAjustes\nSalir\n\nEditar\nNuevo directorio\n\nAyuda\nInformación sobre el programa\n\n",ROOTDIR))==NULL) {

                 return(1);

         }

         flag_ignorelmb=0;

@@ -164,16 +197,21 @@ fprintf(stderr,"SELECTED: \"%s\"->\"%s\"\n",sel_menu,sel_submenu);

 #endif

                         }

                 }

+                if(click_avail)

+                        im_body_mouse(im->body, mousepos, lmbpressed, lmbreleased, lmbdown, &click_avail);

+

+

                 /* draw screen contents */

                 BeginDrawing();

                 ClearBackground(RAYWHITE);

-                im_menubar_draw(im->menubar,im->font,im->w,im->h);

-#if 1

+                im_body_draw(im->body,im->w,im->h);

+                im_menubar_draw(im->menubar,im->w,im->h);

+#if 0

 {

  int i,j;

  Vector2 v2;

  listing_t listing={0};

- if(listing_get(&listing,".." SEP ".",1)==0) {

+ if(listing_get(&listing,"..",".",1)==0) {

    i=2;

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

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

@@ -209,14 +247,12 @@ fprintf(stderr,"SELECTED: \"%s\"->\"%s\"\n",sel_menu,sel_submenu);

 }

 im_t *

-im_init(char *menus)

+im_init(char *menus, char *rootdir)

 {

         im_t *im;

         if(menus==NULL)

                 return(NULL); /* sanity check failed */

-        if((im=calloc(1,sizeof(im_t)))==NULL

-          || (im->menubar=im_menubar_init(menus))==NULL

-        ) {

+        if((im=calloc(1,sizeof(im_t)))==NULL) {

                 im_free(im),im=NULL;

                 return(NULL); /* insuf. mem. */

         }

@@ -225,35 +261,36 @@ im_init(char *menus)

         InitWindow((im->w=DEFAULTWIDTH),(im->h=DEFAULTHEIGHT),"Image Mover");

         im->windowinit=1;

         SetTargetFPS(30);

-        /* init font */

-        if((im->font=im_font_init())==NULL) {

+        /* init fonts and contents */

+        if((im->font=im_font_init(FONTSIZE))==NULL

+          || (im->fontbig=im_font_init(FONTBIGSIZE))==NULL

+          || (im->fonthuge=im_font_init(FONTHUGESIZE))==NULL

+          || (im->menubar=im_menubar_init(menus,im->font))==NULL

+          || (im->body=im_body_init(0,im->menubar->height, im->font, im->fontbig, im->fonthuge, LEFTSIZE, rootdir))==NULL

+        ) {

                 im_free(im),im=NULL;

                 return(NULL); /* insuf. mem. */

         }

+        /* add the starting directory */

+        im_body_add(im->body,"/");

         return(im);

 }

 void

 im_free(im_t *im)

 {

-        int i;

         if(im==NULL)

                 return;

         if(im->menubar!=NULL)

                 im_menubar_free(im->menubar),im->menubar=NULL;

-        if(im->dirdata!=NULL) {

-                dirdata_t *dirdata;

-                for(i=0;i<im->sizedirdata;i++) {

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

-                                continue;

-                        if(dirdata->dirname!=NULL)

-                                free(dirdata->dirname),dirdata->dirname=NULL;

-                        listing_freedata(&(dirdata->listing));

-                }

-                free(im->dirdata),im->dirdata=NULL,im->sizedirdata=0;

-        }

+        if(im->body!=NULL)

+                im_body_free(im->body),im->body=NULL;

         if(im->font!=NULL)

                 im_font_free(im->font),im->font=NULL;

+        if(im->fontbig!=NULL)

+                im_font_free(im->fontbig),im->fontbig=NULL;

+        if(im->fonthuge!=NULL)

+                im_font_free(im->fonthuge),im->fonthuge=NULL;

 #if 0 /* not working as intended */

         if(im->windowinit)

                 CloseWindow(),im->windowinit=0;

@@ -263,14 +300,14 @@ im_free(im_t *im)

 }

 font_t *

-im_font_init(void)

+im_font_init(int size)

 {

         font_t *font;

         int sizecodepoints;

         int *codepoints;

         if((font=calloc(1,sizeof(font_t)))==NULL)

                 return(NULL); /* insuf. mem. */

-        font->height=18;

+        font->height=size;

         codepoints=getcodepoints(&sizecodepoints);

         font->font=LoadFontFromMemory(".ttf",(const unsigned char *)roboto_regular,sizeof(roboto_regular)-1,font->height,codepoints,sizecodepoints);

         return(font);

@@ -281,22 +318,20 @@ im_font_free(font_t *font)

 {

         if(font==NULL)

                 return;

-#if 0 /* not working as intended */

-        UnloadFont(font->font);

-#endif

+        /* NOTE: Cannot call UnloadFont(font->font) as the data was not malloc'd; see https://github.com/raysan5/raylib/blob/master/examples/others/embedded_files_loading.c */

         free(font),font=NULL;

         return;

 }

 menubar_t *

-im_menubar_init(char *menus)

+im_menubar_init(char *menus, font_t *font)

 {

         int i,j;

         char *str,*substr;

         int len,sublen;

         menubar_t *menubar;

         menudata_t *menudata;

-        if(menus==NULL)

+        if(menus==NULL || font==NULL)

                 return(NULL); /* sanity check failed */

         if((menubar=calloc(1,sizeof(menubar_t)))==NULL

           || (menubar->sizemenudata=imutil_menu_count(menus))<=0

@@ -305,6 +340,8 @@ im_menubar_init(char *menus)

                 im_menubar_free(menubar),menubar=NULL;

                 return(NULL); /* insuf. mem. */

         }

+        menubar->ptrfont=font;

+        menubar->height=font->height+font->height/2;

         /* init menus */

         for(i=0;i<menubar->sizemenudata;i++) {

                 if((menudata=menubar->menudata[i]=calloc(1,sizeof(menudata_t)))==NULL

@@ -465,12 +502,242 @@ im_menubar_mouse(menubar_t *menubar, Vector2 mousepos, int lmbpressed, int lmbre

 }

 int

-im_menubar_draw(menubar_t *menubar, font_t *font, int windowwidth, int windowheight)

+im_menubar_draw(menubar_t *menubar, int windowwidth, int windowheight)

 {

         int i,j,k,x;

         menudata_t *menudata;

+        font_t *font;

+        if(menubar==NULL)

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

+        font=menubar->ptrfont;

+        DrawRectangle(0,0,windowwidth, font->height+font->height/2, (Color){ 235, 235, 235, 235 } );

+        for(i=0,x=0;i<menubar->sizemenudata;i++) {

+                Vector2 v2;

+                menudata=menubar->menudata[i];

+                v2=MeasureTextEx(font->font,menudata->title,font->height,0);

+                FILLXYWH(menudata->xywh,x,0,((int)v2.x)+font->height,font->height+font->height/2);

+                v2.x=(float) (menudata->xywh.x+font->height/2);

+                v2.y=(float) (menudata->xywh.y+font->height/4);

+                DrawTextEx(font->font

+                  ,menudata->title

+                  ,v2

+                  ,font->height

+                  ,0

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

+                );

+                if(menudata->flag_open || menudata->flag_stickyopen) {

+                        int underline_height=3;

+                        int maxw;

+                        DrawRectangle(menudata->xywh.x,menudata->xywh.y+menudata->xywh.h-underline_height,menudata->xywh.w,underline_height, (Color){ 53,132,228,255 } );

+                        for(j=0,maxw=0;j<menudata->sizeoptions;j++) {

+                                v2=MeasureTextEx(font->font,menudata->options[j],font->height,0);

+                                maxw=(((int)(v2.x))>maxw)?((int)(v2.x)):maxw;

+                        }

+                        maxw=(maxw<(menudata->xywh.w+font->height))?(menudata->xywh.w+font->height):maxw;

+                        maxw+=font->height;

+                        FILLXYWH(menudata->optionsxywh,menudata->xywh.x+1,menudata->xywh.y+menudata->xywh.h+2,maxw,(font->height+font->height/2)*menudata->sizeoptions);

+                        DrawLine(menudata->optionsxywh.x-1,menudata->optionsxywh.y-2,menudata->optionsxywh.x+menudata->optionsxywh.w+2,menudata->optionsxywh.y-2,(Color){ 255,255,255,255 } );

+                        DrawLine(menudata->optionsxywh.x-1,menudata->optionsxywh.y,menudata->optionsxywh.x-1,menudata->optionsxywh.y+menudata->optionsxywh.h+1,(Color){ 255,255,255,255 } );

+                        DrawLine(menudata->optionsxywh.x+menudata->optionsxywh.w+2,menudata->optionsxywh.y,menudata->optionsxywh.x+menudata->optionsxywh.w+2,menudata->optionsxywh.y+menudata->optionsxywh.h+1,(Color){ 192,192,192,255 } );

+                        DrawLine(menudata->optionsxywh.x-1,menudata->optionsxywh.y+menudata->optionsxywh.h+1,menudata->optionsxywh.x+menudata->optionsxywh.w+2,menudata->optionsxywh.y+menudata->optionsxywh.h+1,(Color){ 192,192,192,255 } );

+                        DrawRectangle(menudata->optionsxywh.x,menudata->optionsxywh.y,menudata->optionsxywh.w,menudata->optionsxywh.h,(Color){ 235, 235, 235, 235 });

+                        for(k=0;k<menudata->sizeoptions;k++) {

+                                Color c;

+                                c=(k==menudata->currentoption)?((Color){ 255,255,255,255 }):((Color){ 45, 45, 45, 255 });

+                                if(k==menudata->currentoption)

+                                        DrawRectangle(menudata->optionsxywh.x+1,menudata->optionsxywh.y+(font->height+(font->height/2))*k,menudata->optionsxywh.w-2,font->height+font->height/2,(Color){ 53,132,228,255 });

+                                v2.x=(float) (menudata->optionsxywh.x+font->height/2);

+                                v2.y=(float) (menudata->optionsxywh.y+(font->height/4)+(font->height+(font->height/2))*k);

+                                DrawTextEx(font->font

+                                  ,menudata->options[k]

+                                  ,v2

+                                  ,font->height

+                                  ,0

+                                  ,c

+                                );

+                        }

+                } else {

+                        FILLXYWH(menudata->optionsxywh,0,0,0,0);

+                }

+                x=menudata->xywh.x+menudata->xywh.w;

+        }

+        return(0);

+}

+

+body_t *

+im_body_init(int x, int y, font_t *font, font_t *fontbig, font_t *fonthuge, int leftsize, char *rootdir)

+{

+        body_t *body;

+        if(font==NULL || fontbig==NULL || fonthuge==NULL || rootdir==NULL)

+                return(NULL); /* sanity check failed */

+        if((body=calloc(1,sizeof(body_t)))==NULL

+          || (body->rootdir=strdup(rootdir))==NULL

+        ) {

+                im_body_free(body),body=NULL;

+                return(NULL);

+        }

+        FILLXY(body->xywh,x,y);

+        body->leftsize=leftsize;

+        body->ptrfont=font;

+        body->ptrfontbig=fontbig;

+        body->ptrfonthuge=fonthuge;

+        return(body);

+}

+

+void

+im_body_free(body_t *body)

+{

+        int i;

+        dirdata_t *dirdata;

+        if(body==NULL)

+                return; /* nothing to do */

+        if(body->rootdir!=NULL)

+                free(body->rootdir),body->rootdir=NULL;

+        if(body->dirdata!=NULL) {

+                for(i=0;i<body->sizedirdata;i++) {

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

+                                continue;

+                        if(dirdata->dirname!=NULL)

+                                free(dirdata->dirname),dirdata->dirname=NULL;

+                        listing_freedata(&(dirdata->listing));

+                        free(dirdata),dirdata=body->dirdata[i]=NULL;

+                }

+                free(body->dirdata),body->dirdata=NULL,body->sizedirdata=0;

+        }

+        free(body),body=NULL;

+        return;

+}

+

+int

+im_body_add(body_t *body,char *dir)

+{

+        int i;

+        dirdata_t *dirdata;

+        if(body==NULL || dir==NULL)

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

+        for(i=0;i<body->sizedirdata;i++) {

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

+                        break;

+        }

+        if(i==body->sizedirdata) {

+                /* dirdata container full, add more slots */

+                dirdata_t **newdirdata;

+                if((newdirdata=realloc(body->dirdata,sizeof(dirdata_t *)*(body->sizedirdata+BLOCKDIRDATA)))==NULL)

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

+                body->dirdata=newdirdata;

+                memset(body->dirdata+body->sizedirdata,0,sizeof(dirdata_t *)*BLOCKDIRDATA);

+                body->sizedirdata+=BLOCKDIRDATA;

+        }

+        if((dirdata=body->dirdata[i]=calloc(1,sizeof(dirdata_t)))==NULL

+          || (dirdata->dirname=strdup(dir))==NULL

+        ) {

+                if(dirdata!=NULL)

+                        free(dirdata),dirdata=body->dirdata[i]=NULL;

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

+        }

+        dirdata->height=DEFAULTDIRDATAHEIGHT;

+        dirdata->dirname=strdup(dir);

+        listing_get(&(dirdata->listing),body->rootdir,dir,1);

+        return(0);

+}

+

+int

+im_body_mouse(body_t *body, Vector2 mousepos, int lmbpressed, int lmbreleased, int lmbdown, int *click_avail)

+{

+#warning TODO

+        return(0);

+}

+

+int

+im_body_draw(body_t *body, int windowwidth, int windowheight)

+{

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

+        dirdata_t *dirdata;

+        Vector2 v2,m2;

+        font_t *font,*fontbig,*fonthuge;

+        if(body==NULL)

+                return(-1);

+        font=body->ptrfont;

+        fontbig=body->ptrfontbig;

+        fonthuge=body->ptrfonthuge;

+        FILLWH(body->xywh,windowwidth-body->xywh.x,windowheight-body->xywh.y);

+        FILLXYWH(body->backxywh,0,0,0,0);

+        /* draw left side background */

+        DrawRectangle(body->xywh.x,body->xywh.y,body->leftsize, body->xywh.h, (Color){ 215, 215, 215, 255 } );

+        /* draw right side background */

+        DrawRectangle(body->xywh.x+body->leftsize,body->xywh.y,body->xywh.w-body->leftsize, body->xywh.h, (Color){ 227, 227, 227, 255 } );

+        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) {

+                        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 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 }

+                        );

+                        /* 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;

+                        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)

+                                        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 });

+                                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 } );

+                }

+                /* 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 */

+        int i,j,k,x;

+        menudata_t *menudata;

+        font_t *font;

         if(menubar==NULL || font==NULL)

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

+        font=menubar->ptrfont;

         DrawRectangle(0,0,windowwidth, font->height+font->height/2, (Color){ 235, 235, 235, 235 } );

         for(i=0,x=0;i<menubar->sizemenudata;i++) {

                 Vector2 v2;

@@ -523,6 +790,8 @@ im_menubar_draw(menubar_t *menubar, font_t *font, int windowwidth, int windowhei

                 x=menudata->xywh.x+menudata->xywh.w;

         }

         return(0);

+#endif

+        return(0);

 }

 int

@@ -662,6 +931,8 @@ getcodepoints(int *sizecodepoints)

 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,

 /* Latin-1 Supplement */

 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,

+/* down arrow (U+2186 -- this font doesn't have arrows, this is old roman numeral 50 */

+(0x21<<8)|0x86,

 };

         if(sizecodepoints!=NULL)

                 *sizecodepoints=(int) (sizeof(codepoints)/sizeof(codepoints[0]));

@@ -675,18 +946,21 @@ strptrcmp(void *a,void *b)

 }

 int

-listing_get(listing_t *listing, char *path, int flag_sort)

+listing_get(listing_t *listing, char *pathprefix, char *parampath, int flag_sort)

 {

         int l;

         DIR *d;

         struct dirent *de;

         unsigned char dtype;

+        char path[1024];

         if(listing==NULL)

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

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

-        if(path==NULL)

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

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

-        if((d=opendir(".." SEP "."))==NULL)

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

+        path[sizeof(path)-1]='\0';

+        if((d=opendir(path))==NULL)

                 return(-1); /* dir not found */

         while((de=readdir(d))!=NULL) {

                 l=strlen(de->d_name);

@@ -702,7 +976,7 @@ listing_get(listing_t *listing, char *path, int flag_sort)

                       :'u';

 #endif

                 if(dtype=='u') {

-                        char stpath[1024];

+                        char stpath[2048];

                         struct stat st;

                         mode_t m;

                         snprintf(stpath,sizeof(stpath),"%s%s%s",path,SEP,de->d_name);