@@ -275,6 +275,37 @@ reui_fillrounded(reui_t *ui, int x, int y, int w, int h, const char *rgba)

         return(0);

 }

+int

+reui_fillblended(reui_t *ui, int x, int y, int w, int h, const char *rgba)

+{

+        SDL_Surface *bgsurface;

+        SDL_Texture *tex;

+        SDL_Rect dstrect;

+        Uint32 color;

+        if(ui==NULL || rgba==NULL)

+                return(-1);

+        if((bgsurface=SDL_CreateRGBSurface(0

+          ,1

+          ,1

+          ,32, ui->rmask, ui->gmask, ui->bmask, ui->amask))==NULL) {

+                return(-1);

+        }

+        color=CHARRGBA2UINT(rgba);

+        RECTFILL(dstrect,0,0,1,1);

+        SDL_FillRect(bgsurface,&dstrect,color);

+        if((tex=SDL_CreateTextureFromSurface(ui->renderer,bgsurface))==NULL) {

+                SDL_FreeSurface(bgsurface),bgsurface=NULL;

+                return(-1);

+        }

+        RECTFILL(dstrect,x,y,w,h);

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

+        ui->rendererdirty=1;

+        SDL_FreeSurface(bgsurface),bgsurface=NULL;

+        SDL_DestroyTexture(tex),tex=NULL;

+        return(0);

+}

+

+

 int

 reui_scr2renderer(reui_t *ui, int x, int y, int w, int h)

@@ -493,7 +524,6 @@ reui_balloon(reui_t *ui, char direction, int x, int y, const char *rgbafg, const

         SDL_FreeSurface(bgsurface),bgsurface=NULL;

         SDL_DestroyTexture(tex),tex=NULL;

         return(0);

-

 }

