@@ -58,6 +58,7 @@ typedef struct re_t {

         char *command;

         char commandbuf[COMMANDBUFSIZE];

         question_t *question;

+        int showingwarning;

         int ignorenkeys;

 } re_t;

@@ -75,6 +76,7 @@ void re_free(re_t *re);

 int re_setuidata(re_t *re);

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

+int re_fixorigin(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);

@@ -145,6 +147,9 @@ main(int argc, char *argv[])

 fprintf(stderr,"QUESTION INIT: %s: %s\n",re->question->title,re->question->body);

 #endif

                         } else {

+                                long startpos;

+                                char *startptr;

+                                int len;

                                 if(redata_load(re->data,re->filename,NULL)==-1)

                                         re->flag_newfile=1;

                                 else

@@ -155,6 +160,15 @@ fprintf(stderr,"QUESTION INIT: %s: %s\n",re->question->title,re->question->body)

                                 load_pending=0;

                                 re->headerdirty=1;

                                 re->contentsdirty=1;

+                                /* check if last character of file is '\n', if not, add it */

+                                if(redata_getused(re->data)==0

+                                  || (redata_line_rawinfo(re->data,redata_getused(re->data)-1,&startpos,&startptr,&len,NULL)!=-1

+                                    && len>0 && startptr[len-1]!='\0')) {

+                                        redata_op_add(re->data,redata_getused(re->data),"\n",1,NULL);

+                                        re->command=COMMAND_WARNING;

+                                        snprintf(re->commandbuf,sizeof(re->commandbuf),"Added missing \\n at end of file");

+                                        re->commandbuf[sizeof(re->commandbuf)-1]='\0';

+                                }

                         }

                 }

                 if(re->headerdirty) {

@@ -163,6 +177,7 @@ fprintf(stderr,"QUESTION INIT: %s: %s\n",re->question->title,re->question->body)

 fprintf(stderr,"REDRAW Header (editing)\n");

 #endif

                                 re_drawheader_editing(re);

+                                re->showingwarning=0;

                         } else {

 #if 0

 fprintf(stderr,"REDRAW Header (command)\n");

@@ -172,6 +187,9 @@ fprintf(stderr,"REDRAW Header (command)\n");

                                         /* the warnings only get shown once, remove it */

                                         re->command=NULL;

                                         re->commandbuf[0]='\0';

+                                        re->showingwarning=1;

+                                } else {

+                                        re->showingwarning=0;

                                 }

                         }

                 }

@@ -224,9 +242,9 @@ fprintf(stderr,"WINDOWEVENT: %s(%li) data1:%li data2:%li\n",

 #endif

                                         if(event.window.event==SDL_WINDOWEVENT_SHOWN

                                           || event.window.event==SDL_WINDOWEVENT_EXPOSED) {

-                                                re->headerdirty=1;

+                                                if(!re->showingwarning)

+                                                        re->headerdirty=1;

                                                 re->contentsdirty=1;

-                                                re->ui->rendererdirty=1;

                                         } else if((event.window.event==SDL_WINDOWEVENT_RESIZED

                                           || event.window.event==SDL_WINDOWEVENT_SIZE_CHANGED)

                                           && (event.window.data1!=re->ui->w || event.window.data2!=re->ui->h)) {

@@ -238,7 +256,6 @@ fprintf(stderr,"Resizing from %ix%i to %ix%i...\n",re->ui->w,re->ui->h,(int)even

                                                 re_setuidata(re);

                                                 re->headerdirty=1;

                                                 re->contentsdirty=1;

-                                                re->ui->rendererdirty=1;

                                         }

                                         break;

                                 default:

@@ -344,6 +361,19 @@ re_setfilename(re_t *re, char *filename)

         return(0);

 }

+int

+re_fixorigin(re_t *re)

+{

+        if(re==NULL)

+                return(-1);

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

+                re->originline=re->curline-(re->maxrow/2);

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

+        }

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

+        return(0);

+}

+

 int

 re_processkey_editing(re_t *re, SDL_Event *event)

 {

@@ -366,7 +396,7 @@ re_processkey_editing(re_t *re, SDL_Event *event)

                 strncpy(event->text.text,spaces+(re->curcol%8),sizeof(event->text.text));

                 event->text.text[sizeof(event->text.text)-1]='\0';

         } else if(event->type==SDL_KEYDOWN && event->key.keysym.sym==SDLK_DELETE) {

-#if 1

+#if 0

 fprintf(stderr,"SDL_KEYDOWN: DELETE\n");

 #endif

                 long realend;

@@ -376,6 +406,8 @@ fprintf(stderr,"SDL_KEYDOWN: DELETE\n");

                 if(redata_line_realend(re->data,re->cursorpos,&realend)==-1)

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

                 at_end=(re->cursorpos==realend)?1:0;

+                if(at_end && (re->cursorpos+1)==redata_getused(re->data))

+                        return(-1); /* we shouldn't erase the final '\n' */

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

                 event=&fakeevent;

                 event->type=SDL_KEYDOWN;

@@ -394,7 +426,7 @@ fprintf(stderr,"SDL_KEYDOWN: DELETE\n");

                 } else {

                         re_moveleftright(re,1);

                 }

-#if 1

+#if 0

 fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

 #endif

         }

@@ -408,7 +440,7 @@ fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

                         re->ignorenkeys--;

                         return(0); /* this is an already processed key, ignore it */

                 }

-#if 1

+#if 0

 fprintf(stderr,"SDL_TEXTINPUT:\"%s\"\n",event->text.text);

 #endif

                 if(redata_line_realend(re->data,re->cursorpos,&realend)==-1)

@@ -458,13 +490,20 @@ fprintf(stderr,"SDL_TEXTEDITING: composition:\"%s\" start:%i len:%i\n",event->ed

         /* default case: keydown event */

         if(event->type!=SDL_KEYDOWN)

                 return(0); /* Ignore other possible events */

-#if 1

+#if 0

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

 #endif

         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((SDL_GetModState()&KMOD_CTRL)!=0 && (event->key.keysym.sym==SDLK_PAGEDOWN || event->key.keysym.sym==SDLK_PAGEUP)) {

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

+                re->contentsdirty=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) {

@@ -561,17 +600,14 @@ fprintf(stderr,"re_processkey(): received Control+z\n");

                         return(-1);

                 re->cursorpos=newpos;

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

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

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

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

-                }

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

+                re_fixorigin(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

         }

         return(0);

 }

+

 int

 re_processkey_commandwait(re_t *re, SDL_Event *event)

 {