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

 #include <unistd.h>

 #include <string.h>

 #include <pthread.h>

+#include <sys/time.h>

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

 #include "win32_pipe.h"

 #endif

@@ -25,25 +26,20 @@

 #include "bg.h"

 #define UNLOADTIMEOUTSECONDS 10

+#define THREADNUMBER 8

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

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

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

+static int mysleep(struct timeval *tv);

 void

 bg_staticinit(void)

 {

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

-        win32pipe_init();

-#endif

+        /* not needed now, was for win32pipe_init() */

 }

 void

 bg_staticfini(void)

 {

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

-        win32pipe_fini();

-#endif

+        /* not needed now, was for win32pipe_fini() */

 }

 bg_t *

@@ -54,9 +50,6 @@ bg_init(int sizebgload)

         bg=NULL;

         if((errstr="Insuf. mem. for bg")==NULL

           || (bg=calloc(1,sizeof(bg_t)))==NULL

-          || (errstr="Error init pipes (please check program is not blocked in firewall)")==NULL

-          || (bg->pipe[0]=bg->pipe[1]=-1)!=-1

-          || mypipe(bg->pipe)!=0

           || (errstr="Insuf mem bgload")==NULL

           || (bg->bgload=calloc(sizebgload,sizeof(bgload_t)))==NULL

           || (bg->sizebgload=sizebgload)!=sizebgload

@@ -81,11 +74,7 @@ bg_free(bg_t *bg)

         if(bg==NULL)

                 return; /* nothing to do */

         if(bg->flag_threadstarted) {

-                char dummy=1;

-#if 1

-fprintf(stderr,"bg_free: notifying thread to exit\n");

-#endif

-                mypipewrite(bg->pipe[WR],&dummy,1);

+                bg->do_exit=1;

 #if 1

 fprintf(stderr,"bg_free: joining thread\n");

 #endif

@@ -94,11 +83,8 @@ fprintf(stderr,"bg_free: joining thread\n");

 fprintf(stderr,"bg_free: thread joined OK\n");

 #endif

                 bg->flag_threadstarted=0;

+                bg->do_exit=0;

         }

-        if(bg->pipe[0]!=-1)

-                close(bg->pipe[0]),bg->pipe[0]=-1;

-        if(bg->pipe[1]!=-1)

-                close(bg->pipe[1]),bg->pipe[1]=-1;

         if(bg->bgload!=NULL) {

                 bgload_t *bgload;

                 for(i=0,bgload=bg->bgload;i<bg->sizebgload;i++,bgload++) {

@@ -148,7 +134,6 @@ bg_add(bg_t *bg, char *path)

 {

         int i;

         bgload_t *bgload;

-        char dummy;

         if(bg==NULL)

                 return(-1);

         for(i=0,bgload=bg->bgload;i<bg->sizebgload;i++,bgload++) {

@@ -156,8 +141,6 @@ bg_add(bg_t *bg, char *path)

                         bgload->is_todo=1;

                         bgload->has_mark=1;

                         gettimeofday(&(bgload->tv_lastadded),NULL); // Breaks premise of "don't touch until thread finished", but this is rather innocuous

-                        dummy=0;

-                        mypipewrite(bg->pipe[WR],&dummy,1);

                         return(0); /* already on list */

                 }

         }

@@ -169,9 +152,7 @@ bg_add(bg_t *bg, char *path)

                         bgload->is_todo=1;

                         bgload->has_mark=1;

                         gettimeofday(&(bgload->tv_lastadded),NULL); // Breaks premise of "don't touch until thread finished", but this is rather innocuous

-                        dummy=0;

                         bgload->lended_to_thread=1;

-                        mypipewrite(bg->pipe[WR],&dummy,1);

                         return(0); /* added to list */

                 }

         }

@@ -213,16 +194,11 @@ void *

 bg_thread(void *parambg)

 {

         bg_t *bg;

-        char dummy;

         bg=(bg_t *)parambg;

         int i;

         bgload_t *bgload,*candidate;

         while(1) {

-                mypiperead(bg->pipe[RD],&dummy,1);

-#if 1

-fprintf(stderr,"Thread received byte: %i\n",(int)((unsigned char)dummy));

-#endif

-                if(dummy!=0)

+                if(bg->do_exit!=0)

                         break; /* was told to exit */

                 for(candidate=NULL,i=0,bgload=bg->bgload;i<bg->sizebgload;i++,bgload++) {

                         if(bgload->lended_to_thread==0)

@@ -249,53 +225,35 @@ fprintf(stderr,"Thread received byte: %i\n",(int)((unsigned char)dummy));

                                 bgload->has_failedload=1;

                         bgload->lastused=time(NULL);

                         bgload->thread_finished=1;

+                } else {

+                        struct timeval tv;

+                        tv.tv_sec=0,tv.tv_usec=50*1000; /* sleep 50ms if nothing to do */

+                        mysleep(&tv);

                 }

+#if 1

+fprintf(stderr,"."),fflush(stderr);

+#endif

         }

         pthread_exit(NULL);

         return(NULL);

 }

-

-

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

 static int

-mypipe(int fds[2])

-{

-        return(win32pipe_pipe(fds));

-}

-

-static int

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

-{

-        return(win32pipe_read(fd,buf,count));

-}

-

-static int

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

+mysleep(struct timeval *tv)

 {

-        return(win32pipe_write(fd,buf,count));

+        win32pipe_sleep(tv->tv_sec*1000+tv->tv_usec/1000);

+        return(0);

 }

 #else

 static int

-mypipe(int fds[2])

-{

-        return(pipe(fds));

-}

-

-static int

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

-{

-        return(read(fd,buf,count));

-}

-

-static int

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

+mysleep(struct timeval *tv)

 {

-        return(write(fd,buf,count));

+        struct timespec ts;

+        if(tv==NULL)

+                return(-1);

+        ts.tv_sec=tv->tv_sec,ts.tv_nsec=tv->tv_usec*1000;

+        nanosleep(&ts,NULL);

+        return(0);

 }

 #endif

-

-

-

-

-

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

 #ifndef BG_H

 #define BG_H

-#include <pthread.h>

 #include <time.h>

 #include <sys/time.h>

 #include "raylib.h"

@@ -39,10 +38,10 @@ typedef struct bgload_t {

 typedef struct bg_t {

         int sizebgload;

         bgload_t *bgload;

-        int pipe[2];

         pthread_t thread;

         pthread_attr_t tattr;

         int flag_threadstarted;

+        int do_exit;

 } bg_t;

@@ -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')

@@ -176,6 +176,10 @@ rayui_getmousedata(rayui_t *rayui, mousedata_t *mousedata)

           )?1:0;

         mousedata->needs_nextredraw=0;

         /* mouse process scrolling */

+#if 1

+if(mousedata->lmbdown!=mousedata->oldlmbdown)

+ fprintf(stderr,"[%s:+%i+%i] ===\n",(mousedata->lmbdown==1)?"DOWN":".UP.",(int)mousedata->mousepos.x,(int)mousedata->mousepos.y);

+#endif

         if(mousedata->lmbdown==1 && mousedata->oldlmbdown==0 && mousedata->scrollstart==0) {

                 for(i=0;i<mousedata->usedscrollablerect;i++) {

                         if(is_global_insidewhxy(mousedata->mousepos,&(mousedata->scrollablerect[i].whxy),0)) {

@@ -187,7 +191,17 @@ rayui_getmousedata(rayui_t *rayui, mousedata_t *mousedata)

                                 break;

                         }

                 }

+#if 1

+if(i>=mousedata->usedscrollablerect) {

+fprintf(stderr,"Couldn't start scrolling because not in scrollable area\n");

+}

+#endif

         }

+#if 1

+else if(mousedata->lmbdown==1 && mousedata->oldlmbdown==0 && mousedata->scrollstart!=0) {

+fprintf(stderr,"Couldn't start scrolling because scrollstart!=0\n");

+}

+#endif

         if(mousedata->scrollstart!=0 && mousedata->lmbdown==0) {

                 mousedata->scrollstart=0;

                 if(mousedata->is_scrolling)

@@ -1,5 +1,6 @@

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

 #include <winsock2.h>

+#include <synchapi.h>

 typedef SOCKET socket_t; /* https://stackoverflow.com/questions/10817252/why-is-invalid-socket-defined-as-0-in-winsock2-h-c */

 #ifndef SHUT_WR

 #define SHUT_WR SD_SEND

@@ -147,4 +148,10 @@ win32pipe_write(int fd, char *buf, int count)

         return(send(fd,buf,count,0));

 }

+int

+win32pipe_sleep(int ms)

+{

+       Sleep(ms);

+       return(0);

+}

@@ -3,5 +3,7 @@ void win32pipe_fini(void);

 int win32pipe_pipe(int fds[2]);

 int win32pipe_read(int fd, char *buf, int count);

 int win32pipe_write(int fd, char *buf, int count);

+int win32pipe_sleep(int ms); /* does not require calling win32pipe_init()/win32pipe_fini() */

+