Refactored key/mouse mappings in README

Makefile

@@ -1,6 +1,6 @@
 all: sxiv
 
-VERSION=git-20110406
+VERSION=git-20110407
 
 CC?=gcc
 PREFIX?=/usr/local

README.md

@@ -50,50 +50,45 @@ sxiv supports the following command-line options:
     -Z           Same as `-z 100'
     -z ZOOM      Scale all images to current zoom level, use ZOOM at startup
 
-Use the following keys to control the basic behaviour of sxiv:
+The following key mappings are available; differences between image view and
+thumbnail mode are denoted via brackets:
 
     q            Quit sxiv
-    f            Toggle fullscreen mode (requires an EWMH/NetWM compliant
-                 window manager)
-
-Inside image view mode, the following key mappings are available:
+    Return       Switch to thumbnail mode [open selected image]
 
     n,Space      Go to the next image
     p,Backspace  Go to the previous image
-    g/G          Go to first/last image
+    g/G          Go to [select] first/last image
     [/]          Go 10 images backward/forward
+
     +,=          Zoom in
     -            Zoom out
     0            Set zoom level to 100%
     w            Fit image into window
-    h,j,k,l      Pan image left/down/up/right (also with arrow keys)
+
+    h,j,k,l      Pan image [move selection] left/down/up/right
+                 (also with arrow keys)
+
     <,>          Rotate image (counter-)clockwise by 90 degrees
+
     W            Resize window to fit image
+    f            Toggle fullscreen mode (requires an EWMH/NetWM compliant
+                 window manager)
+
     a            Toggle anti-aliasing
     A            Toggle visibility of alpha-channel, i.e. transparency
+    D            Remove image from file list and go to [select] next image
     r            Reload image
-    D            Remove image from file list and go to next image
-    Return       Switch to thumbnail mode
 
-Additionally, the image view offers the following mouse commands:
+Additionally, the following mouse mappings are available:
 
     Button1           Go to the next image
+                      [select image/open image if it is already selected]
     Button2           Drag image with mouse while keeping it pressed
     Button3           Go to the previous image
-    ScrollUp          Pan image up
-    ScrollDown        Pan image down
+    ScrollUp          Pan image up [scroll up one thumbnail row]
+    ScrollDown        Pan image down [scroll down one thumbnail row]
     Shift+ScrollUp    Pan image left
     Shift+ScrollDown  Pan image right
     Ctrl+ScrollUp     Zoom in
     Ctrl+ScrollDown   Zoom out
-
-In thumbnail mode, the following key and mouse mappings are available:
-
-    h,j,k,l      Move selection left/down/up/right (also with arrow keys)
-    g/G          Move selection to first/last image
-    D            Remove selected image from file list and select next image
-    Return       Open selected image
-
-    Button1      Select image/open image if it is already selected
-    ScrollUp     Scroll up one row
-    ScrollDown   Scroll down one row