X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxputty.c;h=54e0d71bde7302aba40b33721a1023f369a090f1;hb=90e7bf4228fa74fda1c65cb2597c9d964329f702;hp=6b1eabb7cbf7df03348492b528e1ff60df8c330a;hpb=1f5780ad9f731f7687362577268e812e0746e761;p=PuTTY.git

diff --git a/unix/uxputty.c b/unix/uxputty.c
index 6b1eabb7..54e0d71b 100644
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -7,10 +7,17 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <unistd.h>
+#include <gdk/gdk.h>
 
 #include "putty.h"
 #include "storage.h"
 
+/*
+ * Stubs to avoid uxpty.c needing to be linked in.
+ */
+const int use_pty_argv = FALSE;
+char **pty_argv;		       /* never used */
+
 /*
  * Clean up and exit.
  */
@@ -39,14 +46,14 @@ Backend *select_backend(Config *cfg)
 
 int cfgbox(Config *cfg)
 {
-    return do_config_box("PuTTY Configuration", cfg, 0);
+    return do_config_box("PuTTY Configuration", cfg, 0, 0);
 }
 
 static int got_host = 0;
 
 const int use_event_log = 1, new_session = 1, saved_sessions = 1;
 
-int process_nonoption_arg(char *arg, Config *cfg)
+int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
 {
     char *p, *q = arg;
 
@@ -97,6 +104,8 @@ int process_nonoption_arg(char *arg, Config *cfg)
         cfg->host[sizeof(cfg->host) - 1] = '\0';
         got_host = 1;
     }
+    if (got_host)
+	*allow_launch = TRUE;
     return 1;
 }
 
@@ -105,6 +114,21 @@ char *make_default_wintitle(char *hostname)
     return dupcat(hostname, " - PuTTY", NULL);
 }
 
+/*
+ * X11-forwarding-related things suitable for Gtk app.
+ */
+
+const char platform_x11_best_transport[] = "unix";
+
+char *platform_get_x_display(void) {
+    const char *display;
+    /* Try to take account of --display and what have you. */
+    if (!(display = gdk_get_display()))
+	/* fall back to traditional method */
+	display = getenv("DISPLAY");
+    return dupstr(display);
+}
+
 int main(int argc, char **argv)
 {
     extern int pt_main(int argc, char **argv);