@@ -85,6 +85,9 @@ typedef struct re_t {

         int headerdirty;

         int contentsdirty;

         int command_first_key;

+        int selstartactive;

+        int selstartline;

+        int selstartcol;

         int selactive;

         int sellinefrom,sellineto;

         int selcolfrom,selcolto;

@@ -350,6 +353,11 @@ fprintf(stderr,"RENDER\n");

                                                 do_exit=1;

                                         }

                                         break;

+                                case SDL_KEYUP:

+                                        if(event.key.keysym.sym==SDLK_RSHIFT || event.key.keysym.sym==SDLK_LSHIFT) {

+                                                re->selstartactive=0;

+                                        }

+                                        break;

                                 case SDL_KEYDOWN:

                                 case SDL_TEXTINPUT:

                                 case SDL_TEXTEDITING:

@@ -375,6 +383,11 @@ fprintf(stderr,"RENDER\n");

                                                 }

                                                 break;

                                         }

+                                        if(!re->viewonly && event.type==SDL_KEYDOWN && (event.key.keysym.sym==SDLK_RSHIFT || event.key.keysym.sym==SDLK_LSHIFT)) {

+                                                re->selstartactive=1;

+                                                re->selstartline=re->curline;

+                                                re->selstartcol=re->curcol;

+                                        }

                                         if(re->command==NULL || strcmp(re->command,COMMAND_WARNING)==0 || strcmp(re->command,COMMAND_INFO)==0)

                                                 re_processkey_editing(re,&event);

                                         else if(re->command[0]=='\0')

@@ -843,19 +856,24 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                 }

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

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

-                if(re_moveleftright(re,(event->key.keysym.sym==SDLK_LEFT)?-1:1)==0 && (SDL_GetModState()&KMOD_SHIFT)!=0 && (re->curcol!=oldcol || re->curline!=oldline)) {

+                if(re_moveleftright(re,(event->key.keysym.sym==SDLK_LEFT)?-1:1)==0 && (SDL_GetModState()&KMOD_SHIFT)!=0 && (re->curcol!=oldcol || re->curline!=oldline))

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

-                }

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

                 long cursorpos;

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

                 cursorpos=(event->key.keysym.sym==SDLK_PAGEDOWN)?(redata_getused(re->data)-1):0;

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

                 redata_pos2linecol(re->data,cursorpos,&(re->curline),&(re->curcol));

                 re_fixorigin_center(re);

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

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

                 re->headerdirty=1;

                 re->contentsdirty=1;

         } else if(event->key.keysym.sym==SDLK_PAGEDOWN || event->key.keysym.sym==SDLK_PAGEUP) {

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

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

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

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

         } else if(event->key.keysym.sym==SDLK_HOME || event->key.keysym.sym==SDLK_END) {

                 long newpos;

                 long cursorpos;

@@ -869,9 +887,8 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                 cursorpos=newpos;

                 if(redata_pos2linecol(re->data,cursorpos,NULL,&(re->curcol))==-1)

                         return(-1); /* couldn't get col of current pos */;

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

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

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

-                }

                 re_fixorigin(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

@@ -1632,27 +1649,40 @@ re_sel_resize(re_t *re,int oldcol,int oldline,int direction)

 {

         if(re==NULL || oldcol<0 || oldline<0 || (direction!=-1 && direction!=1))

                 return(-1);

-        if(direction==-1) {

-                if(re->selactive==0) {

-                        re_sel_setstart(re,re->curline,re->curcol);

-                        re_sel_setend(re,oldline,oldcol);

-                } else if(re_sel_lincolisafter(re,re->curline,re->curcol) || re_sel_lincolisinside(re,re->curline,re->curcol)) {

-                        re_sel_setend(re,re->curline,re->curcol);

+        if(re->selstartactive==0) {

+                /* we don't know the start position, manage with the nifo we have */

+                if(direction==-1) {

+                        if(re->selactive==0) {

+                                re_sel_setstart(re,re->curline,re->curcol);

+                                re_sel_setend(re,oldline,oldcol);

+                        } else if(re_sel_lincolisafter(re,re->curline,re->curcol) || re_sel_lincolisinside(re,re->curline,re->curcol)) {

+                                re_sel_setend(re,re->curline,re->curcol);

+                        } else {

+                                re_sel_setstart(re,re->curline,re->curcol);

+                        }

                 } else {

-                        re_sel_setstart(re,re->curline,re->curcol);

+                        if(re->selactive==0 || re_sel_lincolisbefore(re,oldline,oldcol)) {

+                                re_sel_setstart(re,oldline,oldcol);

+                                re_sel_setend(re,re->curline,re->curcol);

+                        } else if(re_sel_lincolisinside(re,oldline,oldcol)) {

+                                re_sel_setstart(re,re->curline,re->curcol);

+                        } else {

+                                re_sel_setend(re,re->curline,re->curcol);

+                        }

                 }

         } else {

-                if(re->selactive==0 || re_sel_lincolisbefore(re,oldline,oldcol)) {

-                        re_sel_setstart(re,oldline,oldcol);

-                        re_sel_setend(re,re->curline,re->curcol);

-                } else if(re_sel_lincolisinside(re,oldline,oldcol)) {

+                /* we know the start position, try to select accordingly */

+                if(re->curline<re->selstartline || (re->curline==re->selstartline && re->curcol<=re->selstartcol)) {

                         re_sel_setstart(re,re->curline,re->curcol);

+                        re_sel_setend(re,re->selstartline,re->selstartcol);

                 } else {

+                        re_sel_setstart(re,re->selstartline,re->selstartcol);

                         re_sel_setend(re,re->curline,re->curcol);

                 }

         }

         if(re->sellinefrom==re->sellineto && re->selcolfrom==re->selcolto)

                 re->selactive=0;

+

         return(0);

 }