@@ -48,6 +48,8 @@ void re_free(re_t *re);

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

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

+int re_moveupdown(re_t *re, int totalinc);

+int re_moveleftright(re_t *re, int totalinc);

 int re_drawheader(re_t *re);

 int re_drawcontents(re_t *re);

@@ -209,27 +211,61 @@ re_setfilename(re_t *re, char *filename)

 int

 re_processkey(re_t *re, SDL_Event *event)

 {

-        long newpos,newpos2;

-        char *ptr,*ptr2;

+        long newpos;

+        char *ptr;

         int len;

         int has_nl;

-        int maxcol;

-        int inc;

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

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

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

+                re_moveupdown(re,(event->key.keysym.sym==SDLK_UP)?-1:1);

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

+                re_moveleftright(re,(event->key.keysym.sym==SDLK_LEFT)?-1:1);

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

+                re_moveupdown(re,(event->key.keysym.sym==SDLK_PAGEUP)?-(re->maxrow):re->maxrow);

+        } else if(event->key.keysym.sym==SDLK_HOME || event->key.keysym.sym==SDLK_END) {

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

-#if 0

-                maxcol=redata_generic_utf8len(ptr,len);

-                if(maxcol<re->curcol)

-                        re->cursorpos=newpos+len;

-                else

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

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

+                re->cursorpos=(event->key.keysym.sym==SDLK_HOME)?newpos:newpos+len-has_nl;

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

+                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->contentsdirty=1;

+                re_drawheader(re);

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

+                ;

+        }

+        return(-1);

+}

+

+int

+re_moveupdown(re_t *re, int totalinc)

+{

+        long newpos,newpos2;

+        char *ptr;

+        int len;

+        int has_nl;

+        int maxcol;

+        int inc,doneinc;

+

+        if(re==NULL)

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

+        if(totalinc==0)

+                return(0); /* nothing to do */

+        inc=(totalinc<0)?-1:1;

+        for(doneinc=0;doneinc!=totalinc;doneinc+=inc) {

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

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

+                if(inc==-1 && newpos==0)

+                        return(0); /* going up but already at top; nothing to do */

+                if(redata_line_info(re->data,(inc==1)?(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;

@@ -237,22 +273,40 @@ re_processkey(re_t *re, SDL_Event *event)

                         re->cursorpos=newpos2+len-has_nl;

                 else

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

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

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

                 re->contentsdirty=1;

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

+        }

+        re_drawheader(re);

+        return(0);

+}

+

+int

+re_moveleftright(re_t *re, int totalinc)

+{

+        long newpos;

+        char *ptr,*ptr2;

+        int len;

+        int has_nl;

+        int maxcol;

+        int inc,doneinc;

+

+        if(re==NULL)

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

+        if(totalinc==0)

+                return(0); /* nothing to do */

+        inc=(totalinc<0)?-1:1;

+        for(doneinc=0;doneinc!=totalinc;doneinc+=inc) {

                 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_LEFT && re->cursorpos==0)

+                if(inc==-1 && re->cursorpos==0)

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

                 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->curcol<=maxcol)

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

@@ -270,15 +324,12 @@ re_processkey(re_t *re, SDL_Event *event)

                 }

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

-                ;

         }

-        return(-1);

+        re_drawheader(re);

+        return(0);

 }

-

 int

 re_drawheader(re_t *re)

 {