And everyone's favourite cosmetic change: Unix PuTTY now doesn't

[u/mdw/putty] / unix / pterm.c

diff --git a/unix/pterm.c b/unix/pterm.c
index 3eafe14..177e53a 100644 (file)
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -184,6 +184,17 @@ static Mouse_Button translate_button(Mouse_Button button)
 }
 
 /*
+ * Return the top-level GtkWindow associated with a particular
+ * front end instance.
+ */
+void *get_window(void *frontend)
+{
+    Terminal *term = (Terminal *)frontend;
+    struct gui_data *inst = (struct gui_data *)term->frontend;
+    return inst->window;
+}
+
+/*
  * Minimise or restore the window in response to a server-side
  * request.
  */
@@ -2298,11 +2309,6 @@ int pt_main(int argc, char **argv)
 
     inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-    if (inst->cfg.wintitle[0])
-       set_title(inst, inst->cfg.wintitle);
-    else
-       set_title(inst, "pterm");
-
     /*
      * Set up the colour map.
      */
@@ -2402,10 +2408,19 @@ int pt_main(int argc, char **argv)
 
     inst->back = select_backend(&inst->cfg);
     {
-       char *realhost;                /* FIXME: don't ignore this! */
+       char *realhost;
+
        inst->back->init((void *)inst->term, &inst->backhandle, &inst->cfg,
                         inst->cfg.host, inst->cfg.port, &realhost,
                         inst->cfg.tcp_nodelay);
+
+        if (inst->cfg.wintitle[0])
+            set_title(inst, inst->cfg.wintitle);
+        else {
+            char *title = make_default_wintitle(realhost);
+            set_title(inst, title);
+            sfree(title);
+        }
     }
     inst->back->provide_logctx(inst->backhandle, inst->logctx);