--- rxvt-unicode/src/xdefaults.C	2014/05/02 20:35:00	1.176
+++ rxvt-unicode/src/xdefaults.C	2014/07/29 13:50:05	1.179
@@ -11,7 +11,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -98,6 +98,7 @@
               SWCH ("iconic", Opt_iconic, 0, "start iconic"),
               SWCH ("ic", Opt_iconic, 0, NULL),	/* short form */
               STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
+              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"),
               BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
@@ -629,6 +630,12 @@
 /*----------------------------------------------------------------------*/
 
 # ifdef KEYSYM_RESOURCE
+static void
+rxvt_define_key (rxvt_term *term, const char *k, const char *v)
+{
+  term->bind_action (k, v);
+}
+
 /*
  * Define key from XrmEnumerateDatabase.
  *   quarks will be something like
@@ -636,21 +643,27 @@
  *   value will be a string
  */
 static int
-rxvt_define_key (XrmDatabase *database ecb_unused,
-                 XrmBindingList bindings ecb_unused,
-                 XrmQuarkList quarks,
-                 XrmRepresentation *type ecb_unused,
-                 XrmValue *value,
-                 XPointer closure)
+rxvt_keysym_enumerate_helper (
+   XrmDatabase *database ecb_unused,
+   XrmBindingList bindings ecb_unused,
+   XrmQuarkList quarks,
+   XrmRepresentation *type ecb_unused,
+   XrmValue *value,
+   XPointer closure
+)
 {
-  rxvt_term *term = (rxvt_term *)closure;
   int last;
 
   for (last = 0; quarks[last] != NULLQUARK; last++)	/* look for last quark in list */
     ;
 
-  last--;
-  term->bind_action (XrmQuarkToString (quarks[last]), (char *)value->addr);
+  rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
+  void (*cb)(rxvt_term *, const char *, const char *)
+     = (void (*)(rxvt_term *, const char *, const char *))
+          (((void **)closure)[1]);
+
+  cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
+
   return False;
 }
 
@@ -833,13 +846,18 @@
 }
 
 void
-rxvt_term::extract_keysym_resources ()
+rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
 {
 #ifndef NO_RESOURCES
   /*
    * [R5 or later]: enumerate the resource database
    */
 #  ifdef KEYSYM_RESOURCE
+  void *closure[2] = {
+    (void *)this,
+    (void *)cb,
+  };
+
   XrmDatabase database = XrmGetDatabase (dpy);
   XrmName name_prefix[3];
   XrmClass class_prefix[3];
@@ -852,16 +870,23 @@
   class_prefix[2] = NULLQUARK;
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
-                        XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
+                        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_define_key, (XPointer)this);
+                        XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
 #   endif
 #  endif
 
 #endif /* NO_RESOURCES */
 }
 
+void
+rxvt_term::extract_keysym_resources ()
+{
+  enumerate_keysym_resources (rxvt_define_key);
+}
+
 /*----------------------- end-of-file (C source) -----------------------*/
+