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

  *      20250119 Creation. Menu bar.

  *      20250123 Load font.

  *      20250213 Support sticky drop-down menus.

+ *      20250216 Modularize menu handling.

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -47,6 +48,12 @@ typedef struct xywh_t {

         int h;

 } xywh_t;

+typedef struct font_t {

+        Font font;

+        int height;

+} font_t;

+

+

 typedef struct menudata_t {

         char *title;

         xywh_t xywh;

@@ -58,29 +65,40 @@ typedef struct menudata_t {

         int currentoption;

 } menudata_t;

+typedef struct menubar_t {

+        int sizemenudata;

+        menudata_t **menudata;

+} menubar_t;

+

 typedef struct dirdata_t {

         int height;

         char *dirname;

 } dirdata_t;

 typedef struct im_t {

+        int windowinit;

         int w;

         int h;

-        int sizemenudata;

-        menudata_t **menudata;

         int sizedirdata;

         dirdata_t **dirdata;

         int currentdirdata;

         int leftscrollpos;

         int rightscrollpos;

-        Font font;

-        int font_height;

+        menubar_t *menubar;

+        font_t *font;

 } im_t;

 im_t *im_init(char *menus);

 void im_free(im_t *im);

-int imdraw_menus(im_t *im);

+font_t *im_font_init(void);

+void im_font_free(font_t *font);

+

+menubar_t *im_menubar_init(char *menus);

+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 imutil_menu_count(char *menus);

 char *imutil_menu_get(char *menus, int targetn, int *len);

@@ -97,9 +115,9 @@ main(int argc, char *argv[])

         im_t *im;

         Vector2 mousepos;

         int flag_ignorelmb;

-        int i,j;

         int lmbpressed,lmbreleased,lmbdown;

-        int flag_outsideall;

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

                 return(1);

         }

@@ -109,69 +127,21 @@ main(int argc, char *argv[])

                 lmbpressed=IsMouseButtonPressed(0);

                 lmbreleased=IsMouseButtonReleased(0);

                 lmbdown=IsMouseButtonDown(0);

-                /* check if we have to open a menu */

-                flag_outsideall=1;

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

-                        int insidetitle,currentoption;

-                        insidetitle=is_imutil_insidexywh(mousepos,&(im->menudata[i]->xywh));

-                        currentoption=menudata_pos2option(im->menudata[i],mousepos);

-                        flag_outsideall=(currentoption!=-1 || insidetitle)?0:flag_outsideall;

