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

@@ -41,6 +41,7 @@ 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, const char *rgba);

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

@@ -1965,7 +1965,7 @@ re_drawheader_command(re_t *re)

                         reui_printf(re->ui,re->ui->fontwidth*(commandlen+1),0,COLOR_QUERYFG,"%s",re->commandbuf);

                 } else {

                         commandbuflen=redata_generic_utf8len(re->commandbuf,strlen(re->commandbuf));

-                        reui_fill(re->ui,re->ui->fontwidth*(commandlen+1)-re->ui->fontwidth/2,0,re->ui->fontwidth*(commandbuflen+1)+1,re->ui->fontheight,COLOR_QUERYBGOLD);

+                        reui_fillrounded(re->ui,re->ui->fontwidth*(commandlen+1)-re->ui->fontwidth/2,0,re->ui->fontwidth*(commandbuflen+1)+1,re->ui->fontheight,COLOR_QUERYBGOLD);

                         reui_printf(re->ui,re->ui->fontwidth*(commandlen+1),0,COLOR_QUERYFGOLD,"%s",re->commandbuf);

                 }

         }