@@ -22,6 +22,8 @@

  *      20250308 Show statustooltip on image hover.

  *               Scrollwheel support for leftside.

  *               Fix thumb aspect ratio.

+ *      20250311 Fix bug because of stray CloseWindow() call.

+ *               Add show using all window with right button.

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -161,6 +163,15 @@ typedef struct dirdata_t {

         listing_t listing;

 } dirdata_t;

+typedef struct texture_t {

+        char currentpath[2048];

+        Texture2D texture;

+        int texturew;

+        int textureh;

+        int has_texture;

+        int has_failedload;

+} texture_t;

+

 typedef struct body_t {

         char *rootdir;

         xywh_t xywh;

@@ -174,12 +185,8 @@ typedef struct body_t {

         font_t *ptrfont;

         font_t *ptrfontbig;

         font_t *ptrfonthuge;

-        char currenttexture[2048];

-        Texture2D texture;

-        int texturew;

-        int textureh;

-        int has_texture;

-        int has_failedload;

+        texture_t texture;

+        texture_t bigtexture;

 } body_t;

 typedef struct im_t {

@@ -212,12 +219,16 @@ 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, Vector2 wheel, int lmbpressed, int lmbreleased, int lmbdown, int *click_avail);

-int im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int windowwidth, int windowheight);

+int im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int rmbdown, int windowwidth, int windowheight);

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

 void listing_freedata(listing_t *listing);

 int listing_fillxywh(listing_t *listing, font_t *font, int w, int sidelen, int is_left);

+int texture_load(texture_t *texture, char *fullpath, int maxw, int maxh);

+int texture_draw(texture_t *texture, int x0, int y0, int maxw, int maxh);

+int texture_freedata(texture_t *texture);

+

 int imutil_menu_count(char *menus);

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

 int imutil_submenu_count(char *menus);

@@ -235,7 +246,7 @@ main(int argc, char *argv[])

         im_t *im;

         Vector2 mousepos,wheel;

         int flag_ignorelmb;

-        int lmbpressed,lmbreleased,lmbdown;

+        int lmbpressed,lmbreleased,lmbdown,rmbdown;

         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",ROOTDIR))==NULL) {

@@ -248,6 +259,7 @@ main(int argc, char *argv[])

                 lmbpressed=IsMouseButtonPressed(0);

                 lmbreleased=IsMouseButtonReleased(0);

                 lmbdown=IsMouseButtonDown(0);

+                rmbdown=IsMouseButtonDown(1);

                 click_avail=1;

                 /* process clicks on menus */

                 if(click_avail) {

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

                 /* draw screen contents */

                 BeginDrawing();

                 ClearBackground(RAYWHITE);

-                im_body_draw(im->body,mousepos,lmbdown,im->w,im->h);

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

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

 #if 0

 {

@@ -352,10 +364,8 @@ im_free(im_t *im)

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

         if(im->fonthuge!=NULL)

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

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

         if(im->windowinit)

                 CloseWindow(),im->windowinit=0;

-#endif

         free(im),im=NULL;

         return;

 }

@@ -666,12 +676,8 @@ im_body_free(body_t *body)

                 }

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

         }

-        if(body->has_texture) {

-                UnloadTexture(body->texture);

-                body->currenttexture[0]='\0';

-                body->has_texture=0;

-                body->has_failedload=0;

-        }

+        texture_freedata(&(body->texture));

+        texture_freedata(&(body->bigtexture));

         if(body->rootdir!=NULL)

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

         free(body),body=NULL;

@@ -778,7 +784,7 @@ im_body_mouse(body_t *body, Vector2 mousepos, Vector2 wheel, int lmbpressed, int

 }

 int

-im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int windowwidth, int windowheight)

