Expire texts, based on age in cache.

src/defs.h

@@ -42,6 +42,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define FPS				60
 #define LOGIC_RATE		(1000 / FPS)
 
+#define TEXT_TTL		(1000 * 20)
+
 #define MAX_NAME_LENGTH				32
 #define MAX_DESCRIPTION_LENGTH		512
 #define MAX_FILENAME_LENGTH			1024

src/draw/text.c

@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "text.h"
 
-void expireTexts(void);
 static void loadFont(int size);
 static SDL_Texture *getCachedText(unsigned long hash);
 static void cacheText(unsigned long hash, SDL_Texture *t);
@@ -89,11 +88,6 @@ static void drawTextNormal(int x, int y, int size, int align, SDL_Color c, char
 		t = SDL_CreateTextureFromSurface(app.renderer, surface);
 		SDL_FreeSurface(surface);
 		
-		if (cacheSize >= TEXT_CACHE_SIZE)
-		{
-			expireTexts();
-		}
-		
 		cacheText(hash, t);
 	}
 
@@ -209,6 +203,7 @@ static SDL_Texture *getCachedText(unsigned long hash)
 	{
 		if (t->hash == hash)
 		{
+			t->ttl = SDL_GetTicks() + TEXT_TTL;
 			return t->texture;
 		}
 	}
@@ -236,36 +231,45 @@ static void cacheText(unsigned long hash, SDL_Texture *texture)
 
 	new->hash = hash;
 	new->texture = texture;
+	new->ttl = SDL_GetTicks() + TEXT_TTL;
 
 	t->next = new;
 	
 	cacheSize++;
 }
 
-void expireTexts(void)
+void expireTexts(int all)
 {
-	Texture *t;
+	Texture *t, *prev;
 	int i, n;
+	long now;
 	
 	n = 0;
+	now = SDL_GetTicks();
 
 	for (i = 0 ; i < NUM_TEXT_BUCKETS ; i++)
 	{
-		while (textures[i].next)
+		prev = &textures[i];
+		
+		for (t = textures[i].next ; t != NULL ; t = t->next)
 		{
-			t = textures[i].next;
+			if (t->ttl <= now || all)
-			textures[i].next = t->next;
+			{
-			SDL_DestroyTexture(t->texture);
+				prev->next = t->next;
-			free(t);
+				SDL_DestroyTexture(t->texture);
+				free(t);
 				
-			n++;
+				cacheSize--;
+				
+				n++;
+				
+				t = prev;
+			}
+			
+			prev = t;
 		}
-
-		textures[i].next = NULL;
 	}
 	
-	cacheSize = 0;
-	
 	SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, "Expired %d texts", n);
 }
 

src/draw/text.h

@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "SDL2/SDL_ttf.h"
 
-#define TEXT_CACHE_SIZE 256
-
 extern void blit(SDL_Texture *texture, int x, int y, int centered);
 extern char *getFileLocation(char *filename);
 

src/main.c

@@ -26,6 +26,7 @@ int main(int argc, char *argv[])
 {
 	float td;
 	long then, lastFrameTime, frames;
+	long expireTextTimer;
 	
 	SDL_Event event;
 	
@@ -47,6 +48,7 @@ int main(int argc, char *argv[])
 	dev.fps = frames = td = 0;
 	then = SDL_GetTicks();
 	lastFrameTime = SDL_GetTicks() + 1000;
+	expireTextTimer = SDL_GetTicks() + (1000 * 10);
 	
 	while (1)
 	{
@@ -116,6 +118,13 @@ int main(int argc, char *argv[])
 			}
 		}
 		
+		if (SDL_GetTicks() > expireTextTimer)
+		{
+			expireTexts(0);
+			
+			expireTextTimer = SDL_GetTicks() + (1000 * 10);
+		}
+
 		SDL_Delay(1);
 	}
 

src/main.h

@@ -35,6 +35,7 @@ extern void doMouseDown(SDL_MouseButtonEvent *event);
 extern void doMouseUp(SDL_MouseButtonEvent *event);
 extern void doMouseWheel(SDL_MouseWheelEvent *event);
 extern void doDevKeys(void);
+extern void expireTexts(int all);
 
 App app;
 Colors colors;

src/structs.h

@@ -56,6 +56,7 @@ typedef struct {
 struct Texture {
 	char name[MAX_DESCRIPTION_LENGTH];
 	long hash;
+	long ttl;
 	SDL_Texture *texture;
 	Texture *next;
 };

src/system/init.c

@@ -211,7 +211,7 @@ void cleanup(void)
 	
 	destroyTextures();
 	
-	expireTexts();
+	expireTexts(1);
 	
 	destroyFonts();
 	

src/system/init.h

@@ -54,7 +54,7 @@ extern void destroyBattle(void);
 extern void destroyTextures(void);
 extern void destroyGalacticMap(void);
 extern void destroyWidgets(void);
-extern void expireTexts(void);
+extern void expireTexts(int all);
 extern void initInput(void);
 extern void createSaveFolder(void);
 extern char *getFileLocation(char *filename);

src/system/transition.c

@@ -30,7 +30,7 @@ void startSectionTransition(void)
 	
 	presentScene();
 	
-	expireTexts();
+	expireTexts(1);
 }
 
 void endSectionTransition(void)

src/system/transition.h

@@ -22,4 +22,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern void prepareScene(void);
 extern void presentScene(void);
-extern void expireTexts(void);
+extern void expireTexts(int all);