--- rxvt-unicode/src/rxvtperl.xs	2020/06/30 07:31:24	1.247
+++ rxvt-unicode/src/rxvtperl.xs	2021/07/24 11:58:27	1.253
@@ -379,6 +379,7 @@
 {
   if (perl)
     {
+      localise_env set_environ (perl_environ);
       perl_destruct (perl);
       perl_free (perl);
       PERL_SYS_TERM ();
@@ -822,6 +823,8 @@
     const_iv (HOOK_INIT),
     const_iv (HOOK_DESTROY),
     const_iv (HOOK_ACTION),
+    const_iv (HOOK_OSC_SEQ),
+    const_iv (HOOK_OSC_SEQ_PERL),
 
     const_iv (NUM_RESOURCES),
     const_iv (DEFAULT_RSTYLE),
@@ -1052,8 +1055,8 @@
     const_iv (PrivMode_MouseBtnEvent),
     const_iv (PrivMode_MouseAnyEvent),
     const_iv (PrivMode_BracketPaste),
-    const_iv (PrivMode_ExtModeMouse),
-    const_iv (PrivMode_ExtMouseRight),
+    const_iv (PrivMode_ExtMouseUTF8),
+    const_iv (PrivMode_ExtMouseUrxvt),
     const_iv (PrivMode_BlinkingCursor),
     const_iv (PrivMode_mouse_report),
     const_iv (PrivMode_Default),
@@ -1563,14 +1566,13 @@
 	RETVAL
 
 int
-rxvt_term::view_start (int newval = 1)
+rxvt_term::view_start (int newval = 0)
 	PROTOTYPE: $;$
 	CODE:
 {
         RETVAL = THIS->view_start;
-
-        if (newval <= 0)
-          THIS->scr_changeview (max (newval, THIS->top_row));
+        if (items > 1)
+          THIS->scr_changeview (newval);
 }
         OUTPUT:
 	RETVAL
@@ -1790,7 +1792,7 @@
           if (*s == NOCHAR)
             ;
           else if (IS_COMPOSE (*s))
-            dlen += rxvt_composite.expand (*s, 0);
+            dlen += rxvt_composite.expand (*s);
           else
             dlen++;