--- rxvt-unicode/src/init.C	2011/04/07 12:19:40	1.294
+++ rxvt-unicode/src/init.C	2011/12/06 11:39:30	1.306
@@ -57,6 +57,11 @@
 # include <langinfo.h>
 #endif
 
+#ifdef HAVE_STARTUP_NOTIFICATION
+# define SN_API_NOT_YET_FROZEN
+# include <libsn/sn-launchee.h>
+#endif
+
 #ifdef DISPLAY_IS_IP
 /* On Solaris link with -lsocket and -lnsl */
 #include <sys/types.h>
@@ -565,7 +570,7 @@
 rxvt_term::init_resources (int argc, const char *const *argv)
 {
   int i, r_argc;
-  const char **cmd_argv, **r_argv;
+  const char **cmd_argv;
 
   /*
    * Look for -e option. Find => split and make cmd_argv[] of command args
@@ -579,21 +584,7 @@
   else if (!argv[r_argc + 1])
     rxvt_fatal ("option '-e' requires an argument, aborting.\n");
   else
-    {
-      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
-
-      for (i = 0; i < argc - r_argc - 1; i++)
-        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
-
-      cmd_argv[i] = NULL;
-    }
-
-  r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
-
-  for (i = 0; i < r_argc; i++)
-    r_argv[i] = (const char *)argv[i];
-
-  r_argv[i] = NULL;
+    cmd_argv = (const char **)argv + r_argc + 1;
 
   rs[Rs_name] = rxvt_basename (argv[0]);
 
@@ -604,13 +595,10 @@
   if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
     rs[Rs_display_name] = ":0";
 
-  get_options (r_argc, r_argv);
+  get_options (r_argc, argv);
 
   if (!(display = displays.get (rs[Rs_display_name])))
-    {
-      free (r_argv);
-      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
-    }
+    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
 
   // using a local pointer decreases code size a lot
   xa = display->xa;
@@ -623,21 +611,10 @@
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
 
-  free (r_argv);
-
   for (int i = NUM_RESOURCES; i--; )
     if (rs [i] == resval_undef)
       rs [i] = 0;
 
-#ifdef HAVE_AFTERIMAGE
-  set_application_name ((char *)rs[Rs_name]);
-  set_output_threshold (OUTPUT_LEVEL_WARNING);
-#endif
-
-#ifdef HAVE_PIXBUF
-  g_type_init ();
-#endif
-
 #if ENABLE_PERL
   if (!rs[Rs_perl_ext_1])
     rs[Rs_perl_ext_1] = "default";
@@ -651,6 +628,10 @@
     }
 #endif
 
+  // must be called after initialising the perl interpreter as it
+  // may invoke the `on_register_command' hook
+  extract_keysym_resources ();
+
   /*
    * set any defaults not already set
    */
@@ -768,10 +749,8 @@
 
 /*----------------------------------------------------------------------*/
 void
-rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
+rxvt_term::init (int argc, const char *const *argv)
 {
-  this->envv = envv;
-
   SET_R (this);
   set_locale ("");
   set_environ (envv); // a few things in X do not call setlocale :(
@@ -795,10 +774,20 @@
       }
 
   if (option (Opt_scrollBar))
-    scrollBar.state = STATE_IDLE;    /* set existence for size calculations */
+    scrollBar.state = SB_STATE_IDLE;    /* set existence for size calculations */
 
   pty = ptytty::create ();
 
+#ifdef HAVE_AFTERIMAGE
+  set_application_name ((char *)rs[Rs_name]);
+  set_output_threshold (OUTPUT_LEVEL_WARNING);
+#endif
+
+  // must be called before create_windows, because the latter may call set_icon
+#ifdef HAVE_PIXBUF
+  g_type_init ();
+#endif
+
   create_windows (argc, argv);
 
   init_xlocale ();
@@ -838,16 +827,6 @@
 #ifdef BG_IMAGE_FROM_FILE
     if (rs[Rs_backgroundPixmap])
       {
-        const char *p = rs[Rs_backgroundPixmap];
-
-        if ((p = strchr (p, ';')) != 0)
-          {
-            p++;
-            bg_set_geometry (p);
-          }
-        else
-          bg_set_default_geometry ();
-
         if (bg_set_file (rs[Rs_backgroundPixmap]))
           if (!bg_window_position_sensitive ())
             update_background ();
@@ -864,8 +843,6 @@
 
   init_command (cmd_argv);
 
-  free (cmd_argv);
-
   if (pty->pty >= 0)
     pty_ev.start (pty->pty, ev::READ);
 
@@ -881,9 +858,33 @@
     }
 #endif
 
+#if HAVE_STARTUP_NOTIFICATION
+  SnDisplay *snDisplay;
+  SnLauncheeContext *snContext;
+
+  snDisplay = sn_display_new (dpy, NULL, NULL);
+  snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
+
+  /* Tell the window manager that this window is part of the startup context */
+  if (snContext)
+    sn_launchee_context_setup_window (snContext, parent);
+#endif
+
   XMapWindow (dpy, vt);
   XMapWindow (dpy, parent);
 
+#if HAVE_STARTUP_NOTIFICATION
+  if (snContext)
+    {
+      /* Mark the startup process as complete */
+      sn_launchee_context_complete (snContext);
+
+      sn_launchee_context_unref (snContext);
+    }
+
+  sn_display_unref (snDisplay);
+#endif
+
   refresh_check ();
 }
 
@@ -1394,7 +1395,7 @@
 }
 
 /*----------------------------------------------------------------------*/
-/* rxvt_Create_Windows () - Open and map the window */
+/* Open and map the window */
 void
 rxvt_term::create_windows (int argc, const char *const *argv)
 {
@@ -1450,7 +1451,7 @@
 
   window_calc (0, 0);
 
-  /* sub-window placement & size in rxvt_resize_subwindows () */
+  /* sub-window placement & size in rxvt_term::resize_all_windows () */
   attributes.background_pixel = pix_colors_focused [Color_border];
   attributes.border_pixel     = pix_colors_focused [Color_border];
   attributes.colormap         = cmap;
@@ -1506,7 +1507,7 @@
 #endif
   };
 
-  XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
+  XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
 
 #if ENABLE_FRILLS
   if (rs[Rs_transient_for])