--- rxvt-unicode/src/rxvtperl.xs	2006/01/08 03:07:05	1.41
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/10 04:49:54	1.53
@@ -31,8 +31,9 @@
 #include <cstddef>
 #include <cstdarg>
 
-#include "rxvt.h"
 #include "iom.h"
+#include "rxvt.h"
+#include "keyboard.h"
 #include "rxvtutil.h"
 #include "rxvtperl.h"
 
@@ -51,6 +52,22 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
+static SV *
+taint (SV *sv)
+{
+  SvTAINT (sv);
+  return sv;
+}
+
+static SV *
+taint_if (SV *sv, SV *src)
+{
+  if (SvTAINTED (src))
+    SvTAINT (sv);
+
+  return sv;
+}
+
 static wchar_t *
 sv2wcs (SV *sv)
 {
@@ -398,13 +415,14 @@
     {
       char *argv[] = {
         "",
+        "-T",
         "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
       };
 
       perl = perl_alloc ();
       perl_construct (perl);
 
-      if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
+      if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
           || perl_run (perl))
         {
           rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
@@ -416,6 +434,17 @@
     }
 }
 
+static void
+ungrab (rxvt_term *THIS)
+{
+  if (THIS->perl.grabtime)
+    {
+      XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
+      XUngrabPointer  (THIS->display->display, THIS->perl.grabtime);
+      THIS->perl.grabtime = 0;
+    }
+}
+
 bool
 rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
 {
@@ -433,20 +462,25 @@
     {
       // handled later
     }
-  else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
+  else
     {
-      HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
-
-      if (HvKEYS (hv))
+      if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
         {
-          hv_iterinit (hv);
+          HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
+
+          if (HvKEYS (hv))
+            {
+              hv_iterinit (hv);
+
+              while (HE *he = hv_iternext (hv))
+                ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
+            }
 
-          while (HE *he = hv_iternext (hv))
-            ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
         }
+
+      if (!should_invoke [htype])
+        return false;
     }
-  else if (!should_invoke [htype])
-    return false;
 
   dSP;
   va_list ap;
@@ -475,7 +509,7 @@
           break;
 
         case DT_STR:
-          XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
+          XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
           break;
 
         case DT_STR_LEN:
@@ -483,7 +517,7 @@
             char *str = va_arg (ap, char *);
             int len = va_arg (ap, int);
 
-            XPUSHs (sv_2mortal (newSVpvn (str, len)));
+            XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
           }
           break;
 
@@ -492,7 +526,7 @@
             wchar_t *wstr = va_arg (ap, wchar_t *);
             int wlen = va_arg (ap, int);
 
-            XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
+            XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
           }
          break;
 
@@ -567,7 +601,10 @@
             LEAVE;
 
             if (SvTRUE (ERRSV))
-              rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
+              {
+                rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
+                ungrab (term); // better lose the grab than the session
+              }
 
             if (htype == HOOK_DESTROY)
               {
@@ -592,7 +629,10 @@
 
 BOOT:
 {
-  sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
+  sv_setsv (get_sv ("urxvt::LIBDIR",   1), newSVpvn (LIBDIR,   sizeof (LIBDIR)   - 1));
+  sv_setsv (get_sv ("urxvt::RESNAME",  1), newSVpvn (RESNAME,  sizeof (RESNAME)  - 1));
+  sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
+  sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
 
   AV *hookname = get_av ("urxvt::HOOKNAME", 1);
 # define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
@@ -631,6 +671,10 @@
   export_const_iv (Button4Mask);
   export_const_iv (Button5Mask);
   export_const_iv (AnyModifier);
+
+  export_const_iv (EVENT_NONE);
+  export_const_iv (EVENT_READ);
+  export_const_iv (EVENT_WRITE);
 }
 
 SV *
@@ -678,6 +722,21 @@
 	CODE:
         rxvt_fatal ("%s", msg);
 
+SV *
+untaint (SV *sv)
+	CODE:
+        RETVAL = newSVsv (sv);
+        SvTAINTED_off (RETVAL);
+        OUTPUT:
+        RETVAL
+
+bool
+safe ()
+	CODE:
+        RETVAL = !rxvt_tainted ();
+        OUTPUT:
+        RETVAL
+
 NV
 NOW ()
 	CODE:
@@ -767,27 +826,25 @@
         RETVAL
 
 void
-rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)
+rxvt_term::allow_events_async ()
 	CODE:
