--- rxvt-unicode/src/command.C	2006/01/18 17:49:46	1.271
+++ rxvt-unicode/src/command.C	2006/01/20 10:27:08	1.274
@@ -66,9 +66,6 @@
 
 #define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
 
-// exception thrown when the command parser runs out of input data
-class out_of_input { } out_of_input;
-
 #if ENABLE_FRILLS || ISO_14755
 
 #define ISO_14755_STARTED	0x80000000UL
@@ -466,7 +463,7 @@
                 {
                     /* normal XTerm key bindings */
                   case XK_Insert:	/* Shift+Insert = paste mouse selection */
-                    selection_request (ev.time, 0, 0);
+                    selection_request (ev.time, Sel_Primary);
                     return;
 #if TODO
                     /* rxvt extras */
@@ -1046,7 +1043,7 @@
   hidden_cursor = !hidden_cursor;
   want_refresh = 1;
 
-  w.start (w.at + BLINK_INTERVAL);
+  w.start (w.at + CURSOR_BLINK_INTERVAL);
 }
 #endif
 
@@ -1715,7 +1712,7 @@
           want_refresh = 1;
         }
 
-      cursor_blink_ev.start (NOW + BLINK_INTERVAL);
+      cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
     }
 #endif
 
@@ -1753,7 +1750,7 @@
 #endif
 #if CURSOR_BLINK
       if (OPTION (Opt_cursorBlink))
-        cursor_blink_ev.start (NOW + BLINK_INTERVAL);
+        cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
 #endif
 #if OFF_FOCUS_FADING
       if (rs[Rs_fade])
@@ -2157,9 +2154,18 @@
           case Button3:
             selection_make (ev.time);
             break;
+
           case Button2:
-            selection_request (ev.time, ev.x, ev.y);
+            if (IN_RANGE_EXC (ev.x, 0, width)
+                && IN_RANGE_EXC (ev.y, 0, height))  // inside window?
+	      {
+		if (ev.state & ShiftMask)
+		  selection_request (ev.time, Sel_Clipboard);
+		else
+		  selection_request (ev.time, Sel_Primary);
+	      }
             break;
+
 #ifdef MOUSE_WHEEL
           case Button4:
           case Button5:
@@ -2824,7 +2830,7 @@
 
 // read the next character
 wchar_t
-rxvt_term::next_char ()
+rxvt_term::next_char () NOTHROW
 {
   while (cmdbuf_ptr < cmdbuf_endp)
     {
@@ -2855,20 +2861,22 @@
 
 // read the next octet
 uint32_t
-rxvt_term::next_octet ()
+rxvt_term::next_octet () NOTHROW
 {
   return cmdbuf_ptr < cmdbuf_endp
          ? (unsigned char)*cmdbuf_ptr++
          : NOCHAR;
 }
 
+static class out_of_input out_of_input;
+
 /* rxvt_cmd_getc () - Return next input character */
 /*
  * Return the next input character after first passing any keyboard input
  * to the command.
  */
 wchar_t
-rxvt_term::cmd_getc ()
+rxvt_term::cmd_getc () THROW ((class out_of_input))
 {
   wchar_t c = next_char ();
 
@@ -2879,7 +2887,7 @@
 }
 
 uint32_t
-rxvt_term::cmd_get8 ()
+rxvt_term::cmd_get8 () THROW ((class out_of_input))
 {
   uint32_t c = next_octet ();
 
@@ -4039,7 +4047,7 @@
 
 /* we're not using priv _yet_ */
 void
-rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
+rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
 {
   unsigned int i, j;
   int state;