@@ -107,7 +107,9 @@ int re_sel_toggle(re_t *re);

 int re_sel_lincolisinside(re_t *re, int line, int col);

 int re_sel_lincolisbefore(re_t *re, int line, int col);

 int re_sel_lincolisafter(re_t *re, int line, int col);

+int re_selectbuf_resize(re_t *re,long size);

 int re_selectbuf_fill(re_t *re,long frompos,long size, int nadditionalspaces);

+int re_selectbuf_replace(re_t *re,char *newdata);

 int re_rtrim(re_t *re, long curpos, int *trimmed);

 long re_getmatchingbracket(re_t *re,long posini, char originalchar, char *matchingchar);

 int re_drawheader_editing(re_t *re);

@@ -708,6 +710,7 @@ fprintf(stderr,"re_processkey(): received Control+%c\n",is_cut?'x':'c');

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

                   && redata_linecol2pos(re->data,re->sellineto,re->selcolto,&topos,&coldone)==0) {

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

+                        SDL_SetClipboardText(re->selectbuf);

                         if(is_cut) {

                                 redata_undo_groupinit(re->data,NULL);

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

@@ -726,6 +729,8 @@ fprintf(stderr,"re_processkey(): received Control+v\n");

                 /* CUA92-style paste (ctrl+v)*/

                 if(re->selactive)

                         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,re->cursorpos,re->selectbuf,re->usedselectbuf,NULL);

@@ -765,9 +770,6 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

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

                 re->headerdirty=1;

         } else if(re->command_first_key=='k' && event->key.keysym.sym==SDLK_h) {

-#warning #error TODO: IF Ctrl+C, get a buffer of the right size into re (re->selectbuf), use redata_extract() to get those bytes into the buffer

-#warning #error TODO: IF Ctrl+X, do as in Ctrl+X, but delete the bytes from redata afterwards

-#warning #error TODO: IF Ctrl+V, insert the bytes in re->selectbuf into the curent cursor pos

                 re_sel_toggle(re);

                 re->command=NULL;

                 re->headerdirty=1;

@@ -1214,6 +1216,24 @@ re_sel_lincolisafter(re_t *re, int line, int col)

         return(0);

 }

+int

+re_selectbuf_resize(re_t *re,long size)

+{

+        long newsize;

+        char *newptr;

+        if(re==NULL || size<0)

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

+        if(size==0)

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

+        newsize=(size+SELECTBUFBLOCK-1)/SELECTBUFBLOCK;

+        newsize*=SELECTBUFBLOCK;

+        if((newptr=realloc(re->selectbuf,newsize))==NULL)

+                return(-1);

+        re->selectbuf=newptr;

+        re->sizeselectbuf=newsize;

+        return(0);

+}

+

 int

 re_selectbuf_fill(re_t *re,long frompos,long size, int nadditionalspaces)

 {

@@ -1222,15 +1242,9 @@ re_selectbuf_fill(re_t *re,long frompos,long size, int nadditionalspaces)

         if(re==NULL || size<0 || nadditionalspaces<0 || (frompos+size)>redata_getused(re->data) || redata_getposptr(re->data,frompos,&nchunk,&off)!=0)

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

         re->usedselectbuf=0;

-        if((size+nadditionalspaces)>re->sizeselectbuf) {

-                long newsize;

-                char *newptr;

-                newsize=(size+nadditionalspaces+SELECTBUFBLOCK-1)/SELECTBUFBLOCK;

-                newsize*=SELECTBUFBLOCK;

-                if((newptr=realloc(re->selectbuf,newsize))==NULL)

-                        return(-1);

-                re->selectbuf=newptr;

-                re->sizeselectbuf=newsize;

+        if((size+nadditionalspaces+1)>re->sizeselectbuf

+          && re_selectbuf_resize(re,size+nadditionalspaces+1)!=0) {

+                return(-1); /* insuf. mem. */

         }

         for(n=0;n<size && nchunk<re->data->sizechunks;nchunk++,off=0) {

                 avail=re->data->chunks[nchunk]->useddata-off;

@@ -1246,6 +1260,24 @@ re_selectbuf_fill(re_t *re,long frompos,long size, int nadditionalspaces)

                 memset(re->selectbuf+re->usedselectbuf,' ',nadditionalspaces);

                 re->usedselectbuf+=nadditionalspaces;

         }

+        re->selectbuf[re->usedselectbuf]='\0';

+        return(0);

+}

+

+int

+re_selectbuf_replace(re_t *re,char *newdata)

+{

+        long size;

+        if(re==NULL || newdata==NULL)

+                return(-1);

+        size=strlen(newdata);

+        if((size+1)>re->sizeselectbuf

+          && re_selectbuf_resize(re,size+1)!=0) {

+                return(-1); /* insuf. mem. */

+        }

+        memcpy(re->selectbuf,newdata,size);

+        re->usedselectbuf=size;

+        re->selectbuf[re->usedselectbuf]='\0';

         return(0);

 }

@@ -1547,7 +1579,6 @@ fprintf(stderr,"\n");

                                         if(utf8charlen==1 && strchr("[]{}<>()",*curptr)!=NULL)

                                                 matchingpos=re_getmatchingbracket(re,re->cursorpos,*curptr,&matchingchar);

                                 }

-#warning TODO: Select(control+k+b/control+k+k/...)

                         }

                 }

                 if(row==(re->curline-re->originline) && !drawn_cursor)