X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/045f707bf479ce03fc35f76ae397b1f5d93d9fda..96add4441605991d48fcdee861c115216d355f6f:/unix/pterm.c

diff --git a/unix/pterm.c b/unix/pterm.c
index 947e4411..e53499d5 100644
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -1332,9 +1332,16 @@ void sys_cursor(void *frontend, int x, int y)
      */
 }
 
+/*
+ * This is still called when mode==BELL_VISUAL, even though the
+ * visual bell is handled entirely within terminal.c, because we
+ * may want to perform additional actions on any kind of bell (for
+ * example, taskbar flashing in Windows).
+ */
 void beep(void *frontend, int mode)
 {
-    gdk_beep();
+    if (mode != BELL_VISUAL)
+	gdk_beep();
 }
 
 int CharWidth(Context ctx, int uc)
@@ -1721,6 +1728,33 @@ char *get_x_display(void *frontend)
 
 char *app_name = "pterm";
 
+static void help(FILE *fp) {
+    if(fprintf(fp,
+"pterm option summary:\n"
+"\n"
+"  --display DISPLAY         Specify X display to use (note '--')\n"
+"  -name PREFIX              Prefix when looking up resources (default: pterm)\n"
+"  -fn FONT                  Normal text font\n"
+"  -fb FONT                  Bold text font\n"
+"  -geometry WIDTHxHEIGHT    Size of terminal in characters\n"
+"  -sl LINES                 Number of lines of scrollback\n"
+"  -fg COLOUR, -bg COLOUR    Foreground/background colour\n"
+"  -bfg COLOUR, -bbg COLOUR  Foreground/background bold colour\n"
+"  -cfg COLOUR, -bfg COLOUR  Foreground/background cursor colour\n"
+"  -T TITLE                  Window title\n"
+"  -ut, +ut                  Do(default) or do not update utmp\n"
+"  -ls, +ls                  Do(default) or do not make shell a login shell\n"
+"  -sb, +sb                  Do(default) or do not display a scrollbar\n"
+"  -log PATH                 Log all output to a file\n"
+"  -nethack                  Map numeric keypad to hjklyubn direction keys\n"
+"  -xrm RESOURCE-STRING      Set an X resource\n"
+"  -e COMMAND [ARGS...]      Execute command (consumes all remaining args)\n"
+	 ) < 0 || fflush(fp) < 0) {
+	perror("output error");
+	exit(1);
+    }
+}
+
 int do_cmdline(int argc, char **argv, int do_everything)
 {
     int err = 0;
@@ -1874,6 +1908,10 @@ int do_cmdline(int argc, char **argv, int do_everything)
 	    EXPECTS_ARG;
 	    provide_xrm_string(val);
 
+	} else if(!strcmp(p, "-help") || !strcmp(p, "--help")) {
+	    help(stdout);
+	    exit(0);
+	    
 	} else {
 	    err = 1;
 	    fprintf(stderr, "pterm: unrecognized option '%s'\n", p);