@@ -24,6 +24,8 @@

 #include "rayui.h"

 #include "bg.h"

+#define UNLOADTIMEOUTSECONDS 10

+

 static int mypipe(int fds[2]);

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

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

@@ -153,6 +155,7 @@ bg_add(bg_t *bg, char *path)

                 if(bgload->lended_to_thread && strcmp(path,bgload->path)==0) {

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

@@ -165,6 +168,7 @@ bg_add(bg_t *bg, char *path)

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

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

@@ -179,11 +183,13 @@ bg_freeunmarked(bg_t *bg)

 {

         int i;

         bgload_t *bgload;

+        time_t now;

         if(bg==NULL)

                 return(-1);

+        now=time(NULL);

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

                 if(bgload->lended_to_thread && bgload->thread_finished && bgload->has_mark==0) {

-                        if(bgload->has_data) {

+                        if(bgload->has_data && (bgload->lastused<(now-UNLOADTIMEOUTSECONDS) || bgload->lastused>(now+UNLOADTIMEOUTSECONDS))) {

 #if 1

 fprintf(stderr,"bg: Unloading: \"%s\"\n",bgload->path);

 #endif

@@ -196,6 +202,8 @@ fprintf(stderr,"bg: Cancelling: \"%s\"\n",bgload->path);

 }

 #endif

                         memset(bgload,0,sizeof(bgload_t));

+                } else if(bgload->lended_to_thread && bgload->thread_finished && bgload->has_mark!=0 && bgload->has_data) {

+                        bgload->lastused=now;

                 }

         }

         return(0);

@@ -208,7 +216,7 @@ bg_thread(void *parambg)

         char dummy;

         bg=(bg_t *)parambg;

         int i;

-        bgload_t *bgload;

+        bgload_t *bgload,*candidate;

         while(1) {

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

 #if 1

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

 #endif

                 if(dummy!=0)

                         break; /* was told to exit */

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

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

                         if(bgload->lended_to_thread==0)

                                 continue;

                         if(bgload->is_todo==0) {

@@ -224,14 +232,24 @@ fprintf(stderr,"Thread received byte: %i\n",(int)((unsigned char)dummy));

                                 continue;

                         }

                         if(bgload->has_data==0 && bgload->has_failedload==0) {

-                                bgload->image=global_loadimage(bgload->path);

-                                if(IsImageValid(bgload->image))

-                                        bgload->has_data=1;

-                                else

-                                        bgload->has_failedload=1;

-                                bgload->thread_finished=1;

+                                if(candidate==NULL

+                                  || bgload->tv_lastadded.tv_sec>candidate->tv_lastadded.tv_sec

+                                  || (bgload->tv_lastadded.tv_sec==candidate->tv_lastadded.tv_sec && bgload->tv_lastadded.tv_usec>candidate->tv_lastadded.tv_usec)

+                                ) {

+                                        candidate=bgload;

+                                }

                         }

                 }

+                if(candidate!=NULL) {

+                        bgload=candidate;

+                        bgload->image=global_loadimage(bgload->path);

+                        if(IsImageValid(bgload->image))

+                                bgload->has_data=1;

+                        else

+                                bgload->has_failedload=1;

+                        bgload->lastused=time(NULL);

+                        bgload->thread_finished=1;

+                }

         }

         pthread_exit(NULL);

         return(NULL);

@@ -17,6 +17,8 @@

 #define BG_H

 #include <pthread.h>

+#include <time.h>

+#include <sys/time.h>

 #include "raylib.h"

 typedef struct bgload_t {

@@ -30,6 +32,8 @@ typedef struct bgload_t {

         Image image; // to use only from owner

         int has_data; // to use only from owner

         int has_failedload; // to use only from owner

+        time_t lastused; // to don't purge until some time has passed after load

+        struct timeval tv_lastadded; // to be able to load the "most recently added bgload" first

 } bgload_t;

 typedef struct bg_t {

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