Attachment 2871 Details for Bug 2341 – OSX X11: if using launchd socket, remove the screen number

[patch] OSX X11: if using launchd socket, remove the screen number

osx.patch (text/plain), 1002 bytes, created by Darren Tucker on 2016-09-07 10:29:09 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2016-09-07 10:29:09 AEST

Size: 1002 bytes

patch

obsolete

>@@ -4041,15 +4041,35 @@ x11_connect_display(void)
> 	 * connection to the real X server.
> 	 */
> 
>-	/* Check if the display is from launchd. */
> #ifdef __APPLE__
>-	if (strncmp(display, "/tmp/launch", 11) == 0) {
>-		sock = connect_local_xsocket_path(display);
>-		if (sock < 0)
>-			return -1;
>+	/* Check if display is a path to a socket (as set by launchd). */
>+	{
>+		char path[PATH_MAX];
>+		struct stat sbuf;
>+		int is_path_to_socket = 0;
>+
>+		strlcpy(path, display, sizeof(path));
>+		if (0 == stat(path, &sbuf)) {
>+			is_path_to_socket = 1;
>+		} else {
>+			char *dot = strrchr(path, '.');
>+			if (dot) {
>+				*dot = '\0';
>+				if (0 == stat(path, &sbuf)) {
>+					is_path_to_socket=1;
>+				}
>+			}
>+		}
> 
>-		/* OK, we now have a connection to the display. */
>-		return sock;
>+		if (is_path_to_socket) {
>+			/* Create a socket. */
>+			sock = connect_local_xsocket_path(path);
>+			if (sock < 0)
>+				return -1;
>+
>+			/* OK, we now have a connection to the display. */
>+			return sock;
>+		}
> 	}
> #endif
> 	/*

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 2341: 2585 | 2871 | 2915 | 2916 | 2917