--- rxvt-unicode/src/rxvtperl.xs	2006/01/09 23:00:07	1.51
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/11 00:59:58	1.54
@@ -629,7 +629,10 @@
 
 BOOT:
 {
-  sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
+  sv_setsv (get_sv ("urxvt::LIBDIR",   1), newSVpvn (LIBDIR,   sizeof (LIBDIR)   - 1));
+  sv_setsv (get_sv ("urxvt::RESNAME",  1), newSVpvn (RESNAME,  sizeof (RESNAME)  - 1));
+  sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
+  sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
 
   AV *hookname = get_av ("urxvt::HOOKNAME", 1);
 # define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
@@ -674,36 +677,6 @@
   export_const_iv (EVENT_WRITE);
 }
 
-SV *
-new (...)
-	CODE:
-{
-	stringvec *argv = new stringvec;
-        bool success;
-
-        for (int i = 0; i < items ;i++)
-          argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
-
-        rxvt_term *term = new rxvt_term;
-
-        term->argv = argv;
-
-        try
-          {
-            if (!term->init (argv->size (), argv->begin ()))
-              term = 0;
-          }
-        catch (const class rxvt_failure_exception &e)
-          {
-            term->destroy ();
-            croak ("exception caught while initializing new terminal instance");
-          }
-
-        RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
-}
-	OUTPUT:
-        RETVAL
-
 void
 set_should_invoke (int htype, int value)
 	CODE:
@@ -791,6 +764,50 @@
 
 MODULE = urxvt             PACKAGE = urxvt::term
 
+SV *
+_new (...)
+	CODE:
+{
+	if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
+          croak ("first argument to urxvt::term->_new must be arrayref");
+
+        rxvt_term *term = new rxvt_term;
+
+	term->argv = new stringvec;
+	term->envv = new stringvec;
+
+        for (int i = 1; i < items; i++)
+          term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
+
+        AV *envv = (AV *)SvRV (ST (0));
+        for (int i = av_len (envv) + 1; i--; )
+          term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
+
+        term->envv->push_back (0);
+
+        bool success;
+
+        try
+          {
+            success = term->init (term->argv->size (), term->argv->begin ());
+          }
+        catch (const class rxvt_failure_exception &e)
+          {
+            success = false;
+          }
+
+        if (!success)
+          {
+            term->destroy ();
+            croak ("error while initializing new terminal instance");
+          }
+
+        RETVAL = term && term->perl.self
+                 ? newSVterm (term) : &PL_sv_undef;
+}
+	OUTPUT:
+        RETVAL
+
 void
 rxvt_term::destroy ()
 
@@ -958,6 +975,26 @@
         OUTPUT:
         RETVAL
 
+SV *
+rxvt_term::_env ()
+	CODE:
+{
+        if (THIS->envv)
+          {
+            AV *av = newAV ();
+
+            for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
+              if (*i)
+                av_push (av, newSVpv (*i, 0));
+
+            RETVAL = newRV_noinc ((SV *)av);
+          }
+        else
+          RETVAL = &PL_sv_undef;
+}
+        OUTPUT:
+        RETVAL
+
 int
 rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
 	CODE:
@@ -1317,6 +1354,13 @@
           }
 }
 
+char
+rxvt_term::cur_charset ()
+	CODE:
+        RETVAL = THIS->charsets [THIS->screen.charset];
+	OUTPUT:
+        RETVAL
+
 int
 rxvt_term::selection_grab (U32 eventtime)