[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtperl.xs

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.223 by root, Sun May 18 18:09:52 2014 UTC vs.
Revision 1.248 by sf-exg, Sat May 8 06:16:21 2021 UTC

 /*----------------------------------------------------------------------*
  * File:	rxvtperl.xs
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2005-2014 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
       if (len != 1 && len != 3 && len != 4)
         croak ("component colour array must have 1, 3 or 4 components,");
       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.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
-          c.b = float_to_component (SvIV (*av_fetch (av, 2, 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)
     {
       rxvt_color rc;
       break;
   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;
   THIS->want_refresh = 1;
 struct rxvt_perl_interp rxvt_perl;
 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)
     {
       perl_destruct (perl);
       perl_free (perl);
       PERL_SYS_TERM ();
     }
 }
+#endif
 void
 rxvt_perl_interp::init ()
 {
   if (!perl)
       {
         perl_environ = rxvt_environ;
         localise_env set_environ (perl_environ);
-        char *args[] = {
+        const char *args[] = {
           "",
           "-e"
           "BEGIN {"
           "   urxvt->bootstrap;"
           "   unshift @INC, '" LIBDIR "';"
           "}"
           ""
-          "use urxvt;"
+          "use urxvt;",
+          0
         };
-        int argc = ecb_array_length (args);
+        int argc = ecb_array_length (args) - 1;
-        char **argv = args;
+        char **argv = (char **)args;
         PERL_SYS_INIT3 (&argc, &argv, &environ);
         perl = perl_alloc ();
         perl_construct (perl);
 }
 static void
 _keysym_resource_push (rxvt_term *term, const char *k, const char *v)
 {
+  unsigned int state;
+  if (term->parse_keysym (k, state) == -1)
+    return;
   dSP;
   XPUSHs (sv_2mortal (newSVpv (v, 0)));
   PUTBACK;
 }
     const_iv (XIMLineEnd),
     const_iv (XIMAbsolutePosition),
     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--)
     newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
 }
 void
-log (const char *msg)
+log (utf8_string msg)
 	CODE:
         rxvt_log ("%s", msg);
 void
-warn (const char *msg)
+warn (utf8_string msg)
 	CODE:
         rxvt_warn ("%s", msg);
 void
-fatal (const char *msg)
+fatal (utf8_string msg)
 	CODE:
         rxvt_fatal ("%s", msg);
 void
 _exit (int status)
 rxvt_term::ungrab ()
 	CODE:
         ungrab (THIS);
 int
-rxvt_term::XStringToKeysym (char *string)
+rxvt_term::XStringToKeysym (octet_string string)
 	CODE:
         RETVAL = XStringToKeysym (string);
 	OUTPUT: RETVAL
 char *
 	OUTPUT: RETVAL
 int
 rxvt_term::XKeycodeToKeysym (int code, int index)
 	CODE:
-        RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
+        RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
 	OUTPUT: RETVAL
 int
 rxvt_term::strwidth (SV *str)
 	CODE:
 #define TERM_OFFSET_saveLines   TERM_OFFSET(saveLines)
 #define TERM_OFFSET_total_rows  TERM_OFFSET(total_rows)
 #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
            fwidth      = TERM_OFFSET_fwidth
            fheight     = TERM_OFFSET_fheight
            saveLines   = TERM_OFFSET_saveLines
            total_rows  = TERM_OFFSET_total_rows
            top_row     = TERM_OFFSET_top_row
 	CODE:
         RETVAL = *(int *)((char *)THIS + ix);
+        if (items > 1)
+          *(int *)((char *)THIS + ix) = new_value;
         OUTPUT:
         RETVAL
 unsigned int
 rxvt_term::ModLevel3Mask ()
            ModLevel3Mask  = 0
            ModMetaMask    = 1
            ModNumLockMask = 2
            current_screen = 3
            hidden_cursor  = 4
+           priv_modes     = 5
 	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;
 #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
 char *
 void
 rxvt_term::want_refresh ()
 	CODE:
         THIS->want_refresh = 1;
 	THIS->refresh_check ();
+void
+rxvt_term::refresh_check ()
 void
 rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
 	PPCODE:
 {
               *r++ = NOCHAR;
           }
 	rxvt_pop_locale ();
+        free (wstr);
         RETVAL = wcs2sv (rstr, r - rstr);
 }
 	OUTPUT:
         RETVAL
           else if (IS_COMPOSE (*s))
             r += rxvt_composite.expand (*s, r);
           else
             *r++ = *s;
+        free (wstr);
         RETVAL = wcs2sv (rstr, r - rstr);
 }
 	OUTPUT:
         RETVAL
 void
-rxvt_term::_resource (char *name, int index, SV *newval = 0)
+rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
 	PPCODE:
 {
 	static const struct resval { const char *name; int value; } *rs, rslist [] = {
 #	  define def(name) { # name, Rs_ ## name },
 #	  define reserve(name,count)
             index += rs->value;
           }
         else
           {
             --rs;
-            name = "";
+            name = (octet_string)"";
           }
         if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
           croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
               THIS->rs [index] = 0;
           }
 }
 const char *
-rxvt_term::x_resource (const char *name)
+rxvt_term::x_resource (octet_string name)
 bool
 rxvt_term::option (U8 optval, int set = -1)
 	CODE:
 {
                     THIS->cursor_blink_reset ();
                     break;
 #endif
                   case Opt_cursorUnderline:
+                    THIS->cursor_type = set ? 1 : 0;
                     THIS->want_refresh = 1;
                     THIS->refresh_check ();
                     break;
 #                  case Opt_scrollBar_floating:
           }
 }
         OUTPUT:
         RETVAL
+SV *
+rxvt_term::lookup_keysym (int keysym, unsigned int state)
+        CODE:
+{
+        keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
+        RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
+}
+        OUTPUT:
+        RETVAL
 bool
-rxvt_term::bind_action (char *keysym, char *str)
+rxvt_term::bind_action (octet_string keysym, octet_string action)
         ALIAS:
            parse_keysym = 1
 	CODE:
-        RETVAL = 0 < THIS->bind_action (keysym, str);
+        RETVAL = 0 < THIS->bind_action (keysym, action);
         THIS->keyboard->register_done ();
 	OUTPUT:
         RETVAL
 void
 void
 rxvt_term::scr_bell ()
 void
-rxvt_term::scr_recolour (bool refresh = true);
+rxvt_term::scr_recolor (bool refresh = true);
 void
 rxvt_term::scr_change_screen (int screen)
 void
         RETVAL
 #endif
 void
-rxvt_term::set_background (rxvt_img *img, bool border = false)
+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_flags = 0;
+        THIS->bg_img = 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
             if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
               img->sub_rect (0, 0,
             img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
                ->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;
           }
 void
 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
 rxvt_img::DESTROY ()
 	CODE:
 rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
 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 *
 rxvt_img::shade (rxvt_img::nv factor)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.223 by root, Sun May 18 18:09:52 2014 UTC vs. Revision 1.248 by sf-exg, Sat May 8 06:16:21 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.223 by root, Sun May 18 18:09:52 2014 UTC vs.
Revision 1.248 by sf-exg, Sat May 8 06:16:21 2021 UTC