@@ -51,6 +51,8 @@

 #define COLOR_QUERYBG "\xad\x92\x5e\xff"

 #define COLOR_QUERYFG "\xd0\xef\x4f\xff"

+#define COLOR_QUERYBGOLD "\x83\x75\x59\xff"

+#define COLOR_QUERYFGOLD "\xb1\xc5\x5e\xff"

 #define COLOR_WARNINGBG "\xba\x07\x07\xff"

 #define COLOR_WARNINGFG "\xe6\xdc\x5d\xff"

@@ -84,11 +86,14 @@ typedef struct re_t {

         int selactive;

         int sellinefrom,sellineto;

         int selcolfrom,selcolto;

+        int mouseselactive;

+        int sellinestart,selcolstart;

         long sizeselectbuf;

         long usedselectbuf;

         char *selectbuf;

         char *command;

         char commandbuf[COMMANDBUFSIZE];

+        int is_oldcommandbuf;

         char cachelastsearch[COMMANDBUFSIZE];

         char cachelastreplacewith[COMMANDBUFSIZE];

         question_t *question;

@@ -135,6 +140,7 @@ int re_sel_lincolisend(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_clipget(re_t *re);

 int re_addprint(re_t *re);

 int re_delprint(re_t *re, int nprint);

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

@@ -406,16 +412,29 @@ fprintf(stderr,"Resizing from %ix%i to %ix%i...\n",re->ui->w,re->ui->h,(int)even

                                         }

                                         break;

                                 case SDL_MOUSEBUTTONDOWN:

-                                        if(event.button.y>=re->y && event.button.x>=re->x) {

-                                                int newposx,newposy;

-                                                long tmppos;

-                                                newposx=(event.button.x-re->x)/re->ui->fontwidth;

-                                                newposy=(event.button.y-re->y)/re->ui->fontheight;

-                                                if(redata_linecol2pos(re->data, re->originline+newposy, re->origincol+newposx,&tmppos,NULL)==0) {

-                                                        re->curline=re->originline+newposy;

-                                                        re->curcol=re->origincol+newposx;

-                                                        re->headerdirty=1;

-                                                        re->contentsdirty=1;

+                                case SDL_MOUSEBUTTONUP:

+                                case SDL_MOUSEMOTION:

+                                        {

+#warning TODO

+                                                int mx,my;

+                                                mx=(event.type!=SDL_MOUSEMOTION)?event.button.x:event.motion.x;

+                                                my=(event.type!=SDL_MOUSEMOTION)?event.button.y:event.motion.y;

+                                                if(!(event.type==SDL_MOUSEMOTION && (re->mouseselactive==0 || my<re->y || mx<re->x))) {

+                                                        int newposx,newposy;

+                                                        long tmppos;

+                                                        if(event.type==SDL_MOUSEBUTTONDOWN && event.button.button==SDL_BUTTON_LEFT) {

+                                                                re->mouseselactive=1;

+                                                        } else if( event.type==SDL_MOUSEBUTTONUP && event.button.button==SDL_BUTTON_LEFT) {

+                                                                re->mouseselactive=0;

+                                                        }

+                                                        newposx=(mx-re->x)/re->ui->fontwidth;

+                                                        newposy=(my-re->y)/re->ui->fontheight;

+                                                        if(redata_linecol2pos(re->data, re->originline+newposy, re->origincol+newposx,&tmppos,NULL)==0) {

+                                                                re->curline=re->originline+newposy;

+                                                                re->curcol=re->origincol+newposx;

+                                                                re->headerdirty=1;

+                                                                re->contentsdirty=1;

+                                                        }

                                                 }

                                         }

                                         break;

@@ -1029,16 +1048,19 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

         if(re->command_first_key=='q' && event->key.keysym.sym==SDLK_l) {

                 re->command=COMMAND_GOTOLINE;

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

+                re->is_oldcommandbuf=0;

                 re->headerdirty=1;

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

                 re->command=COMMAND_SEARCHFORWARD;

                 strncpy(re->commandbuf,re->cachelastsearch,sizeof(re->commandbuf));

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

+                re->is_oldcommandbuf=1;

                 re->headerdirty=1;

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

                 re->command=COMMAND_REPLACEWHAT;

                 strncpy(re->commandbuf,re->cachelastsearch,sizeof(re->commandbuf));

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

+                re->is_oldcommandbuf=1;

                 re->headerdirty=1;

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

                 if(redata_needs_saving(re->data)) {

@@ -1048,6 +1070,7 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

                         re->command=COMMAND_EXIT;

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

                 }

+                re->is_oldcommandbuf=0;

                 re->headerdirty=1;

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

                 re_sel_toggle(re);

@@ -1154,6 +1177,10 @@ re_processkey_commanddata(re_t *re, SDL_Event *event)

                         re->ignorenkeys--;

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

                 }

+                if(re->is_oldcommandbuf) {

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

+                        re->is_oldcommandbuf=0;

+                }

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

                 if((strlen(re->commandbuf)+len+1)>=sizeof(re->commandbuf))

                         return(-1); /* No space for text */

@@ -1172,12 +1199,24 @@ re_processkey_commanddata(re_t *re, SDL_Event *event)

         } else if(event->key.keysym.sym==SDLK_BACKSPACE && re->commandbuf[0]!='\0') {

                 int nchar;

                 char *ptr;

+                if(re->is_oldcommandbuf) {

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

+                        re->is_oldcommandbuf=0;

+                        re->headerdirty=1;

+                        return(0);

+                }

                 if((nchar=redata_generic_utf8len(re->commandbuf,strlen(re->commandbuf)))<=0)

                         return(-1); /* error parsing commandbuf */

                 if((ptr=redata_generic_utf8col(re->commandbuf,strlen(re->commandbuf),nchar-1))==NULL)

                         return(-1); /* error positioning in commandbuf */

                 *ptr='\0';

                 re->headerdirty=1;

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

+                if(re->is_oldcommandbuf) {

+                        re->is_oldcommandbuf=0;

+                        re->headerdirty=1;

+                        return(0);

+                }

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

                 re_processcommand(re);

         }

@@ -1691,6 +1730,14 @@ re_selectbuf_replace(re_t *re,char *newdata)

         return(0);

 }

+int

+re_clipget(re_t *re)

+{

+#warning TODO

+        return(-1);

+}

+

+

 int

 re_addprint(re_t *re)

 {

@@ -1908,9 +1955,19 @@ re_drawheader_command(re_t *re)

                    ,(q->nopts>3)?" 4.":"",(q->nopts>4)?(q->optsshort!=NULL)?q->optsshort[3]:q->opts[3]:""

                    ,re->commandbuf);

         } else {

+                int commandlen;

+                int commandbuflen;

                 reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_QUERYBG);

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

-                reui_printf(re->ui,0,0,COLOR_QUERYFG,"%s %s",re->command,re->commandbuf);

+                commandlen=redata_generic_utf8len(re->command,strlen(re->command));

+                reui_printf(re->ui,0,0,COLOR_QUERYFG,"%s",re->command);

+                if(!(re->is_oldcommandbuf) || re->commandbuf[0]=='\0') {

+                        reui_printf(re->ui,re->ui->fontwidth*(commandlen+1),0,COLOR_QUERYFG,"%s",re->commandbuf);

+                } else {

+                        commandbuflen=redata_generic_utf8len(re->commandbuf,strlen(re->commandbuf));

+                        reui_fill(re->ui,re->ui->fontwidth*(commandlen+1)-re->ui->fontwidth/2,0,re->ui->fontwidth*(commandbuflen+1)+1,re->ui->fontheight,COLOR_QUERYBGOLD);

+                        reui_printf(re->ui,re->ui->fontwidth*(commandlen+1),0,COLOR_QUERYFGOLD,"%s",re->commandbuf);

+                }

         }

         re->headerdirty=0;

         re->ui->rendererdirty=1;