--- rxvt-unicode/src/init.C	2012/12/29 14:23:35	1.330
+++ rxvt-unicode/src/init.C	2014/10/13 17:05:32	1.339
@@ -16,7 +16,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,
@@ -662,6 +662,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);
@@ -743,6 +750,10 @@
   this->argv = argv;
   this->envv = envv;
 
+  env = new char *[this->envv->size ()];
+  for (int i = 0; i < this->envv->size (); i++)
+    env[i] = this->envv->at (i);
+
   init2 (argv->size () - 1, argv->begin ());
 }
 
@@ -770,7 +781,7 @@
 {
   SET_R (this);
   set_locale ("");
-  set_environ (envv); // a few things in X do not call setlocale :(
+  set_environ (env); // a few things in X do not call setlocale :(
 
   init_vars ();
 
@@ -947,7 +958,7 @@
 void
 rxvt_term::set_locale (const char *locale)
 {
-  set_environ (envv);
+  set_environ (env);
 
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
@@ -985,7 +996,7 @@
 void
 rxvt_term::init_xlocale ()
 {
-  set_environ (envv);
+  set_environ (env);
 
 #if USE_XIM
   if (!locale)
@@ -1205,7 +1216,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 +1409,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,
@@ -1410,9 +1423,7 @@
    */
 
   if (rs [Rs_iconfile])
-    {
-      set_icon (rs [Rs_iconfile]);
-    }
+    set_icon (rs [Rs_iconfile]);
 #endif
 
 #if ENABLE_FRILLS