--- rxvt-unicode/src/command.C	2006/01/06 03:02:22	1.239
+++ rxvt-unicode/src/command.C	2006/01/06 03:40:19	1.240
@@ -869,6 +869,9 @@
         }
     }
 
+  if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
+    return;
+
   if (len <= 0)
     return;			/* not mapped */
 
@@ -1637,7 +1640,9 @@
 
         if (ev.xany.window == vt)
           {
-            if (ev.xbutton.state & (Button1Mask | Button3Mask))
+            if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
+              ; // nop
+            else if (ev.xbutton.state & (Button1Mask | Button3Mask))
               {
                 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
                   ;
@@ -1896,7 +1901,7 @@
           if (ev.button != MEvent.button)
             MEvent.clicks = 0;
 
-          if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
+          if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
             switch (ev.button)
               {
                 case Button1:
@@ -2158,6 +2163,9 @@
           && ev.button == Button1 && MEvent.clicks <= 1)
         selection_extend (ev.x, ev.y, 0);
 
+      if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
+        return;
+
       switch (ev.button)
         {
           case Button1: