@@ -20,6 +20,8 @@

 #define DEFAULTTITLEPREFIX "re - "

 #define DEFAULTWINDOWWIDTH 80

 #define DEFAULTWINDOWHEIGHT 66

+#define FONTCACHEXSIZE 512

+#define FONTCACHEYSIZE 512

 #define RECTFILL(r,rx,ry,rw,rh) (r).x=(rx),(r).y=(ry),(r).w=(rw),(r).h=(rh)

@@ -46,7 +48,7 @@

 static int reui_fillrounded(SDL_Surface *dst, int xo, int yo, int w, int h, int r, const char *rgba);

 static int reui_triangle(SDL_Surface *dst, int x, int y, int w, int h, char direction, const char *rgba);

-

+static int reui_fontcachereset(reui_t *ui);

 reui_t *

 reui_init(int fontheight)

@@ -79,7 +81,7 @@ reui_init(int fontheight)

         ui->screenw=screenrect.w;

         ui->screenh=screenrect.h;

         /* font */

-        ui->fontheight=fontheight;

+        ui->fontheight=fontheight; /* placeholder, will fill later with real value */

         ui->fontdata=SDL_RWFromConstMem(hack_regular,SIZE_HACK_REGULAR);

         SDL_RWseek(ui->fontdata,0,RW_SEEK_SET);

         if(ui->fontdata==NULL

@@ -99,6 +101,17 @@ reui_init(int fontheight)

                 ui->fontwidth=s->w;

                 SDL_FreeSurface(s),s=NULL;

         }

+        /* font height */

+        {

+                SDL_Surface *s;

+                SDL_Color c={0,0,0,0};

+                if((s=TTF_RenderUTF8_Blended(ui->font,"gjpqy_",c))==NULL) {

+                        reui_free(ui),ui=NULL;

+                        return(NULL);

+                }

+                ui->fontheight=s->h;

+                SDL_FreeSurface(s),s=NULL;

+        }

         /* main window */

         ui->w=ui->fontwidth*DEFAULTWINDOWWIDTH;

         ui->w=(ui->w>ui->screenw)?ui->screenw:ui->w;

@@ -113,10 +126,15 @@ reui_init(int fontheight)

           || (ui->scr=SDL_CreateTexture(ui->renderer,SDL_PIXELFORMAT_ARGB8888,

               SDL_TEXTUREACCESS_STREAMING,ui->w,ui->h))==NULL

           || (ui->onepx=SDL_CreateTexture(ui->renderer,SDL_PIXELFORMAT_ARGB8888,

-              SDL_TEXTUREACCESS_STATIC,1,1))==NULL) {

+              SDL_TEXTUREACCESS_STATIC,1,1))==NULL

+          || (ui->fontcache=SDL_CreateTexture(ui->renderer,SDL_PIXELFORMAT_ARGB8888,

+              SDL_TEXTUREACCESS_STATIC,FONTCACHEXSIZE,FONTCACHEYSIZE))==NULL) {

                 reui_free(ui),ui=NULL;

                 return(NULL);

         }

+        /* font cache */

+        SDL_SetTextureBlendMode(ui->fontcache, SDL_BLENDMODE_BLEND);

+        reui_fontcachereset(ui);

         /* finished */

         ui->scrdirty=1;

         ui->rendererdirty=1;

@@ -129,6 +147,8 @@ reui_free(reui_t *ui)

 {

         if(ui==NULL)

                 return;

+        if(ui->fontcache!=NULL)

+                SDL_DestroyTexture(ui->fontcache),ui->fontcache=NULL;

         if(ui->onepx!=NULL)

                 SDL_DestroyTexture(ui->onepx),ui->onepx=NULL;

         if(ui->font!=NULL)

@@ -143,7 +163,6 @@ reui_free(reui_t *ui)

                 SDL_DestroyRenderer(ui->renderer),ui->renderer=NULL;

         if(ui->win!=NULL)

                 SDL_DestroyWindow(ui->win),ui->win=NULL;

-

         SDL_Quit();

         free(ui),ui=NULL;

 }

