@@ -66,6 +66,7 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

         highlighter_t *hl;

         if(redata==NULL || slot==NULL)

                 return(-1);

+#if 1

         /* "forest" theme */

         colors=hl_initcolors(&ncolors,

                              color_keyword,"\x38\x17\x1e\xff",

@@ -83,6 +84,25 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

                              color_symbol,"\x69\x2a\x44\xff",

                              color_endenum,DEFAULTCOLOR,

                              -1);

+#else

+        /* "alternative" theme (dark) */

+        colors=hl_initcolors(&ncolors,

+                             color_keyword,"\xcc\x99\xcc\xff",//

+                             color_directive,"\x38\x4b\x00\xff",

+                             color_directivekeyword,"\x63\x7d\x16\xff",

+                             color_directivestring,"\x07\x20\x3b\xff",

+                             color_directiveinclude,"\x16\x63\x7d\xff",

+                             color_directiveincludestring,"\x6\x13\x2d\xff",

+                             color_normal,"\xf2\xf0\xec\xff",//

+                             color_string,"\x99\xcc\x99\xff",//

+                             color_multilinecomment,"\x74\x73\x69\xff",//

+                             color_linecomment,"\x74\x73\x69\xff",//

+                             color_number,"\xf9\x91\x57\xff",//

+                             color_operator,"\x66\xcc\xcc\xff",//

+                             color_symbol,"\x91\xa7\xff\xff",//

+                             color_endenum,"\xf2\xf0\xec\xff",//

+                             -1);

+#endif

         if(colors==NULL || (hl=malloc(sizeof(highlighter_t)))==NULL) {

                 if(colors!=NULL)

                         free(colors),colors=NULL;

@@ -171,7 +171,6 @@ redata_highlighter_getcolorindex(redata_t *redata, int line, int nthbyte)

 static void

 redata_highlighter_util_applytheme(int *template3,hcolor_t *color,int invert)

 {

-        unsigned char c[3];

         if(template3==NULL || color==NULL || template3[0]<0 || template3[0]>2 || template3[1]<0 || template3[1]>2 || template3[2]<0 || template3[2]>2)

                 return; /* sanity check error */

         if(invert==0) {

@@ -200,7 +199,7 @@ redata_highlighter_settheme(redata_t *redata, int ntheme, int invert)

                 return(-1);

         for(i=0;i<ncolors;i++)

                 redata_highlighter_util_applytheme(permutationtemplate,colors+i,invert);

-        return;

+        return(0);

 }

 static int

@@ -354,6 +353,7 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

                 mode_in_linecomment,

                 mode_in_directive,

                 mode_in_string,

+                mode_in_singlestring,

                 mode_in_directivestring,

         } mode,mlcprevmode;

         if(redata==NULL || hl==NULL || nline<0)

@@ -471,6 +471,11 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

                                         linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,color_string);

                                         continue;

                                 }

+                                if(ptr[i]=='\'') {

+                                        mode=mode_in_singlestring;

+                                        linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,color_string);

+                                        continue;

+                                }

                                 if(!cant_define && ptr[i]=='#') {

                                         mode=mode_in_directive;

                                         is_directiveinclude=0;

@@ -592,11 +597,12 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

                                 linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,(is_directiveinclude==0)?color_directivestring:color_directiveincludestring);

                                 continue;

                         }

