--- rxvt-unicode/src/command.C	2006/01/19 16:22:12	1.272
+++ rxvt-unicode/src/command.C	2006/01/20 12:16:28	1.277
@@ -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
@@ -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
 
@@ -1407,52 +1404,35 @@
 
       case ClientMessage:
         if (ev.xclient.format == 32
-            && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
+            && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
           {
-            if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
-              destroy ();
+            if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
+              {
+                if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
+                  {
+                    if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
+                      {
+                        if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
+                          destroy ();
+                      }
 #if ENABLE_EWMH
-            else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
-              XSendEvent (disp, ev.xclient.window = display->root,
-                          False, SubstructureRedirectMask | SubstructureNotifyMask,
-                          &ev);
+                    else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
+                      XSendEvent (disp, ev.xclient.window = display->root,
+                                  False, SubstructureRedirectMask | SubstructureNotifyMask,
+                                  &ev);
 #endif
-          }
+                  }
+              }
 #if ENABLE_XEMBED
-        else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
-          {
-            if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
-              focus_in ();
-            else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
-              focus_out ();
-          }
+            else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
+              {
+                if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
+                  focus_in ();
+                else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
+                  focus_out ();
+              }
 #endif
-#ifdef OFFIX_DND
-        /* OffiX Dnd (drag 'n' drop) protocol */
-          else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
-            && (ev.xclient.data.l[0] == DndFile
-                || ev.xclient.data.l[0] == DndDir
-                || ev.xclient.data.l[0] == DndLink))
-          {
-            /* Get Dnd data */
-            Atom ActualType;
-            int ActualFormat;
-            unsigned char *data;
-            unsigned long Size, RemainingBytes;
-
-            XGetWindowProperty (disp, display->root,
-                                xa[XA_DNDSELECTION],
-                                0L, 1000000L,
-                                False, AnyPropertyType,
-                                &ActualType, &ActualFormat,
-                                &Size, &RemainingBytes,
-                                &data);
-            set_string_property (XA_CUT_BUFFER0, data);
-            XFree (data);
-            selection_paste (display->root, XA_CUT_BUFFER0, true);
-            XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
           }
-#endif				/* OFFIX_DND */
         break;
 
       case MappingNotify:
@@ -1715,7 +1695,7 @@
           want_refresh = 1;
         }
 
-      cursor_blink_ev.start (NOW + BLINK_INTERVAL);
+      cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
     }
 #endif
 
@@ -1753,7 +1733,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])
@@ -2159,10 +2139,8 @@
             break;
 
           case Button2:
-            if (IN_RANGE_EXC (ev.x, 0, width)
-                && IN_RANGE_EXC (ev.y, 0, height))  // inside window?
-              selection_request (ev.time);
-
+            if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
+	      selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
             break;
 
 #ifdef MOUSE_WHEEL
@@ -2829,7 +2807,7 @@
 
 // read the next character
 wchar_t
-rxvt_term::next_char ()
+rxvt_term::next_char () NOTHROW
 {
   while (cmdbuf_ptr < cmdbuf_endp)
     {
@@ -2860,20 +2838,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 ();
 
@@ -2884,7 +2864,7 @@
 }
 
 uint32_t
-rxvt_term::cmd_get8 ()
+rxvt_term::cmd_get8 () THROW ((class out_of_input))
 {
   uint32_t c = next_octet ();
 
@@ -4044,7 +4024,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;