--- rxvt-unicode/src/rxvtperl.xs	2006/01/20 18:50:49	1.84
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/22 11:57:06	1.89
@@ -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);
@@ -930,23 +930,23 @@
 
         rxvt_term *term = new rxvt_term;
 
-	term->argv = new stringvec;
-	term->envv = new stringvec;
+	stringvec *argv = new stringvec;
+	stringvec *envv = new stringvec;
 
         for (int i = 1; i < items; i++)
-          term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
+          argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
 
-        AV *envv = (AV *)SvRV (ST (0));
-        for (int i = AvFILL (envv) + 1; i--; )
-          term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
+        AV *env = (AV *)SvRV (ST (0));
+        for (int i = AvFILL (env) + 1; i--; )
+          envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
 
-        term->envv->push_back (0);
+        envv->push_back (0);
 
         bool success;
 
         try
           {
-            success = term->init (term->argv->size (), term->argv->begin ());
+            success = term->init (argv, envv);
           }
         catch (const class rxvt_failure_exception &e)
           {
@@ -1119,12 +1119,16 @@
            ModLevel3Mask  = 0
            ModMetaMask    = 1
            ModNumLockMask = 2
+           current_screen = 3
+           hidden_cursor  = 4
 	CODE:
         switch (ix)
           {
-           case 0: RETVAL = THIS->ModLevel3Mask;  break;
-           case 1: RETVAL = THIS->ModMetaMask;    break;
-           case 2: RETVAL = THIS->ModNumLockMask; break;
+            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;
+            case 4: RETVAL = THIS->hidden_cursor;  break;
           }
         OUTPUT:
         RETVAL
@@ -1529,10 +1533,20 @@
             rc.row = SvIV (ST (1));
             rc.col = SvIV (ST (2));
 
-            if (ix == 2 && rc.col == 0)
+            if (ix == 2)
               {
-                rc.row--;
-                rc.col = THIS->ncol;
+                if (rc.col == 0)
+                  {
+                    // col == 0 means end of previous line
+                    rc.row--;
+                    rc.col = THIS->ncol;
+                  }
+                else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
+                         && rc.col > ROW(rc.row).l)
+                  {
+                    // col >= length means while line and add newline
+                    rc.col = THIS->ncol;
+                  }
               }
 
             clamp_it (rc.col, 0, THIS->ncol);
@@ -1591,6 +1605,9 @@
 rxvt_term::scr_bell ()
 
 void
+rxvt_term::scr_change_screen (int screen)
+
+void
 rxvt_term::scr_add_lines (SV *string)
 	CODE:
 {