-                        if(lmbreleased && insidetitle) {

-                                for(j=0;j<im->sizemenudata;j++) {

-                                        im->menudata[j]->flag_stickyopen=(j==i)?1:0;

-                                        im->menudata[j]->flag_open=0;

-                                        im->menudata[j]->currentoption=-1;

-                                }

-                        } else if((lmbpressed || lmbdown) && insidetitle) {

-                                for(j=0;j<im->sizemenudata;j++) {

-                                        im->menudata[j]->flag_open=(j==i)?1:0;

-                                        im->menudata[j]->flag_stickyopen=0;

-                                        im->menudata[j]->currentoption=-1;

-                                }

-                        } else if((lmbdown || im->menudata[i]->flag_stickyopen) && currentoption!=-1) {

-                                for(j=0;j<im->sizemenudata;j++) {

-                                        if(lmbreleased==0 || j!=i || im->menudata[i]->flag_stickyopen==0) {

-                                                im->menudata[j]->flag_open=(j==i)?im->menudata[i]->flag_open:0;

-                                                im->menudata[j]->flag_stickyopen=(j==i)?im->menudata[i]->flag_stickyopen:0;

-                                                im->menudata[j]->currentoption=(j==i)?currentoption:-1;

-                                        } else {

-                                                im->menudata[j]->flag_open=0;

-                                                im->menudata[j]->flag_stickyopen=0;

-                                                im->menudata[j]->currentoption=-1;

+                click_avail=1;

+                /* process clicks on menus */

+                if(click_avail) {

+                        sel_menu=sel_submenu=NULL;

+                        im_menubar_mouse(im->menubar, mousepos, lmbpressed, lmbreleased, lmbdown, &click_avail, &sel_menu, &sel_submenu);

+                        if(sel_menu!=NULL && sel_submenu!=NULL) {

 #if 1

-fprintf(stderr,"SELECTED: \"%s\"->\"%s\"\n",im->menudata[i]->title,im->menudata[i]->options[currentoption]);

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

 #endif

-                                        }

-                                }

-                        } else if(im->menudata[i]->flag_stickyopen && currentoption==-1) {

-                                if(lmbreleased) {

-                                        im->menudata[i]->flag_open=0;

-                                        im->menudata[i]->flag_stickyopen=0;

-                                }

-                                im->menudata[i]->currentoption=-1;

-                        } else if(lmbreleased && currentoption!=-1) {

-                                for(j=0;j<im->sizemenudata;j++) {

-                                        im->menudata[j]->flag_open=0;

-                                        im->menudata[j]->flag_stickyopen=0;

-                                        im->menudata[j]->currentoption=-1;

-                                }

-#if 1

-fprintf(stderr,"SELECTED: \"%s\"->\"%s\"\n",im->menudata[i]->title,im->menudata[i]->options[currentoption]);

-#endif

-                        } else if(lmbdown==0) {

-                                im->menudata[i]->flag_open=0;

-                                im->menudata[i]->flag_stickyopen=0;

-                                im->menudata[i]->currentoption=-1;

-                        }

-                }

-                if(flag_outsideall) {

-                        for(j=0;j<im->sizemenudata;j++) {

-                                im->menudata[j]->currentoption=-1;

                         }

                 }

+                /* draw screen contents */

                 BeginDrawing();

                 ClearBackground(RAYWHITE);

-                imdraw_menus(im);

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

                 EndDrawing();

         }

         CloseWindow();

@@ -183,51 +153,118 @@ im_t *

 im_init(char *menus)

 {

         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

+        ) {

+                im_free(im),im=NULL;

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

+        }

+        /* init window */

+        SetTraceLogLevel(LOG_ERROR);

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

+        im->windowinit=1;

+        SetTargetFPS(30);

+        /* init font */

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

+                im_free(im),im=NULL;

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

+        }

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

+                }

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

+        }

+        if(im->font!=NULL)

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

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

+        if(im->windowinit)

+                CloseWindow(),im->windowinit=0;

+#endif

+        free(im),im=NULL;

+        return;

+}

+

+font_t *

+im_font_init(void)

+{

+        font_t *font;

+        int sizecodepoints;

+        int *codepoints;

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

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

+        font->height=18;

+        codepoints=getcodepoints(&sizecodepoints);

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

+        return(font);

+}

+

+void

+im_font_free(font_t *font)

+{

+        if(font==NULL)

+                return;

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

+        UnloadFont(font->font);

+#endif

+        free(font),font=NULL;

+        return;

+}

+

+menubar_t *

+im_menubar_init(char *menus)

+{

         int i,j;

         char *str,*substr;

         int len,sublen;

+        menubar_t *menubar;

         menudata_t *menudata;

         if(menus==NULL)

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

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

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

-          || (im->menudata=calloc(im->sizemenudata,sizeof(menudata_t)))==NULL

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

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

+          || (menubar->menudata=calloc(menubar->sizemenudata,sizeof(menudata_t)))==NULL

         ) {

-                im_free(im),im=NULL;

+                im_menubar_free(menubar),menubar=NULL;

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

         }

         /* init menus */

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

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

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

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

                   || (str=imutil_menu_get(menus,i,&len))==NULL

                   || (menudata->title=imutil_strduplen(str,len))==NULL

                   || (menudata->sizeoptions=imutil_submenu_count(str))<=0

                   || (menudata->options=calloc(menudata->sizeoptions,sizeof(char *)))==NULL

                 ) {

-                        im_free(im),im=NULL;

+                        im_menubar_free(menubar),menubar=NULL;

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

                 }

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

                         if((substr=imutil_submenu_get(str,j,&sublen))==NULL

                           || (menudata->options[j]=imutil_strduplen(substr,sublen))==NULL

                         ) {

-                                im_free(im),im=NULL;

+                                im_menubar_free(menubar),menubar=NULL;

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

                         }

                 }

         }

