--- rxvt-unicode/src/rxvtperl.xs	2006/01/08 22:58:13	1.44
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/11 00:59:58	1.54
@@ -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"
 
@@ -433,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, ...)
 {
@@ -450,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;
@@ -584,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)
               {
@@ -609,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));
@@ -648,37 +671,11 @@
   export_const_iv (Button4Mask);
   export_const_iv (Button5Mask);
   export_const_iv (AnyModifier);
-}
-
-SV *
-new (...)
-	CODE:
-{
-	stringvec *argv = new stringvec;
-        bool success;
 
-        for (int i = 0; i < items ;i++)
-          argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
-
-        rxvt_term *term = new rxvt_term;
-
-        term->argv = argv;
-
-        try
-          {
-            if (!term->init (argv->size (), argv->begin ()))
-              term = 0;
-          }
-        catch (const class rxvt_failure_exception &e)
-          {
-            term->destroy ();
-            croak ("exception caught while initializing new terminal instance");
-          }
-
-        RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
+  export_const_iv (EVENT_NONE);
+  export_const_iv (EVENT_READ);
+  export_const_iv (EVENT_WRITE);
 }
-	OUTPUT:
-        RETVAL
 
 void
 set_should_invoke (int htype, int value)
@@ -695,6 +692,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:
@@ -752,6 +764,50 @@
 
 MODULE = urxvt             PACKAGE = urxvt::term
 
+SV *
+_new (...)
+	CODE:
+{
+	if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
+          croak ("first argument to urxvt::term->_new must be arrayref");
+
+        rxvt_term *term = new rxvt_term;
+
+	term->argv = new stringvec;
+	term->envv = new stringvec;
+
+        for (int i = 1; i < items; i++)
+          term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
+
+        AV *envv = (AV *)SvRV (ST (0));
+        for (int i = av_len (envv) + 1; i--; )
+          term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
+
+        term->envv->push_back (0);
+
+        bool success;
+
+        try
+          {
+            success = term->init (term->argv->size (), term->argv->begin ());
+          }
+        catch (const class rxvt_failure_exception &e)
+          {
+            success = false;
+          }
+
+        if (!success)
+          {
+            term->destroy ();
+            croak ("error while initializing new terminal instance");
+          }
+
+        RETVAL = term && term->perl.self
+                 ? newSVterm (term) : &PL_sv_undef;
+}
+	OUTPUT:
+        RETVAL
+
 void
 rxvt_term::destroy ()
 
@@ -802,14 +858,7 @@
 void
 rxvt_term::ungrab ()
 	CODE:
-{
-        if (THIS->perl.grabtime)
-          {
-            XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
-            XUngrabPointer  (THIS->display->display, THIS->perl.grabtime);
-            THIS->perl.grabtime = 0;
-          }
-}
+        ungrab (THIS);
 
 int
 rxvt_term::strwidth (SV *str)
@@ -912,6 +961,49 @@
         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
+
+SV *
+rxvt_term::_env ()
+	CODE:
+{
+        if (THIS->envv)
+          {
+            AV *av = newAV ();
+
+            for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
+              if (*i)
+                av_push (av, newSVpv (*i, 0));
+
+            RETVAL = newRV_noinc ((SV *)av);
+          }
+        else
+          RETVAL = &PL_sv_undef;
+}
+        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:
@@ -1222,8 +1314,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
@@ -1254,6 +1354,13 @@
           }
 }
 
+char
+rxvt_term::cur_charset ()
+	CODE:
+        RETVAL = THIS->charsets [THIS->screen.charset];
+	OUTPUT:
+        RETVAL
+
 int
 rxvt_term::selection_grab (U32 eventtime)
 
@@ -1262,7 +1369,9 @@
         PPCODE:
 {
         if (GIMME_V != G_VOID)
-          XPUSHs (taint (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)
           {
@@ -1274,6 +1383,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:
 {