Draft a full zsh completion

Author: desertstsung

docs/chafa.xml

@@ -217,7 +217,7 @@ fraction. Defaults to 1/2. This will only be applied in symbol mode.
 </varlistentry>
 
 <varlistentry>
-<term><option>-g, --grid <replaceable>cols</replaceable>x<replaceable>rows</replaceable></option></term>
+<term><option>--grid <replaceable>cols</replaceable>x<replaceable>rows</replaceable></option></term>
 <listitem><para>
 Lay out images in a grid of <replaceable>cols</replaceable> columns and
 <replaceable>rows</replaceable> rows per screenful. Either
@@ -229,13 +229,27 @@ picked automatically.
 </varlistentry>
 
 <varlistentry>
-<term><option>-l, --label <replaceable>bool</replaceable></option></term>
+<term><option>-g</option></term>
+<listitem><para>
+Alias for "--grid auto".
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--label <replaceable>bool</replaceable></option></term>
 <listitem><para>
 Labeling [on, off]. When this is enabled, each image will be labeled with
 its filename. Defaults to off.
 </para></listitem>
 </varlistentry>
 
+<varlistentry>
+<term><option>-l</option></term>
+<listitem><para>
+Alias for "--label on".
+</para></listitem>
+</varlistentry>
+
 <varlistentry>
 <term><option>--margin-bottom <replaceable>num</replaceable></option></term>
 <listitem><para>

tools/chafa/chicle-options.c

@@ -254,7 +254,7 @@ print_summary (void)
     "      --label=BOOL   Labeling [on, off]. Filenames below images. Default off.\n"
     "  -l                 Alias for \"--label on\".\n"
     "      --link=BOOL    Link labels [auto, on, off]. Turns labels into clickable\n"
-    "                     hyperlinks. Use with \"-l on\". Defaults to auto.\n"
+    "                     hyperlinks. Use with \"--label on\". Defaults to auto.\n"
     "      --margin-bottom=NUM  When terminal size is detected, reserve at least NUM\n"
     "                     rows at the bottom as a safety margin. Can be used to\n"
     "                     prevent images from scrolling out. Defaults to 1.\n"
@@ -1786,12 +1786,12 @@ chicle_parse_options (int *argc, char **argv [])
         { "exact-size",  '\0', 0, G_OPTION_ARG_CALLBACK, parse_exact_size_arg,  "Whether to prefer the original image size", NULL },
         { "fg",          '\0', 0, G_OPTION_ARG_CALLBACK, parse_fg_color_arg,    "Foreground color of display", NULL },
         { "fg-only",     '\0', 0, G_OPTION_ARG_NONE,     &options.fg_only,      "Foreground only", NULL },
-        { "fill",        '\0', 0, G_OPTION_ARG_CALLBACK, parse_fill_arg,        "Fill symbols", NULL },
         { "files",       '\0', 0, G_OPTION_ARG_CALLBACK, parse_files_arg,       "File list", NULL },
         { "files0",      '\0', 0, G_OPTION_ARG_CALLBACK, parse_files0_arg,      "File list (NUL-separated)", NULL },
+        { "fill",        '\0', 0, G_OPTION_ARG_CALLBACK, parse_fill_arg,        "Fill symbols", NULL },
         { "fit-width",   '\0', 0, G_OPTION_ARG_NONE,     &options.fit_to_width, "Fit to width", NULL },
-        { "format",      'f',  0, G_OPTION_ARG_CALLBACK, parse_format_arg,      "Format of output pixel data (iterm, kitty, sixels or symbols)", NULL },
         { "font-ratio",  '\0', 0, G_OPTION_ARG_CALLBACK, parse_font_ratio_arg,  "Font ratio", NULL },
+        { "format",      'f',  0, G_OPTION_ARG_CALLBACK, parse_format_arg,      "Format of output pixel data (iterm, kitty, sixels or symbols)", NULL },
         { "fuzz-options", '\0', 0, G_OPTION_ARG_NONE,    &options.fuzz_options, "Fuzz the options", NULL },
         { "glyph-file",  '\0', 0, G_OPTION_ARG_CALLBACK, parse_glyph_file_arg,  "Glyph file", NULL },
         { "grid",        '\0', 0, G_OPTION_ARG_CALLBACK, parse_grid_arg,        "Grid", NULL },
@@ -1808,7 +1808,6 @@ chicle_parse_options (int *argc, char **argv [])
         { "preprocess",  'p',  0, G_OPTION_ARG_CALLBACK, parse_preprocess_arg,  "Preprocessing", NULL },
         { "probe",       '\0', 0, G_OPTION_ARG_CALLBACK, parse_probe_arg,       "Terminal probing", NULL },
         { "relative",    '\0', 0, G_OPTION_ARG_CALLBACK, parse_relative_arg,    "Relative", NULL },
