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