--- rxvt-unicode/src/rxvtperl.xs	2006/01/17 16:22:41	1.71
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/18 11:05:09	1.75
@@ -404,7 +404,13 @@
 
       char *argv[] = {
         "",
-        "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
+        "-e"
+        "BEGIN {"
+        "   urxvt->bootstrap;"
+        "   unshift @INC, '" LIBDIR "';"
+        "}"
+        ""
+        "use urxvt;"
       };
 
       perl = perl_alloc ();
@@ -531,6 +537,7 @@
 
 #           define set(name, sv) hv_store (hv, # name,  sizeof (# name) - 1, sv, 0)
 #           define setiv(name, val) hv_store (hv, # name,  sizeof (# name) - 1, newSViv (val), 0)
+#           define setuv(name, val) hv_store (hv, # name,  sizeof (# name) - 1, newSVuv (val), 0)
 #           undef set
 
                   setiv (type,       xe->type);
@@ -544,31 +551,54 @@
                       case ButtonPress:
                       case ButtonRelease:
                       case MotionNotify:
-                        setiv (time,   xe->xmotion.time);
-                        setiv (x,      xe->xmotion.x);
-                        setiv (y,      xe->xmotion.y);
-                        setiv (row,    xe->xmotion.y / term->fheight);
-                        setiv (col,    xe->xmotion.x / term->fwidth);
-                        setiv (x_root, xe->xmotion.x_root);
-                        setiv (y_root, xe->xmotion.y_root);
-                        setiv (state,  xe->xmotion.state);
-                        break;
-                    }
+                        setuv (window,    xe->xmotion.window);
+                        setuv (root,      xe->xmotion.root);
+                        setuv (subwindow, xe->xmotion.subwindow);
+                        setuv (time,      xe->xmotion.time);
+                        setiv (x,         xe->xmotion.x);
+                        setiv (y,         xe->xmotion.y);
+                        setiv (row,       xe->xmotion.y / term->fheight);
+                        setiv (col,       xe->xmotion.x / term->fwidth);
+                        setiv (x_root,    xe->xmotion.x_root);
+                        setiv (y_root,    xe->xmotion.y_root);
+                        setuv (state,     xe->xmotion.state);
+
+                        switch (xe->type)
+                          {
+                            case KeyPress:
+                            case KeyRelease:
+                              setuv (keycode, xe->xkey.keycode);
+                              break;
+
+                            case ButtonPress:
+                            case ButtonRelease:
+                              setuv (button,  xe->xbutton.button);
+                              break;
+
+                            case MotionNotify:
+                              setiv (is_hint, xe->xmotion.is_hint);
+                              break;
+                          }
 
-                  switch (xe->type)
-                    {
-                      case KeyPress:
-                      case KeyRelease:
-                        setiv (keycode, xe->xkey.keycode);
                         break;
 
-                      case ButtonPress:
-                      case ButtonRelease:
-                        setiv (button,  xe->xbutton.button);
-                        break;
+                      case MapNotify:
+                      case UnmapNotify:
+                      case ConfigureNotify:
+                        setuv (event,  xe->xconfigure.event);
+                        setuv (window, xe->xconfigure.window);
+
+                        switch (xe->type)
+                          {
+                            case ConfigureNotify:
+                              setiv (x,      xe->xconfigure.x);
+                              setiv (y,      xe->xconfigure.y);
+                              setiv (width,  xe->xconfigure.width);
+                              setiv (height, xe->xconfigure.height);
+                              setuv (above,  xe->xconfigure.above);
+                              break;
+                          }
 
-                      case MotionNotify:
-                        setiv (is_hint, xe->xmotion.is_hint);
                         break;
                     }
 
@@ -1508,8 +1538,17 @@
 
         if (items == 3)
           {
-            rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
-            rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
+            rc.row = SvIV (ST (1));
+            rc.col = SvIV (ST (2));
+
+            if (ix == 2 && rc.col == 0)
+              {
+                rc.row--;
+                rc.col = THIS->ncol;
+              }
+
+            clamp_it (rc.col, 0, THIS->ncol);
+            clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
 
             if (ix)
               THIS->want_refresh = 1;
@@ -1677,6 +1716,13 @@
         OUTPUT:
         RETVAL
 
+timer *
+timer::after (NV delay)
+	CODE:
+        THIS->start (NOW + delay);
+        OUTPUT:
+        RETVAL
+
 timer *
 timer::stop ()
 	CODE: