@@ -520,8 +520,13 @@ im_body_draw(body_t *body, mousedata_t *mousedata, int windowwidth, int windowhe

                 IMDEBUG("begin draw");

                 maxw=windowwidth;

                 maxh=windowheight-body->whxy.y;

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

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

+#if 1

+fprintf(stderr,"~~~ TEXTURE_LOAD FOR BIGTEXTURE \"%s\"\n",body->texture.currentpath);

+#endif

+                        bg_add(body->bg,body->texture.currentpath,1);

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

+                }

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

                         int x0,y0;

                         x0=0;

@@ -529,7 +534,10 @@ im_body_draw(body_t *body, mousedata_t *mousedata, int windowwidth, int windowhe

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

                         return(0); /* all done */

                 } else {

+#if 0

+#warning TEMP

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

+#endif

                 }

         }

         /* calculate positions */

@@ -716,7 +724,7 @@ fprintf(stderr,"elem:\"%s\" sidelen:%i old:%ix%i new:%ix%i\n",elem->name+1,sidel

                                                                 thumb->has_failedload=1;

                                                         }

                                                 } else if(bgload==NULL) {

-                                                        bg_add(body->bg,fullpath);

+                                                        bg_add(body->bg,fullpath,0);

                                                 }

                                         }

                                         if(thumb->has_texture!=0) {

@@ -784,7 +792,7 @@ fprintf(stderr,"elem:\"%s\" sidelen:%i old:%ix%i new:%ix%i\n",elem->name+1,sidel

                                 }

                         }

                         if(imageundermouse[0]!='\0')

-                                bg_add(body->bg,imageundermouse); /* to prioritise loading this image */