-                        if(mode==mode_in_string) {

+                        if(mode==mode_in_string || mode_in_singlestring) {

                                 if(prev_char=='\\' || ptr[i]=='\\') {

                                         continue;

                                 }

-                                if(ptr[i]=='\"') {

+                                if((mode==mode_in_string && ptr[i]=='\"')

+                                  || (mode==mode_in_singlestring && ptr[i]=='\'')) {

                                         mode=mode_whatever;

                                         linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,color_string);

                                         continue;

@@ -168,6 +168,41 @@ redata_highlighter_getcolorindex(redata_t *redata, int line, int nthbyte)

         return(-1);

 }

+static void

+redata_highlighter_util_applytheme(int *template3,hcolor_t *color,int invert)

+{

+        unsigned char c[3];

+        if(template3==NULL || color==NULL || template3[0]<0 || template3[0]>2 || template3[1]<0 || template3[1]>2 || template3[2]<0 || template3[2]>2)

+                return; /* sanity check error */

+        if(invert==0) {

+                ((unsigned char *)color->rgba)[0]=((unsigned char *)color->origrgba)[template3[0]];

+                ((unsigned char *)color->rgba)[1]=((unsigned char *)color->origrgba)[template3[1]];

+                ((unsigned char *)color->rgba)[2]=((unsigned char *)color->origrgba)[template3[2]];

+        } else {

+                ((unsigned char *)color->rgba)[0]=255-((unsigned char *)color->origrgba)[template3[0]];

+                ((unsigned char *)color->rgba)[1]=255-((unsigned char *)color->origrgba)[template3[1]];

+                ((unsigned char *)color->rgba)[2]=255-((unsigned char *)color->origrgba)[template3[2]];

+        }

+        return;

+}

+

+int

+redata_highlighter_settheme(redata_t *redata, int ntheme, int invert)

+{

+        int permutations[6][3]={{0,1,2},{0,2,1},{1,0,2},{1,2,0},{2,1,0},{2,0,1}};

+        int *permutationtemplate;

+        hcolor_t *colors;

+        int ncolors,i;

+        ntheme=(ntheme<0)?0:ntheme;

+        ntheme%=6;

+        permutationtemplate=permutations[ntheme];

+        if((colors=redata_highlighter_getcolors(redata, &ncolors))==NULL)

+                return(-1);

+        for(i=0;i<ncolors;i++)

+                redata_highlighter_util_applytheme(permutationtemplate,colors+i,invert);

+        return;

+}

+

 static int

 redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd)

 {

@@ -248,6 +283,8 @@ hl_initcolors(int *ncolors, /* int color, char *colordef, */ ...)

                         colordef=va_arg(paramlist,char *);

                         maxcolor=(maxcolor<color)?color:maxcolor;

                         if(round==1) {

+                                strncpy(hcolors[color].origrgba,colordef,sizeof(hcolors[color].origrgba));

+                                hcolors[color].origrgba[sizeof(hcolors[color].origrgba)-1]='\0';

                                 strncpy(hcolors[color].rgba,colordef,sizeof(hcolors[color].rgba));

                                 hcolors[color].rgba[sizeof(hcolors[color].rgba)-1]='\0';

                         }

@@ -788,3 +825,4 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

         return(linecolor);

 }

+

@@ -71,7 +71,7 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

                              color_keyword,"\x38\x17\x1e\xff",

                              color_directive,"\x38\x4b\x00\xff",

                              color_directivekeyword,"\x63\x7d\x16\xff",

-                             color_directivestring,"\x07\x20\3b\xff",

+                             color_directivestring,"\x07\x20\x3b\xff",

                              color_directiveinclude,"\x16\x63\x7d\xff",

                              color_directiveincludestring,"\x6\x13\x2d\xff",

                              color_normal,"\x9a\x67\x43\xff",

@@ -5,7 +5,7 @@

  *

  * re_data plugin to support the syntax highlighter.

  *

- * Author: Dario Rodriguez dario@softhome.net

+ * Author: Dario Rodriguez antartica@whereismybit.com

  * This program is licensed under the terms of GNU GPL v2.1+

  */

@@ -193,7 +193,7 @@ redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t

                 }

         }

         /* special case: check if pos is inside last line */

-        if(nline>=hl->usedlines && (hl->lines[hl->usedlines-1].pos+hl->lines[hl->usedlines-1].len)>=pos)

+        if(nline>=hl->usedlines)

                 nline=hl->usedlines-1;

         /* invalidate from this line on */

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