@@ -183,23 +202,29 @@ int

 reui_setfontheight(reui_t *ui, int fontheight)

 {

         TTF_Font *newfont;

-        SDL_Surface *s;

+        SDL_Surface *s,*s2;

         SDL_Color c={0,0,0,0};

         if(ui==NULL || fontheight<=0)

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

         SDL_RWseek(ui->fontdata,0,RW_SEEK_SET);

         if((newfont=TTF_OpenFontRW(ui->fontdata,0,fontheight))==NULL)

                 return(-1); /* couln't setup new font */

-        if((s=TTF_RenderUTF8_Blended(newfont,"m",c))==NULL) {

+        if((s=TTF_RenderUTF8_Blended(newfont,"m",c))==NULL

+          || (s2=TTF_RenderUTF8_Blended(newfont,"gjpqy_",c))==NULL) {

+                if(s!=NULL)

+                        SDL_FreeSurface(s),s=NULL;

                 TTF_CloseFont(newfont),newfont=NULL;

                 return(-1); /* couldn't use new font */

         }

         if(ui->font!=NULL)

                 TTF_CloseFont(ui->font),ui->font=NULL;

         ui->font=newfont;

-        ui->fontheight=fontheight;

+        ui->fontheight=s2->h;

         ui->fontwidth=s->w;

         SDL_FreeSurface(s),s=NULL;

+        SDL_FreeSurface(s2),s2=NULL;

+        /* font cache */

+        reui_fontcachereset(ui);

         return(0);

 }

@@ -247,6 +272,7 @@ reui_present(reui_t *ui)

 int

 reui_write(reui_t *ui, int x, int y, const char *rgba, const char *str, int nchar)

 {

+#if 0

         char buf[1024];

         SDL_Surface *fgsurface;

         SDL_Texture *fg;

@@ -274,6 +300,84 @@ reui_write(reui_t *ui, int x, int y, const char *rgba, const char *str, int ncha

         SDL_FreeSurface(fgsurface),fgsurface=NULL;

         SDL_DestroyTexture(fg),fg=NULL;

         return(0);

+#else

+        int curcol;

+        char smallbuf[2];

+        int maxcached;

+        int cachelines,cachecols;

+        Uint32 *pixels;

+        char buf[1024];

+        SDL_Surface *fgsurface;

+        SDL_Texture *fg;

+        SDL_Color c={((unsigned char *)rgba)[0],

+                     ((unsigned char *)rgba)[1],

+                     ((unsigned char *)rgba)[2],

+                     ((unsigned char *)rgba)[3]};

+        SDL_Color whitec={255,255,255,255};

+        SDL_Rect srcrect,dstrect;

+        int i,n;

+        int has_uncached;

+        if(nchar<sizeof(buf)) {

+                memcpy(buf,str,nchar);

+                buf[nchar]='\0';

+        } else {

+                memcpy(buf,str,sizeof(buf)-1);

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

+        }

+        SDL_SetTextureColorMod(ui->fontcache, c.r, c.g, c.b);

+        cachelines=(ui->fontheight>0)?(FONTCACHEYSIZE/ui->fontheight):0;

+        cachecols=(ui->fontwidth>0)?(FONTCACHEXSIZE/ui->fontwidth):0;

+        maxcached=cachelines*cachecols;

+        /* write cached characters (or fill cache) */

+        has_uncached=0;

+        for(i=0,curcol=-1;buf[i]!='\0';i++) {

+                curcol+=(((buf[i]&0xc0)!=0x80)?1:0); /* this detects an utf-8 start byte, and advances one pos if true */

+                if(!(buf[i]>=FONTCACHESTART && buf[i]<=FONTCACHEEND) || maxcached==0) {

+                        has_uncached=1;

+                        continue;

+                }

+                /* fill cache if possible */

+                if(ui->usedfontcache<maxcached && ui->fontcachewhere[buf[i]-FONTCACHESTART]==0) {

+                        smallbuf[0]=buf[i],smallbuf[1]='\0';

+                        if((fgsurface=TTF_RenderUTF8_Blended(ui->font,smallbuf,whitec))==NULL)

+                                return(-1); /* cannot create text */

+                        SDL_LockSurface(fgsurface);

+                        pixels=(Uint32*)(fgsurface->pixels);

+                        RECTFILL(dstrect,(ui->usedfontcache%cachecols)*ui->fontwidth,(ui->usedfontcache/cachecols)*ui->fontheight,ui->fontwidth,ui->fontheight);

+                        SDL_UpdateTexture(ui->fontcache,&dstrect,pixels,sizeof(Uint32)*fgsurface->w);

+                        SDL_UnlockSurface(fgsurface);

+                        if(fgsurface!=NULL)

+                                SDL_FreeSurface(fgsurface),fgsurface=NULL;

+                        ui->usedfontcache++;

+                        ui->fontcachewhere[buf[i]-FONTCACHESTART]=ui->usedfontcache; /* one more than real pos, as 0 is not init */

+                }

+                /* if cached, write from there and change the letter to space */

+                if(ui->fontcachewhere[buf[i]-FONTCACHESTART]!=0) {

+                        n=ui->fontcachewhere[buf[i]-FONTCACHESTART]-1;

+                        RECTFILL(srcrect,((n%cachecols)*ui->fontwidth),((n/cachecols)*ui->fontheight),ui->fontwidth,ui->fontheight);

+                        RECTFILL(dstrect,(x+ui->fontwidth*curcol),y,ui->fontwidth,ui->fontheight);

+                        SDL_RenderCopy(ui->renderer,ui->fontcache,&srcrect,&dstrect);

+                        buf[i]=' ';

+                } else {

+                        has_uncached=1;

+                }

+        }

+        /* write uncached characters */

+        if(has_uncached) {

+                if((fgsurface=TTF_RenderUTF8_Blended(ui->font,buf,c))==NULL

+                  || (fg=SDL_CreateTextureFromSurface(ui->renderer,fgsurface))==NULL) {

+                        if(fgsurface!=NULL)

+                                SDL_FreeSurface(fgsurface),fgsurface=NULL;

+                        return(-1);

+                }

+                RECTFILL(dstrect,x,y,fgsurface->w,fgsurface->h);

+                SDL_RenderCopy(ui->renderer,fg,NULL,&dstrect);

+                SDL_FreeSurface(fgsurface),fgsurface=NULL;

+                SDL_DestroyTexture(fg),fg=NULL;

+        }

+        ui->rendererdirty=1;

+        return(0);

+#endif

 }

@@ -523,3 +627,12 @@ reui_triangle(SDL_Surface *dst, int x, int y, int w, int h, char direction, cons

         return(0);

 }

+static int

+reui_fontcachereset(reui_t *ui)

+{

+        if(ui==NULL || ui->fontcache==NULL)

+                return(-1); /* sanity check failed */

+        ui->usedfontcache=0;

+        memset(ui->fontcachewhere,0,sizeof(ui->fontcachewhere));

+        return(0);

+}

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

 #include "SDL_ttf.h"

+#define FONTCACHESTART ' '

+#define FONTCACHEEND '~'

 typedef struct reui_t {

         int screenw,screenh;

@@ -28,6 +30,9 @@ typedef struct reui_t {

         SDL_RWops *fontdata;

         TTF_Font *font;

         SDL_Texture *onepx;

+        int usedfontcache;

+        SDL_Texture *fontcache;

+        int fontcachewhere[FONTCACHEEND-FONTCACHESTART];

         int fontheight;

         int fontwidth;

         int scrdirty;