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

 {

@@ -54,4 +54,5 @@ int redata_highlighter_unregister(redata_t *redata, redata_plugin_t *slot,char *

 hcolor_t *redata_highlighter_getcolors(redata_t *redata, int *ncolors);

 linecolor_t *redata_highlighter_getline(redata_t *redata, int line, int *nlinecolors);

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

@@ -31,6 +31,9 @@

 #define COMMAND_WARNING "(!)"

 #define COMMAND_GOTOLINE "Go to line:"

 #define COMMAND_SEARCHFORWARD "Search:"

+#define COMMAND_REPLACEWHAT "Search for:"

+#define COMMAND_REPLACEWITH "Replace with:"

+#define COMMAND_REPLACEHOW "Replace options (Igncase Selected Backwards Entire All Noconfirm):"

 #define COMMAND_QUESTION "(?)"

 #define COMMAND_EXIT "Exit"

@@ -88,6 +91,7 @@ int re_processcommand(re_t *re);

 int re_moveupdown(re_t *re, int totalinc);

 int re_moveleftright(re_t *re, int totalinc);

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

+long re_getmatchingbracket(re_t *re,long posini, char originalchar, char *matchingchar);

 int re_drawheader_editing(re_t *re);

 int re_drawheader_command(re_t *re);

 int re_drawcontents(re_t *re);

@@ -661,6 +665,7 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

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

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

                 re->headerdirty=1;

+#warning TODO: Search and replace (control+q+a)

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

                 re->command=COMMAND_EXIT;

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

@@ -938,6 +943,70 @@ re_rtrim(re_t *re, long curpos, int *trimmed)

         return(0);

 }

+long

+re_getmatchingbracket(re_t *re,long posini, char originalchar, char *matchingchar)

+{

+        char *ori,*dest;

+        char *pairs="[]{}<>()";

+        int is_backwards;

+        int colorindex,newcolor;

+        long realstart;

+        int line;

+        long pos;

+        long posnextori,posnextdest;

+        long posnext;

+        int counter;

+        if(re==NULL)

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

+        if((ori=strchr(pairs,originalchar))==NULL)

+                return(-1); /* unknown char */

+        is_backwards=(ori-pairs)%2;

+        dest=ori+((is_backwards)?-1:1);

+        if(redata_pos2linecol(re->data,posini,&line,NULL)==-1

+          || redata_line_realstart(re->data,posini,&realstart)==-1) {

+                return(-1); /* couldn't get line number or startpos */

+        }

+        colorindex=redata_highlighter_getcolorindex(re->data,line,posini-realstart);

+        pos=posini;

+        counter=1;

+        while(1) {

+                /* get the next pos */

+                if(!is_backwards) {

+                        posnextori=redata_searchforward(re->data,pos+1,ori,1);

+                        posnextdest=redata_searchforward(re->data,pos+1,dest,1);

+                        posnext=(posnextori==-1)?posnextdest:(posnextdest==-1)?posnextori:(posnextori<posnextdest)?posnextori:posnextdest;

+                } else {

+                        posnextori=redata_searchbackwards(re->data,pos-1,ori,1);

+                        posnextdest=redata_searchbackwards(re->data,pos-1,dest,1);

+                        posnext=(posnextori==-1)?posnextdest:(posnextdest==-1)?posnextori:(posnextori>posnextdest)?posnextori:posnextdest;

+                }

+                if(posnext==-1)

+                        break; /* search ended and couln't get the counter to zero */

+                /* check that the color index is ok */

+                if(redata_pos2linecol(re->data,posnext,&line,NULL)==-1

+                  || redata_line_realstart(re->data,posnext,&realstart)==-1) {

+                        return(-1); /* couldn't get line number or startpos */

+                }

+                newcolor=redata_highlighter_getcolorindex(re->data,line,posnext-realstart);

+                if(colorindex!=newcolor) {

+                        pos=posnext;

+                        continue; /* it doesn't have the same color */

+                }

+                /* do the math */

+                if(posnext==posnextori)

+                        counter++;

+                if(posnext==posnextdest)

+                        counter--;

+                pos=posnext;

+                if(counter==0) {

+                        if(matchingchar!=NULL)

+                                *matchingchar=*dest;

+                        return(posnext); /* found matching bracket */

+                }

+        }

+        return(-1);

+}

+

 int

 re_drawheader_editing(re_t *re)

 {

@@ -1012,6 +1081,9 @@ re_drawcontents(re_t *re)

         int ncolors;

         linecolor_t *linecolors;

         int nlinecolors;

+        int matchingpos;

+        char matchingchar;

+        int mline,mcol;

         if(re==NULL)

                 return(-1);

         reui_fill(re->ui,re->x,re->y,re->w,re->h,"\xdf\xdf\xdf\xff");

@@ -1029,8 +1101,10 @@ re_drawcontents(re_t *re)

         /* draw the lines */

         drawn_cursor=0;

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

+        matchingpos=-1;

+        matchingchar='\0';

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

-                /* definiciton of vars for teacking linecolor usage */

+                /* definition of vars for tracking linecolor usage */

                 int curlinecolor; /* current linecolor */

                 int usedlenlinecolor; /* number of bytes of current linecolor already drawn */

                 /* end of deifinitions */

@@ -1072,15 +1146,18 @@ re_drawcontents(re_t *re)

                         }

                         if(row==(re->curline-re->originline)) {

                                 if(re->curcol>=tmpcol && re->curcol<(tmpcol+availcol)) {

+                                        int utf8charlen;

+                                        /* draw cursor */

                                         reui_fill(re->ui,re->x+re->ui->fontwidth*(re->curcol-re->origincol),y,re->ui->fontwidth,re->ui->fontheight+1,"\x00\x00\x00\xff");

                                         drawn_cursor=1;

                                         curptr=redata_generic_utf8col(ptr,len-has_nl,re->curcol-tmpcol);

                                         curptrlen=(curptr==NULL)?0:(len-has_nl)-(curptr-ptr);

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

+                                        utf8charlen=redata_generic_utf8charlen(curptr,curptrlen);

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

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

+                                        if(utf8charlen==1 && strchr("[]{}<>()",*curptr)!=NULL)

+                                                matchingpos=re_getmatchingbracket(re,re->cursorpos,*curptr,&matchingchar);

                                 }

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

-#warning When searching for matching backet/..., count only the ones in the same highlighting color.

-#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/...)

                         }

                 }

