--- rxvt-unicode/src/rxvtperl.xs	2006/02/04 16:12:48	1.97
+++ rxvt-unicode/src/rxvtperl.xs	2006/02/20 20:44:22	1.100
@@ -925,14 +925,14 @@
 int
 SET_FGCOLOR (int rend, int new_color)
 	CODE:
-        RETVAL = SET_FGCOLOR (rend, new_color);
+        RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
 	OUTPUT:
         RETVAL
 
 int
 SET_BGCOLOR (int rend, int new_color)
 	CODE:
-        RETVAL = SET_BGCOLOR (rend, new_color);
+        RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
 	OUTPUT:
         RETVAL
 
@@ -1211,24 +1211,19 @@
         RETVAL
 
 SV *
-rxvt_term::_env ()
-	CODE:
+rxvt_term::envv ()
+	ALIAS:
+        argv = 1
+	PPCODE:
 {
-        if (THIS->envv)
-          {
-            AV *av = newAV ();
+	stringvec *vec = ix ? THIS->argv : THIS->envv;
 
-            for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
-              if (*i)
-                av_push (av, newSVpv (*i, 0));
+        EXTEND (SP, vec->size ());
 
-            RETVAL = newRV_noinc ((SV *)av);
-          }
-        else
-          RETVAL = &PL_sv_undef;
+        for (char **i = vec->begin (); i != vec->end (); ++i)
+          if (*i)
+            PUSHs (sv_2mortal (newSVpv (*i, 0)));
 }
-        OUTPUT:
-        RETVAL
 
 int
 rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
@@ -1294,6 +1289,32 @@
 rxvt_term::focus_out ()
 
 void
+rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
+	ALIAS:
+           key_release = 1
+	CODE:
+{
+        XKeyEvent xkey;
+
+        memset (&xkey, 0, sizeof (xkey));
+
+        xkey.time      = time;
+        xkey.state     = state;
+        xkey.keycode   = keycode;
+
+        xkey.type      = ix ? KeyRelease : KeyPress;
+        xkey.display   = THIS->dpy;
+        xkey.window    = THIS->vt;
+        xkey.root      = THIS->display->root;
+        xkey.subwindow = THIS->vt;
+
+        if (ix)
+          THIS->key_release (xkey);
+        else
+          THIS->key_press (xkey);
+}
+
+void
 rxvt_term::want_refresh ()
 	CODE:
         THIS->want_refresh = 1;
@@ -1788,7 +1809,6 @@
 	XChangeProperty (THIS->dpy, window, property,
                          type, format, PropModeReplace,
                          (unsigned char *)data_, len / elemsize);
-        XSync (THIS->dpy, 0);
 }
 
 Atom