+im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int rmbdown, int windowwidth, int windowheight)

 {

         int i,k,margin,righty;

         int lastx,lasty;

@@ -788,6 +794,7 @@ im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int windowwidth, int w

         font_t *font,*fontbig,*fonthuge;

         int is_leftside;

         int flag_skiprightside;

+        int flag_skipall;

         int xoff,yoff;

         thumb_t *thumb;

         char statustooltip[1024];

@@ -819,8 +826,8 @@ im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int windowwidth, int w

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

         /* first pass, draw leftside, second pass, draw all of rightside */

         statustooltip[0]='\0';

-        for(is_leftside=1,flag_skiprightside=0;is_leftside>=0 && flag_skiprightside==0;is_leftside--) {

-                for(i=(is_leftside)?body->currentdirdata:0,righty=body->xywh.y;(is_leftside && i==body->currentdirdata) || (!is_leftside && i<body->sizedirdata);i++) {

+        for(is_leftside=1,flag_skiprightside=flag_skipall=0;is_leftside>=0 && flag_skiprightside==0 && flag_skipall==0;is_leftside--) {

+                for(i=(is_leftside)?body->currentdirdata:0,righty=body->xywh.y;flag_skipall==0 && ((is_leftside && i==body->currentdirdata) || (!is_leftside && i<body->sizedirdata));i++) {

                         int sidelen;

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

                                 continue;

@@ -962,56 +969,49 @@ fprintf(stderr,"elem:\"%s\" sidelen:%i old:%ix%i new:%ix%i\n",elem->name+1,sidel

                                                 DrawTexture(*te,thumb->screenxywh.x,thumb->screenxywh.y,WHITE);

                                                 has_imagedrawn=1;

                                                 lastx=xywh->x+xywh->w,lasty=xywh->y+xywh->h+yoff;

-                                                if(is_leftside && lmbdown==0 && is_imutil_insidexywh(mousepos,&(thumb->screenxywh),margin)) {

+                                                if(is_leftside && lmbdown==0 && rmbdown==0 && is_imutil_insidexywh(mousepos,&(thumb->screenxywh),margin)) {

                                                         /* draw image in rightside */

-                                                        char path[2048];

+                                                        char fullpath[2048];

                                                         int maxw,maxh;

-                                                        snprintf(path,sizeof(path),"%s/%s",dirdata->dirname,elem->name+1);

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

                                                         maxw=windowwidth-(body->leftsize-DEFAULTDIRDATATRIANGLEW);

                                                         maxh=windowheight-body->xywh.y;

-                                                        if((body->has_texture==0 && !(body->has_failedload && strcmp(body->currenttexture,path)==0))

-                                                          || strcmp(body->currenttexture,path)!=0

+                                                        snprintf(fullpath,sizeof(fullpath),"%s/%s/%s",body->rootdir,dirdata->dirname,elem->name+1);

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

+                                                        if((body->texture.has_texture==0 && !(body->texture.has_failedload && strcmp(body->texture.currentpath,fullpath)==0))

+                                                          || strcmp(body->texture.currentpath,fullpath)!=0

                                                         ) {

-                                                                Image im;

-                                                                int neww,newh;

-                                                                char fullpath[2048];

-                                                                if(body->has_texture) {

-                                                                        UnloadTexture(body->texture);

-                                                                        body->currenttexture[0]='\0';

-                                                                        body->has_texture=0;

-                                                                        body->has_failedload=0;

-                                                                }

-                                                                snprintf(fullpath,sizeof(fullpath),"%s/%s/%s",body->rootdir,dirdata->dirname,elem->name+1);

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

-                                                                im=LoadImage(fullpath);

-                                                                if(IsImageValid(im)) {

-                                                                        im_util_aspectmaximize(im.width,im.height,maxw,maxh,&neww,&newh);

-                                                                        ImageResize(&im,neww,newh);

-                                                                        body->texture=LoadTextureFromImage(im);

-                                                                        UnloadImage(im);

-                                                                        strncpy(body->currenttexture,fullpath,sizeof(body->currenttexture));

-                                                                        body->currenttexture[sizeof(body->currenttexture)-1]='\0';

-                                                                        body->has_texture=1;

-                                                                        body->has_failedload=0;

-                                                                        body->texturew=neww;

-                                                                        body->textureh=newh;

-                                                                } else {

-                                                                        strncpy(body->currenttexture,fullpath,sizeof(body->currenttexture));

-                                                                        body->currenttexture[sizeof(body->currenttexture)-1]='\0';

-                                                                        body->has_texture=0;

-                                                                        body->has_failedload=1;

-                                                                }

+                                                                texture_load(&(body->texture),fullpath,maxw,maxh);

                                                         }

-                                                        if(body->has_texture) {

+                                                        if(body->texture.has_texture && strcmp(body->texture.currentpath,fullpath)==0) {

                                                                 int x0,y0;

                                                                 x0=body->leftsize-DEFAULTDIRDATATRIANGLEW;

                                                                 y0=body->xywh.y;

-                                                                DrawRectangle(x0,y0,maxw,maxh,(Color){ 215, 215, 215, 255 } );

-                                                                DrawTexture(body->texture,x0+(maxw-body->texturew)/2,y0+(maxh-body->textureh)/2,WHITE);

+                                                                texture_draw(&(body->texture),x0,y0,maxw,maxh);

                                                                 flag_skiprightside=1;

                                                         }

                                                 }

+                                                if(is_leftside && lmbdown==0 && rmbdown!=0 && is_imutil_insidexywh(mousepos,&(thumb->screenxywh),margin)) {

+                                                        /* draw image in full screen */

+                                                        char fullpath[2048];

+                                                        int maxw,maxh;

+                                                        maxw=windowwidth;

+                                                        maxh=windowheight-body->xywh.y;

+                                                        snprintf(fullpath,sizeof(fullpath),"%s/%s/%s",body->rootdir,dirdata->dirname,elem->name+1);

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

+                                                        if((body->bigtexture.has_texture==0 && !(body->bigtexture.has_failedload && strcmp(body->bigtexture.currentpath,fullpath)==0))

+                                                          || strcmp(body->bigtexture.currentpath,fullpath)!=0

+                                                        ) {

+                                                                texture_load(&(body->bigtexture),fullpath,maxw,maxh);

+                                                        }

+                                                        if(body->bigtexture.has_texture && strcmp(body->bigtexture.currentpath,fullpath)==0) {

+                                                                int x0,y0;

+                                                                x0=0;

+                                                                y0=body->xywh.y;

+                                                                texture_draw(&(body->bigtexture),x0,y0,maxw,maxh);

+                                                                flag_skipall=1;

+                                                                break;

+                                                        }

+                                                }

                                         }

                                 }

                                 if(has_imagedrawn==0) {

@@ -1065,6 +1065,65 @@ fprintf(stderr,"elem:\"%s\" sidelen:%i old:%ix%i new:%ix%i\n",elem->name+1,sidel

         return(0);

 }

+int

+texture_load(texture_t *texture, char *fullpath, int maxw, int maxh)

+{ 

+        Image im;

+        int neww,newh;

+        if(texture==NULL || fullpath==NULL)

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

+        if(texture->has_texture) {

+                UnloadTexture(texture->texture);

+                texture->currentpath[0]='\0';

+                texture->has_texture=0;

+                texture->has_failedload=0;

+        }

+        texture->currentpath[0]='\0';

+        im=LoadImage(fullpath);

+        if(IsImageValid(im)) {

+                im_util_aspectmaximize(im.width,im.height,maxw,maxh,&neww,&newh);

+                ImageResize(&im,neww,newh);

+                texture->texture=LoadTextureFromImage(im);

+                UnloadImage(im);

+                strncpy(texture->currentpath,fullpath,sizeof(texture->currentpath));

+                texture->currentpath[sizeof(texture->currentpath)-1]='\0';

+                texture->has_texture=1;

+                texture->has_failedload=0;

+                texture->texturew=neww;

+                texture->textureh=newh;

+        } else {

+                strncpy(texture->currentpath,fullpath,sizeof(texture->currentpath));

+                texture->currentpath[sizeof(texture->currentpath)-1]='\0';

+                texture->has_texture=0;

+                texture->has_failedload=1;

+        }

+        return(0);

+}

+

+int

+texture_draw(texture_t *texture, int x0, int y0, int maxw, int maxh)

+{

+        if(texture==NULL || texture->has_texture==0)

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

+        DrawRectangle(x0,y0,maxw,maxh,(Color){ 215, 215, 215, 255 } );

+        DrawTexture(texture->texture,x0+(maxw-texture->texturew)/2,y0+(maxh-texture->textureh)/2,WHITE);

+        return(0);

+}

+

+int

+texture_freedata(texture_t *texture)

+{

+        if(texture==NULL)

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

+        if(texture->has_texture) {

+                UnloadTexture(texture->texture);

+                texture->currentpath[0]='\0';

+                texture->has_texture=0;

+                texture->has_failedload=0;

+        }

+        return(0);

+}

+

 int

 imutil_menu_count(char *menus)

 {