--- rxvt-unicode/src/rxvtperl.xs	2006/01/08 08:43:11	1.42
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/09 19:25:57	1.49
@@ -408,20 +408,20 @@
 }
 
 void
-rxvt_perl_interp::init (bool tainted)
+rxvt_perl_interp::init ()
 {
   if (!perl)
     {
       char *argv[] = {
         "",
-        "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
         "-T",
+        "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
       };
 
       perl = perl_alloc ();
       perl_construct (perl);
 
-      if (perl_parse (perl, xs_init, 2 + !!tainted, 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");
@@ -433,6 +433,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, ...)
 {
@@ -584,7 +595,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)
               {
@@ -695,6 +709,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:
@@ -784,27 +813,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)
@@ -907,6 +934,20 @@
         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
+
 U32
 rxvt_term::parent ()
 	CODE:
@@ -1218,7 +1259,7 @@
         RETVAL
 
 void
-rxvt_term::cur (...)
+rxvt_term::screen_cur (...)
 	PROTOTYPE: $;$$
         ALIAS:
            screen_cur     = 0
@@ -1257,7 +1298,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)
           {