@@ -179,9 +179,6 @@ redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t

         if(redata==NULL || slot==NULL || hl==NULL || undo==NULL || stack==NULL || slot->active==0)

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

         if(hl->usedlines==0) {

-#if 0

-fprintf(stderr,"INVALIDATING USEDLINELINES==0 (nothing to do)\n");

-#endif

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

         }

         /* get the first pos of the operation */

@@ -203,9 +200,6 @@ fprintf(stderr,"INVALIDATING USEDLINELINES==0 (nothing to do)\n");

         /* invalidate from this line on */

         nline=(nline<0)?0:nline;

         hl_invalidatefrom(redata,hl,nline);

-#if 0

-fprintf(stderr,"INVALIDATING LINE %i\n",nline);

-#endif

         return(0);

 }

@@ -372,9 +366,6 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

         }

         /* make sure we have previous lines highlighted */

         for(i=hl->usedlines;i<nline;i++) {

-#if 0

-fprintf(stderr,"Recursing from %i to %i\n",nline,i);

-#endif

                 if(hl_doline(redata,hl,i)==-1)

                         return(-1); /* error highlighting line */

         }

@@ -395,77 +386,24 @@ fprintf(stderr,"Recursing from %i to %i\n",nline,i);

         opaque=0;

         linecolor=hl_addtolinecolor(&opaque,hl,NULL,color_normal,0);

         posoffset=0;

-#if 0

-fprintf(stderr,"Doing line %i pos:%li\n",nline,line->pos);

