--- rxvt-unicode/src/xdefaults.C	2014/07/29 13:50:05	1.179
+++ rxvt-unicode/src/xdefaults.C	2015/05/11 22:05:58	1.187
@@ -101,6 +101,7 @@
               SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
               BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
               BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
+              STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
               BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
               BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
               BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
@@ -626,7 +627,6 @@
 
 /*}}} */
 
-#ifndef NO_RESOURCES
 /*----------------------------------------------------------------------*/
 
 # ifdef KEYSYM_RESOURCE
@@ -708,19 +708,20 @@
 };
 
 int
-rxvt_term::bind_action (const char *str, const char *arg)
+rxvt_term::parse_keysym (const char *str, unsigned int &state)
 {
   int sym;
-  unsigned int state = 0;
   const char *key = strrchr (str, '-');
 
+  state = 0;
+
   if (!key)
     key = str;
   else
     key++;
 
   // string or key is empty
-  if (*arg == '\0' || *key == '\0')
+  if (*key == '\0')
     return -1;
 
   // parse modifiers
@@ -755,6 +756,18 @@
         return -1;
     }
 
+  return sym;
+}
+
+int
+rxvt_term::bind_action (const char *str, const char *arg)
+{
+  int sym;
+  unsigned int state;
+
+  if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
+    return -1;
+
   wchar_t *ws = rxvt_mbstowcs (arg);
   if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
     keyboard->register_action (sym, state, ws);
@@ -764,7 +777,6 @@
 }
 
 # endif /* KEYSYM_RESOURCE */
-#endif /* NO_RESOURCES */
 
 static char *
 get_res (XrmDatabase database, const char *program, const char *option)
@@ -848,7 +860,6 @@
 void
 rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
 {
-#ifndef NO_RESOURCES
   /*
    * [R5 or later]: enumerate the resource database
    */
@@ -862,30 +873,34 @@
   XrmName name_prefix[3];
   XrmClass class_prefix[3];
 
-  name_prefix[0] = XrmStringToName (rs[Rs_name]);
   name_prefix[1] = XrmStringToName ("keysym");
   name_prefix[2] = NULLQUARK;
-  class_prefix[0] = XrmStringToName (RESCLASS);
   class_prefix[1] = XrmStringToName ("Keysym");
   class_prefix[2] = NULLQUARK;
-  /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
-  XrmEnumerateDatabase (database, name_prefix, class_prefix,
-                        XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
+
 #   ifdef RESFALLBACK
   name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
                         XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
 #   endif
-#  endif
 
-#endif /* NO_RESOURCES */
+  name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
+  XrmEnumerateDatabase (database, name_prefix, class_prefix,
+                        XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
+
+  name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
+  XrmEnumerateDatabase (database, name_prefix, class_prefix,
+                        XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
+#  endif
 }
 
 void
 rxvt_term::extract_keysym_resources ()
 {
+#ifdef KEYSYM_RESOURCE
   enumerate_keysym_resources (rxvt_define_key);
+#endif
 }
 
 /*----------------------- end-of-file (C source) -----------------------*/