@@ -351,7 +351,7 @@ reui_balloon(reui_t *ui, char direction, int x, int y, const char *rgbafg, const

 {

         char buf[1024];

         SDL_Surface *bgsurface;

-        SDL_Surface *fgsurface;

+        SDL_Surface *fgsurface,*linefgsurface;

         SDL_Texture *tex;

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

                      ((unsigned char *)rgbafg)[1],

@@ -363,6 +363,8 @@ reui_balloon(reui_t *ui, char direction, int x, int y, const char *rgbafg, const

         int marginoffx,marginoffy;

         int radius;

         int offx,offy;

+        int i,w,iw,maxw,lastspace,lastspacew,nlines;

+        char *ptr,*end;

         if(ui==NULL || rgbafg==NULL || rgbabg==NULL || (str==NULL && nchar!=0))

                 return(-1);

         if(nchar<sizeof(buf)) {

@@ -372,8 +374,63 @@ reui_balloon(reui_t *ui, char direction, int x, int y, const char *rgbafg, const

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

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

         }

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

-                return(-1);

+        /* split into lines if width is greater than screen width */

+        nlines=1;

+        for(i=0,w=0,lastspace=-1,maxw=0;buf[i]!='\0';w+=iw,i++) {

+                iw=((buf[i]&0xc0)!=0x80)?ui->fontwidth:0;

+                if(buf[i]==' ') {

+                        lastspace=i;

+                        lastspacew=w;

+                }

+                if(w>(ui->w-ui->fontwidth*2)) {

+                        nlines++;

+                        if(lastspace==-1) {

+                                memmove(buf+i+1,buf+i,sizeof(buf)-i-1);

+                                buf[i]='\n';

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

+                                maxw=(w>maxw)?w:maxw;

+                                iw=w=0;

+                                continue;

+                        } else {

+                                buf[lastspace]='\n';

+                                i=lastspace+1;

+                                w=lastspacew;

+                                maxw=(w>maxw)?w:maxw;

+                                iw=w=0;

+                                continue;

+                        }

+                }

+        }

+        maxw=(w>maxw)?w:maxw;

+        /* render fg */

+        if(strchr(buf,'\n')==NULL) {

+                /* text without newlines */

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

+                        return(-1);

+        } else {

+                /* text with newlines */

+                if((fgsurface=SDL_CreateRGBSurface(0

+                      ,maxw,nlines*ui->fontheight

+                      ,32, ui->rmask,ui->gmask, ui->bmask, ui->amask))==NULL) {

+                        return(-1); /* couldn't create fg surface */

+                }

+                for(i=0,ptr=buf,end=strchr(ptr,'\n')

+                  ;ptr!=NULL

+                  ;ptr=((end!=NULL)?end+1:NULL),end=((ptr!=NULL)?strchr(ptr,'\n'):NULL),i++) {

+                        if(end!=NULL)

+                                *end='\0';

+                        if(*ptr=='\0')

+                                continue; /* blank line */

+                        if((linefgsurface=TTF_RenderUTF8_Blended(ui->font,ptr,c))==NULL) {

+                                SDL_FreeSurface(fgsurface),fgsurface=NULL;

+                                return(-1); /* couldn't create linefssurface */

+                        }

+                        RECTFILL(dstrect,0,i*ui->fontheight,linefgsurface->w,linefgsurface->h);

+                        SDL_BlitSurface(linefgsurface,NULL,fgsurface,&dstrect);

+                        SDL_FreeSurface(linefgsurface),linefgsurface=NULL;

+                }                

+        }

+        /* render bg */

         trianglew=ui->fontwidth;

         triangleh=ui->fontheight/2;

         marginw=ui->fontwidth*4/3;

@@ -5,7 +5,7 @@

  *

  * Simple UI in SDL2

  *

- * Author: Dario Rodriguez dario@softhome.net

+ * Author: Dario Rodriguez antartica@whereismybit.com

  * This program is licensed under the terms of GNU GPL v2.1+

  */

@@ -45,8 +45,8 @@

 #endif

-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 intreui_fillroundedr(SDL_Surface *dst, int xo, int yo, int w, int h, int r, const char *rgba);

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

 reui_t *

 reui_init(int fontheight, reui_t *parent)

@@ -245,6 +245,37 @@ reui_fill(reui_t *ui, int x, int y, int w, int h, const char *rgba)

         return(0);

 }

+int

+reui_fillrounded(reui_t *ui, int x, int y, int w, int h, const char *rgba)

+{

+        static int rounded5[]={5,3,2,1,1};

+        static int rounded4[]={4,2,1,1};

+        int i;

+        if(ui==NULL || rgba==NULL)

+                return(-1);

+        if(w<2 || h<2)

+                return(reui_fill(ui,x,y,w,h,rgba));

+        if(w<8 || h<8 || ui->fontheight<8 || ui->fontwidth<8) {

+                reui_fill(ui,x+1,y,w-2,1,rgba);

+                reui_fill(ui,x,y+1,w,h-2,rgba);

+                reui_fill(ui,x+1,y+h-1,w-2,1,rgba);

+        } else if(w<10 || h<10 || ui->fontheight<10 || ui->fontwidth<10) {

+                reui_fill(ui,x,y+4,w,h-8,rgba);

+                for(i=0;i<(sizeof(rounded4)/sizeof(rounded4[0]));i++) {

+                        reui_fill(ui,x+rounded4[i],i,w-(rounded4[i]<<1),1,rgba);

+                        reui_fill(ui,x+rounded4[i],y+h-1-i,w-(rounded4[i]<<1),1,rgba);

+                }

+        } else {

+                reui_fill(ui,x,y+5,w,h-10,rgba);

+                for(i=0;i<(sizeof(rounded5)/sizeof(rounded5[0]));i++) {

+                        reui_fill(ui,x+rounded5[i],i,w-(rounded5[i]<<1),1,rgba);

+                        reui_fill(ui,x+rounded5[i],y+h-1-i,w-(rounded5[i]<<1),1,rgba);

+                }

+        }

+        return(0);

+}

+

+

 int

 reui_scr2renderer(reui_t *ui, int x, int y, int w, int h)

 {

@@ -359,35 +390,35 @@ reui_balloon(reui_t *ui, char direction, int x, int y, const char *rgbafg, const

                 return(-1);

         }

         if(direction=='n') {

-                reui_fillrounded(bgsurface,0,triangleh-1,bgsurface->w,bgsurface->h-triangleh,radius,rgbabg);

-                reui_triangle(bgsurface,(bgsurface->w-trianglew)/2,0,trianglew,triangleh,direction,rgbabg);

+                intreui_fillroundedr(bgsurface,0,triangleh-1,bgsurface->w,bgsurface->h-triangleh,radius,rgbabg);

+                intreui_triangle(bgsurface,(bgsurface->w-trianglew)/2,0,trianglew,triangleh,direction,rgbabg);

                 RECTFILL(dstrect,marginw+marginoffx,triangleh+marginh+marginoffy,fgsurface->w,fgsurface->h);

                 SDL_BlitSurface(fgsurface,NULL,bgsurface,&dstrect);

                 offx=-bgsurface->w/2;

                 offy=0;

         } else if(direction=='e') {

-                reui_fillrounded(bgsurface,0,0,bgsurface->w-trianglew,bgsurface->h,radius,rgbabg);

-                reui_triangle(bgsurface,bgsurface->w-trianglew,(bgsurface->h-triangleh)/2,trianglew,triangleh,direction,rgbabg);

+                intreui_fillroundedr(bgsurface,0,0,bgsurface->w-trianglew,bgsurface->h,radius,rgbabg);

+                intreui_triangle(bgsurface,bgsurface->w-trianglew,(bgsurface->h-triangleh)/2,trianglew,triangleh,direction,rgbabg);

                 RECTFILL(dstrect,marginw+marginoffx,marginh+marginoffy,fgsurface->w,fgsurface->h);

                 SDL_BlitSurface(fgsurface,NULL,bgsurface,&dstrect);

                 offx=-bgsurface->w;

                 offy=-bgsurface->h/2;

         } else if(direction=='s') {

-                reui_fillrounded(bgsurface,0,0,bgsurface->w,bgsurface->h-triangleh,radius,rgbabg);

-                reui_triangle(bgsurface,(bgsurface->w-trianglew)/2,bgsurface->h-triangleh,trianglew,triangleh,direction,rgbabg);

+                intreui_fillroundedr(bgsurface,0,0,bgsurface->w,bgsurface->h-triangleh,radius,rgbabg);

+                intreui_triangle(bgsurface,(bgsurface->w-trianglew)/2,bgsurface->h-triangleh,trianglew,triangleh,direction,rgbabg);

                 RECTFILL(dstrect,marginw+marginoffx,marginh+marginoffy,fgsurface->w,fgsurface->h);

                 SDL_BlitSurface(fgsurface,NULL,bgsurface,&dstrect);

                 offx=-bgsurface->w/2;

                 offy=-bgsurface->h;

         } else if(direction=='w') {

-                reui_fillrounded(bgsurface,trianglew,0,bgsurface->w-trianglew,bgsurface->h,radius,rgbabg);

-                reui_triangle(bgsurface,0,(bgsurface->h-triangleh)/2,trianglew,triangleh,direction,rgbabg);

+                intreui_fillroundedr(bgsurface,trianglew,0,bgsurface->w-trianglew,bgsurface->h,radius,rgbabg);

+                intreui_triangle(bgsurface,0,(bgsurface->h-triangleh)/2,trianglew,triangleh,direction,rgbabg);

                 RECTFILL(dstrect,trianglew+marginw+marginoffx,marginh+marginoffy,fgsurface->w,fgsurface->h);

                 SDL_BlitSurface(fgsurface,NULL,bgsurface,&dstrect);

                 offx=0;

                 offy=-bgsurface->h/2;

         } else { /* default: center */

-                reui_fillrounded(bgsurface,0,0,bgsurface->w,bgsurface->h,radius,rgbabg);

+                intreui_fillroundedr(bgsurface,0,0,bgsurface->w,bgsurface->h,radius,rgbabg);

                 RECTFILL(dstrect,marginw+marginoffx,marginh+marginoffy,fgsurface->w,fgsurface->h);

                 SDL_BlitSurface(fgsurface,NULL,bgsurface,&dstrect);

                 offx=-bgsurface->w/2;

@@ -433,7 +464,7 @@ reui_balloon(reui_t *ui, char direction, int x, int y, const char *rgbafg, const

  * returns 0 on success

  */

 static int

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

+intreui_fillroundedr(SDL_Surface *dst, int xo, int yo, int w, int h, int r, const char *rgba)

 {

         int yd=(dst->pitch)/(dst->format->BytesPerPixel);

         Uint32 *pixels=NULL;

@@ -501,7 +532,7 @@ reui_fillrounded(SDL_Surface *dst, int xo, int yo, int w, int h, int r, const ch

 /* end of external code */

 static int

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

+intreui_triangle(SDL_Surface *dst, int x, int y, int w, int h, char direction, const char *rgba)

 {

         Uint32 color;

         SDL_Rect dstrect;

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

 #include <stdarg.h>

 #include "re_ui.h"

 #include "hack_regular.h"

+#include "iosevka_fixed_regular.h"

 #define DEFAULTTITLEPREFIX "re - "

 #define DEFAULTWINDOWWIDTH 80

@@ -88,7 +89,7 @@ reui_init(int fontheight, reui_t *parent)

         if(parent==NULL)

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

         else

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

+                ui->fontdata=SDL_RWFromConstMem(iosevka_fixed_regular,SIZE_IOSEVKA_FIXED_REGULAR);

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

         if(ui->fontdata==NULL

           || TTF_Init()==-1

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

 #include <stdarg.h>

 #include "re_ui.h"

 #include "hack_regular.h"

-#include "saxmono.h"

 #define DEFAULTTITLEPREFIX "re - "

 #define DEFAULTWINDOWWIDTH 80

@@ -89,7 +88,7 @@ reui_init(int fontheight, reui_t *parent)

         if(parent==NULL)

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

         else

-                ui->fontdata=SDL_RWFromConstMem(saxmono,SIZE_SAXMONO);

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

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

         if(ui->fontdata==NULL

           || TTF_Init()==-1

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

 #include <stdarg.h>

 #include "re_ui.h"

 #include "hack_regular.h"

+#include "saxmono.h"

 #define DEFAULTTITLEPREFIX "re - "

 #define DEFAULTWINDOWWIDTH 80

@@ -85,7 +86,10 @@ reui_init(int fontheight, reui_t *parent)

         ui->screenh=screenrect.h;

         /* font */

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

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

+        if(parent==NULL)

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

+        else

+                ui->fontdata=SDL_RWFromConstMem(saxmono,SIZE_SAXMONO);

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

         if(ui->fontdata==NULL

           || TTF_Init()==-1

@@ -48,7 +48,7 @@ static int reui_fillrounded(SDL_Surface *dst, int xo, int yo, int w, int h, int

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

 reui_t *

-reui_init(int fontheight)

+reui_init(int fontheight, reui_t *parent)

 {

         reui_t *ui;

         SDL_Rect screenrect;

@@ -70,10 +70,16 @@ reui_init(int fontheight)

         ui->amask=0xff000000;

 #endif

         /* video */

-        if(SDL_Init(SDL_INIT_VIDEO)<0

-          || SDL_GetDisplayBounds(0,&screenrect)!=0) {

-                reui_free(ui),ui=NULL;

-                return(NULL);

+        if(parent==NULL) {

+                if(SDL_Init(SDL_INIT_VIDEO)<0

+                  || SDL_GetDisplayBounds(0,&screenrect)!=0) {

+                        reui_free(ui),ui=NULL;

+                        return(NULL);

+                }

+        } else {

+                ui->parent=(void *)parent;

+                screenrect.w=parent->screenw;

+                screenrect.h=parent->screenh;

         }

         ui->screenw=screenrect.w;

         ui->screenh=screenrect.h;

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

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

         if(ui->font!=NULL)

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

-        if(TTF_WasInit())

+        if(ui->parent==NULL && TTF_WasInit())

                 TTF_Quit();

         if(ui->fontdata!=NULL)

                 SDL_FreeRW(ui->fontdata),ui->fontdata=NULL;

@@ -153,7 +159,8 @@ 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();

+        if(ui->parent==NULL)

+                SDL_Quit();

         free(ui),ui=NULL;

 }

@@ -113,7 +113,7 @@ reui_init(int fontheight)

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

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

         ui->h=ui->fontheight*DEFAULTWINDOWHEIGHT;

-        ui->h=(ui->h>ui->screenh)?ui->screenw:ui->h;

+        ui->h=(ui->h>ui->screenh)?ui->screenh:ui->h;

         if((ui->win=SDL_CreateWindow(

               DEFAULTTITLEPREFIX,

               SDL_WINDOWPOS_UNDEFINED,SDL_WINDOWPOS_UNDEFINED,

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

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

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

 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)

@@ -126,15 +123,10 @@ 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

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

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

+              SDL_TEXTUREACCESS_STATIC,1,1))==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;

@@ -147,8 +139,6 @@ 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)

@@ -223,8 +213,6 @@ reui_setfontheight(reui_t *ui, int fontheight)

         ui->fontwidth=s->w;

         SDL_FreeSurface(s),s=NULL;

         SDL_FreeSurface(s2),s2=NULL;

-        /* font cache */

-        reui_fontcachereset(ui);

         return(0);

 }

@@ -272,7 +260,6 @@ 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;

@@ -300,84 +287,6 @@ 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

 }

@@ -627,12 +536,3 @@ 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);

-}

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

+}

@@ -28,16 +28,24 @@

                             |(((Uint32)(((unsigned char *)rgba)[1]))<<16) \

                             |(((Uint32)(((unsigned char *)rgba)[2]))<<8)  \

                             |((Uint32)(((unsigned char *)rgba)[3])))

+#define CHARRGBA2TEXARGB8888(rgba) ((((Uint32)(((unsigned char *)rgba)[2]))<<24) \

+                            |(((Uint32)(((unsigned char *)rgba)[1]))<<16) \

+                            |(((Uint32)(((unsigned char *)rgba)[0]))<<8)  \

+                            |((Uint32)(((unsigned char *)rgba)[3])))

 #else

 #define CHARRGBA2UINT(rgba) ((((Uint32)(((unsigned char *)rgba)[3]))<<24) \

                             |(((Uint32)(((unsigned char *)rgba)[2]))<<16) \

                             |(((Uint32)(((unsigned char *)rgba)[1]))<<8)  \

                             |((Uint32)(((unsigned char *)rgba)[0])))

+#define CHARRGBA2TEXARGB8888(rgba) ((((Uint32)(((unsigned char *)rgba)[3]))<<24) \

+                            |(((Uint32)(((unsigned char *)rgba)[0]))<<16) \

+                            |(((Uint32)(((unsigned char *)rgba)[1]))<<8)  \

+                            |((Uint32)(((unsigned char *)rgba)[2])))

 #endif

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

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

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

 reui_t *

@@ -50,6 +58,18 @@ reui_init(int fontheight)

         if((ui=malloc(sizeof(reui_t)))==NULL)

                 return(NULL);

         memset(ui,0,sizeof(reui_t));

+        /* masks */

+#if SDL_BYTEORDER==SDL_BIG_ENDIAN

+        ui->rmask=0xff000000;

+        ui->gmask=0x00ff0000;

+        ui->bmask=0x0000ff00;

+        ui->amask=0x000000ff;

+#else

+        ui->rmask=0x000000ff;

+        ui->gmask=0x0000ff00;

+        ui->bmask=0x00ff0000;

+        ui->amask=0xff000000;

+#endif

         /* video */

         if(SDL_Init(SDL_INIT_VIDEO)<0

           || SDL_GetDisplayBounds(0,&screenrect)!=0) {

@@ -91,7 +111,9 @@ reui_init(int fontheight)

           || (ui->renderer=SDL_CreateRenderer(ui->win,-1,

               SDL_RENDERER_ACCELERATED|SDL_RENDERER_PRESENTVSYNC))==NULL

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

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

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

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

+              SDL_TEXTUREACCESS_STATIC,1,1))==NULL) {

                 reui_free(ui),ui=NULL;

                 return(NULL);

         }

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

 {

         if(ui==NULL)

                 return;

+        if(ui->onepx!=NULL)

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

         if(ui->font!=NULL)

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

         if(TTF_WasInit())

@@ -119,6 +143,7 @@ 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;

 }

@@ -180,18 +205,18 @@ reui_setfontheight(reui_t *ui, int fontheight)

 int

-reui_fill(reui_t *ui, int x, int y, int w, int h, char *rgba)

+reui_fill(reui_t *ui, int x, int y, int w, int h, const char *rgba)

 {

+        SDL_Rect srcrect;

         SDL_Rect dstrect;

+        Uint32 pixels[1];

         if(ui==NULL || rgba==NULL)

                 return(-1);

+        pixels[0]=CHARRGBA2TEXARGB8888(rgba);

+        SDL_UpdateTexture(ui->onepx,NULL,pixels,sizeof(Uint32));

+        RECTFILL(srcrect,0,0,1,1);

         RECTFILL(dstrect,x,y,w,h);

-        SDL_SetRenderDrawColor(ui->renderer,

-                ((unsigned char *)rgba)[0],

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

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

-                ((unsigned char *)rgba)[3]);

-        SDL_RenderFillRect(ui->renderer, &dstrect);

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

         ui->rendererdirty=1;

         return(0);

 }

@@ -220,7 +245,7 @@ reui_present(reui_t *ui)

 }

 int

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

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

 {

         char buf[1024];

         SDL_Surface *fgsurface;

@@ -253,7 +278,7 @@ reui_write(reui_t *ui, int x, int y, char *rgba, char *str, int nchar)

 int

-reui_printf(reui_t *ui, int x, int y, char *rgba, char *format, ...)

+reui_printf(reui_t *ui, int x, int y, const char *rgba, char *format, ...)

 {

         char buf[1024];

         va_list l;

@@ -267,7 +292,7 @@ reui_printf(reui_t *ui, int x, int y, char *rgba, char *format, ...)

 }

 int

-reui_balloon(reui_t *ui, char direction, int x, int y, char *rgbafg, char *rgbabg, char *str, int nchar)

+reui_balloon(reui_t *ui, char direction, int x, int y, const char *rgbafg, const char *rgbabg, const char *str, int nchar)

 {

         char buf[1024];

         SDL_Surface *bgsurface;

@@ -278,7 +303,6 @@ reui_balloon(reui_t *ui, char direction, int x, int y, char *rgbafg, char *rgbab

                      ((unsigned char *)rgbafg)[2],

                      ((unsigned char *)rgbafg)[3]};

         SDL_Rect dstrect;

-        Uint32 rmask, gmask, bmask, amask;

         int trianglew,triangleh;

         int marginw,marginh;