--- rxvt-unicode/src/rxvtperl.xs	2011/01/07 21:17:08	1.136
+++ rxvt-unicode/src/rxvtperl.xs	2011/03/24 17:34:29	1.139
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2005-2008,2011 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
@@ -415,8 +415,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 +584,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 +613,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
@@ -853,6 +873,21 @@
             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);
+        RETVAL = (IV)req;
+	OUTPUT:
+        RETVAL
+
+void
+_delete_selection_request (IV req_)
+	CODE:
+        rxvt_selection *req = (rxvt_selection *)req_;
+        delete req;
+
 MODULE = urxvt             PACKAGE = urxvt::term
 
 SV *