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

 {