@@ -308,6 +308,7 @@ redata_t *re_getfunclisting(re_t *re);

 int re_funclistingxy2line(re_t *re,int mx,int my);

 int re_wheelaccel(re_t *re, int rawamount);

 int re_themeset(re_t *re, int ntheme);

+int re_gotofunctiondefinition(re_t *re, int line, int col);

 int re_socketinit(re_t *re, char *filename);

 void re_socketfree(re_t *re);

 int re_socketnewclient(re_t *re, int alreadyacceptedfd);

@@ -558,11 +559,18 @@ fprintf(stderr,"RENDER\n");

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

                                                         newposy=my/printout->ui->fontheight;

                                                         if(redata_linecol2pos(re->data, printout->originline+newposy, printout->origincol+newposx,&tmppos,NULL)==0) {

-                                                                re->curline=printout->originline+newposy;

-                                                                re->curcol=printout->origincol+newposx;

-                                                                re->headerdirty=1;

-                                                                re->contentsdirty=1;

-                                                                re_fixorigin_center(re);                                                        }

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

+                                                                        /* go to this printout clicked-pos in the editor */

+                                                                        re->curline=printout->originline+newposy;

+                                                                        re->curcol=printout->origincol+newposx;

+                                                                        re->headerdirty=1;

+                                                                        re->contentsdirty=1;

+                                                                        re_fixorigin_center(re);

+                                                                } else {

+                                                                        /* control+click: search function definition (in the editor window, not in the printout) */

+                                                                        re_gotofunctiondefinition(re, printout->originline+newposy, printout->origincol+newposx);

+                                                                }

+                                                        }

                                                 }

                                                 break;