-        /* init window */

-        SetTraceLogLevel(LOG_ERROR);

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

-        SetTargetFPS(30);

-        /* init font */

-        {

-                int sizecodepoints;

-                int *codepoints;

-                im->font_height=18;

-                codepoints=getcodepoints(&sizecodepoints);

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

-        }

 #if 0

         /* test imutil_menu_xxx */

         int n,m,l,ml,len,mlen;

@@ -248,26 +285,26 @@ im_init(char *menus)

 #endif

 #if 0

         /* test menudata */

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

-                fprintf(stderr,"menu[%i]:\"%s\"->",i,im->menudata[i]->title);

-                for(j=0;j<im->menudata[i]->sizeoptions;j++)

-                        fprintf(stderr,"|\"%s\"",im->menudata[i]->options[j]);

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

+                fprintf(stderr,"menu[%i]:\"%s\"->",i,menubar->menudata[i]->title);

+                for(j=0;j<menubar->menudata[i]->sizeoptions;j++)

+                        fprintf(stderr,"|\"%s\"",menubar->menudata[i]->options[j]);

                 fprintf(stderr,"\n");

         }

 #endif

-        return(im);

+        return(menubar);

 }

 void

-im_free(im_t *im)

+im_menubar_free(menubar_t *menubar)

 {

         int i,j;

-        if(im==NULL)

+        menudata_t *menudata;

+        if(menubar==NULL)

                 return;

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

-                menudata_t *menudata;

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

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

+        if(menubar->menudata!=NULL) {

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

+                        if((menudata=menubar->menudata[i])==NULL)

                                 continue;

                         if(menudata->title!=NULL)

                                 free(menudata->title),menudata->title=NULL;

@@ -278,41 +315,114 @@ im_free(im_t *im)

                                 }

                                 free(menudata->options),menudata->options=NULL,menudata->sizeoptions=0;

                         }

-                        free(im->menudata[i]),im->menudata[i]=NULL,menudata=NULL;

+                        free(menubar->menudata[i]),menubar->menudata[i]=NULL,menudata=NULL;

                 }

-                free(im->menudata),im->menudata=NULL,im->sizemenudata=0;

+                free(menubar->menudata),menubar->menudata=NULL,menubar->sizemenudata=0;

         }

-        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;

+        free(menubar),menubar=NULL;

+        return;

+}

+

+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 flag_outsideall;

+        int i,j;

+        if(menubar==NULL || click_avail==NULL || sel_menu==NULL || sel_submenu==NULL)

+                return(-1);

+        *click_avail=1;

+        *sel_menu=NULL;

+        *sel_submenu=NULL;

+        flag_outsideall=1;

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

+                int insidetitle,currentoption;

+                insidetitle=is_imutil_insidexywh(mousepos,&(menubar->menudata[i]->xywh));

+                currentoption=menudata_pos2option(menubar->menudata[i],mousepos);

+                flag_outsideall=(currentoption!=-1 || insidetitle)?0:flag_outsideall;

+                if(lmbreleased && insidetitle) {

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

+                                menubar->menudata[j]->flag_stickyopen=(j==i)?1:0;

+                                menubar->menudata[j]->flag_open=0;

+                                menubar->menudata[j]->currentoption=-1;

+                        }

+                } else if((lmbpressed || lmbdown) && insidetitle) {

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

+                                menubar->menudata[j]->flag_open=(j==i)?1:0;

+                                menubar->menudata[j]->flag_stickyopen=0;

+                                menubar->menudata[j]->currentoption=-1;

+                        }

