@@ -17,7 +17,6 @@

 #include "re_ui.h"

 #include "hack_regular.h"

-#define DEFAULTFONTSIZE 16

 #define DEFAULTTITLEPREFIX "re - "

 #define DEFAULTWINDOWWIDTH 80

 #define DEFAULTWINDOWHEIGHT 66

@@ -42,10 +41,12 @@ static int reui_triangle(SDL_Surface *dst, int x, int y, int w, int h, char dire

 reui_t *

-reui_init()

+reui_init(int fontheight)

 {

         reui_t *ui;

         SDL_Rect screenrect;

+        if(fontheight<=0)

+                return(NULL); /* sanity check failed */

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

                 return(NULL);

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

@@ -58,7 +59,7 @@ reui_init()

         ui->screenw=screenrect.w;

         ui->screenh=screenrect.h;

         /* font */

-        ui->fontheight=DEFAULTFONTSIZE;

+        ui->fontheight=fontheight;

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

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

         if(ui->fontdata==NULL

@@ -153,6 +154,31 @@ reui_resize(reui_t *ui, int w, int h)

         return(0);

 }

+int

+reui_setfontheight(reui_t *ui, int fontheight)

+{

+        TTF_Font *newfont;

+        SDL_Surface *s;

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

+                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->fontwidth=s->w;

+        SDL_FreeSurface(s),s=NULL;

+        return(0);

+}

+

+

 int

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

 {

@@ -31,11 +31,12 @@ typedef struct reui_t {

         int rendererdirty;

 } reui_t;

-reui_t *reui_init();

+reui_t *reui_init(int fontheight);

 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_scr2renderer(reui_t *ui, int x, int y, int w, int h);

 int reui_present(reui_t *ui);

@@ -28,6 +28,7 @@

 #define IDLETIMEOUTSECONDS 10

 #define COMMANDBUFSIZE 1024

+#define DEFAULTFONTHEIGHT 16

 #define COMMAND_WARNING "(!)"

 #define COMMAND_GOTOLINE "Go to line:"

@@ -54,6 +55,7 @@ typedef struct re_t {

         int flag_newfile;

         char filename[PATH_MAX];

         int x, y, w, h; // contents rect

+        int fontheightpercent;

         long cursorpos;

         int originline,origincol;

         int curline,curcol;

@@ -91,6 +93,7 @@ int re_processkey_commanddata(re_t *re, SDL_Event *event);

 int re_processcommand(re_t *re);

 int re_moveupdown(re_t *re, int totalinc);

 int re_moveleftright(re_t *re, int totalinc);

+int re_changefontsize(re_t *re, int direction);

 int re_rtrim(re_t *re, long curpos, int *trimmed);

 long re_getmatchingbracket(re_t *re,long posini, char originalchar, char *matchingchar);

 int re_drawheader_editing(re_t *re);

@@ -320,7 +323,8 @@ re_init(void)

                 re_free(re),re=NULL;

                 return(NULL); /* insuf. mem. */

         }

-        if((re->ui=reui_init())==NULL) {

+        re->fontheightpercent=100;

+        if((re->ui=reui_init(DEFAULTFONTHEIGHT*re->fontheightpercent/100))==NULL) {

                 re_free(re),re=NULL;

                 return(NULL); /* video init error */

         }

@@ -645,6 +649,18 @@ fprintf(stderr,"re_processkey(): received Control+l\n");

                 re_fixorigin_center(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

+        } else if(event->key.keysym.sym==SDLK_PLUS && (SDL_GetModState()&KMOD_CTRL)!=0) {

+fprintf(stderr,"re_processkey(): received Control+'+'\n");

+                re_changefontsize(re, 1);

+                re->ignorenkeys++;

+        } else if(event->key.keysym.sym==SDLK_MINUS && (SDL_GetModState()&KMOD_CTRL)!=0) {

+fprintf(stderr,"re_processkey(): received Control+'-'\n");

+                re_changefontsize(re, -1);

+                re->ignorenkeys++;

+        } else if(event->key.keysym.sym==SDLK_0 && (SDL_GetModState()&KMOD_CTRL)!=0) {

+fprintf(stderr,"re_processkey(): received Control+'0'\n");

+                re_changefontsize(re, 0);

+                re->ignorenkeys++;

         }

         return(0);

 }

@@ -915,6 +931,44 @@ re_moveleftright(re_t *re, int totalinc)

         return(0);

 }

+int

+re_changefontsize(re_t *re, int direction)

+{

+        int validpercent[]={30,50,67,80,90,100,110,120,133,150,170,200,240,300};

+        int newpercent;

+        int i;

+        if(re==NULL)

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

+        if(direction<0) {

+                newpercent=validpercent[0];

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

+                        if(validpercent[i]<re->fontheightpercent)

+                                newpercent=validpercent[i];

+                        else

+                                break;

+                }

+        } else if(direction>0) {

+                newpercent=validpercent[(sizeof(validpercent)/sizeof(validpercent[0]))-1];

+                for(i=(sizeof(validpercent)/sizeof(validpercent[0]))-1;i>=0;i--) {

+                        if(validpercent[i]>re->fontheightpercent)

+                                newpercent=validpercent[i];

+                        else

+                                break;

+                }

+        } else {

+                newpercent=100;

+        }

+        if(reui_setfontheight(re->ui,DEFAULTFONTHEIGHT*newpercent/100)==-1)

+                return(-1); /* couldn't setup new font size */

+        re->fontheightpercent=newpercent;

+        re_setuidata(re);

+        re_fixorigin(re);

+        re->contentsdirty=1;

+        re->headerdirty=1;

+        return(0);

+}

+

+

 int

 re_rtrim(re_t *re, long curpos, int *trimmed)

 {