--- rxvt-unicode/src/rxvtperl.xs	2015/03/17 09:23:08	1.236
+++ rxvt-unicode/src/rxvtperl.xs	2021/07/14 12:39:57	1.251
@@ -84,15 +84,15 @@
 
       c.a = rgba::MAX_CC;
 
-      c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
+      c.r = c.g = c.b = float_to_component (SvNV (*av_fetch (av, 0, 0)));
 
       if (len >= 3)
         {
-          c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
-          c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
+          c.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
+          c.b = float_to_component (SvNV (*av_fetch (av, 2, 0)));
 
           if (len >= 4)
-            c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
+            c.a = float_to_component (SvNV (*av_fetch (av, 3, 0)));
         }
     }
   else if (s)
@@ -293,7 +293,7 @@
   for (; i < AvFILL (overlay_av); i++)
     av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
 
-  av_pop (overlay_av);
+  SvREFCNT_dec (av_pop (overlay_av));
 
   SvREFCNT_dec (overlay_av);
   overlay_av = 0;
@@ -372,15 +372,20 @@
 
 static PerlInterpreter *perl;
 
+#if 0 /* we are not a library anymore, so doing this is just not worth it */
+/*THINK/TODO: this has the side effect of, of course, not calling destructors. */
+/* but therse are not guaranteed anyway... */
 rxvt_perl_interp::~rxvt_perl_interp ()
 {
   if (perl)
     {
+      localise_env set_environ (perl_environ);
       perl_destruct (perl);
       perl_free (perl);
       PERL_SYS_TERM ();
     }
 }
+#endif
 
 void
 rxvt_perl_interp::init ()
@@ -393,7 +398,7 @@
         perl_environ = rxvt_environ;
         localise_env set_environ (perl_environ);
 
-        char *args[] = {
+        const char *args[] = {
           "",
           "-e"
           "BEGIN {"
@@ -401,10 +406,11 @@
           "   unshift @INC, '" LIBDIR "';"
           "}"
           ""
-          "use urxvt;"
+          "use urxvt;",
+          0
         };
-        int argc = ecb_array_length (args);
-        char **argv = args;
+        int argc = ecb_array_length (args) - 1;
+        char **argv = (char **)args;
 
         PERL_SYS_INIT3 (&argc, &argv, &environ);
         perl = perl_alloc ();
@@ -1022,6 +1028,36 @@
     const_iv (XIMDontChange),
 #   endif
 #   endif
+
+    /* DEC private modes */
+    const_iv (PrivMode_132),
+    const_iv (PrivMode_132OK),
+    const_iv (PrivMode_rVideo),
+    const_iv (PrivMode_relOrigin),
+    const_iv (PrivMode_Screen),
+    const_iv (PrivMode_Autowrap),
+    const_iv (PrivMode_aplCUR),
+    const_iv (PrivMode_aplKP),
+    const_iv (PrivMode_HaveBackSpace),
+    const_iv (PrivMode_BackSpace),
+    const_iv (PrivMode_ShiftKeys),
+    const_iv (PrivMode_VisibleCursor),
+    const_iv (PrivMode_MouseX10),
+    const_iv (PrivMode_MouseX11),
+    const_iv (PrivMode_scrollBar),
+    const_iv (PrivMode_TtyOutputInh),
+    const_iv (PrivMode_Keypress),
+    const_iv (PrivMode_smoothScroll),
+    const_iv (PrivMode_vt52),
+    const_iv (PrivMode_LFNL),
+    const_iv (PrivMode_MouseBtnEvent),
+    const_iv (PrivMode_MouseAnyEvent),
+    const_iv (PrivMode_BracketPaste),
+    const_iv (PrivMode_ExtMouseUTF8),
+    const_iv (PrivMode_ExtMouseUrxvt),
+    const_iv (PrivMode_BlinkingCursor),
+    const_iv (PrivMode_mouse_report),
+    const_iv (PrivMode_Default),
   };
 
   for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
@@ -1389,7 +1425,7 @@
 #define TERM_OFFSET_top_row     TERM_OFFSET(top_row)
 
 int
-rxvt_term::width ()
+rxvt_term::width (int new_value = NO_INIT)
 	ALIAS:
            width       = TERM_OFFSET_width
            height      = TERM_OFFSET_height
@@ -1409,6 +1445,8 @@
            top_row     = TERM_OFFSET_top_row
 	CODE:
         RETVAL = *(int *)((char *)THIS + ix);
+        if (items > 1)
+          *(int *)((char *)THIS + ix) = new_value;
         OUTPUT:
         RETVAL
 
@@ -1420,6 +1458,7 @@
            ModNumLockMask = 2
            current_screen = 3
            hidden_cursor  = 4
+           priv_modes     = 5
 	CODE:
         switch (ix)
           {
@@ -1429,7 +1468,10 @@
             case 3: RETVAL = THIS->current_screen; break;
 #ifdef CURSOR_BLINK
             case 4: RETVAL = THIS->hidden_cursor;  break;
+#else
+            case 4: RETVAL = 0;                    break;
 #endif
+            case 5: RETVAL = THIS->priv_modes;     break;
           }
         OUTPUT:
         RETVAL
@@ -1527,9 +1569,8 @@
 	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
@@ -1749,7 +1790,7 @@
           if (*s == NOCHAR)
             ;
           else if (IS_COMPOSE (*s))
-            dlen += rxvt_composite.expand (*s, 0);
+            dlen += rxvt_composite.expand (*s);
           else
             dlen++;
 
@@ -1797,7 +1838,7 @@
         else
           {
             --rs;
-            name = "";
+            name = (octet_string)"";
           }
 
         if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
@@ -2277,13 +2318,20 @@
 #endif
 
 void
+rxvt_term::clr_background ()
+	CODE:
+        delete THIS->bg_img;
+        THIS->bg_img = 0;
+        THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
+
+void
 rxvt_term::set_background (rxvt_img *img, bool border = false)
 	CODE:
         delete THIS->bg_img;
         THIS->bg_img = 0;
-        THIS->bg_flags = 0;
+        THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
 
-        if (img) // TODO: cannot be false
+        //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
           {
             img = img->clone (); // own the img
 
@@ -2301,7 +2349,6 @@
                ->replace (img);
 
             THIS->bg_img = img;
-            THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
 
             if (!border)
               THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
@@ -2388,7 +2435,9 @@
 rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
 	PROTOTYPE: $;$$$$
 	INIT:
-        rgba cc = parse_rgba (c, THIS->s);
+	rxvt_screen screen;
+	screen.set (THIS->d);
+	rgba cc = parse_rgba (c, &screen);
 	C_ARGS: cc, x, y, w, h
 
 void
@@ -2456,7 +2505,9 @@
 rxvt_img *
 rxvt_img::tint (SV *c)
 	INIT:
-        rgba cc = parse_rgba (c, THIS->s);
+	rxvt_screen screen;
+	screen.set (THIS->d);
+	rgba cc = parse_rgba (c, &screen);
 	C_ARGS: cc
 
 rxvt_img *