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

  *               Add show using all window with right button.

  *      20250316 Add android target support.

  *               Delay loading images if over fps deadline.

+ *               Scroll by finger. Big image on double click.

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -46,7 +47,9 @@

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

+#ifndef ANDROID

 #define SIMANDROID

+#endif

 #define TARGETFPS 30

@@ -74,6 +77,8 @@

 #define FONTHUGESIZE 48

 #endif

+#define SCROLLTHRESHOLD (LEFTIMAGESIDELEN/3)

+

 #if defined(SIMANDROID)

 #undef ROOTDIR

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

@@ -192,6 +197,7 @@ typedef struct texture_t {

         int textureh;

         int has_texture;

         int has_failedload;

+        xywh_t source; /* be able to detect a "double click" */

 } texture_t;

 typedef struct body_t {

@@ -208,7 +214,9 @@ typedef struct body_t {

         font_t *ptrfontbig;

         font_t *ptrfonthuge;

         texture_t texture;

+        int is_displayingtexture;

         texture_t bigtexture;

+        int flag_drawbigtexture;

 } body_t;

 typedef struct im_t {

@@ -264,17 +272,23 @@ int is_imagefilename(char *filename);

 Image imutil_loadimage(const char *filename);

 void imutil_fpsreset(void);

 int imutil_fpsleft(void);

+long long imutil_milliseconds(void);

 int

 main(int argc, char *argv[])

 {

         im_t *im;

-        Vector2 mousepos,wheel,oldmousepos;

+        Vector2 mousepos,wheel,oldmousepos,scrollstartpos;

         int flag_ignorelmb;

         int lmbpressed,lmbreleased,lmbdown,rmbdown,oldlmbdown,oldrmbdown;

         int click_avail;

         int has_mousechanges;

         int needs_nextredraw;

+        long long scrollstart;

+        long long scrolllast;

+        int scrollspeed;

+        int is_scrolling;

+        int leftscrollposstart;

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

                 return(1);

@@ -283,6 +297,8 @@ main(int argc, char *argv[])

         mousepos=(Vector2) {.x=0,.y=0};

         lmbdown=rmbdown=-1;

         needs_nextredraw=1;

+        scrollstart=0;

+        is_scrolling=0;

         while(!WindowShouldClose()) {

                 imutil_fpsreset();

                 oldmousepos=mousepos;

@@ -296,21 +312,57 @@ main(int argc, char *argv[])

                 rmbdown=IsMouseButtonDown(1);

                 click_avail=1;

                 has_mousechanges=(lmbdown!=oldlmbdown || rmbdown!=oldrmbdown || mousepos.x!=oldmousepos.x || mousepos.y!=oldmousepos.y || wheel.x!=0 || wheel.y!=0)?1:0;

-                needs_nextredraw=(has_mousechanges==0 && needs_nextredraw==0)?0:1;

-                if(needs_nextredraw==0) {

-                        BeginDrawing();

-                        EndDrawing();

-                        continue;

-                }

                 needs_nextredraw=0;

+                /* process scrolling */

+                if(lmbdown==1 && oldlmbdown==0 && scrollstart==0 && mousepos.y>im->body->xywh.y) {

+                        scrollstart=imutil_milliseconds();

+                        scrollstartpos=mousepos;

+                        leftscrollposstart=im->body->leftscrollpos;

+                }

+                if(scrollstart!=0 && lmbdown==0) {

+                        scrollstart=0;

+                        if(is_scrolling)

+                                click_avail=0; /* this click is the mouseup of the scroll */

+                }

+                is_scrolling=(scrollstart==0)?0:is_scrolling;

+                if(is_scrolling==0 && scrollstart!=0) {

+                        float t;

+                        t=scrollstartpos.y-mousepos.y;

+                        t=(t<0)?-t:t;

+                        if(t>SCROLLTHRESHOLD) {

+                                is_scrolling=1;

+                                scrolllast=0;

+                        }

+                        t=scrollstartpos.x-mousepos.x;

+                        t=(t<0)?-t:t;

+                        if(t>SCROLLTHRESHOLD)

+                                is_scrolling=0,scrollstart=0;

+                }

+                if(is_scrolling) {

+                        long long tcur,tdif;

+                        long long ycur;

+                        tcur=imutil_milliseconds();

+                        tdif=tcur-scrolllast;

+                        ycur=scrollstartpos.y-mousepos.y;

+                        scrollspeed=(tdif>0)?(oldmousepos.y-mousepos.y)*100000/tdif:0;

+                        im->body->leftscrollpos=leftscrollposstart+ycur;

+                        scrolllast=tcur;

+                }

+                if(is_scrolling==0 && scrollspeed!=0) {

+                        scrollspeed=scrollspeed*4/5;

+                        im->body->leftscrollpos+=scrollspeed;

+                }

                 /* 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",sel_menu,sel_submenu);

 #endif

+                                if(strcmp(sel_submenu,"Salir")==0)

+                                        break; /* exit from main loop */

                         }

                 }

                 if(click_avail)

@@ -353,6 +405,13 @@ fprintf(stderr,"SELECTED: \"%s\"->\"%s\"\n",sel_menu,sel_submenu);

  }

 }

 #endif

