+/*
+ * Platform-independent bits of X11 forwarding.
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
return atoi(display + n + 1);
}
+/* Find the right display, returns an allocated string */
+char *x11_display(const char *display) {
+ char *ret;
+ if(!display || !*display) {
+ /* try to find platform-specific local display */
+ if(!(ret = platform_get_x_display()))
+ /* plausible default for all platforms */
+ ret = dupstr(":0");
+ } else
+ ret = dupstr(display);
+ if(ret[0] == ':') {
+ /* no transport specified, use whatever we think is best */
+ char *s = dupcat(platform_x11_best_transport, display, (char *)0);
+ sfree(ret);
+ return s;
+ } else
+ return ret;
+}
+
/*
* Called to set up the raw connection.
*
int n, displaynum;
struct X11Private *pr;
+ /* default display */
+ display = x11_display(display);
/*
* Split up display name into host and display-number parts.
*/
n = strcspn(display, ":");
+ assert(n != 0); /* x11_display() promises this */
if (display[n])
displaynum = atoi(display + n + 1);
else
displaynum = 0; /* sensible default */
if (n > sizeof(host) - 1)
n = sizeof(host) - 1;
- if (n > 0) {
- strncpy(host, display, n);
- host[n] = '\0';
+ strncpy(host, display, n);
+ host[n] = '\0';
+ sfree(display);
+
+ if(!strcmp(host, "unix")) {
+ /* use AF_UNIX sockets (doesn't make sense on all platforms) */
+ addr = platform_get_x11_unix_address(displaynum,
+ &dummy_realhost);
+ port = 0; /* to show we are not confused */
} else {
+ port = 6000 + displaynum;
+
/*
- * Local display numbers, particularly on Unix, often omit
- * the display part completely.
+ * Try to find host.
*/
- strcpy(host, "localhost");
- }
-
- port = 6000 + displaynum;
-
- /*
- * Try to find host.
- */
- addr = name_lookup(host, port, &dummy_realhost, cfg);
- if ((err = sk_addr_error(addr)) != NULL) {
- sk_addr_free(addr);
- return err;
+ addr = name_lookup(host, port, &dummy_realhost, cfg);
+ if ((err = sk_addr_error(addr)) != NULL) {
+ sk_addr_free(addr);
+ return err;
+ }
}
/*
pr->c = c;
pr->s = *s = new_connection(addr, dummy_realhost, port,
- 0, 1, 0, (Plug) pr, cfg);
+ 0, 1, 0, 0, (Plug) pr, cfg);
if ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;