@@ -23,7 +23,8 @@

 #include "re_data.h"

 #include "sha3/sha3.h"

-#define CHUNKSIZE 32768

+//#define CHUNKSIZE 32768

+#define CHUNKSIZE 160

 #define UNDOBLOCK 1024

 #define UNDOGROWSIZE (256*1024)

 #define SECURESAVEPREFIX "."

@@ -1304,6 +1305,53 @@ redata_hash_gen(redata_t *redata, char *filename, char *buf, long buflen, char *

         return(0);

 }

+/*#define DEBUG_LINE_INFO*/

+

+#ifdef DEBUG_LINE_INFO

+#define LINEINFODEBUG(a) fprintf a

+#else

+#define LINEINFODEBUG(a)

+#endif

+

+int

+redata_line_info(redata_t *redata, long pos, long *startpos, char **startptr, int *len)

+{

+        int chunkno;

+        long start;

+        unsigned char *ptr,*end;

+        rechunk_t *chunk;

+        if(redata==NULL || pos<0)

+                return(-1);

+        /* search chunk of pos */

+        for(chunkno=0,start=0;chunkno<redata->sizechunks;start+=(redata->chunks[chunkno]==NULL)?0:redata->chunks[chunkno]->useddata,chunkno++) {

+        LINEINFODEBUG((stderr,"redata_line_info: searchchunk: pos:%li chunkno:%i start:%li\n",pos,chunkno,start));

+                if(redata->chunks[chunkno]==NULL)

+                        continue;

+                if((start+redata->chunks[chunkno]->useddata)>pos)

+                        break;

+        }

+        if(chunkno>=redata->sizechunks)

+                return(-1);

+        chunk=redata->chunks[chunkno];

+        /* search line start */

+        LINEINFODEBUG((stderr,"redata_line_info: searchstart: pos:%li start:%li offset:%li\n",pos,start,(pos-start)));

+        for(ptr=chunk->data+(pos-start);ptr>chunk->data && ptr[-1]!='\n';ptr--)

+                ;

+        /* search line end */

+        LINEINFODEBUG((stderr,"redata_line_info: searchend: pos:%li start:%li offset:%li\n",pos,start,(pos-start)));

+        for(end=chunk->data+(pos-start)+1;end<=(chunk->data+chunk->useddata) && end[-1]!='\n';end++)

+                ;

+        /* fill results */

+        LINEINFODEBUG((stderr,"redata_line_info: filling results: len:%li\n",end-ptr));

+        if(startpos!=NULL)

+                *startpos=(pos-((chunk->data+(pos-start))-ptr));

+        if(startptr!=NULL)

+                *startptr=(char *) ptr;

+        if(len!=NULL)

+                *len=end-ptr;

+        return(0);

+}