+                } else if((lmbdown || menubar->menudata[i]->flag_stickyopen) && currentoption!=-1) {

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

+                                if(lmbreleased==0 || j!=i || menubar->menudata[i]->flag_stickyopen==0) {

+                                        menubar->menudata[j]->flag_open=(j==i)?menubar->menudata[i]->flag_open:0;

+                                        menubar->menudata[j]->flag_stickyopen=(j==i)?menubar->menudata[i]->flag_stickyopen:0;

+                                        menubar->menudata[j]->currentoption=(j==i)?currentoption:-1;

+                                } else {

+                                        menubar->menudata[j]->flag_open=0;

+                                        menubar->menudata[j]->flag_stickyopen=0;

+                                        menubar->menudata[j]->currentoption=-1;

+                                        /* has selected this submenu */

+                                        *click_avail=0;

+                                        *sel_menu=menubar->menudata[j]->title;

+                                        *sel_submenu=menubar->menudata[j]->options[currentoption];

+                                }

+                        }

+                } else if(menubar->menudata[i]->flag_stickyopen && currentoption==-1) {

+                        if(lmbreleased) {

+                                menubar->menudata[i]->flag_open=0;

+                                menubar->menudata[i]->flag_stickyopen=0;

+                        }

+                        menubar->menudata[i]->currentoption=-1;

+                } else if(lmbreleased && currentoption!=-1) {

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

+                                menubar->menudata[j]->flag_open=0;

+                                menubar->menudata[j]->flag_stickyopen=0;

+                                menubar->menudata[j]->currentoption=-1;

+                        }

+                        /* has selected this submenu */

+                        *click_avail=0;

+                        *sel_menu=menubar->menudata[i]->title;

+                        *sel_submenu=menubar->menudata[i]->options[currentoption];

+                } else if(lmbdown==0) {

+                        menubar->menudata[i]->flag_open=0;

+                        menubar->menudata[i]->flag_stickyopen=0;

+                        menubar->menudata[i]->currentoption=-1;

                 }

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

         }

-        free(im),im=NULL;

-        return;

+        if(flag_outsideall) {

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

+                        menubar->menudata[j]->currentoption=-1;

+                }

+        }

+        /* update click_avail */

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

+                if(menubar->menudata[j]->flag_open || menubar->menudata[j]->flag_stickyopen) {

+                        *click_avail=0;

+                        break;

+                }

+        }

+        return(0);

 }

 int

-imdraw_menus(im_t *im)

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

 {

         int i,j,k,x;

         menudata_t *menudata;

-        DrawRectangle(0,0,im->w, im->font_height+im->font_height/2, (Color){ 235, 235, 235, 235 } );

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

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

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

+        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=im->menudata[i];

-                v2=MeasureTextEx(im->font,menudata->title,im->font_height,0);

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

-                v2.x=(float) (menudata->xywh.x+im->font_height/2);

-                v2.y=(float) (menudata->xywh.y+im->font_height/4);

-                DrawTextEx(im->font

+                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

-                  ,im->font_height

+                  ,font->height

                   ,0

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

                 );

@@ -321,12 +431,12 @@ imdraw_menus(im_t *im)

                         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(im->font,menudata->options[j],im->font_height,0);

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

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

                         }

-                        maxw=(maxw<(menudata->xywh.w+im->font_height))?(menudata->xywh.w+im->font_height):maxw;

-                        maxw+=im->font_height;

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

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

@@ -336,13 +446,13 @@ imdraw_menus(im_t *im)

                                 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+(im->font_height+(im->font_height/2))*k,menudata->optionsxywh.w-2,im->font_height+im->font_height/2,(Color){ 53,132,228,255 });

-                                v2.x=(float) (menudata->optionsxywh.x+im->font_height/2);

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

-                                DrawTextEx(im->font

+                                        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

-                                  ,im->font_height

+                                  ,font->height

                                   ,0

                                   ,c

                                 );

@@ -352,7 +462,6 @@ imdraw_menus(im_t *im)

                 }

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

         }

-#warning TODO

         return(0);

 }