@@ -236,6 +236,28 @@ redata_getposptr(redata_t *redata, long pos, int *numchunk, int *offset)

         return(-1);

 }

+int

+redata_getchar(redata_t *redata, long pos)

+{

+        int numchunk;

+        int offset;

+        int avail;

+        rechunk_t *chunk;

+        if(redata==NULL || pos<0 || pos>=redata_getsize(redata))

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

+        if(redata_getposptr(redata,pos,&numchunk,&offset)!=0)

+                return(-1); /* couldn't get pos */

+        /* search for data starting at that pos */

+        for(;numchunk<redata->sizechunks;numchunk++,offset=0) {

+                chunk=redata->chunks[numchunk];

+                avail=chunk->useddata-offset;

+                if(avail>0) {

+                        return((int) (((unsigned char *)chunk->data)[offset]));

+                }

+        }

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

+}

+

 int

 redata_wipe(redata_t *redata)

 {

@@ -108,7 +108,8 @@ long redata_getsize(redata_t *redata);

 long redata_getused(redata_t *redata);

 long redata_getavailable(redata_t *redata);

 int redata_getposptr(redata_t *redata, long pos, int *numchunk, int *offset);

-

+int redata_getchar(redata_t *redata, long pos);

+ 

 /* low level stuff */

 int redata_wipe(redata_t *redata);

 int redata_preallocate(redata_t *redata, long size);

@@ -116,6 +116,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_textinsert(re_t *re, char *text, int sizetext);

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

@@ -582,6 +583,78 @@ re_fixorigin_center(re_t *re)

         return(0);

 }

+int

+re_textinsert(re_t *re, char *text, int sizetext)

+{

+        long realend;

+        int at_end;

+        int nspaces;

+        long cursorpos;

+        long selstart,selend;

+        int fixsel;

+        char *ptr,*next;

+        int len;

+        int trimmed;

+        if(re==NULL || text==NULL || sizetext<=0)

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

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

+          || redata_line_realend(re->data,cursorpos,&realend)==-1) {

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

+        }

+        fixsel=0;

+        selstart=selend=0;

+        if(re->selactive

+          && redata_linecol2pos(re->data,re->sellinefrom,re->selcolfrom,&selstart,NULL)==0

+          && redata_linecol2pos(re->data,re->sellineto,re->selcolto,&selend,NULL)==0) {

+                fixsel=1;

+        }

+        at_end=(cursorpos==realend)?1:0;

+        for(nspaces=0;nspaces<sizetext && text[nspaces]==' ';nspaces++)

+                ;

+        if(nspaces>0 && nspaces==sizetext && at_end) {

+                /* instead of adding spaces at the end of the line, we move the cursor to the right */

+                re_moveleftright(re,nspaces);

+                return(0); /* no need to add spaces at the end of the line */

+        }

+        redata_undo_groupinit(re->data,NULL);

+        if(!(text[0]=='\n' && sizetext==1) && at_end) {

+                int col;

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

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

+                if(redata_op_addn(re->data,cursorpos,' ',re->curcol-col,NULL)!=0)

+                        return(-1); /* couldn't add spaces up to current displayed pos */

+                /* increment cursorpos; spaces are 1 byte, so the number of columns advanced is the number of bytes advanced */

+                cursorpos+=re->curcol-col;

+        }

+        if(redata_op_add(re->data,cursorpos,text,sizetext,NULL)!=0)

+                return(-1); /* couldn't add requested text */

+        if(fixsel) {

+                if(cursorpos<=selstart)

+                        redata_pos2linecol(re->data,selstart+sizetext,&(re->sellinefrom),&(re->selcolfrom));

+                if(cursorpos<=selend)

+                        redata_pos2linecol(re->data,selend+sizetext,&(re->sellineto),&(re->selcolto));

+        }

+        for(ptr=text,next=memchr(text,'\n',sizetext);ptr!=NULL;ptr=(next!=NULL)?next+1:NULL,next=(ptr!=NULL)?memchr(ptr,'\n',sizetext-(ptr-text)):NULL) {

+                len=(next!=NULL)?(next-ptr):sizetext-(ptr-text);

+                re->curcol+=redata_generic_utf8len(ptr,len);

+                cursorpos+=len;

+                if(next!=NULL) {

+                        cursorpos++;

+                        if(re_rtrim(re,cursorpos-1,&trimmed)!=-1)

+                                cursorpos-=trimmed;

+                        re->curline++;

+                        re->curcol=0;

+                }

+        }

+        /* trim last line inserted */

+        if(redata_getchar(re->data,cursorpos)=='\n' && re_rtrim(re,cursorpos,&trimmed)!=-1)

+                cursorpos-=trimmed;

+        redata_undo_groupcommit(re->data,NULL);

+        re_fixorigin(re);

+        re->headerdirty=1;

+        re->contentsdirty=1;

+        return(0);

