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

         int marginoffx,marginoffy;

@@ -286,17 +310,6 @@ reui_balloon(reui_t *ui, char direction, int x, int y, char *rgbafg, char *rgbab

         int offx,offy;

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

                 return(-1);

-#if SDL_BYTEORDER==SDL_BIG_ENDIAN

-        rmask=0xff000000;

-        gmask=0x00ff0000;

-        bmask=0x0000ff00;

-        amask=0x000000ff;

-#else

-        rmask=0x000000ff;

-        gmask=0x0000ff00;

-        bmask=0x00ff0000;

-        amask=0xff000000;

-#endif

         if(nchar<sizeof(buf)) {

                 memcpy(buf,str,nchar);

                 buf[nchar]='\0';

@@ -316,7 +329,7 @@ reui_balloon(reui_t *ui, char direction, int x, int y, char *rgbafg, char *rgbab

         if((bgsurface=SDL_CreateRGBSurface(0

           ,(fgsurface->w+marginw*2)+((direction=='w' || direction=='e')?trianglew:0)

           ,(fgsurface->h+marginh*2)+((direction=='n' || direction=='s')?triangleh:0)

-          ,32, rmask, gmask, bmask, amask))==NULL) {

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

                 if(fgsurface!=NULL)

                         SDL_FreeSurface(fgsurface),fgsurface=NULL;

                 return(-1);

@@ -396,7 +409,7 @@ reui_balloon(reui_t *ui, char direction, int x, int y, char *rgbafg, char *rgbab

  * returns 0 on success

  */

 static int

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

+reui_fillrounded(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;

@@ -404,6 +417,7 @@ reui_fillrounded(SDL_Surface *dst, int xo, int yo, int w, int h, int r, char *rg

         int rpsqrt2= (int) (r/sqrt(2));

         int sy,ey,sx,ex;

         int d,x2m1;

+        int o,l;

         Uint32 color;

         if(dst==NULL || rgba==NULL || xo<0 || y0<0 || (xo+w)>dst->w || (yo+h)>dst->h)

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

@@ -418,13 +432,15 @@ reui_fillrounded(SDL_Surface *dst, int xo, int yo, int w, int h, int r, char *rg

                 return(-1);

         SDL_LockSurface(dst);

         pixels=(Uint32*)(dst->pixels);

+        l=dst->w*dst->h;

         sy=(yo-h)*yd;

         ey=(yo+h)*yd;

         sx=(xo-w);

         ex=(xo+w);

         for(i=sy;i<=ey;i+=yd) {

                 for(j=sx-r;j<=ex+r;j++) {

-                        pixels[i+j]=color;

+                        if((o=i+j)>=0 && o<l)

+                                pixels[o]=color;

                 }

         }

         d=-r;

@@ -437,17 +453,22 @@ reui_fillrounded(SDL_Surface *dst, int xo, int yo, int w, int h, int r, char *rg

                         y--;

                         d-=(y*2);

                 }

-                for(i=sx-x;i<=ex+x;i++)

-                        pixels[sy-y*yd+i]=color;

-

-                for(i=sx-y;i<=ex+y;i++)

-                        pixels[sy-x*yd+i]=color;

-

-                for(i=sx-y;i<=ex+y;i++)

-                        pixels[ey+x*yd+i]=color;

-

-                for(i=sx-x;i<=ex+x;i++)

-                        pixels[ey+y*yd+i]=color;

+                for(i=sx-x;i<=ex+x;i++) {

+                        if((o=(sy-y*yd+i))>=0 && o<l)

+                                pixels[o]=color;

+                }

+                for(i=sx-y;i<=ex+y ;i++) {

+                        if((o=(sy-x*yd+i))>=0 && o<l)

+                                pixels[o]=color;

+                }

+                for(i=sx-y;i<=ex+y;i++) {

+                        if((o=(ey+x*yd+i))>=0 && o<l)

+                                pixels[o]=color;

+                }

+                for(i=sx-x;i<=ex+x;i++) {

+                        if((o=(ey+y*yd+i))>=0 && o<l)

+                                pixels[o]=color;

+                }

         }

         SDL_UnlockSurface(dst);

         return(0);

@@ -456,7 +477,7 @@ reui_fillrounded(SDL_Surface *dst, int xo, int yo, int w, int h, int r, char *rg

 /* end of external code */

 static int

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

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

 {

         Uint32 color;

         SDL_Rect dstrect;

@@ -17,14 +17,17 @@

 #include "SDL_ttf.h"

+

 typedef struct reui_t {

         int screenw,screenh;

         int w,h;

+        Uint32 rmask, gmask, bmask, amask;

         SDL_Window *win;

         SDL_Renderer *renderer;

         SDL_Texture *scr;

         SDL_RWops *fontdata;

         TTF_Font *font;

+        SDL_Texture *onepx;

         int fontheight;

         int fontwidth;

         int scrdirty;

@@ -37,17 +40,17 @@ void reui_free(reui_t *ui);

 int reui_title(reui_t *ui, char *titlefilename);

 int reui_resize(reui_t *ui, int w, int h);

 int reui_setfontheight(reui_t *ui, int fontheight);

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

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

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

 int reui_present(reui_t *ui);

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

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

 #ifdef __GNUC__

-int reui_printf(reui_t *ui, int x, int y, char *rgba, char *format, ...) __attribute__ ((format (printf, 5, 6)));

+int reui_printf(reui_t *ui, int x, int y, const char *rgba, char *format, ...) __attribute__ ((format (printf, 5, 6)));

 #else

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

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

 #endif

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

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