@@ -365,7 +365,7 @@ 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(hl_doline(redata,hl,i)==-1)

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

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

         }

         hl_invalidatefrom(redata,hl,nline);

         line=hl->lines+nline;

@@ -391,7 +391,7 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

         mlcprevmode=mode_whatever;

         do {

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

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

+                        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 */

@@ -788,4 +788,3 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

         return(linecolor);

 }

-

@@ -46,8 +46,6 @@ typedef enum colorsenum_t {

 } colorsenum_t;

-static int redata_highlighter_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

-static int redata_highlighter_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

 static int redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd);

 static int redata_highlighter_postload(redata_t *redata, redata_plugin_t *slot,char *filename);

@@ -68,6 +66,7 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

         highlighter_t *hl;

         if(redata==NULL || slot==NULL)

                 return(-1);

+        /* "forest" theme */

         colors=hl_initcolors(&ncolors,

                              color_keyword,"\x38\x17\x1e\xff",

                              color_directive,"\x38\x4b\x00\xff",

@@ -97,8 +96,7 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

         slot->name[sizeof(slot->name)-1]='\0';

         slot->unregister=redata_highlighter_unregister;

         slot->postload=redata_highlighter_postload;

-        slot->add=redata_highlighter_add;

-        slot->unadd=redata_highlighter_unadd;

+        slot->add_or_unadd=redata_highlighter_add_or_unadd;

         slot->userptr=hl;

         return(0);

 }

@@ -170,36 +168,20 @@ redata_highlighter_getcolorindex(redata_t *redata, int line, int nthbyte)

         return(-1);

 }

-

-static int

-redata_highlighter_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

-{

-        return(redata_highlighter_add_or_unadd(redata, slot, undo, 0));

-}

-

-static int

-redata_highlighter_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

-{

-        return(redata_highlighter_add_or_unadd(redata, slot, undo, 1));

-}

-

-

 static int

 redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd)

 {

         long pos;

         int nline;

-        undostack_t *stack;

         highlighter_t *hl=(highlighter_t *) ((slot!=NULL)?(slot->userptr):NULL);

-        stack=redata_getstack(redata,undo);

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

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

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

         if(hl->usedlines==0) {

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

         }

         /* get the first pos of the operation */

         pos=undo->posorig;

-        if(undo->type=='D')

+        if((!is_unadd && undo->type=='D') || (is_unadd && undo->type=='A'))

                 pos-=undo->len;

         if(undo->type=='M' && undo->posdest<pos)

                 pos=undo->posdest;

@@ -517,7 +517,7 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

                                 if(prev_char=='/' && ptr[i]=='/') {

                                         mode=mode_in_linecomment;

                                         linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i-1,color_linecomment);

-                                         linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,color_linecomment);

+                                        linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,color_linecomment);

                                         continue;

                                 }

                                 if(prev_char=='/' && ptr[i]=='*') {

@@ -704,6 +704,7 @@ hl_C_getdirectives(char ***directives,int *ndirectives, int *maxlen)

 "line",

 "error",

 "pragma",

+NULL

 };

         if(directives==NULL || ndirectives==NULL)

                 return(-1);

@@ -767,6 +768,7 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

                 linecolor->len=1;

                 linecolor->color=color;

                 *opaque=1;

+                hl->usedbuf=line->off+line->len;

                 return(linecolor);

         }

         /* if posoff was already done, truncate */

@@ -800,7 +802,7 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

         linecolor->color=color;

         *opaque+=1;

         line->len+=sizeof(linecolor_t);

-        hl->usedbuf+=sizeof(linecolor_t);

+        hl->usedbuf=line->off+line->len;

         return(linecolor);

 }

@@ -75,8 +75,8 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

                              color_directivestring,"\x07\x20\3b\xff",

                              color_directiveinclude,"\x16\x63\x7d\xff",

                              color_directiveincludestring,"\x6\x13\x2d\xff",

