X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/56801e3d8daa0638bec8753c3790de586f8f7d11..934dbf050b7f8043eab8f0f04365f18a6b9055f3:/unix/uxputty.c

diff --git a/unix/uxputty.c b/unix/uxputty.c
index ca1208d6..54e0d71b 100644
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -7,31 +7,16 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <unistd.h>
+#include <gdk/gdk.h>
 
 #include "putty.h"
 #include "storage.h"
 
 /*
- * TODO:
- * 
- *  - Go through all the config options and ensure they can all be
- *    configured and reconfigured properly.
- *     + icon title appears to be a non-option on Unix.
- *     + Why the hell did I faff about disabling two of the vtmode
- * 	 options? The rest aren't used either in pterm! Work out
- * 	 whether they should be, and how they can be.
- *     + Refresh in the codepage combo is badly broken.
- *     + `Don't translate line drawing chars' ?? What is this crap?
- * 	 It does nothing at all, and where's the option to paste as
- * 	 lqqqk? What was I smoking?
- *
- *  - 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.
@@ -61,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;
 
@@ -119,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;
 }
 
@@ -127,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);