*** empty log message ***

diff --git a/src/command.C b/src/command.C
index 4d85d705bf5f795121bf0a956fa9d37be552cd24..10402aecbc7c05363fe03b0e834c611883a6aa07 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:       command.c
  *----------------------------------------------------------------------*
- * $Id: command.C,v 1.20 2003-12-18 07:31:18 pcg Exp $
+ * $Id: command.C,v 1.21 2003-12-18 08:06:46 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
@@ -1590,11 +1590,24 @@ rxvt_button_press(pR_ XButtonEvent *ev)
                switch (ev->button)
                   {
                     case Button1:
-                        if (R->MEvent.button == Button1 && clickintime)
-                          R->MEvent.clicks++;
+                        /* allow shift+left click to extend selection */
+                        if (ev->state & ShiftMask)
+                          {
+                            if (R->MEvent.button == Button1 && clickintime)
+                              rxvt_selection_rotate (aR_ ev->x, ev->y);
+                            else
+                              rxvt_selection_extend (aR_ ev->x, ev->y, 1);
+                          }
                         else
-                          R->MEvent.clicks = 1;
-                        rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
+                          {
+                            if (R->MEvent.button == Button1 && clickintime)
+                              R->MEvent.clicks++;
+                            else
+                              R->MEvent.clicks = 1;
+
+                            rxvt_selection_click (aR_ R->MEvent.clicks, ev->x, ev->y);
+                          }
+
                         R->MEvent.button = Button1;
                         break;
 

diff --git a/src/screen.C b/src/screen.C
index f03cf1626429c9f7d14a8245d8465aed94e0500e..8e050463adb06427d063894c4283cf5655c6b966 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*--------------------------------------*
  * File:        screen.c
  *---------------------------------------------------------------------------*
- * $Id: screen.C,v 1.9 2003-12-18 02:07:12 pcg Exp $
+ * $Id: screen.C,v 1.10 2003-12-18 08:06:46 pcg Exp $
  *
  * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
  *
@@ -2458,6 +2458,11 @@ rxvt_term::paste (const unsigned char *data, unsigned int len)
   unsigned int i, j, n;
   unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
   
+#if 0
+  /* a paste should act like the user is typing, so check scrollTtyKeypress */
+  ZERO_SCROLLBACK (r);
+#endif
+
   /* convert normal newline chars into common keyboard Return key sequence */
   for (i = 0; i < len; i += PROP_SIZE)
     {