-                             color_normal,"\x9d\x15\x00\xff",

-                             color_string,"\x68\x00\x01\xff",

+                             color_normal,"\x9a\x67\x43\xff",

+                             color_string,"\x9d\x15\x00\xff",

                              color_multilinecomment,"\x4f\x40\x57\xff",

                              color_linecomment,"\xc6\x8c\xa4\xff",

                              color_number,"\x3b\x10\x35\xff",

@@ -69,13 +69,13 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

         if(redata==NULL || slot==NULL)

                 return(-1);

         colors=hl_initcolors(&ncolors,

-                             color_normal,"\x38\x17\x1e\xff",

+                             color_keyword,"\x38\x17\x1e\xff",

                              color_directive,"\x38\x4b\x00\xff",

                              color_directivekeyword,"\x63\x7d\x16\xff",

                              color_directivestring,"\x07\x20\3b\xff",

                              color_directiveinclude,"\x16\x63\x7d\xff",

                              color_directiveincludestring,"\x6\x13\x2d\xff",

-                             color_keyword,"\x9d\x15\x00\xff",

+                             color_normal,"\x9d\x15\x00\xff",

                              color_string,"\x68\x00\x01\xff",

                              color_multilinecomment,"\x4f\x40\x57\xff",

                              color_linecomment,"\xc6\x8c\xa4\xff",

@@ -155,6 +155,22 @@ redata_highlighter_getline(redata_t *redata, int line, int *nlinecolors)

         return((linecolor_t *) (hl->buf+hl->lines[line].off));

 }

+int

+redata_highlighter_getcolorindex(redata_t *redata, int line, int nthbyte)

+{

+        int i,n;

+        int nlinecolors;

+        linecolor_t *linecolors;

+        if((linecolors=redata_highlighter_getline(redata,line,&nlinecolors))==NULL)

+                return(-1);

+        for(i=0,n=0;n<nlinecolors;i+=linecolors[n].len,n++) {

+                if(nthbyte<(i+linecolors[n].len))

+                        return(linecolors[n].color);

+        }

+        return(-1);

+}

+

+

 static int

 redata_highlighter_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

 {

@@ -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);

 }

@@ -179,7 +179,7 @@ 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 1

+#if 0

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

 #endif

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

@@ -203,7 +203,7 @@ 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 1

+#if 0

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

 #endif

         return(0);

@@ -404,25 +404,67 @@ fprintf(stderr,"Doing line %i pos:%li\n",nline,line->pos);

         hl->useddirectivebuf=0;

         mlcprevmode=mode_whatever;

         do {

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

+                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

                         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

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

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

-#warning FALTA PONER DE UN COLOR DIFERENTE lo de <nombre.h> de los #include (pero no de los #define!)

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

 #if 0

-if(nline==1)

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

+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) {

@@ -595,7 +637,7 @@ if(nline==1)

                         }

                 }

                 posoffset+=len;

-        } while(has_next!=0 && (pos+posoffset)<redataused);

+        } while(has_next!=0 && (realpos+posoffset)<redataused);

         /* special case: keyword ends at end-of-line */

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

                 linecolor=hl_addtolinecolor(&opaque,hl,linecolor,hl->keywordbufstart,color_keyword);

@@ -752,8 +794,8 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

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

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

 #if 0

-#define DEBUGLINE 12