-#endif

         prev_char='\0';

         prev_char_mask=0xff;

         hl->usedkeywordbuf=0;

         hl->useddirectivebuf=0;

         mlcprevmode=mode_whatever;

         do {

-                if(redata_line_rawinfo(redata,realpos+posoffset,&pos,&ptr,&len,NULL)==-1) {

-#if 0

-fprintf(stderr,"nline:%i ERROR: couldn't get lineinfo for realpos:%li posoffset:%i realpos+posoffset:%li redataused:%li\n",

-nline,realpos,posoffset,realpos+posoffset,redata_getused(redata));

-#endif

+                if(redata_line_rawinfo(redata,realpos+posoffset,&pos,&ptr,&len,NULL)==-1)

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

-                }

                 has_nl=((len>0 && ptr[len-1]=='\n')?1:0);

                 has_next=(len==0)?1:(ptr[len-1]=='\n')?0:1;

                 /* special case: line with only a newline */

                 if(posoffset==0 && has_nl==1 && len==1) {

                         /* delete the existing linecolor and break */

                         line->len=0;

-#if 0

-fprintf(stderr,"nline:%i detected blank line, exiting\n",nline);

-#endif

                         break;

                 }

                 /* iterate */

-#if 0

-#define HDEBUGLINE 775

-if(nline==HDEBUGLINE || nline==(HDEBUGLINE+1)) {

-fprintf(stderr,"Line %i chunk at posoffset:%i (realpos:%li)\n",nline, posoffset,realpos);

-fprintf(stderr,"NEW RAWINFO, nline:%i len:%i has_nl:%i has_next:%i mode:%s(%i) mlcprevmode:%s(%i)\n",nline,len,has_nl,has_next,

-mode==mode_whatever?"whatever":

-mode==mode_in_multilinecomment?"mlc":

-mode==mode_in_linecomment?"comment":

-mode==mode_in_directive?"directive":

-mode==mode_in_string?"string":

-mode==mode_in_directivestring?"directivestring":"unknown",

-mode,

-mlcprevmode==mode_whatever?"whatever":

-mlcprevmode==mode_in_multilinecomment?"mlc":

-mlcprevmode==mode_in_linecomment?"comment":

-mlcprevmode==mode_in_directive?"directive":

-mlcprevmode==mode_in_string?"string":

-mlcprevmode==mode_in_directivestring?"directivestring":"unknown",

-mlcprevmode

-);

-}

-#endif

                 for(i=0;i<(len-has_nl);prev_char=(ptr[i]&prev_char_mask),prev_char_mask=0xff,i++) {

-#if 0

-if(nline==HDEBUGLINE || nline==(HDEBUGLINE+1)) {

-fprintf(stderr,"ptr[%i]='%c' prev_char='%s%c' mode=%s(%i) mlcprevmode=%s(%i)\n",i,ptr[i],(prev_char=='\0')?"\\":"",(prev_char=='\0')?'0':prev_char,

-mode==mode_whatever?"whatever":

-mode==mode_in_multilinecomment?"mlc":

-mode==mode_in_linecomment?"comment":

-mode==mode_in_directive?"directive":

-mode==mode_in_string?"string":

-mode==mode_in_directivestring?"directivestring":"unknown",

-mode,

-mlcprevmode==mode_whatever?"whatever":

-mlcprevmode==mode_in_multilinecomment?"mlc":

-mlcprevmode==mode_in_linecomment?"comment":

-mlcprevmode==mode_in_directive?"directive":

-mlcprevmode==mode_in_string?"string":

-mlcprevmode==mode_in_directivestring?"directivestring":"unknown",

-mlcprevmode

-);

-}

-#endif

                         /* special case: keyword ends in a change of mode */

                         if(mode!=mode_whatever && hl->usedkeywordbuf>0) {

                                 if(hl_searchlist(keywords,nkeywords,hl->keywordbuf,hl->usedkeywordbuf,NULL)==0) {

@@ -793,31 +731,6 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

         hline_t *line;

         if(opaque==NULL || *opaque<0 || hl==NULL || (posoff!=0 && linecolor==NULL) || color<0 || posoff<0)

                 return(NULL); /* sanity check failed */

-#if 0

-#define DEBUGLINE 775

-if(hl->usedlines==DEBUGLINE || hl->usedlines==(DEBUGLINE+1)) {

-int i,k;

-int l=hl->lines[hl->usedlines].len;

-linecolor_t *lc=(linecolor_t *) (hl->buf+hl->lines[hl->usedlines].off);

-fprintf(stderr,"addtolinecolor pre.: nline:%i *opaque:%i posoff:%i color:%i current:\"",hl->usedlines,*opaque,posoff,color);

-for(k=0;k<l;k+=sizeof(linecolor_t),lc++) {

-        for(i=0;i<lc->len;i++)

-                fprintf(stderr,"%x",lc->color);

-}

-hl->keywordbuf[hl->usedkeywordbuf]='\0';

-hl->directivebuf[hl->useddirectivebuf]='\0';

-fprintf(stderr,"\" (%i%s%s%s,%i%s%s%s)\n",

-hl->usedkeywordbuf,

-(hl->usedkeywordbuf==0)?"":" \"",

-(hl->usedkeywordbuf==0)?"":hl->keywordbuf,

-(hl->usedkeywordbuf==0)?"":"\"",

-hl->useddirectivebuf,

-(hl->useddirectivebuf==0)?"":" \"",

-(hl->useddirectivebuf==0)?"":hl->directivebuf,

-(hl->useddirectivebuf==0)?"":"\""

-);

-}

-#endif

         /* make sure there is a space for a linecolor_t in buf */

         if((hl->usedbuf+sizeof(linecolor_t))>=hl->sizebuf) {

                 char *newbuf;

@@ -838,19 +751,6 @@ hl->useddirectivebuf,

                 linecolor->len=1;

                 linecolor->color=color;

                 *opaque=1;

-#if 0

-if(hl->usedlines==DEBUGLINE || hl->usedlines==(DEBUGLINE+1)) {

-int i,k;

-int l=hl->lines[hl->usedlines].len;

-linecolor_t *lc=(linecolor_t *) (hl->buf+hl->lines[hl->usedlines].off);

-fprintf(stderr,"addtolinecolor post: nline:%i *opaque:%i posoff:%i color:%i         \"",hl->usedlines,*opaque,posoff,color);

-for(k=0;k<l;k+=sizeof(linecolor_t),lc++) {

-        for(i=0;i<lc->len;i++)

-                fprintf(stderr,"%x",lc->color);

-}

-fprintf(stderr,"\"\n");

-}

-#endif

                 return(linecolor);

         }

         /* if posoff was already done, truncate */

@@ -877,19 +777,6 @@ fprintf(stderr,"\"\n");

                 int added=(posoff-*opaque)+1;

                 linecolor[-1].len+=added;

                 *opaque+=added;

-#if 0

-if(hl->usedlines==DEBUGLINE || hl->usedlines==(DEBUGLINE+1)) {

-int i,k;

-int l=hl->lines[hl->usedlines].len;

-linecolor_t *lc=(linecolor_t *) (hl->buf+hl->lines[hl->usedlines].off);

-fprintf(stderr,"addtolinecolor post: nline:%i *opaque:%i posoff:%i color:%i         \"",hl->usedlines,*opaque,posoff,color);

-for(k=0;k<l;k+=sizeof(linecolor_t),lc++) {

-        for(i=0;i<lc->len;i++)

-                fprintf(stderr,"%x",lc->color);

-}

-fprintf(stderr,"\"\n");

-}

-#endif

                 return(linecolor-1);

         }

         /* add new linecolor */

@@ -898,19 +785,6 @@ fprintf(stderr,"\"\n");

         *opaque+=1;

         line->len+=sizeof(linecolor_t);

         hl->usedbuf+=sizeof(linecolor_t);

-#if 0

-if(hl->usedlines==DEBUGLINE || hl->usedlines==(DEBUGLINE+1)) {

-int i,k;

-int l=hl->lines[hl->usedlines].len;

-linecolor_t *lc=(linecolor_t *) (hl->buf+hl->lines[hl->usedlines].off);

-fprintf(stderr,"addtolinecolor post: nline:%i *opaque:%i posoff:%i color:%i         \"",hl->usedlines,*opaque,posoff,color);

-for(k=0;k<l;k+=sizeof(linecolor_t),lc++) {

-        for(i=0;i<lc->len;i++)

-                fprintf(stderr,"%x",lc->color);

-}

-fprintf(stderr,"\"\n");

-}

-#endif

         return(linecolor);

 }

@@ -16,35 +16,6 @@

 #include <time.h>

 #include "re_data.h"

-#if 0

-#define INITIALCHUNK 20

-#define MAXDUMP 25

-static void

-redata_debug_chunkdump(redata_t *redata, char *title)

-{

-        int m,k;

-        char c;

-        title=(title==NULL)?"":title;

-        fprintf(stderr,"%s:CHUNKDUMP (sizechunks:%i)\n",title,redata->sizechunks);

-        for(m=INITIALCHUNK;m<redata->sizechunks && m<MAXDUMP;m++) {

-                fprintf(stderr,"%s:chunk[%i] len:%-5i data:\"",title,m,redata->chunks[m]->useddata);

-                for(k=0;k<redata->chunks[m]->useddata;k++) {

-                        c=redata->chunks[m]->data[k];

-                        if(c=='\n' || c=='\0')

-                                fprintf(stderr,"\\%c",(c=='\n')?'n':'0');

-                        else if(c<' ' || c>'~' || c=='\\')

-                                fprintf(stderr,"\\x%02X",((unsigned char *)redata->chunks[m]->data)[k]);

-                        else

-                                fprintf(stderr,"%c",c);

-                }

-                fprintf(stderr,"\"\n");

-        }

-}

-#define CHUNKDEBUG(a) redata_debug_chunkdump a

-#else

-#define CHUNKDEBUG(a)

-#endif

-

 #include "re_plugin_unsaved.h"

 #include "re_plugin_highlighter.h"

 #include "re_ui.h"

@@ -1019,9 +990,6 @@ re_drawcontents(re_t *re)

         /* draw the lines */

         drawn_cursor=0;

         colors=redata_highlighter_getcolors(re->data,&ncolors);

-#if 0

-CHUNKDEBUG((re->data,"Pre-display"));

-#endif

         for(y=re->y;y<(re->y+re->h);y+=re->ui->fontheight,row++) {

                 /* definiciton of vars for teacking linecolor usage */

                 int curlinecolor; /* current linecolor */

@@ -1032,19 +1000,6 @@ CHUNKDEBUG((re->data,"Pre-display"));

                 }

                 in_error=0;

                 linecolors=(colors==NULL)?NULL:redata_highlighter_getline(re->data,re->originline+row,&nlinecolors);

-#if 0

-#define DEBUGLINE 12

-if((re->origincol+row)==DEBUGLINE) {

-int i,k,l=nlinecolors*sizeof(linecolor_t);

-linecolor_t *lc=linecolors;

-fprintf(stderr,"linecolors for line:%i \"",re->origincol+row);

-for(k=0;k<l;k+=sizeof(linecolor_t),lc++) {

-        for(i=0;i<lc->len;i++)

-                fprintf(stderr,"%x",lc->color);

-}

-fprintf(stderr,"\"\n");

-}

-#endif

                 curlinecolor=0;

                 usedlenlinecolor=0;

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

@@ -1060,16 +1015,6 @@ fprintf(stderr,"\"\n");

                                 used=usedcol=0;

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

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

-#if 0

-if((re->origincol+row)==DEBUGLINE) {

-int i,l;

-fprintf(stderr,"ui_write (full) for line:%i curlinecolor:%i color:%i at:%i str:\"",(re->origincol+row),curlinecolor,linecolors[curlinecolor].color,(tmpcol-re->origincol+usedcol));

-l=linecolors[curlinecolor].len-usedlenlinecolor;

-for(i=0;i<l;i++)

-fprintf(stderr,"%c",ptr[used+i]);

-fprintf(stderr,"\" (used:%i)\n",used);

-}

-#endif

                                         reui_write(re->ui,re->x+(tmpcol-re->origincol+usedcol)*re->ui->fontwidth,y,colors[linecolors[curlinecolor].color].rgba,ptr+used,linecolors[curlinecolor].len-usedlenlinecolor);

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

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

@@ -1078,27 +1023,11 @@ fprintf(stderr,"\" (used:%i)\n",used);

                                 }

                                 /* for the last bytes of avail text, after writing them we save how many bytes we have processed of that linecolor to be able to continue later */

                                 if((len-has_nl-used)>0 && (linecolors[curlinecolor].len-usedlenlinecolor)>(len-has_nl-used)) {

-#if 0

-if((re->origincol+row)==DEBUGLINE) {

-int i,l;

-fprintf(stderr,"ui_write (last) for line:%i curlinecolor:%i color:%i at:%i str:\"",(re->origincol+row),curlinecolor,linecolors[curlinecolor].color,(tmpcol-re->origincol+usedcol));

-l=(len-has_nl-used);

-for(i=0;i<l;i++)

-fprintf(stderr,"%c",ptr[used+i]);

-fprintf(stderr,"\" (used:%i)\n",used);

-}

-#endif

                                         reui_write(re->ui,re->x+(tmpcol-re->origincol+usedcol)*re->ui->fontwidth,y,colors[linecolors[curlinecolor].color].rgba,ptr+used,(len-has_nl-used));

                                         usedcol+=redata_generic_utf8len(ptr+used,(len-has_nl-used));

                                         usedlenlinecolor+=(len-has_nl-used);

                                         used+=(len-has_nl-used);

                                 }

-#if 0

-if((re->origincol+row)==DEBUGLINE) {

-fprintf(stderr,"AFTER (used:%i)\n",used);

-}

-#endif

-

                         } else {

                                 reui_write(re->ui,re->x+(tmpcol-re->origincol)*re->ui->fontwidth,y,"\x00\x00\x00\xff",ptr,len-has_nl);

                         }

@@ -1111,6 +1040,8 @@ fprintf(stderr,"AFTER (used:%i)\n",used);

                                         reui_write(re->ui,re->x+re->ui->fontwidth*(re->curcol-re->origincol),y,"\xff\xff\xff\xff",curptr,redata_generic_utf8charlen(curptr,curptrlen));

                                 }

 #warning TODO: if it is one of  '[','{','<','>','}',']', highlight the matching bracket/parens/anglebracket.

+#warning If it is ourside of the visible part of the code, put a comic baloon (with some transparency) in that dir. (up, down or right) at the correct height/position to mark the direction of where it is.

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

                         }

                 }

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