--- rxvt-unicode/src/init.C	2014/05/22 18:54:32	1.332
+++ rxvt-unicode/src/init.C	2014/09/05 19:02:53	1.337
@@ -614,8 +614,6 @@
     }
 #endif
 
-  // must be called after initialising the perl interpreter as it
-  // may invoke the `on_register_command' hook
   extract_keysym_resources ();
 
   /*
@@ -662,6 +660,13 @@
     pointerBlankDelay = 2;
 #endif
 
+  if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
+    multiClickTime = i;
+  else
+    multiClickTime = 500;
+
+  cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
+
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
     set_option (Opt_scrollBar, 0);
@@ -1205,7 +1210,7 @@
           if (kc[k] == 0)
             break;
 
-          switch (XKeycodeToKeysym (dpy, kc[k], 0))
+          switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
             {
               case XK_Num_Lock:
                 ModNumLockMask = modmasks[i - 1];
@@ -1398,7 +1403,9 @@
 
   wmHint.flags         = InputHint | StateHint | WindowGroupHint;
   wmHint.input         = True;
-  wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
+  wmHint.initial_state = option (Opt_iconic) ? IconicState
+                         : option (Opt_dockapp) ? WithdrawnState
+                         : NormalState;
   wmHint.window_group  = top;
 
   XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,