@@ -1436,6 +1436,50 @@ redata_line_info(redata_t *redata, long pos, long *startpos, char **startptr, in

         return(0);

 }

+int

+redata_pos2linecol(redata_t *redata, long pos, int *resline, int *rescol)

+{

+        int line,col;

+        int nchunk;

+        int chunkpos;

+        rechunk_t *chunk;

+        int i,o;

+        if(redata==NULL)

+                return(-1);

+        /* search chunk of pos while calculating first lineno of chunk */

+        for(nchunk=0,line=0,chunkpos=0

+          ;nchunk<redata->sizechunks

+          ;line+=chunk->whatin.nlcount,chunkpos+=chunk->useddata,nchunk++) {

+                chunk=redata->chunks[nchunk];

+                if(!(chunk->whatin_fresh))

+                        redata_whatin_refresh(redata,nchunk);

+                if(pos<(chunkpos+chunk->useddata))

+                        break;

+        }

+        if(nchunk>=redata->sizechunks)

+                return(-1); /* pos not found */

+        /* search chunk line/col */

+        for(i=0,o=chunkpos,col=0;o<pos && i<chunk->useddata;i++,o++) {

+                if(chunk->data[i]=='\n')

+                        line++,col=0;

+                else

+                        col++;

+        }

+        if(resline!=NULL)

+                *resline=line;

+        if(rescol!=NULL)

+                *rescol=col;

+        return(0);

+#warning DEBUG THIS

+}

+

+int

+redata_linecol2pos(redata_t *redata, int line, int col, long *pos)

+{

+#warning TODO

+        return(-1);

+}

+

 static char *

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

 {

@@ -144,4 +144,6 @@ int redata_generic_utf8charlen(char *ptr, int maxsize);

 /* line convenience funtions */

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

+int redata_pos2linecol(redata_t *redata, long pos, int *line, int *col);

+int redata_linecol2pos(redata_t *redata, int line, int col, long *pos);

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

         char *ptr,*ptr2;

         int len;

         int has_nl;

-        int oldcol;

+        int oldcol,maxcol;

         int linecols;

         int inc;

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

@@ -219,15 +219,19 @@ 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 */

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

+                maxcol=redata_generic_utf8len(ptr,len);

+                if(maxcol<re->lastcol)

+                        re->cursorpos=newpos+len;

+                else

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

                 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=redata_generic_utf8col(ptr,len-has_nl,oldcol);

-                if(ptr2!=NULL)

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

-                else

+                maxcol=redata_generic_utf8len(ptr,len)-has_nl;

+                if(maxcol<re->lastcol)

                         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)

@@ -265,10 +269,13 @@ re_processkey(re_t *re, SDL_Event *event)

 int

 re_drawheader(re_t *re)

 {

+        int line,col;

         if(re==NULL)

                 return(-1);

+        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","Fichero: %s Col:%i Row:%i Pos:%li",re->filename,re->lastcol,re->lastrow,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->lastrow,line,re->lastcol,col,re->cursorpos);

         return(0);

 }