Update help text formatting

neXromancers · Mar 29, 2020 · 7ca61f7 · 7ca61f7
1 parent 315de3b
commit 7ca61f7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hacksaw"
 description = "Lightweight selection tool for usage in screenshot scripts etc."
-version = "1.0.1"
+version = "1.0.2"
 authors = ["expectocode <expectocode@gmail.com>"]
 license-file = "LICENSE.txt"
 repository = "https://github.com/neXromancers/hacksaw.git"

diff --git a/README.md b/README.md
@@ -95,9 +95,6 @@ hacksaw -n | {
 ### Usage
 
 ```
-hacksaw 0.1.0
-expectocode <expectocode@gmail.com>
-
 USAGE:
     hacksaw [FLAGS] [OPTIONS]
 
@@ -108,15 +105,21 @@ FLAGS:
 
 OPTIONS:
     -f, --format <format>
-            Output format. You can use %x for x-coordinate, %y for y-coordinate, %w for width, %h for height, %i for
-            selected window id, %g as a shorthand for %wx%h+%x+%y (the default, X geometry) and %% for a literal '%'.
+            Output format. You can use:
+                  %x for x-coordinate,
+                  %y for y-coordinate,
+                  %w for width,
+                  %h for height,
+                  %i for selected window id,
+                  %g as a shorthand for %wx%h+%x+%y (X geometry),
+                  %% for a literal '%'.
             Other %-codes will cause an error. [default: %g]
-    -g, --guide-thickness <guide_thickness>          Thickness of fighter pilot guide lines [default: 1]
-    -c, --colour <line_colour>
+    -g, --guide-thickness <guide-thickness>          Thickness of fighter pilot guide lines [default: 1]
+    -c, --colour <line-colour>
             Hex colour of the lines (RGB or RGBA), '#' optional [default: #7f7f7f]
 
-    -r, --remove-decorations <remove_decorations>
+    -r, --remove-decorations <remove-decorations>
             Number of (nested) window manager frames to try and remove [default: 0]
 
-    -s, --select-thickness <select_thickness>        Thickness of selection box lines [default: 1]
+    -s, --select-thickness <select-thickness>        Thickness of selection box lines [default: 1]
 ```
diff --git a/src/lib/parse_args.rs b/src/lib/parse_args.rs
@@ -2,7 +2,7 @@ use super::parse_format::{parse_format_string, Format};
 use structopt::StructOpt;
 
 #[derive(StructOpt, Debug)]
-#[structopt(name = "hacksaw")]
+#[structopt(name = "hacksaw", max_term_width = 80)]
 pub struct Opt {
     #[structopt(
         short = "n",
@@ -42,9 +42,16 @@ pub struct Opt {
         default_value = "%g",
         parse(try_from_str = parse_format_string),
         allow_hyphen_values = true,
-        help = "Output format. You can use %x for x-coordinate, %y for y-coordinate, %w for width, \
-                %h for height, %i for selected window id, %g as a shorthand for %wx%h+%x+%y (the \
-                default, X geometry) and %% for a literal '%'. Other %-codes will cause an error."
+        help = "\
+Output format. You can use:
+      %x for x-coordinate,
+      %y for y-coordinate,
+      %w for width,
+      %h for height,
+      %i for selected window id,
+      %g as a shorthand for %wx%h+%x+%y (X geometry),
+      %% for a literal '%'.
+Other %-codes will cause an error."
     )]
     pub format: Format,