@@ -77,6 +77,7 @@ int re_setuidata(re_t *re);

 int re_setfilename(re_t *re, char *filename);

 int re_fixorigin(re_t *re);

+int re_fixorigin_center(re_t *re);

 int re_processkey_editing(re_t *re, SDL_Event *event);

 int re_processkey_commandwait(re_t *re, SDL_Event *event);

 int re_processkey_commanddata(re_t *re, SDL_Event *event);

@@ -335,11 +336,7 @@ re_setuidata(re_t *re)

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

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

         re->maxcol=re->w/re->ui->fontwidth-1;

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

-                re->originline=re->curline-re->maxrow;

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

-        }

-        re->origincol=(re->curcol>(re->maxcol-COLFORCESCROLL))?(re->curcol-(re->maxcol-COLFORCESCROLL)):0;

+        re_fixorigin(re);

         return(0);

 }

@@ -358,6 +355,30 @@ re_setfilename(re_t *re, char *filename)

 int

 re_fixorigin(re_t *re)

+{

+        if(re==NULL)

+                return(-1);

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

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

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

+        }

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

+                re->originline=re->curline+LINEFORCESCROLL-re->maxrow;

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

+        }

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

+                re->origincol=re->curcol;

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

+        }

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

+                re->origincol=re->curcol+COLFORCESCROLL-re->maxcol;

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

+        }

+        return(0);

+}

+

+int

+re_fixorigin_center(re_t *re)

 {

         if(re==NULL)

                 return(-1);

@@ -369,6 +390,7 @@ re_fixorigin(re_t *re)

         return(0);

 }

+

 int

 re_processkey_editing(re_t *re, SDL_Event *event)

 {

@@ -376,8 +398,8 @@ re_processkey_editing(re_t *re, SDL_Event *event)

         if(re==NULL || event==NULL)

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

         /* convert RETURN KEYDOWN to TEXTINPUT */

-#warning XXX TODO: If the "\n" of end-of-file is deleted using DEL, the editor bugs

         if(event->type==SDL_KEYDOWN && event->key.keysym.sym==SDLK_RETURN) {

+#warning file having two \n at the end, delete the second with DEL staying to the right of the first, if we go down then, it does an scroll but it shouldn't

                 memset(&fakeevent,0,sizeof(SDL_Event));

                 event=&fakeevent;

                 event->type=SDL_TEXTINPUT;

@@ -496,7 +518,7 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                 re->cursorpos=(event->key.keysym.sym==SDLK_PAGEDOWN)?(redata_getused(re->data)-1):0;

                 re->cursorpos=(re->cursorpos<0)?0:re->cursorpos;

                 redata_pos2linecol(re->data,re->cursorpos,&(re->curline),&(re->curcol));

-                re_fixorigin(re);

+                re_fixorigin_center(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

         } else if(event->key.keysym.sym==SDLK_PAGEDOWN || event->key.keysym.sym==SDLK_PAGEUP) {

@@ -510,14 +532,7 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                 re->cursorpos=newpos;

                 if(redata_pos2linecol(re->data,re->cursorpos,NULL,&(re->curcol))==-1)

                         return(-1); /* couldn't get col of current pos */;

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

-                        re->origincol=re->curcol;

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

-                }

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

-                        re->origincol=re->curcol+COLFORCESCROLL-re->maxcol;

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

-                }

+                re_fixorigin(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

         } else if(event->key.keysym.sym==SDLK_BACKSPACE && re->cursorpos>0) {

@@ -733,12 +748,7 @@ fprintf(stderr,"MOVING from cursorpos:%li line:%i col:%i\n",re->cursorpos,re->cu

                 }

                 re->cursorpos=realstart;

                 re->curline+=inc;

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

 #if 0

 fprintf(stderr,"MOVING   to cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

 #endif