+                                bg_add(body->bg,imageundermouse,0); /* to prioritise loading this image */

                         for(;k<dirdata->listing.usedelems;k++) {

                                 elem=dirdata->listing.elems+k;

                                 if(elem->name[0]!='f' && elem->name[0]!='l')

@@ -1124,11 +1132,15 @@ texture_load(texture_t *texture, char *fullpath, int maxw, int maxh, bg_t *bg)

                 texture->has_texture=0;

                 texture->has_failedload=0;

         }

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

         if(bg!=NULL && (bgload=bg_get(bg,texture->currentpath))!=NULL && bgload->has_data!=0) {

                 im=ImageCopy(bgload->image);

         } else {

+#if 0

+#warning TEST CODE

+                return(-1); /* if not loaded in background, return -1 to indicate "not ready" */

+#else

                 im=global_loadimage(fullpath);

+#endif

         }

         if(IsImageValid(im)) {

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

@@ -35,7 +35,7 @@

 #define SCROLLTHRESHOLD (LEFTIMAGESIDELEN/3)

 #define WHEELSTEP LEFTIMAGESIDELEN

 #define SEP '/'

-#define SIZEBGLOAD 256

+#define SIZEBGLOAD (3*((DEFAULTWIDTH+(LEFTIMAGESIDELEN-1))/LEFTIMAGESIDELEN)*((DEFAULTHEIGHT+(LEFTIMAGESIDELEN-1))/LEFTIMAGESIDELEN))

 #define DEFAULTDIRDATAHEIGHT 492

 #define ADDREMOVEDIRDATAHEIGHT 128

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

@@ -45,7 +45,13 @@

 #define BLOCKDIRDATA 16

 #define MYFUNC "UNKNOWN"

+#if 0

 #define IMDEBUG(a) fprintf(stderr,"%s:%i: %s: %s\n",__FILE__,__LINE__,MYFUNC,a)

+#define IMDEBUG2(a) fprintf(stderr,"%s:%i: %s: ",__FILE__,__LINE__,MYFUNC),fprintf a

+#else

+#define IMDEBUG(a)

+#define IMDEBUG2(a)

+#endif

 // RIGHTSIDEMARGIN=FONTBIGSIZE/2

@@ -495,6 +501,7 @@ im_body_draw(body_t *body, mousedata_t *mousedata, int windowwidth, int windowhe

         int xoff,yoff;

         thumb_t *thumb;

         char statustooltip[1024];

+        char imageundermouse[1024];

         thumb_t *selectedthumb;

         IMDEBUG("Pre-sanitycheck");

         if(body==NULL)

@@ -549,18 +556,15 @@ im_body_draw(body_t *body, mousedata_t *mousedata, int windowwidth, int windowhe

                 rayui_scrollablerectadd(body->rayui,mousedata,&whxy,"body.leftside",body->dirdata[body->currentdirdata]->leftscrollpos,(int (*)(void *, Vector2))im_body_tryselect,body,SCROLLTHRESHOLD);

         }

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

-fprintf(stderr,"%ix%i+%i+%i\n",body->leftsize, body->whxy.h,body->whxy.x,body->whxy.y);

+        IMDEBUG2((stderr,"%ix%i+%i+%i\n",body->leftsize, body->whxy.h,body->whxy.x,body->whxy.y));

         /* draw right side background */

-#if 1

-fprintf(stderr,"body->whxy:%ix%i+%i+%i\n",UNROLLWHXY(body->whxy));

-fprintf(stderr,"body->leftsize:%i\n",body->leftsize);

-#endif

+        IMDEBUG2((stderr,"body->whxy:%ix%i+%i+%i\n",UNROLLWHXY(body->whxy)));

+        IMDEBUG2((stderr,"body->leftsize:%i\n",body->leftsize));

         IMDEBUG("draw right bg");

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

-fprintf(stderr,"DrawRectangle(body->whxy.x(%i)+body->leftsize(%i),body->whxy.y(%i),body->whxy.w(%i)-body->leftsize(%i), body->whxy.h(%i), (Color){ 227, 227, 227, 255 } );\n"

-        ,body->whxy.x,body->leftsize,body->whxy.y,body->whxy.w,body->leftsize, body->whxy.h);

-

-fprintf(stderr,"%ix%i+%i+%i\n",body->whxy.w-body->leftsize, body->whxy.h,body->whxy.x+body->leftsize,body->whxy.y);

+        IMDEBUG2((stderr,"DrawRectangle(body->whxy.x(%i)+body->leftsize(%i),body->whxy.y(%i),body->whxy.w(%i)-body->leftsize(%i), body->whxy.h(%i), (Color){ 227, 227, 227, 255 } );\n"

+        ,body->whxy.x,body->leftsize,body->whxy.y,body->whxy.w,body->leftsize, body->whxy.h));

+        IMDEBUG2((stderr,"%ix%i+%i+%i\n",body->whxy.w-body->leftsize, body->whxy.h,body->whxy.x+body->leftsize,body->whxy.y));

         /* reset lazy load marks */

         bg_resetmarks(body->bg);

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

@@ -648,6 +652,7 @@ DrawRectangle(UNROLLXYWH(body->backwhxy),((Color){ 0,255,0,255 })); /* hit zone

                                 FILLWHXY(thumb->screenwhxy,0,0,0,0);

                         }

                         /* files */

+                        imageundermouse[0]='\0';

                         for(k=0,lastx=lasty=0;k<dirdata->listing.usedelems;k++) {

                                 Texture2D *te;

                                 whxy_t *whxy;

@@ -669,6 +674,10 @@ DrawRectangle(UNROLLXYWH(body->backwhxy),((Color){ 0,255,0,255 })); /* hit zone

                                 /* show image */

                                 has_imagedrawn=0;

                                 if(is_imagefilename(elem->name+1) && !(thumb->screenwhxy.y>(body->whxy.y+body->whxy.h) || (thumb->screenwhxy.y+thumb->screenwhxy.h)<body->whxy.y)) {

+                                        if(is_global_insidewhxy(mousedata->mousepos,&(thumb->screenwhxy),0)) {

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

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

+                                        }

                                         if(thumb->has_texture==0 && thumb->has_failedload==0) {

                                                 bgload_t *bgload;

                                                 char fullpath[2048];

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

                                         selectedthumb=thumb;

                                 }

                         }

+                        if(imageundermouse[0]!='\0')

+                                bg_add(body->bg,imageundermouse); /* to prioritise loading this image */

                         for(;k<dirdata->listing.usedelems;k++) {

                                 elem=dirdata->listing.elems+k;

                                 if(elem->name[0]!='f' && elem->name[0]!='l')

@@ -30,7 +30,8 @@

 #define DEFAULTWIDTH 1280

 #define DEFAULTHEIGHT 768

-#define LEFTIMAGESIDELEN 326

+//#define LEFTIMAGESIDELEN 326

+#define LEFTIMAGESIDELEN 64

 #define SCROLLTHRESHOLD (LEFTIMAGESIDELEN/3)

 #define WHEELSTEP LEFTIMAGESIDELEN

 #define SEP '/'

@@ -1,40 +1,11 @@

 /*

  * imgmover.c

  *

- * Simple C application using raylib to move images between directories.

+ * Simple C application using raylib to cselect/rotate/classify/arrange photos.

  *

  * History:

- *      20250119 Creation. Menu bar.

- *      20250123 Load font.

- *      20250213 Support sticky drop-down menus.

- *      20250216 Modularize menu handling.

- *      20250222 Able to list files.

- *      20250223 Draw pane titles and main dir list.

- *      20250224 Draw right dir list and store elem positions.

- *      20250225 Draw image placeholders

- *      20250226 Fix rightside positions

- *      20250228 Navigate directories

- *      20250301 Aesthetic fixes for leftside.

- *               Basic image loading.

- *               Show big image on hover.

- *               Preserve aspect ratio of big image.

- *      20250305 Scrollable left pane.

- *      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.

- *      20250316 Add android target support.

- *               Delay loading images if over fps deadline.

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

- *      20250319 Add-dirdata button.

- *      20250320 Fix add-dirdata button appearance.

- *               Dirdata colors. Select dirdata.

- *      20250329 Background loading of thumbnails.

- *      20250330 Refine background loading.

- *      20250413 Background loading for windows target.

- *      20250420 Fix background loading for windows target.

- *      20250427 Start move image functionality.

+ *      20250902 Rewrite using parts of old prototype.

+ *      20250920 Reimplemented all scroll functionality.

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -54,152 +25,32 @@

 #include "win32_pipe.h"

 #endif

-#include "raylib.h"

-#include "roboto_regular.c"

+#include "rayui.h"

+#include "bg.h"

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

-

-//#ifndef ANDROID

-//#define SIMANDROID

-//#endif

-

-#define TARGETFPS 30

-

-#if defined(ANDROID) || defined(SIMANDROID)

-#define ROOTDIR "/sdcard/"

-#define DEFAULTWIDTH 2400

-#define DEFAULTHEIGHT 1080

-#define LEFTSIZE 1600

-#define DEFAULTDIRDATAHEIGHT 492

-#define DEFAULTDIRDATATRIANGLEW 100

-#define LEFTIMAGESIDELEN 326

-#define FONTSIZE 64

-#define FONTBIGSIZE 96

-#define FONTHUGESIZE 128

-#define ADDREMOVEDIRDATAHEIGHT 128

-#else

-#if !defined(__linux__) && !defined(ANDROID)

-#define ROOTDIR "Z:\\"

-#define SEP "\\"

-#else

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

-#define ROOTDIR "/"

-#define SEP "/"

-#endif

 #define DEFAULTWIDTH 1280

 #define DEFAULTHEIGHT 768

-#define LEFTSIZE 720

-#define DEFAULTDIRDATAHEIGHT 150

-#define DEFAULTDIRDATATRIANGLEW 35

-#define LEFTIMAGESIDELEN 125

-#define FONTSIZE 18

-#define FONTBIGSIZE 32

-#define FONTHUGESIZE 48

-#define ADDREMOVEDIRDATAHEIGHT 128

-#endif

-

+#define LEFTIMAGESIDELEN 326

 #define SCROLLTHRESHOLD (LEFTIMAGESIDELEN/3)

-

-

-#if defined(SIMANDROID)

-#undef ROOTDIR

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

-#endif

-

 #define WHEELSTEP LEFTIMAGESIDELEN

-

-

+#define SEP '/'

+#define SIZEBGLOAD 256

+#define DEFAULTDIRDATAHEIGHT 492

+#define ADDREMOVEDIRDATAHEIGHT 128

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

+#define DEFAULTDIRDATATRIANGLEW 35

 #define BLOCKLISTINGBUF 2048

 #define BLOCKLISTINGELEMS 1024

 #define BLOCKDIRDATA 16

-#define SIZEBGLOAD 256

-#ifndef FILLXY

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

-#endif

+#define MYFUNC "UNKNOWN"

+#define IMDEBUG(a) fprintf(stderr,"%s:%i: %s: %s\n",__FILE__,__LINE__,MYFUNC,a)

-#ifndef FILLWH

-#define FILLWH(xywh,valw,valh) (xywh).w=(valw),(xywh).h=(valh)

-#endif

-

-#ifndef FILLXYWH

-#define FILLXYWH(xywh,valx,valy,valw,valh) (xywh).x=(valx),(xywh).y=(valy),(xywh).w=(valw),(xywh).h=(valh)

-#endif

-

-#ifndef UNROLLXYWH

-#define UNROLLXYWH(xywh) (xywh).x,(xywh).y,(xywh).w,(xywh).h

-#endif

-

-#ifndef UNROLLWHXY

-#define UNROLLWHXY(xywh) (xywh).w,(xywh).h,(xywh).x,(xywh).y

-#endif

-

-#ifndef RD

-#define RD 0

-#endif

-

-#ifndef WR

-#define WR 1

-#endif

-

-#if !defined(__linux__) && !defined(ANDROID)

-int MessageBoxA(void *hWnd,void *lpText,void *lpCaption,unsigned int uType);

-#define messagebox(str) MessageBoxA(NULL,str,"imgmover",0);

-#else

-#define messagebox(str) fprintf(stderr,"%s\n",str);

-#endif

-

-

-

-#if !defined(__linux__) && !defined(ANDROID) && RAYLIB_VERSION_MAJOR==5 && RAYLIB_VERSION_MINOR==0

-/* the old raylib used in the windows build lacks this function */

-bool IsImageValid(Image image)

-{

-    bool result = false;

-

-    if ((image.data != NULL) &&     // Validate pixel data available

-        (image.width > 0) &&        // Validate image width

-        (image.height > 0) &&       // Validate image height

-        (image.format > 0) &&       // Validate image format

-        (image.mipmaps > 0)) result = true; // Validate image mipmaps (at least 1 for basic mipmap level)

-

-    return result;

-}

-#endif

-

-typedef struct xywh_t {

-        int x;

-        int y;

-        int w;

-        int h;

-} xywh_t;

-

-typedef struct font_t {

-        Font font;

-        int height;

-} font_t;

-

-typedef struct menudata_t {

-        char *title;

-        xywh_t xywh;

-        int sizeoptions;

-        char **options;

-        xywh_t optionsxywh;

-        int flag_open;

-        int flag_stickyopen;

-        int currentoption;

-} menudata_t;

-

-typedef struct menubar_t {

-        int height;

-        int sizemenudata;

-        menudata_t **menudata;

-        font_t *ptrfont;

-} menubar_t;

+// RIGHTSIDEMARGIN=FONTBIGSIZE/2

 typedef struct thumb_t {

-        xywh_t xywh;

-        xywh_t screenxywh;

+        whxy_t whxy;

+        whxy_t screenwhxy;

         Texture2D texture;

         int has_texture;

         int has_failedload;

@@ -218,9 +69,9 @@ typedef struct listing_t {

         int sizebuf;

         int usedbuf;

         char *buf;

-        int has_leftxywh;

-        int has_rightxywh;

-        xywh_t lastleftxywh;

+        int has_leftwhxy;

+        int has_rightwhxy;

+        whxy_t lastleftwhxy;

 } listing_t;

 typedef struct dirdata_t {

@@ -237,35 +88,14 @@ typedef struct texture_t {

         int textureh;

         int has_texture;

         int has_failedload;

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

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

 } texture_t;

-typedef struct bgload_t {

-        /* main/thread ownership management */

-        int lended_to_thread; // written from main, read from thread

-        int thread_finished; // written from thread, read from main

-        int is_todo;  // written from main, read from thread

-        int has_mark;  // written/read from main

-        /* data only accessed from owner */

-        char path[1024]; // to use only from owner

-        Image image; // to use only from owner

-        int has_data; // to use only from owner

-        int has_failedload; // to use only from owner

-} bgload_t;

-

-typedef struct bg_t {

-        int sizebgload;

-        bgload_t *bgload;

-        int pipe[2];

-        pthread_t thread;

-        pthread_attr_t tattr;

-        int flag_threadstarted;

-} bg_t;

-

 typedef struct body_t {

+        rayui_t *rayui;

         char *rootdir;

-        xywh_t xywh;

-        xywh_t backxywh;

+        whxy_t whxy;

+        whxy_t backwhxy;

         int leftsize;

         int sizedirdata;

         dirdata_t **dirdata;

@@ -278,223 +108,74 @@ typedef struct body_t {

         int is_displayingtexture;

         texture_t bigtexture;

         int flag_drawbigtexture;

-        xywh_t dirdataadd;

+        whxy_t dirdataadd;

         Font roundedbox;

         bg_t *bg;

         char selectedpath[2048];

 } body_t;

+

 typedef struct im_t {

-        int windowinit;

-        int w;

-        int h;

-        menubar_t *menubar;

+        rayui_t *rayui;

+        mousedata_t mousedata;

         body_t *body;

-        font_t *font;

-        font_t *fontbig;

-        font_t *fonthuge;

 } im_t;

-

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

+im_t *im_init(char *rootdir);

 void im_free(im_t *im);

-font_t *im_font_init(int size);

-void im_font_free(font_t *font);

-

-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, int windowwidth, int windowheight, int *needs_nextredraw);

-

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

+body_t *im_body_init(rayui_t *rayui, int w, int h, int x, int y, int leftsidesize, char *rootdir);

 void im_body_free(body_t *body);

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

 int im_body_tryselect(body_t *body, Vector2 mousepos);

+int im_body_mouse(body_t *body, mousedata_t *mousedata);

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

-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 rmbdown, int windowwidth, int windowheight, int *needs_nextredraw, int scrollspeed);

-

+static int strptrcmp(void *a,void *b);

 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 listing_fillwhxy(listing_t *listing, font_t *font, int w, int sidelen, int is_left, int rightsidemargin);

+

+int is_imagefilename(char *filename);

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

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

-char *imutil_submenu_get(char *menus, int targetn, int *len);

-char *imutil_strduplen(char *str, int len);

-int is_imutil_insidexywh(Vector2 pos, xywh_t *xywh, int margin);

 int imutil_aspectmaximize(int w, int h, int maxw, int maxh, int *neww, int *newh);

-int menudata_pos2option(menudata_t *menudata, Vector2 pos);

-int *getcodepoints(int *sizecodepoints);

-int is_imagefilename(char *filename);

-Image imutil_loadimage(const char *filename);

-void imutil_fpsreset(void);

-int imutil_fpsleft(void);

-long long imutil_milliseconds(void);

-

-bg_t *bg_init(int sizebgload);

-void bg_free(bg_t *bg);

-int bg_resetmarks(bg_t *bg);

-bgload_t *bg_get(bg_t *bg, char *path);

-int bg_add(bg_t *bg, char *path);

-int bg_freeunmarked(bg_t *bg);

-void *bg_thread(void *);

-

-static int mypipe(int fds[2]);

-static int mypiperead(int fd, char *buf, int count);

-static int mypipewrite(int fd, char *buf, int count);

 int

 main(int argc, char *argv[])

 {

         im_t *im;

-        Vector2 mousepos,wheel,oldmousepos,scrollstartpos;

-        int flag_ignorelmb;

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

-        int click_avail;

-        int has_mousechanges;

+        char *rootdir;

         int needs_nextredraw;

-        long long scrollstart;

-        long long scrolllast;

-        int scrollspeed;

-        int is_scrolling;

-        int leftscrollposstart;

-        char *sel_menu,*sel_submenu;

-#if !defined(__linux__) && !defined(ANDROID)

-        win32pipe_init();

-#endif

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

-                messagebox("Couldn't init interface");

+        if(argc<2 || strcmp(argv[argc-1],"--help")==0) {

+                global_messagebox("imgmover\n\nSyntax: %s <rootdirectory>\n",(argc>0)?argv[0]:"imgmover");

+                return(1);

+        }

+        rootdir=argv[1];

+        bg_staticinit();

+        if((im=im_init(rootdir))==NULL) {

+                global_messagebox("%s","Couldn't init");

                 return(1);

         }

-        flag_ignorelmb=0;

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

-        lmbdown=rmbdown=-1;

-        needs_nextredraw=1;

-        scrollstart=0;

-        is_scrolling=0;

-        im->body->selectedpath[0]='\0';

         while(!WindowShouldClose()) {

-                imutil_fpsreset();

-                oldmousepos=mousepos;

-                mousepos=GetMousePosition();

-                wheel=GetMouseWheelMoveV();

-                lmbpressed=IsMouseButtonPressed(0);

-                lmbreleased=IsMouseButtonReleased(0);

-                oldlmbdown=lmbdown;

-                lmbdown=IsMouseButtonDown(0);

-                oldrmbdown=rmbdown;

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

+                rayui_timereset(im->rayui);

                 needs_nextredraw=0;

-                /* mouse process scrolling */

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

-                        scrollstart=imutil_milliseconds();

-                        scrollstartpos=mousepos;

-                        leftscrollposstart=im->body->dirdata[im->body->currentdirdata]->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;

-                                im_body_tryselect(im->body,scrollstartpos);

-                                if(im->body->selectedpath[0]!='\0')

-                                        click_avail=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->dirdata[im->body->currentdirdata]->leftscrollpos=leftscrollposstart+ycur;

-                        scrolllast=tcur;

-                }

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

-                        scrollspeed=scrollspeed*4/5;

-                        im->body->dirdata[im->body->currentdirdata]->leftscrollpos+=scrollspeed;

-                }

-                /* mouse 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)

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

+                rayui_getmousedata(im->rayui,&(im->mousedata));

+                /* process mouse actions */

+                if(im->mousedata.click_avail)

+                        im_body_mouse(im->body, &(im->mousedata));

                 /* draw screen contents */

                 BeginDrawing();

                 ClearBackground(RAYWHITE);

-                im_body_draw(im->body,mousepos,lmbdown,rmbdown,im->w,im->h,&needs_nextredraw,scrollspeed);

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

-#if 0

-{

- int i,j;

- Vector2 v2;

- listing_t listing={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));

-     DrawTextEx(im->font->font

-       ,SEP

-       ,v2

-       ,im->font->height

-       ,0

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

-     );

-   for(j=0;j<listing.usedelems;j++) {

-     Color c;

-     i++;

-     c=((Color){ 45, 45, 45, 255 });

-     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].name

-       ,v2

-       ,im->font->height

-       ,0

-       ,c

-     );

-   }

- }

-}

-#endif

-                if(has_mousechanges==0 && needs_nextredraw==0 && scrollspeed==0) {

+                rayui_scrollablerectreset(im->rayui,&(im->mousedata));

+                im_body_draw(im->body,&(im->mousedata),im->rayui->w,im->rayui->h,&needs_nextredraw);

+                if(needs_nextredraw==0 && im->mousedata.has_mousechanges==0 && im->mousedata.scrollspeed==0) {

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

                         EnableEventWaiting();

                 } else {

@@ -504,39 +185,26 @@ fprintf(stderr,"SELECTED: \"%s\"->\"%s\"\n",sel_menu,sel_submenu);

                 EndDrawing();

         }

         im_free(im),im=NULL;

-#if !defined(__linux__) && !defined(ANDROID)

-        win32pipe_fini();

-#endif

+        bg_staticfini();

         return(0);

 }

+

 im_t *

-im_init(char *menus, char *rootdir)

+im_init(char *rootdir)

 {

         im_t *im;

         char *errstr;

-        if(menus==NULL)

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

         if((im=calloc(1,sizeof(im_t)))==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 fonts and contents */

-        if((errstr="Couldn't init font")==NULL

-          || (im->font=im_font_init(FONTSIZE))==NULL

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

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

-          || (errstr="Couldn't init menus")==NULL

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

+        if((errstr="init interface")==NULL

+          || (im->rayui=rayui_init(DEFAULTWIDTH,DEFAULTHEIGHT,"Image Mover",NULL))==NULL

           || (errstr="Couldn't init interface data")==NULL

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

+          || (im->body=im_body_init(im->rayui,im->rayui->w,im->rayui->h, 0, 0, im->rayui->w*2/3, rootdir))==NULL

         ) {

-                messagebox(errstr);

+                global_messagebox("Couldn't %s",errstr);

                 im_free(im),im=NULL;

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

         }

@@ -550,299 +218,21 @@ im_free(im_t *im)

 {

         if(im==NULL)

                 return;

-        if(im->menubar!=NULL)

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

         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(im->windowinit)

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

+        if(im->rayui!=NULL)

+                rayui_free(im->rayui),im->rayui=NULL;

         free(im),im=NULL;

-        return;

-}

-

-font_t *

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

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

-        /* 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, font_t *font)

-{

-        int i,j;

-        char *str,*substr;

-        int len,sublen;

-        menubar_t *menubar;

-        menudata_t *menudata;

-        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

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

-        ) {

-                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

-                  || (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_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_menubar_free(menubar),menubar=NULL;

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

-                        }

-                }

-        }

-#if 0

-        /* test imutil_menu_xxx */

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

-        char *ptr,*mptr;

-        for(n=0,l=imutil_menu_count(menus);n<l;n++) {

-                ptr=imutil_menu_get(menus,n,&len);

-                fprintf(stderr,"menu[%i]:\"",n);

-                fwrite(ptr,1,len,stderr);

-                fprintf(stderr,"\"->");

-                for(m=0,ml=imutil_submenu_count(ptr);m<ml;m++) {

-                        mptr=imutil_submenu_get(ptr,m,&mlen);

-                        fprintf(stderr,"|\"");

-                        fwrite(mptr,1,mlen,stderr);

-                        fprintf(stderr,"\"");

-                }

-                fprintf(stderr,"\n");

-        }

-#endif

-#if 0

-        /* test menudata */

-        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(menubar);

-}

-

-void

-im_menubar_free(menubar_t *menubar)

-{

-        int i,j;

-        menudata_t *menudata;

-        if(menubar==NULL)

-                return;

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

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

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

-                                        if(menudata->options[j]!=NULL)

-                                                free(menudata->options[j]),menudata->options[j]=NULL;

-                                }

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

-                        }

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

-                }

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

-        }

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

-#if 0

-if(lmbpressed || lmbdown)

- fprintf(stderr,"in_menubar_mouse: lmbpressed:%i lmbdown:%i\n",lmbpressed,lmbdown);

-#endif

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

-                int insidetitle,currentoption;

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

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

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