@@ -813,8 +813,15 @@ re_processkey_editing(re_t *re, SDL_Event *event)

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

                 event=&fakeevent;

                 event->type=SDL_TEXTINPUT;

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

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

+                /* If control is pressed, insert a real tab, otherwise, insert spaces until next tabstop */

+

+                if((SDL_GetModState()&KMOD_CTRL)!=0) {

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

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

+                } else {

+                        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 0

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

@@ -2265,7 +2272,7 @@ re_drawcontents(re_t *re, printout_t *printout)

                 /* draw each part of this line */

                 for(tmpcol=0,pos=realstart,availcol=0;tmpcol<(origincol+maxcol) && pos<=realend;pos=newpos+len,tmpcol+=availcol) {

                         int has_nl;

-                        char *ptr;

+                        char *ptr,*aux;

                         int incompletestart,incompleteend,endreq;

                         int used,usedcol; /* number of bytes/columns used of redata chunk (those are already drawn) */

                         if(redata_line_rawinfo(data,pos,&newpos,&ptr,&len,&is_continuation)==-1) {

@@ -2280,6 +2287,18 @@ re_drawcontents(re_t *re, printout_t *printout)

                         /* while the avail text is larger than the linecolor len */

                         while(curlinecolor<nlinecolors && (len-has_nl-incompleteend-used)>=(linecolors[curlinecolor].len-usedlenlinecolor)) {

                                 lastcolor=colors[linecolors[curlinecolor].color].rgba;

+                                while((aux=memchr(ptr+used,'\t',linecolors[curlinecolor].len-usedlenlinecolor))!=NULL) {

+                                        /* there is a tab, we want it highlighted with red bg */

+                                        int thislen=aux-(ptr+used);

+                                        reui_write(ui,x0+(tmpcol-origincol+usedcol)*ui->fontwidth,y,lastcolor,ptr+used,thislen);

+                                        usedcol+=redata_generic_utf8len(ptr+used,thislen);

+                                        used+=thislen;

+                                        usedlenlinecolor+=thislen;

+                                        reui_fill(ui,x0+(tmpcol-origincol+usedcol)*ui->fontwidth,y,ui->fontwidth,ui->fontheight+1,"\xba\x07\x07\xff");

+                                        usedcol++;

+                                        used++;

+                                        usedlenlinecolor++;

+                                }

                                 reui_write(ui,x0+(tmpcol-origincol+usedcol)*ui->fontwidth,y,lastcolor,ptr+used,linecolors[curlinecolor].len-usedlenlinecolor);

                                 usedcol+=redata_generic_utf8len(ptr+used,linecolors[curlinecolor].len-usedlenlinecolor);

                                 used+=linecolors[curlinecolor].len-usedlenlinecolor;

@@ -2328,7 +2347,11 @@ re_drawcontents(re_t *re, printout_t *printout)

                                 drawn_cursor=1;

                                 usedcursorchar=0;

                                 redata_getutf8char(re->data,cursorpos,cursorchar,sizeof(cursorchar),&usedcursorchar);

-                                reui_write(ui,x0+ui->fontwidth*(curcol-origincol),y,"\xff\xff\xff\xff",cursorchar,usedcursorchar);

+                                /* tab chars are drawn as an almost filled block, other chars are written as-is */

+                                if(usedcursorchar==1 && *cursorchar=='\t')

+                                        reui_fill(ui,x0+ui->fontwidth*(curcol-origincol)+1,y+1,ui->fontwidth-2,ui->fontheight+1-2,"\xff\xff\xff\xff");

+                                else

+                                        reui_write(ui,x0+ui->fontwidth*(curcol-origincol),y,"\xff\xff\xff\xff",cursorchar,usedcursorchar);

                                 /* get matching braces/parens/anglebracket/curlybraces for highlighting */

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

                                         matchingpos=re_getmatchingbracket(re,cursorpos,*cursorchar,&matchingchar);