+                if(has_mousechanges==0 && needs_nextredraw==0) {

+                        /* Wait for new events when calling EndDrawing() */

+                        EnableEventWaiting();

+                } else {

+                        /* EndDrawing() doesn't wait for new events, returns immediately */

+                        DisableEventWaiting();

+                }

                 EndDrawing();

         }

         im_free(im),im=NULL;

@@ -764,6 +823,7 @@ im_body_mouse(body_t *body, Vector2 mousepos, Vector2 wheel, int lmbpressed, int

         char *ptr;

         dirdata_t *dirdata;

         listingdata_t *ld;

+        int margin;

         if(body==NULL || click_avail==NULL || body->currentdirdata<0 || body->currentdirdata>=body->sizedirdata || body->dirdata[body->currentdirdata]==NULL)

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

         dirdata=body->dirdata[body->currentdirdata];

@@ -775,6 +835,17 @@ im_body_mouse(body_t *body, Vector2 mousepos, Vector2 wheel, int lmbpressed, int

         /* check if we have to process a click */

         if(*click_avail==0 || lmbreleased==0)

                 return(0); /* nothing else to do */

+        /* show image in full screen */

+        if(body->flag_drawbigtexture) {

+                if(lmbreleased)

+                        body->flag_drawbigtexture=0;

+                return(0); /* nothing else to do */

+        }

+        margin=body->ptrfont->height/4;

+        if(body->is_displayingtexture && lmbreleased && is_imutil_insidexywh(mousepos,&(body->texture.source),margin)) {

+                body->flag_drawbigtexture=1;

+                return(0); /* nothing else to do */

+        }

         /* leftside backbutton */

         if(is_imutil_insidexywh(mousepos,&(body->backxywh),0)) {

                 static char sep[]={SEP};

@@ -845,6 +916,25 @@ im_body_draw(body_t *body, Vector2 mousepos, int lmbdown, int rmbdown, int windo

         fonthuge=body->ptrfonthuge;

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

         margin=font->height/4;

+        body->is_displayingtexture=0;

+        /* if we are displaying a full screenimage... */

+        if(body->flag_drawbigtexture && body->texture.has_texture) {

+                /* draw image in full screen */

+                int maxw,maxh;

+                maxw=windowwidth;

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

+                if(body->bigtexture.has_texture==0 || strcmp(body->bigtexture.currentpath,body->texture.currentpath)!=0)

+                        texture_load(&(body->bigtexture),body->texture.currentpath,maxw,maxh);

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

+                        int x0,y0;

+                        x0=0;

+                        y0=body->xywh.y;

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

+                        return(0); /* all done */

+                } else {

+                        body->flag_drawbigtexture=0; /* error loading big texture, draw screen normally */

+                }

+        }

         /* calculate positions */

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

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

@@ -1011,7 +1101,7 @@ 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 && rmbdown==0 && is_imutil_insidexywh(mousepos,&(thumb->screenxywh),margin)) {

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

                                                         /* draw image in rightside */

                                                         char fullpath[2048];

                                                         int maxw,maxh;

@@ -1029,31 +1119,11 @@ fprintf(stderr,"elem:\"%s\" sidelen:%i old:%ix%i new:%ix%i\n",elem->name+1,sidel

                                                                 x0=body->leftsize-DEFAULTDIRDATATRIANGLEW;

                                                                 y0=body->xywh.y;

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

+                                                                body->is_displayingtexture=1;

+                                                                memcpy(&(body->texture.source),&(thumb->screenxywh),sizeof(body->texture.source));

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

@@ -1639,3 +1709,13 @@ imutil_fpsleft(void)

         return(1);

 }

+long long

+imutil_milliseconds(void)

+{

+        long long res;

+        struct timeval now;

+        gettimeofday(&now,NULL);

+        res=((long long) (now.tv_sec))*1000000L+((long long) (now.tv_usec));

+        return(res);

+}

+