X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxputty.c;h=d71d28988d6501138455a36aeb9a6f0dc7e2b1c0;hb=92f3b101f550c164953b4a490e706ebd0d9f1374;hp=f3da5e120b95c23932bc6fa55c5574570d2f6830;hpb=d93f7113d1564d9e2b23863e3aa7049b64b7f926;p=PuTTY.git

diff --git a/unix/uxputty.c b/unix/uxputty.c
index f3da5e12..d71d2898 100644
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -7,47 +7,11 @@
 #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.
- * 
- *  - Remainder of the context menu:
- * 
- *     - New Session, Duplicate Session and the Saved Sessions
- * 	 submenu.
- * 	  + at least New and Duplicate probably _should_ be in
- * 	    pterm.
- *        + Duplicate Session will be fun, since we must work out
- *          how to pass the config data through.
- *        + In fact this should be easier on Unix, since fork() is
- *          available so we need not even exec (this also saves us
- *          the trouble of scrabbling around trying to find our own
- *          binary). Possible scenario: respond to Duplicate
- *          Session by forking. Parent continues as before; child
- *          unceremoniously frees all extant resources (backend,
- *          terminal, ldisc, frontend etc) and then _longjmps_ (I
- *          kid you not) back to a point in pt_main() which causes
- *          it to go back round to the point of opening a new
- *          terminal window and a new backend.
- *        + A tricky bit here is how to free everything without
- *          also _destroying_ things - calling GTK to free up
- *          existing widgets is liable to send destroy messages to
- *          the X server, which won't go down too well with the
- *          parent process. exec() is a much cleaner solution to
- *          this bit, but requires us to invent some ghastly IPC as
- *          we did in Windows PuTTY.
- *        + Arrgh! Also, this won't work in pterm since we'll
- *          already have dropped privileges by this point, so we
- *          can't get another pty. Sigh. Looks like exec has to be
- *          the way forward then :-/
- */
-
 /*
  * Clean up and exit.
  */
@@ -81,7 +45,7 @@ int cfgbox(Config *cfg)
 
 static int got_host = 0;
 
-const int use_event_log = 1;
+const int use_event_log = 1, new_session = 1, saved_sessions = 1;
 
 int process_nonoption_arg(char *arg, Config *cfg)
 {
@@ -142,6 +106,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);