-        { "work",        'w',  0, G_OPTION_ARG_INT,      &options.work_factor,  "Work factor", NULL },
         { "scale",       '\0', 0, G_OPTION_ARG_CALLBACK, parse_scale_arg,       "Scale", NULL },
         { "size",        's',  0, G_OPTION_ARG_CALLBACK, parse_size_arg,        "Output size", NULL },
         { "speed",       '\0', 0, G_OPTION_ARG_CALLBACK, parse_anim_speed_arg,  "Animation speed", NULL },
@@ -1818,6 +1817,7 @@ chicle_parse_options (int *argc, char **argv [])
         { "threshold",   't',  0, G_OPTION_ARG_CALLBACK, parse_threshold_arg,   "Transparency threshold", NULL },
         { "view-size",   '\0', 0, G_OPTION_ARG_CALLBACK, parse_view_size_arg,   "View size", NULL },
         { "watch",       '\0', 0, G_OPTION_ARG_NONE,     &options.watch,        "Watch a file's contents", NULL },
+        { "work",        'w',  0, G_OPTION_ARG_INT,      &options.work_factor,  "Work factor", NULL },
         /* Deprecated: Equivalent to --scale max */
         { "zoom",        '\0', 0, G_OPTION_ARG_NONE,     &options.zoom,         "Allow scaling up beyond one character per pixel", NULL },
         { 0 }

tools/completions/zsh-completion.zsh

@@ -21,18 +21,26 @@ local options=(
   --exact-size"[Try to match the input's size exactly. Defaults to auto]:MODE:(auto on off)"
   --fg"[Foreground color of display (color name or hex).]:COLOR:(black blue cyan default gray green magenta orange red white)"
   --fg-only"[Leave the background color untouched]"
+  --files"[Read list of files to process from PATH (newline-separated), or '-' for stdin]:FILE:_files"
+  --files0"[Read list of files to process from PATH (NUL-separated), or '-' for stdin]:FILE:_files"
   --fill"[Specify character symbols to use for fill/gradients. Defaults to none]:SYMS:($symbols)"
   --fit-width"[Fit images to view's width, possibly exceeding their height]"
   --font-ratio"[Target font's width/height ratio. Can be specified as a real number or a fraction. Defaults to 1/2]:W/H"
   {-f,--format}"[Set output format]:FORMAT:(iterm kitty sixels symbols)"
   --glyph-file"[Load glyph information from FILE]:FILE:_files"
+  --grid"[Lay out images in a grid of CxR columns/rows per screenful. C or R may be omitted, e.g. '--grid 4'. Can be 'auto']:CxR"
+  {-g,--grid-on}"[Alias for '--grid auto']"
   --invert"[Invert video. For display with bright backgrounds in color modes 2 and none. Swaps --fg and --bg]"
+  --label"[Labeling filenames below images. Defaults to off]:BOOL:(on off)"
+  {-l,--label-on}"[Alias for '--label on']"
+  --link"[Turns labels into clickable hyperlinks. Use with '--label on'. Defaults to auto]:MODE:(auto on off)"
   --margin-bottom"[When terminal size is detected, reserve at least NUM rows at the bottom as a safety margin. Can be used to prevent images from scrolling out. Defaults to 1.]:NUM"
   --margin-right"[When terminal size is detected, reserve at least NUM columns on the right-hand side as a safety margin. Defaults to 0.]:NUM"
   {-O,--optimize}"[Compress the output by using control sequences. 0 disables, 9 enables every available optimization. Defaults to 5, except for when used with '-c none', where it defaults to 0]:NUM:("{0..9}")"
   --passthrough"[Graphics protocol passthrough. Defaults to auto]:MODE:(auto none screen tmux)"
   --polite"[Polite mode. Defaults to on. Turning this off may enhance presentation and prevent interference from other programs, but risks leaving the terminal in an altered state (rude).]:BOOL:(on off)"
   {-p,--preprocess}"[Image preprocessing. Defaults to on with 16 colors or lower, off otherwise]:BOOL:(on off)"
+  --probe"[Probe terminal's capabilities and wait for response. A positive real number denotes the maximum time to wait for a response, in seconds. Defaults to 5.0]:MODE:(auto on off)"
   --relative"[Use relative cursor positioning. Defaults to off]:BOOL:(on off)"
   --scale"[Scale image, respecting terminal's maximum dimensions. 1.0 approximates original pixel dimensions. Specify max to use all available space. Defaults to 1.0 for pixel graphics and 4.0 for symbols]:NUM"
   {-s,--size}"[Set maximum output dimensions in columns and rows. By default this will be the size of your terminal, or 80x25 if size detection fails]:WxH"