-if(hl->usedlines==DEBUGLINE) {

+#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);

@@ -797,7 +839,7 @@ hl->useddirectivebuf,

                 linecolor->color=color;

                 *opaque=1;

 #if 0

-if(hl->usedlines==DEBUGLINE) {

+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);

@@ -836,7 +878,7 @@ fprintf(stderr,"\"\n");

                 linecolor[-1].len+=added;

                 *opaque+=added;

 #if 0

-if(hl->usedlines==DEBUGLINE) {

+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);

@@ -857,7 +899,7 @@ fprintf(stderr,"\"\n");

         line->len+=sizeof(linecolor_t);

         hl->usedbuf+=sizeof(linecolor_t);

 #if 0

-if(hl->usedlines==DEBUGLINE) {

+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);

@@ -22,19 +22,26 @@

 #include "re_plugin_highlighter.h"

 #define PLUGINNAME "highlighter"

+#define HLINETBLOCK (16*1024)

+#define BUFBLOCK (64*1024)

 #define HIGHLIGHTERGROWSIZE (256*1024)

 #define DEFAULTCOLOR "\x80\x80\x80\xff"

 typedef enum colorsenum_t {

         color_normal=0,

-        color_define,

-        color_definestring,

+        color_directive,

+        color_directivekeyword,

+        color_directivestring,

+        color_directiveinclude,

+        color_directiveincludestring,

         color_keyword,

         color_string,

         color_multilinecomment,

         color_linecomment,

         color_number,

+        color_operator,

+        color_symbol,

         color_endenum,

 } colorsenum_t;

@@ -42,13 +49,16 @@ typedef enum colorsenum_t {

 static int redata_highlighter_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

 static int redata_highlighter_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

 static int redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd);

-static int redata_highlighter_commit(redata_t *redata, redata_plugin_t *slot,char *filename);

 static int redata_highlighter_postload(redata_t *redata, redata_plugin_t *slot,char *filename);

 static int hl_invalidatefrom(redata_t *redata, highlighter_t *hl, int nline);

 hcolor_t *hl_initcolors(int *ncolors, /* int color, char *colordef, */ ...);

 static highlighter_t *hl_getplugin(redata_t *redata);

 static int hl_doline(redata_t *redata, highlighter_t *hl, int nline);

+int hl_C_getkeywords(char ***keywords,int *nkeywords, int *maxlen);

+int hl_C_getdirectives(char ***directives,int *ndirectives, int *maxlen);

+int hl_searchlist(char **wordlist, int wordlistlen, char *word, int wordlen, int *res);

+linecolor_t *hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int posoff, int color);

 int

 redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

@@ -60,13 +70,18 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

                 return(-1);

         colors=hl_initcolors(&ncolors,

                              color_normal,"\x38\x17\x1e\xff",

-                             color_define,"\x0d\x2b\x04\xff",

-                             color_definestring,"\x07\x20\3b\xff",

+                             color_directive,"\x38\x4b\x00\xff",

+                             color_directivekeyword,"\x63\x7d\x16\xff",

+                             color_directivestring,"\x07\x20\3b\xff",

+                             color_directiveinclude,"\x16\x63\x7d\xff",

+                             color_directiveincludestring,"\x6\x13\x2d\xff",

                              color_keyword,"\x9d\x15\x00\xff",

                              color_string,"\x68\x00\x01\xff",

                              color_multilinecomment,"\x4f\x40\x57\xff",

-                             color_linecomment,"\xaa\x8c\xcd\xff",

+                             color_linecomment,"\xc6\x8c\xa4\xff",

                              color_number,"\x3b\x10\x35\xff",

+                             color_operator,"\xaa\x8c\xcd\xff",

+                             color_symbol,"\x69\x2a\x44\xff",

                              color_endenum,DEFAULTCOLOR,

                              -1);

         if(colors==NULL || (hl=malloc(sizeof(highlighter_t)))==NULL) {

@@ -84,7 +99,6 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

         slot->postload=redata_highlighter_postload;

         slot->add=redata_highlighter_add;

         slot->unadd=redata_highlighter_unadd;

-        slot->commit=redata_highlighter_commit;

         slot->userptr=hl;

         return(0);

 }

