From efff737e1d5475ed52e6a60decc1b34e6758b828 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Mon, 9 Jan 2006 05:08:02 +0000
Subject: [PATCH] *** empty log message ***

---
 src/rxvtperl.xs   | 7 +++++++
 src/rxvttoolkit.C | 7 ++++---
 src/urxvt.pm      | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index ea65dd50..c5ea2909 100644
--- 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 d1c98962..46dead6d 100644
--- 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 19ff7696..f8ac8434 100644
--- 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";
 }
-- 
2.34.1