+

 static char *

 securesave_genname(char *filename, char *buf, int bufsize)

 {

@@ -128,3 +128,5 @@ int redata_memhash(redata_t *redata, char *buf, long buflen, char *resbuf129byte

 undostack_t *redata_getstack(redata_t *redata, undo_t *undo);

 char *redata_generic_genname(char *filename,char *prefix, char *postfix, char *buf, int bufsize);

+/* line convenience funtions */

+int redata_line_info(redata_t *redata, long pos, long *startpos, char **startptr, int *len);

@@ -56,6 +56,17 @@ reui_init()

                 reui_free(ui),ui=NULL;

                 return(NULL);

         }

+        /* font width */

+        {

+                SDL_Surface *s;

+                SDL_Color c={0,0,0,0};

+                if((s=TTF_RenderUTF8_Blended(ui->font,"m",c))==NULL) {

+                        reui_free(ui),ui=NULL;

+                        return(NULL);

+                }

+                ui->fontwidth=s->w;

+                SDL_FreeSurface(s),s=NULL;

+        }

         /* finished */

         ui->scrdirty=1;

         ui->rendererdirty=1;

@@ -98,13 +109,17 @@ reui_title(reui_t *ui, char *titlefilename)

 int

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

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

 {

         SDL_Rect dstrect;

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

                 return(-1);

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

-        SDL_SetRenderDrawColor(ui->renderer,rgba[0],rgba[1],rgba[2],rgba[3]);

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

         ui->rendererdirty=1;

         return(0);

@@ -134,12 +149,15 @@ reui_present(reui_t *ui)

 }

 int

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

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

 {

         char buf[1024];

         SDL_Surface *fgsurface;

         SDL_Texture *fg;

-        SDL_Color c={rgba[0],rgba[1],rgba[2],rgba[3]};

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

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

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

+                     ((unsigned char *)rgba)[3]};

         SDL_Rect dstrect;

         if(nchar<sizeof(buf)) {

                 memcpy(buf,str,nchar);

@@ -164,7 +182,7 @@ reui_write(reui_t *ui, int x, int y, unsigned char *rgba, char *str, int nchar)

 int

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

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

 {

         char buf[1024];

         va_list l;

@@ -176,3 +194,25 @@ reui_printf(reui_t *ui, int x, int y, unsigned char *rgba, char *format, ...)

                 return(-1);

         return(0);

 }

+

+int

+reui_utf8len(reui_t *ui, char *ptr, int size)

+{

+        /* calculate the number of utf8-charaters in buffer */

+        if(ui==NULL || size<0 || (ptr==NULL && size!=0))

+                return(-1);

+#warning TODO

+        return(size);

+#warning Also consider tabs

+}

+

+char *

+reui_utf8col(reui_t *ui, char *ptr, int size, int col)

+{

+        /* return a pointer to the "n"th ("col"th) utf8-character in buffer */

+#warning TODO

+        if(col<size)

+                return(ptr+col);

+        return(NULL);

+#warning Also consider tabs

+}

@@ -25,6 +25,7 @@ typedef struct reui_t {

         SDL_RWops *fontdata;

         TTF_Font *font;

         int fontheight;

+        int fontwidth;

         int scrdirty;

         int rendererdirty;

 } reui_t;

@@ -33,13 +34,20 @@ reui_t *reui_init();

 void reui_free(reui_t *ui);

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

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

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

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

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

 #ifdef __GNUC__

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

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

 #else

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

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

 #endif

+

+/* calculate the number of utf8-charaters in buffer */

+int reui_utf8len(reui_t *ui, char *ptr, int size);

+

+/* return a pointer to the "n"th ("col"th) utf8-character in buffer */

+char *reui_utf8col(reui_t *ui, char *ptr, int size, int col);

+

@@ -19,11 +19,14 @@

 #include "ext/socklib.h"

 typedef struct re_t {

-        redata_t *redata;

+        redata_t *data;

         reui_t *ui;

         int flag_newfile;

         char filename[PATH_MAX];

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

+        long cursorpos;

+        int lastcol,lastrow;

+        int maxrow,maxcol;

 } re_t;

 volatile int flag_sigint;

@@ -50,6 +53,7 @@ main(int argc, char *argv[])

         int do_exit;

         SDL_Event event;

         sselect *ssel;

+        int flag_had_events;

         if(argc!=2 || strcmp(argv[argc-1],"--help")==0) {

                 fprintf(stderr,"Syntax: %s filename\n",argv[0]);

                 return(1);

@@ -68,17 +72,18 @@ main(int argc, char *argv[])

                 re_free(re),re=NULL;

                 return(2);

         }

-        if((redata_load(re->redata,re->filename,NULL,NULL))!=0)

+        if((redata_load(re->data,re->filename,NULL,NULL))!=0)

                 re->flag_newfile=1;

         else

                 re->flag_newfile=0;

+#if 0

 #warning TESTS

         {

                 char buf[129];

-                redata_hash(re->redata,buf);

+                redata_hash(re->data,buf);

                 fprintf(stderr,"%s %s\n",buf,re->filename);

         }

-#warning TODO

+#endif

         reui_title(re->ui,re->filename);

         flag_sigint=flag_sigpipe=0;

         setsignal(SIGINT,sighandler_sigint);

@@ -91,15 +96,20 @@ main(int argc, char *argv[])

         }

         reui_scr2renderer(re->ui,0,0,re->ui->w,re->ui->h);

         re->x=0,re->y=re->ui->fontheight,re->w=re->ui->w,re->h=re->ui->h-re->y;

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

-        reui_printf(re->ui,0,0,(unsigned char *) "\xff\xff\x00\xff","Fichero: %s",re->filename);

+        re->maxrow=re->h/re->ui->fontheight-1;

+        re->maxcol=re->w/re->ui->fontwidth-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","Fichero: %s",re->filename);

         re_drawcontents(re);

+        flag_had_events=0;

         while(do_exit==0 && flag_sigint==0) {

                 if(re->ui->rendererdirty)

                         reui_present(re->ui);

-                sselect_wait(ssel,100);

+                sselect_wait(ssel,(flag_had_events)?10:100);

+                flag_had_events=(flag_had_events>0)?flag_had_events-1:0;

                 SDL_PumpEvents();

                 while(SDL_PeepEvents(&event,1,SDL_GETEVENT,SDL_FIRSTEVENT,SDL_LASTEVENT)>0) {

+                        flag_had_events=10;

                         switch(event.type) {

                                 case SDL_QUIT:

                                         do_exit=1;

@@ -153,7 +163,7 @@ re_init(void)

         if((re=malloc(sizeof(re_t)))==NULL)

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

         memset(re,0,sizeof(re_t));

-        if((re->redata=redata_init(NULL))==NULL) {

+        if((re->data=redata_init(NULL))==NULL) {

                 re_free(re),re=NULL;

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

         }

@@ -171,8 +181,8 @@ re_free(re_t *re)

                 return; /* all done */

         if(re->ui!=NULL)

                 reui_free(re->ui),re->ui=NULL;

-        if(re->redata!=NULL)

-                redata_free(re->redata),re->redata=NULL;

+        if(re->data!=NULL)

+                redata_free(re->data),re->data=NULL;

         free(re),re=NULL;

         return;

 }

@@ -192,7 +202,33 @@ re_setfilename(re_t *re, char *filename)

 int

 re_processkey(re_t *re, SDL_Event *event)

 {

-#warning TODO

+        long newpos,newpos2;

+        char *ptr,*ptr2;

+        int len;

+        int has_nl;

+        int oldcol;

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

+                return(-1);

+        if(event->key.keysym.sym==SDLK_DOWN || event->key.keysym.sym==SDLK_UP) {

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

+                        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 */

+                oldcol=reui_utf8len(re->ui,ptr,re->cursorpos-newpos);

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

+                ptr2=reui_utf8col(re->ui,ptr,len-has_nl,oldcol);

+                if(ptr2!=NULL)

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

+                else

+                        re->cursorpos=newpos2+len-has_nl;

+                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_drawcontents(re);

+        }

         return(-1);

 }

@@ -200,24 +236,40 @@ re_processkey(re_t *re, SDL_Event *event)

 int

 re_drawcontents(re_t *re)

 {

-        int numchunk;

-        long offset;

-        rechunk_t *chunk;

-        unsigned char *ptr,*end;

-        int y;

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

-        if(redata_getposptr(re->redata,0,&numchunk,&offset)==-1)

-                return(-1);

-        chunk=re->redata->chunks[numchunk];

-        /* iterate on lines */

-        for(y=re->y,ptr=chunk->data+offset,end=memchr(ptr,'\n',chunk->useddata-(ptr-chunk->data)),

-          end=(end==NULL)?chunk->data+chunk->useddata:end;ptr!=NULL && y<(re->y+re->h);

-          y+=re->ui->fontheight,ptr=(end!=(chunk->data+chunk->useddata))?end+1:NULL,

-          end=(ptr==NULL)?NULL:memchr(ptr,'\n',chunk->useddata-(ptr-chunk->data)),

-          end=(end==NULL)?chunk->data+chunk->useddata:end) {

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

+        long pos,newpos;

+        char *ptr;

+        int len;

+        int y,row;

+        char c;

+        int has_nl;

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

+        row=re->lastrow;

+        pos=re->cursorpos;

+        while(row>0) {

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

+                        return(-1);

+                pos=(newpos>0)?newpos-1:0;

+                row--;

         }

-#warning TODO

-        return(-1);

+        /* 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");

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

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

+#warning TODO: consider multibytes characters and tabs to position on the corect character and to pass the correct number of bytes to reui_write

+                        c=(re->lastcol>=(len-has_nl))?' ':ptr[re->lastcol];

+                        reui_write(re->ui,re->x+re->ui->fontwidth*re->lastcol,y,"\xff\xff\xff\xff",&c,1);

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

+                }

+                pos=newpos+len;

+        }

+        re->ui->rendererdirty=1;

+        return(0);

 }

+