Revised command structure and key and mouse button mappings

1 files changed, 65 insertions, 71 deletions

diff --git a/sxiv.1 b/sxiv.1
index a9e83a4..a238282 100644
--- a/sxiv.1
+++ b/sxiv.1
@@ -92,22 +92,15 @@ Set zoom level to ZOOM percent.
 .SH GENERAL KEYBOARD COMMANDS
 The following keyboard commands are available in both image and thumbnail mode:
 .TP
-.B q
-Quit sxiv.
-.TP
-.B Return
-Switch to thumbnail mode / open selected image in image mode.
-.TP
 .BR 0 \- 9
 Prefix the next command with a number (denoted via
 .IR count ).
 .TP
-.B g
-Go to the first image.
+.B q
+Quit sxiv.
 .TP
-.B G
-Go to the last image, or image number
-.IR count .
+.B Return
+Switch to thumbnail mode / open selected image in image mode.
 .TP
 .B f
 Toggle fullscreen mode.
@@ -118,15 +111,31 @@ Toggle visibility of info bar on bottom of window.
 .B Ctrl-x
 Send the next key to the external key-handler.
 .TP
+.B g
+Go to the first image.
+.TP
+.B G
+Go to the last image, or image number
+.IR count .
+.TP
 .B r
 Reload image.
 .TP
-.B R
-Reload all thumbnails.
-.TP
 .B D
 Remove current image from file list and go to next image.
 .TP
+.BR Ctrl-h ", " Ctrl-Left
+Scroll left one screen width.
+.TP
+.BR Ctrl-j ", " Ctrl-Down
+Scroll down one screen height.
+.TP
+.BR Ctrl-k ", " Ctrl-Up
+Scroll up one screen height.
+.TP
+.BR Ctrl-l ", " Ctrl-Right
+Scroll right one screen width.
+.TP
 .B m
 Mark/unmark the current image.
 .TP
@@ -165,11 +174,8 @@ Move selection right
 .I count
 times.
 .TP
-.BR Ctrl-j ", " Ctrl-Down
-Scroll thumbnail grid one window height down.
-.TP
-.BR Ctrl-k ", " Ctrl-Up
-Scroll thumbnail grid one window height up.
+.B R
+Reload all thumbnails.
 .SH IMAGE KEYBOARD COMMANDS
 The following keyboard commands are only available in image mode:
 .SS Navigate image list
@@ -203,74 +209,62 @@ Go to the previous frame of a multi-frame image.
 .TP
 .B Ctrl-Space
 Play/pause animation of a multi-frame image.
-.SS Zooming
-.TP
-.BR +
-Zoom in.
-.TP
-.B \-
-Zoom out.
-.TP
-.B =
-Set zoom level to 100%, or
-.IR count %.
-.TP
-.B w
-Set zoom level to 100%, but fit large images into window.
-.TP
-.B W
-Fit image to window.
-.TP
-.B e
-Fit image to window width.
-.TP
-.B E
-Fit image to window height.
 .SS Panning
 .TP
 .BR h ", " Left
-Pan image 1/5 of window width or
+Scroll image 1/5 of window width or
 .I count
 pixel left.
 .TP
 .BR j ", " Down
-Pan image 1/5 of window height or
+Scroll image 1/5 of window height or
 .I count
 pixel down.
 .TP
 .BR k ", " Up
-Pan image 1/5 of window height or
+Scroll image 1/5 of window height or
 .I count
 pixel up.
 .TP
 .BR l ", " Right
-Pan image 1/5 of window width or
+Scroll image 1/5 of window width or
 .I count
 pixel right.
 .TP
 .B H
-Pan to left image edge.
+Scroll to left image edge.
 .TP
 .B J
-Pan to bottom image edge.
+Scroll to bottom image edge.
 .TP
 .B K
-Pan to top image edge.
+Scroll to top image edge.
 .TP
 .B L
-Pan to right image edge.
+Scroll to right image edge.
+.SS Zooming
 .TP
-.BR Ctrl-h ", " Ctrl-Left
-Pan image one window width left.
+.BR +
+Zoom in.
 .TP
-.BR Ctrl-j ", " Ctrl-Down
-Pan image one window height down.
+.B \-
+Zoom out.
 .TP
-.BR Ctrl-k ", " Ctrl-Up
-Pan image one window height up.
+.B =
+Set zoom level to 100%, or
+.IR count %.
 .TP
-.BR Ctrl-l ", " Ctrl-Right
-Pan image one window width right.
+.B w
+Set zoom level to 100%, but fit large images into window.
+.TP
+.B W
+Fit image to window.
+.TP
+.B e
+Fit image to window width.
+.TP
+.B E
+Fit image to window height.
 .SS Rotation
 .TP
 .B <
@@ -281,7 +275,7 @@ Rotate image clockwise by 90 degrees.
 .TP
 .B ?
 Rotate image by 180 degrees.
-.SS Flip
+.SS Flipping
 .TP
 .B |
 Flip image horizontally.
@@ -319,29 +313,29 @@ Go to next image.
 .TP
 .B Button3
 Go to the previous image.
-.SS Zooming
-.TP
-.B Ctrl+ScrollUp
-Zoom in.
-.TP
-.B Ctrl+ScrollDown
-Zoom out.
-.SS Panning/Moving
+.SS Panning
 .TP
 .B Button2
 Drag the image with the mouse while keeping this button pressed down.
 .TP
 .B ScrollUp
-Pan image up.
+Scroll image up.
 .TP
 .B ScrollDown
-Pan image down.
+Scroll image down.
 .TP
 .B Shift+ScrollUp
-Pan image left.
+Scroll image left.
 .TP
 .B Shift+ScrollDown
-Pan image right.
+Scroll image right.
+.SS Zooming
+.TP
+.B Ctrl+ScrollUp
+Zoom in.
+.TP
+.B Ctrl+ScrollDown
+Zoom out.
 .SH STATUS BAR
 The information displayed on the left side of the status bar can be replaced
 with the output of a user-provided script, which is called by sxiv whenever an