--- rxvt-unicode/src/keyboard.C	2005/02/24 13:01:01	1.13
+++ rxvt-unicode/src/keyboard.C	2006/01/02 21:17:01	1.18
@@ -5,6 +5,7 @@
 
 #include <cstring>
 
+#include "rxvtperl.h"
 #include "keyboard.h"
 #include "command.h"
 
@@ -74,6 +75,8 @@
 {
   if (strncmp (str, "command:", 8) == 0)
     rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8);
+  else if (strncmp (str, "perl:", 5) == 0)
+    PERL_INVOKE((rt, HOOK_KEYBOARD_COMMAND, DT_STRING, str + 5, DT_END));
   else
     rt->tt_write ((unsigned char *)str, strlen (str));
 }
@@ -117,7 +120,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // return: #bits of '1'
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
-# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); }))
+# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); }))
 #else
 static int
 bitcount (uint16_t n)
@@ -217,6 +220,8 @@
           else
             rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
         }
+      else if (strncmp (translation, "builtin:", 8) == 0)
+        key->type = keysym_t::BUILTIN;
 
       user_keymap.push_back (key);
       user_translations.push_back (translation);
@@ -262,6 +267,8 @@
 {
   assert (hash[0] == 0 && "register_done() need to be called");
 
+  state &= OtherModMask; // mask out uninteresting modifiers
+
   if (state & term->ModMetaMask)    state |= MetaMask;
   if (state & term->ModNumLockMask) state |= NumLockMask;
   if (state & term->ModLevel3Mask)  state |= Level3Mask;
@@ -275,64 +282,67 @@
     {
       const keysym_t &key = *keymap [index];
 
-      int keysym_offset = keysym - key.keysym;
-
-      wchar_t *wc = rxvt_utf8towcs (key.str);
-      char *str = rxvt_wcstombs (wc);
-      // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
-      free (wc);
-
-      switch (key.type)
+      if (key.type != keysym_t::BUILTIN)
         {
-         case keysym_t::NORMAL:
-            output_string (term, str);
-            break;
-
-          case keysym_t::RANGE:
-            {
-              char buf[STRING_MAX];
+          int keysym_offset = keysym - key.keysym;
 
-              if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
-                output_string (term, buf);
-            }
-            break;
+          wchar_t *wc = rxvt_utf8towcs (key.str);
+          char *str = rxvt_wcstombs (wc);
+          // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
+          free (wc);
 
-          case keysym_t::RANGE_META8:
+          switch (key.type)
             {
-              int len;
-              char buf[STRING_MAX];
-
-              len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
-              if (len > 0)
-                output_string_meta8 (term, state, buf, len);
+              case keysym_t::NORMAL:
+                output_string (term, str);
+                break;
+
+              case keysym_t::RANGE:
+                {
+                  char buf[STRING_MAX];
+
+                  if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
+                    output_string (term, buf);
+                }
+                break;
+
+              case keysym_t::RANGE_META8:
+                {
+                  int len;
+                  char buf[STRING_MAX];
+
+                  len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
+                  if (len > 0)
+                    output_string_meta8 (term, state, buf, len);
+                }
+                break;
+
+              case keysym_t::LIST:
+                {
+                  char buf[STRING_MAX];
+
+                  char *prefix, *middle, *suffix;
+
+                  prefix = str;
+                  middle = strchr  (prefix + 1, *prefix);
+                  suffix = strrchr (middle + 1, *prefix);
+
+                  memcpy (buf, prefix + 1, middle - prefix - 1);
+                  buf [middle - prefix - 1] = middle [keysym_offset + 1];
+                  strcpy (buf + (middle - prefix), suffix + 1);
+
+                  output_string (term, buf);
+                }
+                break;
             }
-            break;
-
-          case keysym_t::LIST:
-            {
-              char buf[STRING_MAX];
-
-              char *prefix, *middle, *suffix;
 
-              prefix = str;
-              middle = strchr  (prefix + 1, *prefix);
-              suffix = strrchr (middle + 1, *prefix);
+          free (str);
 
-              memcpy (buf, prefix + 1, middle - prefix - 1);
-              buf [middle - prefix - 1] = middle [keysym_offset + 1];
-              strcpy (buf + (middle - prefix), suffix + 1);
-
-              output_string (term, buf);
-            }
-            break;
+          return true;
         }
-
-      free (str);
-
-      return true;
     }
-  else
-    return false;
+
+  return false;
 }
 
 // purge duplicate keymap entries