+}

 int

 re_processkey_editing(re_t *re, SDL_Event *event)

@@ -641,13 +714,6 @@ fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

         }

         /* special case: text editing event */

         if(event->type==SDL_TEXTINPUT) {

-                int len;

-                long realend;

-                int at_end;

-                int nspaces;

-                long cursorpos;

-                long selstart,selend;

-                int fixsel;

                 if(re->ignorenkeys>0) {

                         re->ignorenkeys--;

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

@@ -655,63 +721,7 @@ fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

 #if 0

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

 #endif

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

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

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

-                }

-                fixsel=0;

-                selstart=selend=0;

-                if(re->selactive

-                  && redata_linecol2pos(re->data,re->sellinefrom,re->selcolfrom,&selstart,NULL)==0

-                  && redata_linecol2pos(re->data,re->sellineto,re->selcolto,&selend,NULL)==0) {

-                        fixsel=1;

-                }

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

-                for(nspaces=0;event->text.text[nspaces]==' ';nspaces++)

-                        ;

-                if(nspaces>0 && event->text.text[nspaces]=='\0' && at_end) {

-                        /* instead of adding spaces at the end of the line, we move the cursor to the right */

-                        re_moveleftright(re,nspaces);

-                        return(0); /* no need to add spaces at the end of the line */

-                }

-                redata_undo_groupinit(re->data,NULL);

-                if(!(event->text.text[0]=='\n' && event->text.text[1]=='\0') && at_end) {

-                        int col;

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

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

-                        if(redata_op_addn(re->data,cursorpos,' ',re->curcol-col,NULL)!=0)

-                                return(-1); /* couldn't add spaces up to current displayed pos */

-                        /* increment cursorpos; spaces are 1 byte, so the number of columns advanced is the number of bytes advanced */

-                        cursorpos+=re->curcol-col;

-                }

-                len=strlen(event->text.text);

-                if(redata_op_add(re->data,cursorpos,event->text.text,len,NULL)!=0)

-                        return(-1); /* couldn't add requested text */

-                if(fixsel) {

-                        if(cursorpos<=selstart)

-                                redata_pos2linecol(re->data,selstart+len,&(re->sellinefrom),&(re->selcolfrom));

-                        if(cursorpos<=selend)

-                                redata_pos2linecol(re->data,selend+len,&(re->sellineto),&(re->selcolto));

-                }

-                cursorpos+=len;

-                if(event->text.text[0]=='\n' && event->text.text[1]=='\0') {

-                        int trimmed;

-                        if(re_rtrim(re,cursorpos-len,&trimmed))

-                                cursorpos-=trimmed;

-#if 1

-#if 0

-fprintf(stderr,"SDL_TEXTINPUT: Insering newline\n");

-#endif

-#endif

-                        re->curline++;

-                        re->curcol=0;

-                } else {

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

-                }

-                redata_undo_groupcommit(re->data,NULL);

-                re_fixorigin(re);

-                re->headerdirty=1;

-                re->contentsdirty=1;

+                re_textinsert(re,event->text.text,strlen(event->text.text));

         }

 #if 0

         else if(event->type==SDL_TEXTEDITING) {

@@ -953,10 +963,13 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                         re_selectbuf_fill(re,frompos,topos-frompos,re->selcolto-coldone);

                         SDL_SetClipboardText(re->selectbuf);

                         if(is_cut) {

+                                int trimmed;

                                 redata_undo_groupinit(re->data,NULL);

                                 redata_op_del(re->data,frompos,topos-frompos,NULL);

-                                redata_undo_groupcommit(re->data,NULL);

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

+                                if(redata_getchar(re->data,frompos)=='\n' && re_rtrim(re,frompos,&trimmed)!=-1)

+                                        frompos-=trimmed;

+                                redata_undo_groupcommit(re->data,NULL);

                                 re_fixorigin(re);

                                 re->headerdirty=1;

                         }

@@ -973,16 +986,11 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                         re_sel_toggle(re);

                 if(SDL_HasClipboardText())

                         re_selectbuf_replace(re,SDL_GetClipboardText());

-                if(re->usedselectbuf>0) {

-                        redata_undo_groupinit(re->data,NULL);

-                        redata_op_add(re->data,cursorpos,re->selectbuf,re->usedselectbuf,NULL);

-                        redata_undo_groupcommit(re->data,NULL);

-                        cursorpos+=re->usedselectbuf;

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

-                        re_fixorigin(re);

-                        re->headerdirty=1;

-                        re->contentsdirty=1;

-                }

+#if 1

+fprintf(stderr,"SELECTBUF:\"%s\" len:%i\n",re->selectbuf,(int)strlen(re->selectbuf));

+#endif

+                if(re->usedselectbuf>0)

+                        re_textinsert(re, re->selectbuf,re->usedselectbuf);

                 re->ignorenkeys++;

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

                 re_addprint(re);