X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/3900c2d642c2960fdac52a9afea854a375441fcc..aef05b788c268d43559a0183d1efe9c458724b94:/unix/uxputty.c

diff --git a/unix/uxputty.c b/unix/uxputty.c
index a205f276..0abc1ff8 100644
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -7,20 +7,16 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <unistd.h>
+#include <gdk/gdk.h>
 
 #include "putty.h"
 #include "storage.h"
 
 /*
- * TODO:
- *
- *  - Better control of the individual config box features.
- *     + SSH packet logging shouldn't be mentioned in pterm, and in
- * 	 fact not PuTTYtel either.
- *     + Keepalives, and the Connection panel in general, shouldn't
- * 	 crop up in pterm. (And perhaps also not mid-session in
- * 	 rlogin and raw?)
+ * 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.
@@ -50,7 +46,7 @@ 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;
@@ -116,6 +112,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);