Patch from upstream request tracker

X11_Protocol.patch (text/plain), 2.00 KB, created by Richard Yao (RETIRED) on 2011-12-16 23:16:43 UTC

diff -aur /Users/ajw/Downloads/X11-Protocol-0.53/Protocol/Connection/UNIXSocket.pm ./Protocol/Connection/UNIXSocket.pm
--- /Users/ajw/Downloads/X11-Protocol-0.53/Protocol/Connection/UNIXSocket.pm	2003-02-15 17:44:43.000000000 +0000
+++ ./Protocol/Connection/UNIXSocket.pm	2011-10-04 09:24:12.000000000 +0100
@@ -20,8 +20,9 @@
 sub open {
     my($pkg) = shift;
     my($host, $dispnum) = @_;
+    if ($host eq 'unix') { $host = '/tmp/.X11-unix/X$dispnum' };
     my($sock) = IO::Socket::UNIX->new('Type' => SOCK_STREAM(),
-				      'Peer' => "/tmp/.X11-unix/X$dispnum");
+				      'Peer' => $host);
     croak "Can't connect to display `unix:$dispnum': $!" unless $sock;
     $sock->autoflush(0);
     return bless \$sock, $pkg;
diff -aur /Users/ajw/Downloads/X11-Protocol-0.53/Protocol.pm ./Protocol.pm
--- /Users/ajw/Downloads/X11-Protocol-0.53/Protocol.pm	2004-04-04 21:16:20.000000000 +0100
+++ ./Protocol.pm	2011-10-04 09:23:56.000000000 +0100
@@ -2251,13 +2251,18 @@
     }
 
     unless ($conn) {
-	$display =~ /^(?:[^:]*?\/)?(.*):(\d+)(?:.(\d+))?$/
-	    or croak "Invalid display: `$display'\n";
-	$host = $Default_Display unless $host = $1;
-	$dispnum = $2;
-	$screen = 0 unless $screen = $3;
+	if (-e $display){
+		$host = $display;
+	}
+	else{
+	 	$display =~ /^(?:[^:]*?\/)?(.*):(\d+)(?:.(\d+))?$/
+ 		    or croak "Invalid display: `$display'\n";
+ 		$host = $Default_Display unless $host = $1;
+ 		$dispnum = $2;
+ 		$screen = 0 unless $screen = $3;
+	}
 	if ($] >= 5.00301) { # IO::Socket is bundled
-	    if ($host eq 'unix') {
+	    if ($host eq 'unix' or -e $host) {
 		require 'X11/Protocol/Connection/UNIXSocket.pm';
 		$conn = X11::Protocol::Connection::UNIXSocket
 		    ->open($host, $dispnum);
@@ -2270,7 +2275,7 @@
 		$family = 'Internet';
 	    }
 	} else { # Use FileHandle
-	    if ($host eq 'unix') {
+	    if ($host eq 'unix' or -e $host) {
 		require 'X11/Protocol/Connection/UNIXFH.pm';
 		$conn = X11::Protocol::Connection::UNIXFH
 		    ->open($host, $dispnum);