--- rxvt-unicode/src/rxvtperl.xs	2006/01/20 15:40:39	1.83
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/20 22:49:34	1.86
@@ -598,7 +598,7 @@
                         setuv (time,      xe->xmotion.time);
                         setiv (x,         xe->xmotion.x);
                         setiv (y,         xe->xmotion.y);
-                        setiv (row,       xe->xmotion.y / term->fheight);
+                        setiv (row,       xe->xmotion.y / term->fheight + term->view_start);
                         setiv (col,       xe->xmotion.x / term->fwidth);
                         setiv (x_root,    xe->xmotion.x_root);
                         setiv (y_root,    xe->xmotion.y_root);
@@ -642,6 +642,13 @@
 
                         break;
 
+                      case PropertyNotify:
+                        setuv (window,       xe->xproperty.window);
+                        setuv (atom,         xe->xproperty.atom);
+                        setuv (time,         xe->xproperty.time);
+                        setiv (state,        xe->xproperty.state);
+                        break;
+
                       case ClientMessage:
                         setuv (window,       xe->xclient.window);
                         setuv (message_type, xe->xclient.message_type);
@@ -651,6 +658,7 @@
                         setuv (l2,           xe->xclient.data.l[2]);
                         setuv (l3,           xe->xclient.data.l[3]);
                         setuv (l4,           xe->xclient.data.l[4]);
+                        break;
                     }
 
                   XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
@@ -1111,12 +1119,14 @@
            ModLevel3Mask  = 0
            ModMetaMask    = 1
            ModNumLockMask = 2
+           current_screen = 3
 	CODE:
         switch (ix)
           {
            case 0: RETVAL = THIS->ModLevel3Mask;  break;
            case 1: RETVAL = THIS->ModMetaMask;    break;
            case 2: RETVAL = THIS->ModNumLockMask; break;
+           case 3: RETVAL = THIS->current_screen; break;
           }
         OUTPUT:
         RETVAL
@@ -1583,6 +1593,9 @@
 rxvt_term::scr_bell ()
 
 void
+rxvt_term::scr_change_screen (int screen)
+
+void
 rxvt_term::scr_add_lines (SV *string)
 	CODE:
 {
@@ -1740,7 +1753,16 @@
 
 void
 XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
-	C_ARGS: term->display->display, (Window)window, x, y, width, height
+	C_ARGS: term->display->display, window, x, y, width, height
+
+void
+rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
+	CODE:
+{
+	XWindowAttributes attr;
+        XGetWindowAttributes (THIS->display->display, window, &attr);
+        XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
+}
 
 void
 rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)