--- rxvt-unicode/src/rxvtperl.xs	2011/02/21 07:41:03	1.137
+++ rxvt-unicode/src/rxvtperl.xs	2011/12/06 11:29:52	1.147
@@ -343,7 +343,7 @@
           ""
           "use urxvt;"
         };
-        int argc = ARRAY_LENGTH(args);
+        int argc = ecb_array_length (args);
         char **argv = args;
 
         PERL_SYS_INIT3 (&argc, &argv, &environ);
@@ -369,6 +369,7 @@
       // runs outside of perls ENV
       term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
       hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
+      hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
     }
 }
 
@@ -399,6 +400,16 @@
       for (int i = 0; i <= AvFILL (av); i++)
         ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
     }
+  else if (htype == HOOK_DESTROY)
+    {
+      AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
+
+      for (int i = AvFILL (av); i >= 0; i--)
+        {
+          rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
+          delete req;
+        }
+    }
 
   bool event_consumed;
 
@@ -415,8 +426,9 @@
 
       PUSHMARK (SP);
 
-      XPUSHs (sv_2mortal (newSVterm (term)));
-      XPUSHs (sv_2mortal (newSViv (htype)));
+      EXTEND (SP, 2);
+      PUSHs (sv_2mortal (newSVterm (term)));
+      PUSHs (sv_2mortal (newSViv (htype)));
 
       for (;;) {
         data_type dt = (data_type)va_arg (ap, int);
@@ -583,7 +595,7 @@
 
       if (SvTRUE (ERRSV))
         {
-          rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
+          rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
           ungrab (term); // better lose the grab than the session
         }
 
@@ -612,6 +624,25 @@
   return event_consumed;
 }
 
+void
+rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
+{
+  localise_env set_environ (perl_environ);
+
+  ENTER;
+  SAVETMPS;
+
+  dSP;
+  XPUSHs (sv_2mortal (newSVpvn (data, len)));
+  call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
+
+  if (SvTRUE (ERRSV))
+    rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
+
+  FREETMPS;
+  LEAVE;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 
 MODULE = urxvt             PACKAGE = urxvt
@@ -770,8 +801,8 @@
 #   endif
   };
 
-  for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; )
-    newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
+  for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
+    newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
 }
 
 void
@@ -853,6 +884,35 @@
             PUSHs (sv_2mortal (newSVterm (*t)));
 }
 
+IV
+_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
+	CODE:
+        rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
+        req->cb_sv = newSVsv (cb);
+        AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
+        av_push (av, newSViv ((IV)req));
+        RETVAL = (IV)req;
+	OUTPUT:
+        RETVAL
+
+void
+_delete_selection_request (IV req_)
+	CODE:
+        rxvt_selection *req = (rxvt_selection *)req_;
+        AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
+        int i;
+
+        for (i = AvFILL (av); i >= 0; i--)
+          if (SvIV (*av_fetch (av, i, 1)) == req_)
+            break;
+
+        for (; i < AvFILL (av); i++)
+          av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
+
+        av_pop (av);
+
+        delete req;
+
 MODULE = urxvt             PACKAGE = urxvt::term
 
 SV *
@@ -870,8 +930,6 @@
         for (int i = AvFILL (env) + 1; i--; )
           envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
 
-        envv->push_back (0);
-
         try
           {
             term->init (argv, envv);
@@ -921,11 +979,6 @@
 	CODE:
 	XUngrabKey (THIS->dpy, keycode, modifiers, window);
 
-void
-rxvt_term::XUngrabKeyboard (Time eventtime)
-	CODE:
-	XUngrabKeyboard (THIS->dpy, eventtime);
-
 bool
 rxvt_term::grab (Time eventtime, int sync = 0)
 	CODE:
@@ -1169,7 +1222,7 @@
 Window
 rxvt_term::parent ()
 	CODE:
-        RETVAL = THIS->parent [0];
+        RETVAL = THIS->parent;
         OUTPUT:
         RETVAL
 
@@ -1208,6 +1261,9 @@
 	RETVAL
 
 void
+rxvt_term::set_urgency (bool enable)
+
+void
 rxvt_term::focus_in ()
 
 void
@@ -1448,7 +1504,7 @@
 #	  undef reserve
         };
 
-        rs = rslist + ARRAY_LENGTH(rslist);
+        rs = rslist + ecb_array_length (rslist);
 
         if (*name)
           {
@@ -1532,6 +1588,13 @@
         RETVAL
 
 void
+rxvt_term::register_command (int keysym, unsigned int state, SV *str)
+        CODE:
+        wchar_t *wstr = sv2wcs (str);
+        THIS->keyboard->register_user_translation (keysym, state, wstr);
+        free (wstr);
+
+void
 rxvt_term::screen_cur (...)
 	PROTOTYPE: $;$$
         ALIAS: