@@ -19,6 +19,8 @@

 #define DEFAULTFONTSIZE 16

 #define DEFAULTTITLEPREFIX "re - "

+#define DEFAULTWINDOWWIDTH 80

+#define DEFAULTWINDOWHEIGHT 66

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

@@ -32,20 +34,12 @@ reui_init()

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

         /* video */

         if(SDL_Init(SDL_INIT_VIDEO)<0

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

-          || (ui->win=SDL_CreateWindow(

-              DEFAULTTITLEPREFIX,

-              SDL_WINDOWPOS_UNDEFINED,SDL_WINDOWPOS_UNDEFINED,

-              screenrect.w,screenrect.h,0))==NULL

-          || (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,screenrect.w,screenrect.h))==NULL) {

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

                 reui_free(ui),ui=NULL;

                 return(NULL);

         }

-        ui->w=screenrect.w;

-        ui->h=screenrect.h;

+        ui->screenw=screenrect.w;

+        ui->screenh=screenrect.h;

         /* font */

         ui->fontheight=DEFAULTFONTSIZE;

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

@@ -67,6 +61,22 @@ reui_init()

                 ui->fontwidth=s->w;

                 SDL_FreeSurface(s),s=NULL;

         }

+        /* main window */

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

+        if((ui->win=SDL_CreateWindow(

+              DEFAULTTITLEPREFIX,

+              SDL_WINDOWPOS_UNDEFINED,SDL_WINDOWPOS_UNDEFINED,

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

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

+                reui_free(ui),ui=NULL;

+                return(NULL);

+        }

         /* finished */

         ui->scrdirty=1;

         ui->rendererdirty=1;

@@ -18,6 +18,7 @@

 typedef struct reui_t {

+        int screenw,screenh;

         int w,h;

         SDL_Window *win;

         SDL_Renderer *renderer;

@@ -18,6 +18,9 @@

 #include "re_ui.h"

 #include "ext/socklib.h"

+#define LINEFORCESCROLL 1

+#define COLFORCESCROLL 5

+

 typedef struct re_t {

         redata_t *data;

         reui_t *ui;

@@ -25,7 +28,8 @@ typedef struct re_t {

         char filename[PATH_MAX];

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

         long cursorpos;

-        int lastcol,lastrow;

+        int originline,origincol;

+        int curline,curcol;

         int maxrow,maxcol;

         int contentsdirty;

 } re_t;

@@ -209,8 +213,7 @@ re_processkey(re_t *re, SDL_Event *event)

         char *ptr,*ptr2;

         int len;

         int has_nl;

-        int oldcol,maxcol;

-        int linecols;

+        int maxcol;

         int inc;

         if(re==NULL || event==NULL || event->type!=SDL_KEYDOWN)

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

@@ -219,23 +222,28 @@ re_processkey(re_t *re, SDL_Event *event)

                         return(-1); /* couldn't get current line data */

                 if(event->key.keysym.sym==SDLK_UP && newpos==0)

                         return(-1); /* going up but already at top */

+#if 0

                 maxcol=redata_generic_utf8len(ptr,len);

-                if(maxcol<re->lastcol)

+                if(maxcol<re->curcol)

                         re->cursorpos=newpos+len;

                 else

-                        re->cursorpos=newpos+(redata_generic_utf8col(ptr,len,re->lastcol)-ptr);

+                        re->cursorpos=newpos+(redata_generic_utf8col(ptr,len,re->curcol)-ptr);

+#endif

                 if(redata_line_info(re->data,(event->key.keysym.sym==SDLK_DOWN)?(newpos+len):(newpos-1),&newpos2,&ptr,&len)==-1)

                         return(-1); /* couldn't get next line data */

                 has_nl=((len>0 && ptr[len-1]=='\n')?1:0);

                 maxcol=redata_generic_utf8len(ptr,len)-has_nl;

-                if(maxcol<re->lastcol)

+                if(maxcol<re->curcol)

                         re->cursorpos=newpos2+len-has_nl;

                 else

-                        re->cursorpos=newpos2+(redata_generic_utf8col(ptr,len,re->lastcol)-ptr);

-                if(event->key.keysym.sym==SDLK_DOWN && re->lastrow<re->maxrow)

-                        re->lastrow++;

-                else if(event->key.keysym.sym==SDLK_UP && re->lastrow>0)

-                        re->lastrow--;

+                        re->cursorpos=newpos2+(redata_generic_utf8col(ptr,len,re->curcol)-ptr);

+                re->curline+=(event->key.keysym.sym==SDLK_DOWN)?1:-1;

+                if(re->curline<(re->originline+LINEFORCESCROLL)) {

+                        re->originline-=LINEFORCESCROLL;

+                        re->originline=(re->originline<0)?0:re->originline;

+                }

+                if(re->curline>(re->originline+re->maxrow-LINEFORCESCROLL))

+                        re->originline+=LINEFORCESCROLL;

                 re_drawheader(re);

                 re->contentsdirty=1;

         } else if(event->key.keysym.sym==SDLK_LEFT || event->key.keysym.sym==SDLK_RIGHT) {

@@ -243,20 +251,25 @@ re_processkey(re_t *re, SDL_Event *event)

                         return(-1); /* couldn't get current line data */

                 if(event->key.keysym.sym==SDLK_LEFT && re->cursorpos==0)

                         return(-1); /* going left but already at leftmost char */

-                linecols=redata_generic_utf8len(ptr,len);

-                oldcol=redata_generic_utf8len(ptr,re->cursorpos-newpos);

+                maxcol=redata_generic_utf8len(ptr,len);

                 inc=(event->key.keysym.sym==SDLK_LEFT)?-1:1;

                 has_nl=((len>0 && ptr[len-1]=='\n')?1:0);

-                if(re->lastcol<=linecols) {

-                        ptr2=redata_generic_utf8col(ptr,len,re->lastcol+inc);

-                } else

+                if(re->curcol<=maxcol)

+                        ptr2=redata_generic_utf8col(ptr,len,re->curcol+inc);

+                else

                         ptr2=NULL;

                 if(ptr2!=NULL)

                         re->cursorpos=newpos+(ptr2-ptr);

                 else

                         re->cursorpos=newpos+(len-has_nl); /* we're past the last col, set cursor to last pos in line */

-                if((re->lastcol+inc)>=0)

-                        re->lastcol+=inc;

+                if((re->curcol+inc)>=0)

+                        re->curcol+=inc;

+                if(re->curcol<(re->origincol+COLFORCESCROLL)) {

+                        re->origincol-=COLFORCESCROLL;

+                        re->origincol=(re->origincol<0)?0:re->origincol;

+                }

+                if(re->curcol>(re->origincol+re->maxcol-COLFORCESCROLL))

+                        re->origincol+=COLFORCESCROLL;

                 re_drawheader(re);

                 re->contentsdirty=1;

         } else if(event->key.keysym.sym==SDLK_a) {

@@ -275,7 +288,7 @@ re_drawheader(re_t *re)

         if(redata_pos2linecol(re->data,re->cursorpos,&line,&col)==-1)

                 line=col=-1;

         reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,"\x00\x00\xff\xff");

-        reui_printf(re->ui,0,0,"\xff\xff\x00\xff","File: %s Line:%i (%i) Col:%i (%i) Pos:%li",re->filename,re->lastrow,line,re->lastcol,col,re->cursorpos);

+        reui_printf(re->ui,0,0,"\xff\xff\x00\xff","File: %s Line:%i (%i) Col:%i (%i) Pos:%li",re->filename,re->curline,line,re->curcol,col,re->cursorpos);

         return(0);

 }

@@ -283,7 +296,7 @@ int

 re_drawcontents(re_t *re)

 {

         long pos,newpos;

-        char *ptr;

+        char *ptr,*visibleptr;

         int len;

         int y,row;

         char *curptr;

@@ -292,7 +305,7 @@ re_drawcontents(re_t *re)

         if(re==NULL)

                 return(-1);

         reui_fill(re->ui,re->x,re->y,re->w,re->h,"\xdf\xdf\xdf\xff");

-        row=re->lastrow;

+        row=re->curline-re->originline;

         pos=re->cursorpos;

         while(row>0) {

                 if(redata_line_info(re->data,pos,&newpos,NULL,NULL)==-1)

@@ -301,20 +314,22 @@ re_drawcontents(re_t *re)

                 row--;

         }

         /* highlight current line */

-        reui_fill(re->ui,re->x,re->y+(re->lastrow)*re->ui->fontheight,re->w,re->ui->fontheight+1,"\xef\xef\xef\xff");

+        reui_fill(re->ui,re->x,re->y+(re->curline-re->originline)*re->ui->fontheight,re->w,re->ui->fontheight+1,"\xef\xef\xef\xff");

         /* draw the lines */

         for(y=re->y;y<(re->y+re->h);y+=re->ui->fontheight,row++) {

                 if(redata_line_info(re->data,pos,&newpos,&ptr,&len)==-1)

                         break; /* couldn't get line start pos */

                 has_nl=((len>0 && ptr[len-1]=='\n')?1:0);

-                reui_write(re->ui,re->x,y,"\x00\x00\x00\xff",(char *)ptr,len-has_nl);

-                if(row==re->lastrow) {

+                visibleptr=redata_generic_utf8col((char *)ptr,len-has_nl,re->origincol);

+                if(visibleptr!=NULL)

+                        reui_write(re->ui,re->x,y,"\x00\x00\x00\xff",visibleptr,len-has_nl-(visibleptr-ptr));

+                if(row==(re->curline-re->originline)) {

 #warning DEBUG write of current char

-                        reui_fill(re->ui,re->x+re->ui->fontwidth*re->lastcol,y,re->ui->fontwidth,re->ui->fontheight+1,"\x00\x00\x00\xff");

+                        reui_fill(re->ui,re->x+re->ui->fontwidth*(re->curcol-re->origincol),y,re->ui->fontwidth,re->ui->fontheight+1,"\x00\x00\x00\xff");

 #warning TODO: consider tabs

-                        curptr=redata_generic_utf8col(ptr,len-has_nl,re->lastcol);

+                        curptr=redata_generic_utf8col(ptr,len-has_nl,re->curcol);

                         curptrlen=(curptr==NULL)?0:(len-has_nl)-(curptr-ptr);

-                        reui_write(re->ui,re->x+re->ui->fontwidth*re->lastcol,y,"\xff\xff\xff\xff",curptr,redata_generic_utf8charlen(ptr,curptrlen));

+                        reui_write(re->ui,re->x+re->ui->fontwidth*(re->curcol-re->origincol),y,"\xff\xff\xff\xff",curptr,redata_generic_utf8charlen(ptr,curptrlen));

 #warning TODO: if it is one of  '[','{','<','>','}',']', highlight the matching bracket/parens/anglebracket.

                 }

                 pos=newpos+len;