@@ -566,6 +566,7 @@ fprintf(stderr,"SDL_TEXTINPUT: Insering newline\n");

                         re->curcol+=redata_generic_utf8len(event->text.text,len);

                 }

                 redata_undo_groupcommit(re->data,NULL);

+                re_fixorigin(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

         }

@@ -582,7 +583,9 @@ fprintf(stderr,"SDL_TEXTEDITING: composition:\"%s\" start:%i len:%i\n",event->ed

 #if 0

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

 #endif

-        if((SDL_GetModState()&KMOD_ALT)!=0 && re->selactive && (event->key.keysym.sym==SDLK_LEFT || event->key.keysym.sym==SDLK_RIGHT)) {

+        if(event->key.keysym.sym==SDLK_ESCAPE) {

+                re->headerdirty=1;

+        } else if((SDL_GetModState()&KMOD_ALT)!=0 && re->selactive && (event->key.keysym.sym==SDLK_LEFT || event->key.keysym.sym==SDLK_RIGHT)) {

                 int l;

                 int is_del;

                 int tolinefix;

@@ -742,6 +745,7 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                 re->headerdirty=1;

                 re->contentsdirty=1;

         } else if(event->key.keysym.sym==SDLK_PLUS && (SDL_GetModState()&KMOD_CTRL)!=0) {

+#warning XXX TODO: Control+shift+'+'/'-' iterates between the color permutations of the current theme in rgb, 6 in total (Control+shift+'0' resets to the default permutation)

                 re_changefontsize(re, 1);

                 re->ignorenkeys++;

         } else if(event->key.keysym.sym==SDLK_MINUS && (SDL_GetModState()&KMOD_CTRL)!=0) {

@@ -992,6 +996,7 @@ re_processcommand(re_t *re)

                 re->curline=line;

                 /* position the line in the center of viewport */

                 re->originline=line-(re->maxrow/2);

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

                 re->headerdirty=1;

                 re->contentsdirty=1;

         } else if(strcmp(re->command,COMMAND_SEARCHFORWARD)==0) {

@@ -1670,13 +1675,7 @@ re_drawcontents(re_t *re)

                 return(-1);

         if(redata_linecol2pos(re->data,re->curline,re->curcol,&cursorpos,NULL)!=0)

                 return(0); /* error obtaining position */

-#if 0

-fprintf(stderr,"re_drawcontents: pre  reuifill1\n");

-#endif

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

-#if 0

-fprintf(stderr,"re_drawcontents: post reuifill1\n");

-#endif

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

         pos=cursorpos;

         while(row>0 && pos>0) {

@@ -1687,20 +1686,11 @@ fprintf(stderr,"re_drawcontents: post reuifill1\n");

                         row--;

         }

         /* highlight current line */

-#if 0

-fprintf(stderr,"re_drawcontents: pre  reuifill2\n");

-#endif

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

-#if 0

-fprintf(stderr,"re_drawcontents: post reuifill2\n");

-#endif

         /* highlight the selection */

         if(re->selactive) {

                 const char *selcolor;

                 tmprow=row;

-#if 0

-fprintf(stderr,"re_drawcontents: reuifill3: ");

-#endif

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

                         selcolor=(row==(re->curline-re->originline))?selcolorcurline:selcolornormal;

                         if((re->originline+row)==re->sellinefrom && (re->originline+row)==re->sellineto) {

@@ -1711,13 +1701,7 @@ fprintf(stderr,"re_drawcontents: reuifill3: ");

                                 if(x1<(re->x+re->w))

                                         reui_fill(re->ui,x1,re->y+row*re->ui->fontheight,re->w-x1,re->ui->fontheight+1,selcolor);

                         } else if((re->originline+row)>re->sellinefrom && (re->originline+row)<re->sellineto) {

-#if 0

-fprintf(stderr,"{(ui,%i,%i,%i,%i,#%02X%02X%02X%02X)",re->x,re->y+row*re->ui->fontheight,re->w,re->ui->fontheight+1,((unsigned char *)selcolor)[0],((unsigned char *)selcolor)[1],((unsigned char *)selcolor)[2],((unsigned char *)selcolor)[3]);

-#endif

                                 reui_fill(re->ui,re->x,re->y+row*re->ui->fontheight,re->w,re->ui->fontheight+1,selcolor);

-#if 0

-fprintf(stderr,"}");

-#endif

                         } else if((re->originline+row)==re->sellineto) {

                                 int x2;

                                 x2=re->x+(re->selcolto-re->origincol)*re->ui->fontwidth;

@@ -1727,9 +1711,6 @@ fprintf(stderr,"}");

                 }

                 row=tmprow;

-#if 0

-fprintf(stderr,"\n");

-#endif

         }

         /* draw the lines */

         drawn_cursor=0;