*** empty log message ***

diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index ea65dd50b755e771173fad37d47aee3e7f38f133..c5ea2909d6b804987f1e4f1659f018c0a8b76949 100644 (file)
--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -934,6 +934,13 @@ rxvt_term::ModLevel3Mask ()
         OUTPUT:
         RETVAL
 
+char *
+rxvt_term::display_id ()
+       CODE:
+        RETVAL = THIS->display->id;
+        OUTPUT:
+        RETVAL
+
 U32
 rxvt_term::parent ()
        CODE:

diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index d1c98962c24ce1e95b41504ca9b6833fc6adf6a1..46dead6da1ad5579d273f28cc08e7e172b511739 100644 (file)
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -229,6 +229,9 @@ bool rxvt_display::init ()
 
 rxvt_display::~rxvt_display ()
 {
+  if (!display)
+    return;
+
 #ifdef POINTER_BLANK
   XFreeCursor (display, blank_cursor);
 #endif
@@ -236,9 +239,7 @@ rxvt_display::~rxvt_display ()
 #ifdef USE_XIM
   xims.clear ();
 #endif
-
-  if (display)
-    XCloseDisplay (display);
+  XCloseDisplay (display);
 }
 
 #ifdef USE_XIM

diff --git a/src/urxvt.pm b/src/urxvt.pm
index 19ff76966152ce2f9d4b8909219b76288f3f9349..f8ac8434f29fca6ada8135adbc0813a3db9ea357 100644 (file)
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -1217,6 +1217,7 @@ sub show {
 
    urxvt->new ("--perl-lib" => "", "--perl-ext-common" => "", "-pty-fd" => -1, "-sl" => 0, "-b" => 0,
                "--transient-for" => $self->{term}->parent,
+               "-display" => $self->{term}->display_id,
                "-pe" => "urxvt-popup")
       or die "unable to create popup window\n";
 }