@@ -104,6 +118,12 @@ redata_highlighter_unregister(redata_t *redata, redata_plugin_t *slot, char *fil

         if(hl->lines!=NULL)

                 free(hl->lines),hl->lines=NULL;

         hl->sizelines=hl->usedlines=0;

+        if(hl->keywordbuf!=NULL)

+                free(hl->keywordbuf),hl->keywordbuf=NULL;

+        hl->sizekeywordbuf=hl->usedkeywordbuf=0;

+        if(hl->directivebuf!=NULL)

+                free(hl->directivebuf),hl->directivebuf=NULL;

+        hl->sizedirectivebuf=hl->useddirectivebuf=0;

         if(slot->userptr!=NULL)

                 free(slot->userptr),slot->userptr=NULL;

         return(0);

@@ -131,7 +151,7 @@ redata_highlighter_getline(redata_t *redata, int line, int *nlinecolors)

         if(line<0 || line>=hl->usedlines)

                 return(NULL);

         if(nlinecolors!=NULL)

-                *nlinecolors=(hl->lines[line].len)/sizeof(hcolor_t);

+                *nlinecolors=(hl->lines[line].len)/sizeof(linecolor_t);

         return((linecolor_t *) (hl->buf+hl->lines[line].off));

 }

@@ -158,6 +178,12 @@ redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t

         stack=redata_getstack(redata,undo);

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

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

+        if(hl->usedlines==0) {

+#if 1

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

+#endif

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

+        }

         /* get the first pos of the operation */

         pos=undo->posorig;

         if(undo->type=='D')

@@ -171,21 +197,15 @@ redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t

                         break;

                 }

         }

+        /* special case: check if pos is inside last line */

+        if(nline>=hl->usedlines && (hl->lines[hl->usedlines-1].pos+hl->lines[hl->usedlines-1].len)>=pos)

+                nline=hl->usedlines-1;

         /* invalidate from this line on */

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

         hl_invalidatefrom(redata,hl,nline);

-        return(0);

-}

-

-static int

-redata_highlighter_commit(redata_t *redata, redata_plugin_t *slot,char *filename)

-{

-        highlighter_t *hl=(highlighter_t *) ((slot!=NULL)?(slot->userptr):NULL);

-        if(redata==NULL || hl==NULL || filename==NULL)

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

-        if(hl->flag_doneall)

-                return(0);

-        /* calc highlight of one additional line */

-        hl_doline(redata, hl, hl->usedlines);

+#if 1

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

+#endif

         return(0);

 }

@@ -274,12 +294,582 @@ hl_getplugin(redata_t *redata)

         return(hl);

 }

-

 static int

 hl_doline(redata_t *redata, highlighter_t *hl, int nline)

 {

+        int i;

+        long realpos;

+        long pos;

+        char *ptr;

+        int len;

+        hline_t *line;

+        long redataused;

+        int has_nl;

+        int has_next;

+        char **keywords;

+        int nkeywords;

+        char **directives;

+        int ndirectives;

+        int maxlenkeywords,maxlendirectives;

+        linecolor_t *linecolor;

+        int prev_char;

+        int prev_char_mask;

+        int cant_define;

+        int cant_directivekeyword;

+        int is_directiveinclude;

+        int opaque;

+        int posoffset;

+        enum {

+                mode_whatever=0,

+                mode_in_multilinecomment,

+                mode_in_linecomment,

+                mode_in_directive,

+                mode_in_string,

+                mode_in_directivestring,

+        } mode,mlcprevmode;

+        if(redata==NULL || hl==NULL || nline<0)

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

+        if(hl->usedlines>nline)

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

+        if(hl_C_getkeywords(&keywords,&nkeywords,&maxlenkeywords)==-1)

+                return(-1); /* couldn't get keyword list */

+        if(hl_C_getdirectives(&directives,&ndirectives,&maxlendirectives)==-1)

+                return(-1); /* couldn't get directive list */

+        /* make sure keywordbuf is large enough */

+        if(maxlenkeywords>hl->sizekeywordbuf) {

+                char *newkeywordbuf;