X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1d009ae71b849a95c86c3117d1b8f063fda8aae5..46a3419bd5693b8b3e42290e370d10aa82c67b61:/unix/pterm.c

diff --git a/unix/pterm.c b/unix/pterm.c
index 3eafe14a..0ac3e305 100644
--- 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.
  */
@@ -1905,6 +1916,17 @@ void modalfatalbox(char *p, ...)
     exit(1);
 }
 
+void cmdline_error(char *p, ...)
+{
+    va_list ap;
+    fprintf(stderr, "plink: ");
+    va_start(ap, p);
+    vfprintf(stderr, p, ap);
+    va_end(ap);
+    fputc('\n', stderr);
+    exit(1);
+}
+
 char *get_x_display(void *frontend)
 {
     return gdk_get_display();
@@ -1977,6 +1999,20 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
     char *val;
     while (--argc > 0) {
 	char *p = *++argv;
+        int ret;
+
+        ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
+                                    do_everything ? 1 : -1, cfg);
+
+	if (ret == -2) {
+	    cmdline_error("option \"%s\" requires an argument", p);
+	} else if (ret == 2) {
+	    --argc, ++argv;            /* skip next argument */
+            continue;
+	} else if (ret == 1) {
+            continue;
+        }
+
 	if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
@@ -2124,6 +2160,10 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
 	    help(stdout);
 	    exit(0);
 	    
+	} else if(p[0] != '-' && (!do_everything ||
+                                  process_nonoption_arg(p, cfg))) {
+            /* do nothing */
+
 	} else {
 	    err = 1;
 	    fprintf(stderr, "pterm: unrecognized option '%s'\n", p);
@@ -2246,7 +2286,9 @@ int pt_main(int argc, char **argv)
     if (do_cmdline(argc, argv, 1, &inst->cfg))
 	exit(1);		       /* post-defaults, do everything */
 
-    if (!cfgbox(&inst->cfg))
+    cmdline_run_saved(&inst->cfg);
+
+    if (!*inst->cfg.host && !cfgbox(&inst->cfg))
 	exit(0);		       /* config box hit Cancel */
 
     inst->fonts[0] = gdk_font_load(inst->cfg.font.name);
@@ -2298,11 +2340,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 +2439,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);