@@ -1302,9 +1302,18 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

 int

 re_processkey_commanddata(re_t *re, SDL_Event *event)

 {

+        SDL_Event fakeevent;

         if(re==NULL || event==NULL)

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

         /* special case: text editing event */

+        if(event->type==SDL_KEYDOWN && event->key.keysym.sym==SDLK_TAB && (SDL_GetModState()&KMOD_CTRL)!=0) {

+                /* If control+tab is pressed, insert a real tab (to be able to search for them using Control+F) */

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

+                event=&fakeevent;

+                event->type=SDL_TEXTINPUT;

+                strncpy(event->text.text,"\t",sizeof(event->text.text));

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

+        }

         if(event->type==SDL_TEXTINPUT) {

                 int len;

                 if(re->ignorenkeys>0) {

@@ -2118,10 +2127,12 @@ re_drawheader_command(re_t *re)

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

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

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

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

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

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

+                        /* draw something that to indicate the end of the commandbuf (useful if commandbuf ends in spaces) */

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

                 } else {

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

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

                 }