@@ -1091,22 +1168,40 @@ re_drawcontents(re_t *re)

                 pos=realend+1;

 /*LONG LINE LEFT FOR DEBUGGING PURPOSES: reui_write(re->ui,re->x+re->ui->fontwidth*(re->curcol-re->origincol),y,"\xff\xff\xff\xff",curptr,redata_generic_utf8charlen(ptr,curptrlen));*/

         }

-        re->contentsdirty=0;

-        re->ui->rendererdirty=1;

+        /* highlight matching parens/brace/... if applicable */

+        if(matchingpos!=-1 && redata_pos2linecol(re->data,matchingpos,&mline,&mcol)!=-1) {

+                int x,y;

+                char *fg="\xff\x00\x00\x80";

+                char *bg="\xff\xff\xff\xaf";

+                x=re->x+(mcol-re->origincol)*re->ui->fontwidth+(re->ui->fontwidth/2);

+                x=(x<re->x)?re->x:(x>=(re->x+re->w))?(re->x+re->w-1):x;

+                y=re->y+(mline-re->originline)*re->ui->fontheight+(re->ui->fontheight/2);

+                y=(y<re->y)?re->y:(y>=(re->y+re->h))?(re->y+re->h-1):y;

+                if(mline<re->originline)

+                        reui_balloon(re->ui, 'n', x, re->y, fg, bg, &matchingchar,1);

+                else if(mline>=(re->originline+re->maxrow))

+                        reui_balloon(re->ui, 's', x, re->y+re->h-1, fg, bg, &matchingchar,1);

+                else if(mcol<re->origincol)

+                        reui_balloon(re->ui, 'w', re->x, y, fg, bg, &matchingchar,1);

+                else if(mcol>=(re->origincol+re->maxcol))

+                        reui_balloon(re->ui, 'e', re->x+re->w-1,y, fg, bg, &matchingchar,1);

+                else

+                        reui_balloon(re->ui, '\0', x,y, fg, bg, &matchingchar,1);

+        }

+        /* display commonprototypes info if applicable */

 #if 1

+#warning TODO: display commonprototypes info if applicable

 {

-char sampletext[]={"Here is the top"};

-char sampletextlarge[]={"void *memcpy(void *dest, const void *src, size_t n)"};

-reui_balloon(re->ui, 'n', re->x+re->w/2, re->y, "\xff\x00\x00\xff", "\x00\x00\xff\x80",sampletext,strlen(sampletext));

-reui_balloon(re->ui, 's', re->x+re->w/2, re->y+re->h-1, "\xff\x00\x00\x80", "\xff\xff\xff\xaf", "}",1);

-reui_balloon(re->ui, 'e', re->x+re->w-1,re->y+re->h/2, "\xff\x00\x00\x80", "\xff\xff\xff\xaf", "[",1);

-reui_balloon(re->ui, 'w', re->x, re->y+re->h/2, "\xff\x00\x00\x80", "\xff\xff\xff\xaf", "]",1);

-if((re->curline-re->originline)>=(re->maxrow/2))

-        reui_balloon(re->ui, '\0', re->x+re->w/2, re->y+re->ui->fontheight*3/2, "\x80\x80\x80\xff", "\xff\xff\xff\xcf",sampletextlarge,strlen(sampletextlarge));

-else

-        reui_balloon(re->ui, '\0', re->x+re->w/2, re->y+re->h-re->ui->fontheight*3/2, "\x80\x80\x80\xff", "\xff\xff\xff\xcf",sampletextlarge,strlen(sampletextlarge));

+                char sampletextlarge[]={"void *memcpy(void *dest, const void *src, size_t n)"};

+                if((re->curline-re->originline)>=(re->maxrow/2))

+                        reui_balloon(re->ui, '\0', re->x+re->w/2, re->y+re->ui->fontheight*3/2, "\x80\x80\x80\xff", "\xff\xff\xff\xcf",sampletextlarge,strlen(sampletextlarge));

+                else

+                        reui_balloon(re->ui, '\0', re->x+re->w/2, re->y+re->h-re->ui->fontheight*3/2, "\x80\x80\x80\xff", "\xff\xff\xff\xcf",sampletextlarge,strlen(sampletextlarge));

 }

 #endif

+        /* all done */

+        re->contentsdirty=0;

+        re->ui->rendererdirty=1;

         return(0);

 }