From 9e98701a906ecef8bb31b4a302f89ecb9a6e9481 Mon Sep 17 00:00:00 2001
From: Pierre Le Marre <dev@wismill.eu>
Date: Tue, 3 Oct 2023 10:28:47 +0200
Subject: [PATCH] Improve xkbcli help messages and manual pages

Add missing `--help` entries.
---
 tools/interactive-evdev.c        | 2 ++
 tools/registry-list.c            | 1 +
 tools/xkbcli-how-to-type.1       | 3 +++
 tools/xkbcli-interactive-evdev.1 | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/tools/interactive-evdev.c b/tools/interactive-evdev.c
index 8da105672..2dece752e 100644
--- a/tools/interactive-evdev.c
+++ b/tools/interactive-evdev.c
@@ -391,6 +391,8 @@ usage(FILE *fp, char *progname)
                         "          --enable-compose (enable Compose)\n"
                         "          --consumed-mode={xkb|gtk} (select the consumed modifiers mode, default: xkb)\n"
                         "          --without-x11-offset (don't add X11 keycode offset)\n"
+                    "Other:\n"
+                        "          --help (display this help and exit)\n"
         );
 }
 
diff --git a/tools/registry-list.c b/tools/registry-list.c
index c360da7f8..994860d0a 100644
--- a/tools/registry-list.c
+++ b/tools/registry-list.c
@@ -40,6 +40,7 @@ usage(const char *progname, FILE *fp)
             "  --ruleset=foo .......... Load the 'foo' ruleset\n"
             "  --skip-default-paths ... Do not load the default XKB paths\n"
             "  --load-exotic .......... Load the exotic (extra) rulesets\n"
+            "  --help ................. Print this help and exit\n"
             "\n"
             "Trailing arguments are treated as XKB base directory installations.\n",
             progname);
diff --git a/tools/xkbcli-how-to-type.1 b/tools/xkbcli-how-to-type.1
index d5002ae40..720d8b89f 100644
--- a/tools/xkbcli-how-to-type.1
+++ b/tools/xkbcli-how-to-type.1
@@ -34,6 +34,9 @@ The XKB layout variant
 .
 .It Fl \-options Ar options
 The XKB options
+.
+.It Fl \-help
+Print a help message and exit.
 .El
 .
 .Sh SEE ALSO
diff --git a/tools/xkbcli-interactive-evdev.1 b/tools/xkbcli-interactive-evdev.1
index 13c7b2cec..167e3ec65 100644
--- a/tools/xkbcli-interactive-evdev.1
+++ b/tools/xkbcli-interactive-evdev.1
@@ -68,6 +68,9 @@ The XKB options
 Specify a keymap path.
 This option is mutually exclusive with the RMLVO options.
 .
+.It Fl \-short
+Do not print layout nor Unicode keysym translation.
+.
 .It Fl \-report\-state\-changes
 Report changes to the keyboard state
 .