-        XAllowEvents (THIS->display->display, AsyncBoth, eventtime);
+        XAllowEvents (THIS->display->display, AsyncBoth,      THIS->perl.grabtime);
 
 void
-rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)
+rxvt_term::allow_events_sync ()
 	CODE:
-        XAllowEvents (THIS->display->display, SyncBoth, eventtime);
+        XAllowEvents (THIS->display->display, SyncBoth,       THIS->perl.grabtime);
 
 void
-rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)
+rxvt_term::allow_events_replay ()
 	CODE:
-        XAllowEvents (THIS->display->display, ReplayPointer, eventtime);
-        XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);
+        XAllowEvents (THIS->display->display, ReplayPointer,  THIS->perl.grabtime);
+        XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
 
 void
-rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)
+rxvt_term::ungrab ()
 	CODE:
-        THIS->perl.grabtime = 0;
-        XUngrabKeyboard (THIS->display->display, eventtime);
-        XUngrabPointer (THIS->display->display, eventtime);
+        ungrab (THIS);
 
 int
 rxvt_term::strwidth (SV *str)
@@ -816,7 +873,7 @@
 
         free (wstr);
 
-        RETVAL = newSVpv (mbstr, 0);
+        RETVAL = taint_if (newSVpv (mbstr, 0), str);
         free (mbstr);
 }
 	OUTPUT:
@@ -833,7 +890,7 @@
         wchar_t *wstr = rxvt_mbstowcs (data, len);
         rxvt_pop_locale ();
 
-        RETVAL = wcs2sv (wstr);
+        RETVAL = taint_if (wcs2sv (wstr), octets);
         free (wstr);
 }
 	OUTPUT:
@@ -890,6 +947,29 @@
         OUTPUT:
         RETVAL
 
+char *
+rxvt_term::display_id ()
+	ALIAS:
+           display_id = 0
+           locale     = 1
+	CODE:
+        switch (ix)
+          {
+            case 0: RETVAL = THIS->display->id; break;
+            case 1: RETVAL = THIS->locale;      break;
+          }
+        OUTPUT:
+        RETVAL
+
+int
+rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
+	CODE:
+        RETVAL = THIS->pty_ev.events;
+        if (events != EVENT_UNDEF)
+          THIS->pty_ev.set (events);
+	OUTPUT:
+        RETVAL
+
 U32
 rxvt_term::parent ()
 	CODE:
@@ -950,7 +1030,7 @@
             for (int col = 0; col < THIS->ncol; col++)
               wstr [col] = l.t [col];
 
-            XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
+            XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
 
             delete [] wstr;
           }
@@ -1081,7 +1161,7 @@
 
 	rxvt_pop_locale ();
 
-        RETVAL = wcs2sv (rstr, r - rstr);
+        RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
 
         delete [] rstr;
 }
@@ -1117,7 +1197,7 @@
           else
             *r++ = *s;
 
-        RETVAL = wcs2sv (rstr, r - rstr);
+        RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
 
         delete [] rstr;
 }
@@ -1149,7 +1229,7 @@
           croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
 
         if (GIMME_V != G_VOID)
-          XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
+          XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
 
         if (newval)
           {
@@ -1200,8 +1280,16 @@
         OUTPUT:
         RETVAL
 
+bool
+rxvt_term::parse_keysym (char *keysym, char *str)
+	CODE:
+        RETVAL = 0 < THIS->parse_keysym (keysym, str);
+        THIS->keyboard->register_done ();
+	OUTPUT:
+        RETVAL
+
 void
-rxvt_term::cur (...)
+rxvt_term::screen_cur (...)
 	PROTOTYPE: $;$$
         ALIAS:
            screen_cur     = 0
@@ -1232,6 +1320,13 @@
           }
 }
 
+char
+rxvt_term::cur_charset ()
+	CODE:
+        RETVAL = THIS->charsets [THIS->screen.charset];
+	OUTPUT:
+        RETVAL
+
 int
 rxvt_term::selection_grab (U32 eventtime)
 
@@ -1240,7 +1335,9 @@
         PPCODE:
 {
         if (GIMME_V != G_VOID)
-          XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
+          XPUSHs (THIS->selection.text
+                  ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
+                  : &PL_sv_undef);
 
         if (newtext)
           {
@@ -1252,6 +1349,15 @@
 }
 
 void
+rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
+
+void
+rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
+
+void
+rxvt_term::scr_bell ()
+
+void
 rxvt_term::scr_add_lines (SV *string)
 	CODE:
 {