--- rxvt-unicode/src/rxvtperl.xs	2006/02/03 05:47:05	1.96
+++ rxvt-unicode/src/rxvtperl.xs	2006/02/11 02:28:19	1.99
@@ -764,7 +764,7 @@
 # undef def
 
   HV *stash = gv_stashpv ("urxvt", 1);
-  struct {
+  static const struct {
     const char *name;
     IV iv;
   } *civ, const_iv[] = {
@@ -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
 
@@ -1294,6 +1294,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;
@@ -1494,7 +1520,7 @@
 rxvt_term::_resource (char *name, int index, SV *newval = 0)
 	PPCODE:
 {
-	struct resval { const char *name; int value; } rslist [] = {
+	static const struct resval { const char *name; int value; } *rs, rslist [] = {
 #	  define def(name) { # name, Rs_ ## name },
 #	  define reserve(name,count)
 #	  include "rsinc.h"
@@ -1502,7 +1528,7 @@
 #	  undef reserve
         };
 
-        struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
+        rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
 
         do {
           if (rs-- == rslist)
@@ -1788,7 +1814,6 @@
 	XChangeProperty (THIS->dpy, window, property,
                          type, format, PropModeReplace,
                          (unsigned char *)data_, len / elemsize);
-        XSync (THIS->dpy, 0);
 }
 
 Atom