@@ -715,50 +723,12 @@ fprintf(stderr,"Resizing from %ix%i to %ix%i...\n",re->ui->w,re->ui->h,(int)even

                                                         redata_free(re->funclisting),re->funclisting=NULL;

                                                         re->contentsdirty=1;

                                                 } else if(event.type==SDL_MOUSEBUTTONUP && (SDL_GetModState()&KMOD_CTRL) && my>=re->y) {

-                                                        /* control+click: search function definition */

                                                         int newposx,newposy;

-                                                        long tmppos;

                                                         newposx=(mx-re->x-(re->showlinenumbers?(re->ui->fontwidth*7+re->ui->fontwidth/2):0))/re->ui->fontwidth;

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

                                                         newposy=(my-re->y)/re->ui->fontheight;

-                                                        if(redata_linecol2pos(re->data, re->originline+newposy, re->origincol+newposx,&tmppos,NULL)==0) {

-                                                                char searchbuf[1024]; /* magic number: max. size of string to search (truncated if bigger) */

-                                                                int usedsearchbuf;

-                                                                long curpos;

-                                                                redata_t *funclisting;

-                                                                /* extract word, generate funclisting, search word in funclisting */

-                                                                funclisting=NULL;

-                                                                if(re_extractword2buf(re, re->data, tmppos, searchbuf, sizeof(searchbuf), &usedsearchbuf)==0

-                                                                   && (funclisting=re_getfunclisting(re))!=NULL

-                                                                   && (curpos=redata_searchforward(funclisting,0,searchbuf,usedsearchbuf))!=-1) {

-                                                                        char linebuf[32],*cmdend;

-                                                                        int funcline,funccol;

-                                                                        if(redata_pos2linecol(funclisting,curpos,&funcline,&funccol)==0

-                                                                           && redata_line_getstartstrtrimmed(funclisting,funcline,linebuf,sizeof(linebuf)," ")==0) {

-                                                                                int oldline;

-                                                                                if((cmdend=strchr(linebuf,':'))!=NULL)

-                                                                                        *cmdend='\0';

-                                                                                re->command=COMMAND_GOTOLINE;

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

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

-                                                                                oldline=re->curline;

-                                                                                re_processcommand(re);

-                                                                                if(oldline!=re->curline) {

-                                                                                        /* position the cursor near the top of the window */

-                                                                                        re->originline=re->curline-3;

-                                                                                        re->originline=(re->originline<0)?0:re->originline;

-                                                                                }

-                                                                                /* position the cursor at the start of the line */

-                                                                                re->origincol=0;

-                                                                                re->curcol=0;

-                                                                                /* redraw */

-                                                                                re->contentsdirty=1;

-                                                                        }

-                                                                        redata_free(re->funclisting),re->funclisting=NULL;

-                                                                }

-                                                                if(funclisting!=NULL)

-                                                                        redata_free(funclisting),funclisting=NULL;

-                                                        }

+                                                        /* control+click: search function definition */

+                                                        re_gotofunctiondefinition(re, re->originline+newposy, re->origincol+newposx);

                                                 } else if(event.type==SDL_MOUSEMOTION && re->funclisting!=NULL) {

                                                         if(mx<re->ui->fontwidth*10) {

                                                                 /* scroll */

@@ -3148,6 +3118,53 @@ re_themeset(re_t *re, int ntheme)

         return(0);

 }

+int

+re_gotofunctiondefinition(re_t *re, int line, int col)

+{

+        long tmppos;

+        if(re==NULL)

+                return(-1);

+        if(redata_linecol2pos(re->data, line, col,&tmppos,NULL)==0) {

+                char searchbuf[1024]; /* magic number: max. size of string to search (truncated if bigger) */

+                int usedsearchbuf;

+                long curpos;

+                redata_t *funclisting;

+                /* extract word, generate funclisting, search word in funclisting */

+                funclisting=NULL;

+                if(re_extractword2buf(re, re->data, tmppos, searchbuf, sizeof(searchbuf), &usedsearchbuf)==0

+                   && (funclisting=re_getfunclisting(re))!=NULL

+                   && (curpos=redata_searchforward(funclisting,0,searchbuf,usedsearchbuf))!=-1) {

+                        char linebuf[32],*cmdend;

+                        int funcline,funccol;

+                        if(redata_pos2linecol(funclisting,curpos,&funcline,&funccol)==0

+                           && redata_line_getstartstrtrimmed(funclisting,funcline,linebuf,sizeof(linebuf)," ")==0) {

+                                int oldline;

+                                if((cmdend=strchr(linebuf,':'))!=NULL)

+                                        *cmdend='\0';

+                                re->command=COMMAND_GOTOLINE;

+                                strncpy(re->commandbuf,linebuf,sizeof(re->commandbuf));

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

+                                oldline=re->curline;

+                                re_processcommand(re);

+                                if(oldline!=re->curline) {

+                                        /* position the cursor near the top of the window */

+                                        re->originline=re->curline-3;

+                                        re->originline=(re->originline<0)?0:re->originline;

+                                }

+                                /* position the cursor at the start of the line */

+                                re->origincol=0;

+                                re->curcol=0;

+                                /* redraw */

+                                re->contentsdirty=1;

+                        }

+                        redata_free(re->funclisting),re->funclisting=NULL;

+                }

+                if(funclisting!=NULL)

+                        redata_free(funclisting),funclisting=NULL;

+        }

+        return(0);

+}

+

 int

 re_socketinit(re_t *re,char *filename)

 {

@@ -150,7 +150,8 @@ typedef enum typeprintout_t {

         printoutView=0,

         printoutCopy,

         printoutHelp,

-        printoutManpage

+        printoutManpage,

+        printoutManpageCurlang,

 } typeprintout_t;

 typedef struct printout_t {

@@ -540,7 +541,9 @@ fprintf(stderr,"RENDER\n");

                                         case SDL_MOUSEMOTION:

                                                 if(!(event.type==SDL_MOUSEMOTION && re->mouseselactive==0)

                                                   && printout->type!=printoutHelp

-                                                  && printout->type!=printoutManpage) {

+                                                  && printout->type!=printoutManpage

+                                                  && printout->type!=printoutManpageCurlang

+                                                ) {

                                                         int mx,my;

                                                         int newposx,newposy;

                                                         long tmppos;

@@ -1369,6 +1372,8 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                 re_addprint(re,printoutHelp);

         } else if(event->key.keysym.sym==SDLK_F1 && (SDL_GetModState()&KMOD_CTRL)!=0 && (SDL_GetModState()&(KMOD_SHIFT|KMOD_ALT))==0 ) {

                 re_addprint(re,printoutManpage);

+        } else if(event->key.keysym.sym==SDLK_F1 && (SDL_GetModState()&KMOD_CTRL)!=0 && (SDL_GetModState()&KMOD_SHIFT)!=0 && (SDL_GetModState()&KMOD_ALT)==0) {

+                re_addprint(re,printoutManpageCurlang);

         } else if(event->key.keysym.sym==SDLK_F2 || (event->key.keysym.sym==SDLK_s && (SDL_GetModState()&KMOD_CTRL)!=0)) {

                 char *errormsg=NULL;

                 if(redata_save(re->data,re->filename,&errormsg)!=-1)

@@ -2360,7 +2365,7 @@ Printout window\n\

                         redata_op_add(re->prints[i].data,0,helptext,sizeof(helptext)-1,NULL);

                         re->contentsdirty=1;

                 }

-        } else if(typeprintout==printoutManpage) {

+        } else if(typeprintout==printoutManpage || typeprintout==printoutManpageCurlang) {

                 char searchbuf[1024]; /* magic number: max. size of string to search (truncated if bigger) */

                 char title[256];

                 int lenprefix;

@@ -2368,7 +2373,11 @@ Printout window\n\

                 long tmppos;

                 int nread;

                 FILE *fp;

-                strncpy(searchbuf,"man ",sizeof(searchbuf));

+                protolang_t curlang;

+                curlang=redata_prototypes_detectlang(re->data);

+                strncpy(searchbuf,(typeprintout==printoutManpageCurlang && curlang==protolang_c)?"man 2 "

+                                  :(typeprintout==printoutManpageCurlang && curlang==protolang_tcl)?"man 3tcl "

+                                  :"man ",sizeof(searchbuf));

                 searchbuf[sizeof(searchbuf)-1]='\0';

                 lenprefix=strlen(searchbuf);

                 fp=NULL;

@@ -2699,6 +2708,7 @@ re_drawcontents(re_t *re, printout_t *printout)

         flaglineno=(printout==NULL)?re->showlinenumbers:

                    (printout->type==printoutHelp)?0:

                    (printout->type==printoutManpage)?0:

+                   (printout->type==printoutManpageCurlang)?0:

                    1;

         linenosize=linenowidth=0;

         if(printout==NULL && re->viewonly==1) {

@@ -2731,7 +2741,7 @@ re_drawcontents(re_t *re, printout_t *printout)

         }

         if(redata_linecol2pos(data,curline,curcol,&cursorpos,NULL)!=0)

                 return(0); /* error obtaining position */

-        bgcolor=(printout!=NULL && (printout->type==printoutHelp || printout->type==printoutManpage))

+        bgcolor=(printout!=NULL && (printout->type==printoutHelp || printout->type==printoutManpage || printout->type==printoutManpageCurlang ))

                 ?COLOR_PRINTOUTSTRIPE(re)

                 :COLOR_BACKGROUND(re);

         reui_fill(ui,x0-linenowidth,y0,w,h,bgcolor);

@@ -2748,7 +2758,7 @@ re_drawcontents(re_t *re, printout_t *printout)

         /* highlight current line (in printouts, highlight alternating lines) */

         if(printout==NULL) {

                 reui_fill(ui,x0-linenowidth,y0+(curline-originline)*ui->fontheight,w,ui->fontheight+1,COLOR_PRINTOUTSTRIPE(re));

-        } else if(printout!=NULL && (printout->type==printoutHelp || printout->type==printoutManpage)) {

+        } else if(printout!=NULL && (printout->type==printoutHelp || printout->type==printoutManpage || printout->type==printoutManpageCurlang)) {

                 ; /* help bgcolor already filled */

         } else {

                 for(y=y0+((printout->data==NULL)?1:(printout->originline%2))*ui->fontheight;y<(y0+h);y+=ui->fontheight*2)

@@ -1,4 +1,4 @@

-	/*

+/*

  * recenteditor.c

  *

  * A programmers editor

@@ -1428,6 +1428,28 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                         re_themeset(re, 0);

                 if(re->quirk_duplicates)

                         re->ignorenkeys++;

+        } else if(event->key.keysym.sym==SDLK_5 && (SDL_GetModState()&KMOD_CTRL)!=0) {

+                char cursorchar[7];

+                int usedcursorchar;

+                long cursorpos;

+                int matchingpos;

+                char matchingchar;

+                int mline,mcol;

+                usedcursorchar=0;

+                if(redata_linecol2pos(re->data,re->curline,re->curcol,&cursorpos,NULL)==0

+                  && redata_getutf8char(re->data,cursorpos,cursorchar,sizeof(cursorchar),&usedcursorchar)==0

+                  && usedcursorchar==1

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

+                  && (matchingpos=re_getmatchingbracket(re,cursorpos,*cursorchar,&matchingchar))!=-1

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

+                ) {

+                        re->command=COMMAND_GOTOLINE;

+                        snprintf(re->commandbuf,sizeof(re->commandbuf),"%i:%i",mline+1,mcol+1);

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

+                        re_processcommand(re);

+                }

+                if(re->quirk_duplicates)

+                        re->ignorenkeys++;

         } else if((event->key.keysym.sym==SDLK_c || event->key.keysym.sym==SDLK_x) && (SDL_GetModState()&KMOD_CTRL)!=0) {

                 long frompos,topos;

                 int coldone;

@@ -2293,6 +2315,7 @@ Recenteditor help\n\

  Home/End           - Go to the start/end of the line\n\

  Control+'0'        - Set default font size\n\

  Shift+Ctrl+'0'     - Set default color permutation\n\

+ Control+'5'        - Go to the matching parenthesis or curly brace\n\

  Control+C          - Copy selection to clipboard. Will deselect selection.\n\

  Control+K+Command  - Block command, see below\n\

  Control+L          - Search next (requires a previous search with Control+Q+F)\n\

@@ -1,4 +1,4 @@

-/*

+	/*

  * recenteditor.c

  *

  * A programmers editor

@@ -298,6 +298,7 @@ int re_clipget(re_t *re);

 int re_addprint(re_t *re, typeprintout_t typeprintout);

 int re_delprint(re_t *re, int nprint);

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

+int re_extractword2buf(re_t *re, redata_t *data, long pos, char *buf, int sizebuf, int *usedbuf);

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

@@ -537,7 +538,9 @@ fprintf(stderr,"RENDER\n");

                                         case SDL_MOUSEBUTTONDOWN:

                                         case SDL_MOUSEBUTTONUP:

                                         case SDL_MOUSEMOTION:

-                                                if(!(event.type==SDL_MOUSEMOTION && re->mouseselactive==0)) {

+                                                if(!(event.type==SDL_MOUSEMOTION && re->mouseselactive==0)

+                                                  && printout->type!=printoutHelp

+                                                  && printout->type!=printoutManpage) {

                                                         int mx,my;

                                                         int newposx,newposy;

                                                         long tmppos;

@@ -718,32 +721,11 @@ fprintf(stderr,"Resizing from %ix%i to %ix%i...\n",re->ui->w,re->ui->h,(int)even

                                                         if(redata_linecol2pos(re->data, re->originline+newposy, re->origincol+newposx,&tmppos,NULL)==0) {

                                                                 char searchbuf[1024]; /* magic number: max. size of string to search (truncated if bigger) */

                                                                 int usedsearchbuf;

-                                                                char utfchar[5];

-                                                                int usedutfchar;

-                                                                long startpos,curpos,endpos;

-                                                                int c;

+                                                                long curpos;

                                                                 redata_t *funclisting;

-                                                                /* search start of word */

-                                                                for(curpos=startpos=tmppos;redata_getprevutf8char(re->data,curpos,utfchar,sizeof(utfchar),&usedutfchar)==0;startpos=curpos) {

-                                                                        curpos-=usedutfchar;

-                                                                        if(usedutfchar==1) {

-                                                                                c=utfchar[0];

-                                                                                if(!((c>='0' && c<='9') || (c>='a' && c<='z') || (c>='A' && c<='Z') || c=='_'))

-                                                                                        break;

-                                                                        }

-                                                                }

-                                                                /* search end of word */

-                                                                for(curpos=endpos=tmppos;redata_getutf8char(re->data,curpos,utfchar,sizeof(utfchar),&usedutfchar)==0;endpos=curpos) {

-                                                                        curpos+=usedutfchar;

-                                                                        if(usedutfchar==1) {

-                                                                                c=utfchar[0];

-                                                                                if(!((c>='0' && c<='9') || (c>='a' && c<='z') || (c>='A' && c<='Z') || c=='_'))

-                                                                                        break;

-                                                                        }

-                                                                }

                                                                 /* extract word, generate funclisting, search word in funclisting */

                                                                 funclisting=NULL;

-                                                                if(redata_getsubstr(re->data,startpos,endpos,searchbuf,sizeof(searchbuf),&usedsearchbuf)==0

+                                                                if(re_extractword2buf(re, re->data, tmppos, searchbuf, sizeof(searchbuf), &usedsearchbuf)==0

                                                                    && (funclisting=re_getfunclisting(re))!=NULL

                                                                    && (curpos=redata_searchforward(funclisting,0,searchbuf,usedsearchbuf))!=-1) {

                                                                         char linebuf[32],*cmdend;

@@ -1385,6 +1367,8 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                 re->headerdirty=1;

         } else if(event->key.keysym.sym==SDLK_F1 && (SDL_GetModState()&(KMOD_CTRL|KMOD_SHIFT|KMOD_ALT))==0) {

                 re_addprint(re,printoutHelp);

+        } else if(event->key.keysym.sym==SDLK_F1 && (SDL_GetModState()&KMOD_CTRL)!=0 && (SDL_GetModState()&(KMOD_SHIFT|KMOD_ALT))==0 ) {

+                re_addprint(re,printoutManpage);

         } else if(event->key.keysym.sym==SDLK_F2 || (event->key.keysym.sym==SDLK_s && (SDL_GetModState()&KMOD_CTRL)!=0)) {

                 char *errormsg=NULL;

                 if(redata_save(re->data,re->filename,&errormsg)!=-1)

@@ -2255,12 +2239,11 @@ re_addprint(re_t *re, typeprintout_t typeprintout)

         }

         if(i>=re->sizeprints)

                 return(-1); /* INTERNAL ERROR */

-        /* setup window */

-        if((re->prints[i].ui=reui_init(DEFAULTFONTHEIGHT*re->fontheightpercent/100,re->ui))==NULL)

-                return(-1); /* couldn't init window */

         if(typeprintout==printoutHelp

-          || typeprintout==printoutManpage

           || typeprintout==printoutCopy) {

+                /* setup window */

+                if((re->prints[i].ui=reui_init(DEFAULTFONTHEIGHT*re->fontheightpercent/100,re->ui))==NULL)

+                        return(-1); /* couldn't init window */

                 /* inmutable printout */

                 if((re->prints[i].data=redata_init(redata_highlighter_register,NULL))==NULL) {

                         reui_free(re->prints[i].ui),re->prints[i].ui=NULL;

@@ -2293,7 +2276,7 @@ Recenteditor help\n\

 \n\

  F1           - Open a printout with this help\n\

  Shift+F1     - (TODO) Update hints with functions definitions of all open editors\n\

- Control+F1   - (TODO) Open manpage of word under the cursor in a printout\n\

+ Control+F1   - Open manpage of word under the cursor in a printout\n\

  F2           - Save\n\

 \n\

  Cursor keys        - Move cursor\n\

@@ -2310,7 +2293,7 @@ Recenteditor help\n\

  Home/End           - Go to the start/end of the line\n\

  Control+'0'        - Set default font size\n\

  Shift+Ctrl+'0'     - Set default color permutation\n\

- Control+C          - Copy selection to clipboard. Will deselect current selection.\n\

+ Control+C          - Copy selection to clipboard. Will deselect selection.\n\

  Control+K+Command  - Block command, see below\n\

  Control+L          - Search next (requires a previous search with Control+Q+F)\n\

  Control+N          - Show/hide line numbers\n\

@@ -2335,7 +2318,7 @@ Editing commands (Control+Q+Command)\n\

 Block commands (Control+K+Command)\n\

 ----------------------------------\n\

 \n\

- Control+K+Q - Close editor (exit program -- don\'t ask, it is a legacy key combo)\n\

+ Control+K+Q - Close editor (exit program -- don\'t ask, legacy key combo)\n\

  Control+K+H - Show/hide selection\n\

  Control+K+B - Set start of selection to cursor position\n\

  Control+K+K - Set end of selection to cursor position\n\

@@ -2354,8 +2337,55 @@ Printout window\n\

                         redata_op_add(re->prints[i].data,0,helptext,sizeof(helptext)-1,NULL);

                         re->contentsdirty=1;

                 }

+        } else if(typeprintout==printoutManpage) {

+                char searchbuf[1024]; /* magic number: max. size of string to search (truncated if bigger) */

+                char title[256];

+                int lenprefix;

+                int usedsearchbuf;

+                long tmppos;

+                int nread;

+                FILE *fp;

+                strncpy(searchbuf,"man ",sizeof(searchbuf));

+                searchbuf[sizeof(searchbuf)-1]='\0';

+                lenprefix=strlen(searchbuf);

+                fp=NULL;

+                if(redata_linecol2pos(re->data, re->curline, re->curcol,&tmppos,NULL)==0

+                  && re_extractword2buf(re, re->data, tmppos, searchbuf+lenprefix, sizeof(searchbuf)-lenprefix, &usedsearchbuf)==0

+                  && strncpy(title,searchbuf,sizeof(title))!=NULL

+                  && (title[sizeof(title)-1]='\0')=='\0'

+                  && (fp=popen(searchbuf,"r"))!=NULL

+                  && (nread=fread(searchbuf,1,sizeof(searchbuf),fp))>0

+                ) {

+                        if((re->prints[i].ui=reui_init(DEFAULTFONTHEIGHT*re->fontheightpercent/100,re->ui))==NULL

+                          || (re->prints[i].data=redata_init(redata_highlighter_register,NULL))==NULL) {

+                                if(re->prints[i].ui!=NULL)

+                                        reui_free(re->prints[i].ui),re->prints[i].ui=NULL;

+                                return(-1); /* couldn't init data store */

+                        }

+                        re->usedprints++;

+                        reui_title(re->prints[i].ui,title);

+                        redata_op_add(re->prints[i].data,redata_getused(re->prints[i].data),searchbuf,nread,NULL);

+                        while((nread=fread(searchbuf,1,sizeof(searchbuf),fp))>0) {

+                                redata_op_add(re->prints[i].data,redata_getused(re->prints[i].data),searchbuf,nread,NULL);

+                        }

+                        pclose(fp),fp=NULL;

+                        re->contentsdirty=1;

+                } else {

+                        if(fp!=NULL)

+                                pclose(fp),fp=NULL;

+                        re_delprint(re,i);

+                        re->command=COMMAND_WARNING;

+                        snprintf(re->commandbuf,sizeof(re->commandbuf),"Couldn't show manpage.");

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

+                        re->headerdirty=1;

+                        return(0);

+                }

         } else {

                 char mytitle[256];

+                /* setup window */

+                if((re->prints[i].ui=reui_init(DEFAULTFONTHEIGHT*re->fontheightpercent/100,re->ui))==NULL)

+                        return(-1); /* couldn't init window */

+                /* setup title */

                 snprintf(mytitle,sizeof(mytitle),"view %s",re->filename);

                 mytitle[sizeof(mytitle)-1]='\0';

                 reui_title(re->prints[i].ui,mytitle);

@@ -2408,6 +2438,39 @@ re_rtrim(re_t *re, long curpos, int *trimmed)

         return(0);

 }

+int

+re_extractword2buf(re_t *re, redata_t *data, long pos, char *buf, int sizebuf, int *usedbuf)

+{

+        char utfchar[5];

+        int usedutfchar;

+        long startpos,curpos,endpos;

+        int c;

+        if(re==NULL || data==NULL || pos<0)

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

+        /* search start of word */

+        for(curpos=startpos=pos;redata_getprevutf8char(re->data,curpos,utfchar,sizeof(utfchar),&usedutfchar)==0;startpos=curpos) {

+                curpos-=usedutfchar;

+                if(usedutfchar==1) {

+                        c=utfchar[0];

+                        if(!((c>='0' && c<='9') || (c>='a' && c<='z') || (c>='A' && c<='Z') || c=='_'))

+                                break;

+                }

+        }

+        /* search end of word */

+        for(curpos=endpos=pos;redata_getutf8char(re->data,curpos,utfchar,sizeof(utfchar),&usedutfchar)==0;endpos=curpos) {

+                curpos+=usedutfchar;

+                if(usedutfchar==1) {

+                        c=utfchar[0];

+                        if(!((c>='0' && c<='9') || (c>='a' && c<='z') || (c>='A' && c<='Z') || c=='_'))

+                                break;

+                }

+        }

+        if(redata_getsubstr(re->data,startpos,endpos,buf,sizebuf-1,usedbuf)!=0)

+                return(-1);

+        buf[*usedbuf]='\0';

+        return(0);

+}

+

 long

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

 {

@@ -2612,6 +2675,7 @@ re_drawcontents(re_t *re, printout_t *printout)

         showonlyn=0;

         flaglineno=(printout==NULL)?re->showlinenumbers:

                    (printout->type==printoutHelp)?0:

+                   (printout->type==printoutManpage)?0:

                    1;

         linenosize=linenowidth=0;

         if(printout==NULL && re->viewonly==1) {

@@ -146,9 +146,17 @@

 #define COLOR_SELNORMAL(re) re->theme.color_selnormal

 #define COLOR_CURLINE(re) re->theme.color_curline

+typedef enum typeprintout_t {

+        printoutView=0,

+        printoutCopy,

+        printoutHelp,

+        printoutManpage

+} typeprintout_t;

+

 typedef struct printout_t {

         reui_t *ui;

         redata_t *data;

+        typeprintout_t type;

         int originline;

         int origincol;

         int showonlyn;

@@ -287,7 +295,7 @@ int re_selectbuf_resize(re_t *re,long size);

 int re_selectbuf_fill(re_t *re,long frompos,long size, int nadditionalspaces);

 int re_selectbuf_replace(re_t *re,char *newdata);

 int re_clipget(re_t *re);

-int re_addprint(re_t *re);

+int re_addprint(re_t *re, typeprintout_t typeprintout);

 int re_delprint(re_t *re, int nprint);

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

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

@@ -1375,6 +1383,8 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                 re->command="";

                 re->command_first_key='q';

                 re->headerdirty=1;

+        } else if(event->key.keysym.sym==SDLK_F1 && (SDL_GetModState()&(KMOD_CTRL|KMOD_SHIFT|KMOD_ALT))==0) {

+                re_addprint(re,printoutHelp);

         } else if(event->key.keysym.sym==SDLK_F2 || (event->key.keysym.sym==SDLK_s && (SDL_GetModState()&KMOD_CTRL)!=0)) {

                 char *errormsg=NULL;

                 if(redata_save(re->data,re->filename,&errormsg)!=-1)

@@ -1482,7 +1492,7 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                 if(re->quirk_duplicates)

                         re->ignorenkeys++;

         } else if(/*re->selactive &&*/ event->key.keysym.sym==SDLK_p && (SDL_GetModState()&KMOD_CTRL)!=0) {

-                re_addprint(re);

+                re_addprint(re,printoutView);

         } else if(event->key.keysym.sym==SDLK_n && (SDL_GetModState()&KMOD_CTRL)!=0) {

                 re->showlinenumbers=1-re->showlinenumbers;

                 re_setuidata(re);

@@ -2225,7 +2235,7 @@ re_clipget(re_t *re)

 int

-re_addprint(re_t *re)

+re_addprint(re_t *re, typeprintout_t typeprintout)

 {

         int i;

         if(re==NULL)

@@ -2248,39 +2258,115 @@ re_addprint(re_t *re)

         /* setup window */

         if((re->prints[i].ui=reui_init(DEFAULTFONTHEIGHT*re->fontheightpercent/100,re->ui))==NULL)

                 return(-1); /* couldn't init window */

-#if 0

-/* option A: printouts are immutable */

-        if((re->prints[i].data=redata_init(redata_highlighter_register,NULL))==NULL) {

-                reui_free(re->prints[i].ui),re->prints[i].ui=NULL;

-                return(-1); /* couldn't init data store */

-        }

-        re->usedprints++;

-        /* copy contents (and set clipboard contents and unselect)*/

-        if(re->selactive) {

-                long frompos,topos;

-                int coldone;

-                if(redata_linecol2pos(re->data,re->sellinefrom,re->selcolfrom,&frompos,NULL)==0

-                  && redata_linecol2pos(re->data,re->sellineto,re->selcolto,&topos,&coldone)==0) {

-                        re_selectbuf_fill(re,frompos,topos-frompos,re->selcolto-coldone);

-                        redata_op_add(re->prints[i].data,0,re->selectbuf,strlen(re->selectbuf),NULL);

-                        SDL_SetClipboardText(re->selectbuf);

-                        re_sel_toggle(re);

+        if(typeprintout==printoutHelp

+          || typeprintout==printoutManpage

+          || typeprintout==printoutCopy) {

+                /* inmutable printout */

+                if((re->prints[i].data=redata_init(redata_highlighter_register,NULL))==NULL) {

+                        reui_free(re->prints[i].ui),re->prints[i].ui=NULL;

+                        return(-1); /* couldn't init data store */

+                }

+                re->usedprints++;

+                if(typeprintout==printoutCopy) {

+                        /* copy contents (and set clipboard contents and unselect)*/

+                        if(re->selactive) {

+                                long frompos,topos;

+                                int coldone;

+                                if(redata_linecol2pos(re->data,re->sellinefrom,re->selcolfrom,&frompos,NULL)==0

+                                  && redata_linecol2pos(re->data,re->sellineto,re->selcolto,&topos,&coldone)==0) {

+                                        re_selectbuf_fill(re,frompos,topos-frompos,re->selcolto-coldone);

+                                        redata_op_add(re->prints[i].data,0,re->selectbuf,strlen(re->selectbuf),NULL);

+                                        SDL_SetClipboardText(re->selectbuf);

+                                        re_sel_toggle(re);

+                                        re->contentsdirty=1;

+                                }

+                        } else {

+                                re_selectbuf_fill(re,0,redata_getused(re->data),0);

+                                redata_op_add(re->prints[i].data,0,re->selectbuf,strlen(re->selectbuf),NULL);

+                                SDL_SetClipboardText(re->selectbuf);

+                                re->contentsdirty=1;

+                        }

+                } else if(typeprintout==printoutHelp) {

+                        static char helptext[]={"\

+Recenteditor help\n\

+=================\n\

+\n\

+ F1           - Open a printout with this help\n\

+ Shift+F1     - (TODO) Update hints with functions definitions of all open editors\n\

+ Control+F1   - (TODO) Open manpage of word under the cursor in a printout\n\

+ F2           - Save\n\

+\n\

+ Cursor keys        - Move cursor\n\

+ PageUp/PageDn      - Scroll one page up/down\n\

+ Shift+Cursor       - Select\n\

+ Mousewheel         - Scroll\n\

+ Mouse click        - Change cursor position\n\

+                      Click and hold on status bar to open function list\n\

+ Control+Click      - Search function body of function name under the mouse\n\

+ Tab key            - Insert 8 spaces\n\

+ Control+Tab key    - Insert TAB character\n\

+ Alt+Left/Right     - Change indentation of selection\n\

+ Control+PgUp/PgDn  - Go to the beginning/end of the document\n\

+ Home/End           - Go to the start/end of the line\n\

+ Control+'0'        - Set default font size\n\

+ Shift+Ctrl+'0'     - Set default color permutation\n\

+ Control+C          - Copy selection to clipboard. Will deselect current selection.\n\

+ Control+K+Command  - Block command, see below\n\

+ Control+L          - Search next (requires a previous search with Control+Q+F)\n\

+ Control+N          - Show/hide line numbers\n\

+ Control+P          - Open printout window with current file or selection\n\

+ Control+Q+Command  - Editing command, see below\n\

+ Control+S          - Save\n\

+ Control+X          - Cut selection into clipboard\n\

+ Control+V          - Paste clipboard into current cursor position\n\

+ Control+Z          - Undo\n\

+ Control+'+'/'-'    - Iterates between font sizes\n\

+ Shift+Ctrl+'+'/'-' - Iterates between color permutations\n\

+\n\

+\n\

+Editing commands (Control+Q+Command)\n\

+------------------------------------\n\

+\n\

+ Control+Q+L - Go to line number\n\

+ Control+Q+F - Find\n\

+ Control+Q+A - Search and replace\n\

+\n\

+\n\

+Block commands (Control+K+Command)\n\

+----------------------------------\n\

+\n\

+ Control+K+Q - Close editor (exit program -- don\'t ask, it is a legacy key combo)\n\

+ Control+K+H - Show/hide selection\n\

+ Control+K+B - Set start of selection to cursor position\n\

+ Control+K+K - Set end of selection to cursor position\n\

+ Control+K+Y - Delete selection\n\

+ Control+K+C - Copy selection to current cursor position (doesn\'t use clipboard)\n\

+ Control+K+V - Move selection to current cursor position (doesn\'t use clipboard)\n\

+\n\

+\n\

+Printout window\n\

+---------------\n\

+\n\

+ Cursor/PageUp/PageDown - Scroll printout\n\

+ Mousewheel             - Scroll printout\n\

+"};

+                        reui_title(re->prints[i].ui,"help");

+                        redata_op_add(re->prints[i].data,0,helptext,sizeof(helptext)-1,NULL);

                         re->contentsdirty=1;

                 }

         } else {

-                re_selectbuf_fill(re,0,redata_getused(re->data),0);

-                redata_op_add(re->prints[i].data,0,re->selectbuf,strlen(re->selectbuf),NULL);

-                SDL_SetClipboardText(re->selectbuf);

-                re->contentsdirty=1;

-        }

-#else

-/* option B: printouts are a window into a fixed place of the file */

-        re->prints[i].data=NULL;

-        re->prints[i].originline=(re->selactive)?re->sellinefrom:0;

-        re->prints[i].origincol=0;

-        re->prints[i].showonlyn=0 /* (re->selactive)?re->sellineto-re->sellinefrom+1:0 */ ;

-        re->usedprints++;

-#endif

+                char mytitle[256];

+                snprintf(mytitle,sizeof(mytitle),"view %s",re->filename);

+                mytitle[sizeof(mytitle)-1]='\0';

+                reui_title(re->prints[i].ui,mytitle);

+                /* printout is a window into a fixed place of the file */

+                re->prints[i].data=NULL;

+                re->prints[i].originline=(re->selactive)?re->sellinefrom:0;

+                re->prints[i].origincol=0;

+                re->prints[i].showonlyn=0 /* (re->selactive)?re->sellineto-re->sellinefrom+1:0 */ ;

+                re->usedprints++;

+        }

+        re->prints[i].type=typeprintout;

         re->prints[i].dirty=1;

         return(0);

 }

@@ -2485,6 +2571,7 @@ re_drawcontents(re_t *re, printout_t *printout)

 {

         reui_t *ui;

         redata_t *data;

+        char *bgcolor;

         int x0,y0,w,h;

         int originline,origincol;

         int curline,curcol;

@@ -2523,7 +2610,9 @@ re_drawcontents(re_t *re, printout_t *printout)

         maxcol=re->maxcol;

         maxrow=re->maxrow;

         showonlyn=0;

-        flaglineno=(printout==NULL)?re->showlinenumbers:0;

+        flaglineno=(printout==NULL)?re->showlinenumbers:

+                   (printout->type==printoutHelp)?0:

+                   1;

         linenosize=linenowidth=0;

         if(printout==NULL && re->viewonly==1) {

                 memset(&fakeprintout,0,sizeof(printout_t));

@@ -2544,7 +2633,6 @@ re_drawcontents(re_t *re, printout_t *printout)

                 maxcol=w/ui->fontwidth-1;

                 maxrow=h/ui->fontheight-1;

                 showonlyn=printout->showonlyn;

-                flaglineno=1;

         }

         if(flaglineno) {

                 linenosize=6;

@@ -2556,7 +2644,10 @@ re_drawcontents(re_t *re, printout_t *printout)

         }

         if(redata_linecol2pos(data,curline,curcol,&cursorpos,NULL)!=0)

                 return(0); /* error obtaining position */

-        reui_fill(ui,x0-linenowidth,y0,w,h,COLOR_BACKGROUND(re));

+        bgcolor=(printout!=NULL && (printout->type==printoutHelp || printout->type==printoutManpage))

+                ?COLOR_PRINTOUTSTRIPE(re)

+                :COLOR_BACKGROUND(re);

+        reui_fill(ui,x0-linenowidth,y0,w,h,bgcolor);

         row=curline-originline;

         pos=cursorpos;

         /* get position/row/col of character at top left of screen */

@@ -2570,6 +2661,8 @@ re_drawcontents(re_t *re, printout_t *printout)

         /* highlight current line (in printouts, highlight alternating lines) */

         if(printout==NULL) {

                 reui_fill(ui,x0-linenowidth,y0+(curline-originline)*ui->fontheight,w,ui->fontheight+1,COLOR_PRINTOUTSTRIPE(re));

+        } else if(printout!=NULL && (printout->type==printoutHelp || printout->type==printoutManpage)) {

+                ; /* help bgcolor already filled */

         } else {

                 for(y=y0+((printout->data==NULL)?1:(printout->originline%2))*ui->fontheight;y<(y0+h);y+=ui->fontheight*2)

                         reui_fill(ui,x0-linenowidth,y,w,ui->fontheight+1,COLOR_PRINTOUTSTRIPE(re));

@@ -3353,6 +3353,13 @@ fprintf(stderr,"Changing selected id because of command from client \"%s\" (%i).

                 re_socketout(re, nclient, "\n");

         } else if(line[0]=='\0' ) {

                 ; /* ignore the end-of-message (should only receive them on forwarding clients) */

+        } else if(strcmp(line,"quit")==0) {

+                /* close socket */

+#if 0

+fprintf(stderr,"Closing socket because of command from client \"%s\" (%i).\n",line,nclient);

+#endif

+                close(re->comms.clients[nclient]->fd),re->comms.clients[nclient]->fd=-1;

+                return(0);

         } else {

 #if 1

 fprintf(stderr,"Ignoring unknown command from client \"%s\" (%i).\n",line,nclient);

@@ -198,6 +198,7 @@ typedef struct commclient_t {

 typedef struct comms_t {

         int serverfd;

         char id[MAXFILENAMESIZE];

+        char selectedid[MAXFILENAMESIZE];

         char socketfilename[SOCKETFILENAMESIZE];

         int sizeclients;

         int usedclients;

@@ -3278,15 +3279,17 @@ fprintf(stderr,"Received from client \"%s\" (%i).\n",line,nclient);

 #if 0

 fprintf(stderr,"Changing line because of command from client \"%s\" (%i).\n",line,nclient);

 #endif

-                re->command=COMMAND_GOTOLINE;

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

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

-                oldline=re->curline;

-                re_processcommand(re);

-                if(oldline!=re->curline) {

-                        /* position the cursor near the top of the window */

-                        re->originline=re->curline-3;

-                        re->originline=(re->originline<0)?0:re->originline;

+                if(re->comms.selectedid[0]=='\0' || strcmp(re->comms.id,re->comms.selectedid)==0) {

+                        re->command=COMMAND_GOTOLINE;

+                        strncpy(re->commandbuf,ptr,sizeof(re->commandbuf));

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

+                        oldline=re->curline;

+                        re_processcommand(re);

+                        if(oldline!=re->curline) {

+                                /* position the cursor near the top of the window */

+                                re->originline=re->curline-3;

+                                re->originline=(re->originline<0)?0:re->originline;

+                        }

                 }

                 /* send end-of-results */

                 re_socketout(re, nclient, "\n");

@@ -3298,12 +3301,14 @@ fprintf(stderr,"Changing line because of command from client \"%s\" (%i).\n",lin

 #endif

                         if(re->comms.clients[i]==NULL || re->comms.clients[i]->fd==-1 || re->comms.clients[i]->remoteid[0]=='\0')

                                 continue;

-                        avail=re->comms.clients[i]->sizebufout-re->comms.clients[i]->usedbufout;

-                        if((strlen(line)+1)>avail) {

-                                fprintf(stderr,"Couldn't forward command to client because the output buffer is full (avail:%li, req:%li)\n",(long)avail,(long)(strlen(line)+1));

-                                continue;

+                        if(re->comms.selectedid[0]=='\0' || strcmp(re->comms.clients[i]->remoteid,re->comms.selectedid)==0) {

+                                avail=re->comms.clients[i]->sizebufout-re->comms.clients[i]->usedbufout;

+                                if((strlen(line)+1)>avail) {

+                                        fprintf(stderr,"Couldn't forward command to client because the output buffer is full (avail:%li, req:%li)\n",(long)avail,(long)(strlen(line)+1));

+                                        continue;

+                                }

+                                re_socketout(re, i, "%s\n",line);

                         }

-                        re_socketout(re, i, "%s\n",line);

                 }

         } else if(memcmp(line,"id ",3)==0) {

                 ptr=line+3;

@@ -3328,6 +3333,24 @@ fprintf(stderr,"Listing ids because of command from client \"%s\" (%i).\n",line,

                 }

                 /* send end-of-results */

                 re_socketout(re, nclient, "\n");

+        } else if(strcmp(line,"select")==0) {

+                /* reset select id */

+#if 0

+fprintf(stderr,"Resetting selected id because of command from client \"%s\" (%i).\n",line,nclient);

+#endif

+                re->comms.selectedid[0]='\0';

+                /* send end-of-results */

+                re_socketout(re, nclient, "\n");

+        } else if(memcmp(line,"select ",7)==0) {

+                ptr=line+7;

+                /* select id */

+#if 0

+fprintf(stderr,"Changing selected id because of command from client \"%s\" (%i).\n",line,nclient);

+#endif

+                strncpy(re->comms.selectedid,ptr,sizeof(re->comms.selectedid));

+                re->comms.selectedid[sizeof(re->comms.selectedid)-1]='\0';

+                /* send end-of-results */

+                re_socketout(re, nclient, "\n");

         } else if(line[0]=='\0' ) {

                 ; /* ignore the end-of-message (should only receive them on forwarding clients) */

         } else {

@@ -3315,6 +3315,19 @@ fprintf(stderr,"Storing client id because of command from client \"%s\" (%i).\n"

                 client->remoteid[sizeof(client->remoteid)-1]='\0';

                 /* send end-of-results */

                 re_socketout(re, nclient, "\n");

+        } else if(strcmp(line,"list")==0) {

+                /* list ids */

+#if 0

+fprintf(stderr,"Listing ids because of command from client \"%s\" (%i).\n",line,nclient);

+#endif

+                re_socketout(re, nclient, "%s\n",re->comms.id);

+                for(i=0;i<re->comms.sizeclients;i++) {

+                        if(re->comms.clients[i]==NULL || re->comms.clients[i]->fd==-1 || re->comms.clients[i]->remoteid[0]=='\0')

+                                continue;

+                        re_socketout(re, nclient, "%s\n",re->comms.clients[i]->remoteid);

+                }

+                /* send end-of-results */

+                re_socketout(re, nclient, "\n");

         } else if(line[0]=='\0' ) {

                 ; /* ignore the end-of-message (should only receive them on forwarding clients) */

         } else {

@@ -23,6 +23,7 @@

 #include <sys/select.h>

 #include <stdarg.h>

 #include <sys/stat.h>

+#include <limits.h>

 #include "re_data.h"

 #include "re_plugin_unsaved.h"

@@ -43,6 +44,7 @@

 #define COMMBUFSIZE 16384

 #define COMMCLIENTSBLOCKSIZE 32

 #define SOCKETFILENAMESIZE 1024

+#define MAXFILENAMESIZE PATH_MAX+1

 #define LISTENBACKLOG 5

 #define VIEWONLYPROGNAME "review"

@@ -181,6 +183,8 @@ typedef struct theme_t {

 typedef struct commclient_t {

         int fd;

+        int flag_connectedtoserver;

+        char remoteid[MAXFILENAMESIZE];

         int sizebufin;

         int usedbufin;

         int gotbufin;

@@ -193,6 +197,7 @@ typedef struct commclient_t {

 typedef struct comms_t {

         int serverfd;

+        char id[MAXFILENAMESIZE];

         char socketfilename[SOCKETFILENAMESIZE];

         int sizeclients;

         int usedclients;

@@ -294,7 +299,7 @@ int re_wheelaccel(re_t *re, int rawamount);

 int re_themeset(re_t *re, int ntheme);

 int re_socketinit(re_t *re, char *filename);

 void re_socketfree(re_t *re);

-int re_socketnewclient(re_t *re);

+int re_socketnewclient(re_t *re, int alreadyacceptedfd);

 int re_socketstep(re_t *re);

 int re_socketin(re_t *re, int nclient, char *line);

 #ifndef __GNUC__

@@ -2982,6 +2987,13 @@ re_socketinit(re_t *re,char *filename)