@@ -14,6 +14,7 @@

 #include <limits.h>

 #include <signal.h>

 #include <time.h>

+#include <sys/time.h>

 #include "re_data.h"

 #include "re_plugin_unsaved.h"

@@ -111,6 +112,7 @@ typedef struct re_t {

         redata_t *funclisting;

         int originlinefunclisting;

         int curlinefunclisting;

+        struct timeval lastwheel;

 } re_t;

 volatile int flag_sigint;

@@ -159,6 +161,7 @@ int re_drawheader_command(re_t *re);

 int re_drawcontents(re_t *re, printout_t *printout);

 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

@@ -305,6 +308,7 @@ fprintf(stderr,"RENDER\n");

                           || (event.type==SDL_KEYDOWN && (windowID=event.key.windowID)!=SDL_GetWindowID(re->ui->win))

                           || (event.type==SDL_TEXTEDITING && (windowID=event.edit.windowID)!=SDL_GetWindowID(re->ui->win))

                           || (event.type==SDL_TEXTINPUT && (windowID=event.text.windowID)!=SDL_GetWindowID(re->ui->win))

+                          || (event.type==SDL_MOUSEWHEEL && (windowID=event.text.windowID)!=SDL_GetWindowID(re->ui->win))

                           ) {

                                 printout_t *printout;

                                 for(i=0;i<re->sizeprints;i++) {

@@ -316,6 +320,7 @@ fprintf(stderr,"RENDER\n");

                                 if(i>=re->sizeprints)

                                         continue; /* unknown window */

                                 printout=re->prints+i;

+                                /* transfor mousewheel events to keydown events */

                                 switch(event.type) {

                                         case SDL_WINDOWEVENT:

                                                 if(event.window.event==SDL_WINDOWEVENT_SHOWN

@@ -331,18 +336,24 @@ fprintf(stderr,"RENDER\n");

                                                 }

                                                 break;

                                         case SDL_KEYDOWN:

-                                                if(event.key.keysym.sym==SDLK_ESCAPE) {

+                                        case SDL_MOUSEWHEEL:

+                                                if(event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_ESCAPE) {

                                                         re_delprint(re,i);

-                                                } if(event.key.keysym.sym==SDLK_DOWN || event.key.keysym.sym==SDLK_UP || event.key.keysym.sym==SDLK_PAGEDOWN || event.key.keysym.sym==SDLK_PAGEUP) {

+                                                } if(event.type==SDL_MOUSEWHEEL || (event.type==SDL_KEYDOWN

+                                                  && (event.key.keysym.sym==SDLK_DOWN || event.key.keysym.sym==SDLK_UP

+                                                   || event.key.keysym.sym==SDLK_PAGEDOWN || event.key.keysym.sym==SDLK_PAGEUP))) {

                                                         int neworiginline;

                                                         int maxrow;

                                                         int linetotal;

+                                                        int wheelamount;

+                                                        wheelamount=(event.type==SDL_MOUSEWHEEL)?re_wheelaccel(re,-event.wheel.y):0;

                                                         maxrow=printout->ui->h/printout->ui->fontheight-1;

                                                         neworiginline=printout->originline;

-                                                        neworiginline+=(event.key.keysym.sym==SDLK_UP)?-1:

-                                                                       (event.key.keysym.sym==SDLK_DOWN)?1:

-                                                                       (event.key.keysym.sym==SDLK_PAGEUP)?-maxrow:

-                                                                       (event.key.keysym.sym==SDLK_PAGEDOWN)?maxrow:

+                                                        neworiginline+=(event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_UP)?-1:

+                                                                       (event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_DOWN)?1:

+                                                                       (event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_PAGEUP)?-maxrow:

+                                                                       (event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_PAGEDOWN)?maxrow:

+                                                                       (event.type==SDL_MOUSEWHEEL)?wheelamount:

                                                                        0;

                                                         linetotal=redata_line_total((printout->data!=NULL)?printout->data:re->data);

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

@@ -351,12 +362,12 @@ fprintf(stderr,"RENDER\n");

                                                                 break; /* nothing to do, at top */

                                                         printout->originline=neworiginline;

                                                         printout->dirty=1;

-                                                } else if(event.key.keysym.sym==SDLK_DOWN || event.key.keysym.sym==SDLK_UP) {

+                                                } else if(event.type==SDL_KEYDOWN && (event.key.keysym.sym==SDLK_DOWN || event.key.keysym.sym==SDLK_UP)) {

                                                         if(event.key.keysym.sym==SDLK_UP && printout->originline==0)

                                                                 break; /* nothing to do, at top */

                                                         printout->originline+=((event.key.keysym.sym==SDLK_UP)?-1:1);

                                                         printout->dirty=1;

-                                                } else if(event.key.keysym.sym==SDLK_LEFT || event.key.keysym.sym==SDLK_RIGHT) {

+                                                } else if(event.type==SDL_KEYDOWN && (event.key.keysym.sym==SDLK_LEFT || event.key.keysym.sym==SDLK_RIGHT)) {

                                                         if(event.key.keysym.sym==SDLK_LEFT && printout->origincol==0)

                                                                 break; /* nothing to do, at top */

                                                         printout->origincol+=((event.key.keysym.sym==SDLK_LEFT)?-1:1)*8;

@@ -386,19 +397,25 @@ fprintf(stderr,"RENDER\n");

                                 case SDL_KEYDOWN:

                                 case SDL_TEXTINPUT:

                                 case SDL_TEXTEDITING:

+                                case SDL_MOUSEWHEEL:

                                         if(re->viewonly && (event.type==SDL_TEXTINPUT || event.type==SDL_TEXTEDITING))

                                                 break;

-                                        if(re->viewonly && event.type==SDL_KEYDOWN) {

-                                                if(event.key.keysym.sym==SDLK_ESCAPE) {

+                                        if(re->viewonly && (event.type==SDL_KEYDOWN || event.type==SDL_MOUSEWHEEL)) {

+                                                if(event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_ESCAPE) {

                                                         do_exit=1;

-                                                } if(event.key.keysym.sym==SDLK_DOWN || event.key.keysym.sym==SDLK_UP || event.key.keysym.sym==SDLK_PAGEDOWN || event.key.keysym.sym==SDLK_PAGEUP) {

+                                                } if(event.type==SDL_MOUSEWHEEL || (event.type==SDL_KEYDOWN

+                                                  && (event.key.keysym.sym==SDLK_DOWN || event.key.keysym.sym==SDLK_UP

+                                                   || event.key.keysym.sym==SDLK_PAGEDOWN || event.key.keysym.sym==SDLK_PAGEUP))) {

                                                         int neworiginline;

                                                         int linetotal;

+                                                        int wheelamount;

+                                                        wheelamount=(event.type==SDL_MOUSEWHEEL)?re_wheelaccel(re,-event.wheel.y):0;

                                                         neworiginline=re->originline;

-                                                        neworiginline+=(event.key.keysym.sym==SDLK_UP)?-1:

-                                                                       (event.key.keysym.sym==SDLK_DOWN)?1:

-                                                                       (event.key.keysym.sym==SDLK_PAGEUP)?-re->maxrow:

-                                                                       (event.key.keysym.sym==SDLK_PAGEDOWN)?re->maxrow:

+                                                        neworiginline+=(event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_UP)?-1:

+                                                                       (event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_DOWN)?1:

+                                                                       (event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_PAGEUP)?-re->maxrow:

+                                                                       (event.type==SDL_KEYDOWN && event.key.keysym.sym==SDLK_PAGEDOWN)?re->maxrow:

+                                                                       (event.type==SDL_MOUSEWHEEL)?wheelamount:

                                                                        0;

                                                         linetotal=redata_line_total(re->data);

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

@@ -409,7 +426,7 @@ fprintf(stderr,"RENDER\n");

                                                         re->originline=neworiginline;

                                                         re->headerdirty=1;

                                                         re->contentsdirty=1;

-                                                } else if(event.key.keysym.sym==SDLK_LEFT || event.key.keysym.sym==SDLK_RIGHT) {

+                                                } else if(event.type==SDL_KEYDOWN && (event.key.keysym.sym==SDLK_LEFT || event.key.keysym.sym==SDLK_RIGHT)) {

                                                         if(event.key.keysym.sym==SDLK_LEFT && re->origincol==0)

                                                                 break; /* nothing to do, at top */

                                                         re->origincol+=((event.key.keysym.sym==SDLK_LEFT)?-1:1)*8;

@@ -829,6 +846,7 @@ int

 re_processkey_editing(re_t *re, SDL_Event *event)

 {

         SDL_Event fakeevent;

+        int wheelamount=0;

         if(re==NULL || event==NULL)

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

         /* convert RETURN KEYDOWN to TEXTINPUT */

@@ -844,7 +862,6 @@ re_processkey_editing(re_t *re, SDL_Event *event)

                 event=&fakeevent;

                 event->type=SDL_TEXTINPUT;

                 /* If control is pressed, insert a real tab, otherwise, insert spaces until next tabstop */

-

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

                         strncpy(event->text.text,"\t",sizeof(event->text.text));

                         event->text.text[sizeof(event->text.text)-1]='\0';

@@ -887,6 +904,12 @@ fprintf(stderr,"SDL_KEYDOWN: DELETE\n");

 #if 0

 fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

 #endif

+        } else if(event->type==SDL_MOUSEWHEEL && event->wheel.y!=0) {

+                wheelamount=re_wheelaccel(re,-event->wheel.y);

+                memset(&fakeevent,0,sizeof(SDL_Event));

+                event=&fakeevent;

+                event->type=SDL_KEYDOWN;

+                event->key.keysym.sym=(wheelamount>0)?SDLK_DOWN:SDLK_UP;

         }

         /* special case: text editing event */

         if(event->type==SDL_TEXTINPUT) {

@@ -938,18 +961,20 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

         } else if(event->key.keysym.sym==SDLK_DOWN || event->key.keysym.sym==SDLK_UP) {

                 int move_res;

                 int oldcol=re->curcol,oldline=re->curline;

-                if((SDL_GetModState()&KMOD_CTRL)!=0 && event->key.keysym.sym==SDLK_UP && re->originline==0)

+                if(((SDL_GetModState()&KMOD_CTRL)!=0 || wheelamount!=0) && event->key.keysym.sym==SDLK_UP && re->originline==0)

                         return(0); /* nothing to do, already at top */

-                move_res=re_moveupdown(re,(event->key.keysym.sym==SDLK_UP)?-1:1);

+                move_res=re_moveupdown(re,(wheelamount!=0)?wheelamount:(event->key.keysym.sym==SDLK_UP)?-1:1);

                 if(move_res==0 && (SDL_GetModState()&KMOD_SHIFT)!=0 && (re->curcol!=oldcol || re->curline!=oldline)) {

                         re_sel_resize(re,oldcol,oldline,(event->key.keysym.sym==SDLK_UP)?-1:1);

                 }

-                if(move_res==0 && (SDL_GetModState()&KMOD_CTRL)!=0) {

+                if(move_res==0 && ((SDL_GetModState()&KMOD_CTRL)!=0 || wheelamount!=0)) {

                         if(event->key.keysym.sym==SDLK_UP && re->originline>0) {

-                                re->originline--;

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

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

                                 re->contentsdirty=1;

                         } else if(event->key.keysym.sym==SDLK_DOWN && re->originline<re->curline) {

-                                re->originline++;

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

+                                re->originline=(re->originline>re->curline)?re->curline:re->originline;

                                 re->contentsdirty=1;

                         }

                 }

@@ -2575,6 +2600,26 @@ re_funclistingxy2line(re_t *re,int mx,int my)

         return(-1);

 }

+int

+re_wheelaccel(re_t *re, int rawamount)

+{

+        int wheelamount;

+        struct timeval old;

+        struct timezone dummy;

+        int oldmsec,newmsec,d;

+        if(re==NULL || rawamount==0)

+                return(rawamount);

+        memcpy(&old,&(re->lastwheel),sizeof(old));

+        if(gettimeofday(&(re->lastwheel),&dummy)!=0 || old.tv_sec<(re->lastwheel.tv_sec-1) || old.tv_sec>re->lastwheel.tv_sec)

+                return(rawamount);

+        oldmsec=old.tv_usec/1000;

+        newmsec=re->lastwheel.tv_usec/1000+((old.tv_sec<re->lastwheel.tv_sec)?1000:0);

+        d=newmsec-oldmsec;

+        wheelamount=rawamount;

+        if(d<70)

+                wheelamount*=10;

+        return(wheelamount);

+}