@@ -332,6 +332,24 @@ fprintf(stderr,"RENDER\n");

                                         case SDL_KEYDOWN:

                                                 if(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) {

+                                                        int neworiginline;

+                                                        int maxrow;

+                                                        int linetotal;

+                                                        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:

+                                                                       0;

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

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

+                                                        neworiginline=(neworiginline>linetotal)?linetotal:neworiginline;

+                                                        if(neworiginline==printout->originline)

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

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

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

@@ -372,11 +390,22 @@ fprintf(stderr,"RENDER\n");

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

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

                                                         do_exit=1;

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

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

+                                                } 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) {

+                                                        int neworiginline;

+                                                        int linetotal;

+                                                        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:

+                                                                       0;

+                                                        linetotal=redata_line_total(re->data);

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

+                                                        neworiginline=(neworiginline>linetotal)?linetotal:neworiginline;

+                                                        if(neworiginline==re->originline)

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

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

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

+                                                        re->curline+=(neworiginline-re->originline);

+                                                        re->originline=neworiginline;

                                                         re->headerdirty=1;

                                                         re->contentsdirty=1;

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

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

                 if(re->usedselectbuf>0)

                         re_textinsert(re, re->selectbuf,re->usedselectbuf);

                 re->ignorenkeys++;

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

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

                 re_addprint(re);

         }

         return(0);

@@ -1900,7 +1929,7 @@ re_addprint(re_t *re)

         int i;

         long frompos,topos;

         int coldone;

-        if(re==NULL || re->selactive==0)

+        if(re==NULL)

                 return(-1);

         /* ensure space for the new printout */

         if(re->usedprints==re->sizeprints) {

@@ -1928,20 +1957,27 @@ re_addprint(re_t *re)

         }

         re->usedprints++;

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

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

+        if(re->selactive) {

+                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_sel_toggle(re);

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

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

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

-        re->prints[i].showonlyn=re->sellineto-re->sellinefrom+1;

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

         re->usedprints++;

 #endif

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

@@ -2169,6 +2205,9 @@ re_drawcontents(re_t *re, printout_t *printout)

         char matchingchar;

         int mline,mcol;

         int showonlyn;

+        int flaglineno;

+        int linenowidth;

+        int linenosize;

         if(re==NULL || (printout!=NULL && printout->ui==NULL))

                 return(-1);

         /* init vars and clear screen */

@@ -2185,6 +2224,8 @@ re_drawcontents(re_t *re, printout_t *printout)

         maxcol=re->maxcol;

         maxrow=re->maxrow;

         showonlyn=0;

+        flaglineno=0;

+        linenosize=linenowidth=0;

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

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

                 fakeprintout.ui=re->ui;

@@ -2204,10 +2245,14 @@ re_drawcontents(re_t *re, printout_t *printout)

                 maxcol=w/ui->fontwidth-1;

                 maxrow=h/ui->fontheight-1;

                 showonlyn=printout->showonlyn;

+                flaglineno=1;

+                linenosize=6;

+                linenowidth=linenosize*ui->fontwidth+ui->fontwidth*3/2;

+                x0+=linenowidth;

         }

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

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

-        reui_fill(ui,x0,y0,w,h,"\xdf\xdf\xdf\xff");

+        reui_fill(ui,x0-linenowidth,y0,w,h,"\xdf\xdf\xdf\xff");

         row=curline-originline;

         pos=cursorpos;

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

@@ -2220,10 +2265,10 @@ re_drawcontents(re_t *re, printout_t *printout)

         }

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

         if(printout==NULL) {

-                reui_fill(ui,x0,y0+(curline-originline)*ui->fontheight,w,ui->fontheight+1,"\xef\xef\xef\xff");

+                reui_fill(ui,x0-linenowidth,y0+(curline-originline)*ui->fontheight,w,ui->fontheight+1,"\xef\xef\xef\xff");

         } else {

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

-                        reui_fill(ui,x0,y,w,ui->fontheight+1,"\xef\xef\xef\xff");

+                        reui_fill(ui,x0-linenowidth,y,w,ui->fontheight+1,"\xef\xef\xef\xff");

         }

         /* highlight the selection */

         if(printout==NULL && re->selactive) {

@@ -2280,6 +2325,14 @@ re_drawcontents(re_t *re, printout_t *printout)

                 usedlenlinecolor=0;

                 lastcolor="\x00\x00\x00\xff";                      

                 in_error=0;

+                if(flaglineno) {

+                        int i,n;

+                        char buf[2]={0};

+                        for(i=linenosize,n=originline+row+1;i>=0;i--,n/=10) {

+                                buf[0]=(n>0 || i==linenosize)?(n%10)+'0':' ';

+                                reui_write(ui,x0-linenowidth+(i-1)*ui->fontwidth,y,"\x00\x00\x00\x2f",buf,1);

+                        }

+                }

                 /* draw each part of this line */

                 for(tmpcol=0,pos=realstart,availcol=0;tmpcol<(origincol+maxcol) && pos<=realend;pos=newpos+len,tmpcol+=availcol) {

                         int has_nl;