From 9098e049ed0bd64046cbf3682c30ad58f06817e1 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Mon, 7 Jun 2010 19:32:10 +0200
Subject: Remove Shift+Key bindings

---
 ChangeLog       |  3 +++
 man/feh.1       | 38 +++++++++++++++++++-------------------
 src/keyevents.c | 18 ------------------
 3 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba76300..dae2c36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ git HEAD
     * Fix segfault in Thumbnail mode when trying to open a no longer
       existing image (e.g. when the file was renamed by a previous action)
     * Set a negative slideshow-delay to start the slideshow in paused mode
+    * Remove Shift+Key bindings, they were doing the same as Nothing+Key
+      anyways. Plus, I might want to bind Shift + <already used key> to other
+      stuff in the future
 
 Sat Jun  5 21:35:25 CEST 2010  Daniel Friesel <derf@chaosdorf.de
 
diff --git a/man/feh.1 b/man/feh.1
index 9385c62..3ff6471 100644
--- a/man/feh.1
+++ b/man/feh.1
@@ -554,45 +554,45 @@ provided with a couple of cool example themes.
 The default mode is slideshow mode.  When viewing a slideshow, the following
 keys may be used:
 .Bl -tag -width indent
-.It a , A
+.It a
 Toggle actions display
 .Pq see Cm --draw-actions
-.It c , C
+.It c
 Caption entry mode.  If
 .Cm --caption-path
 has been specified, then this enables caption editing.  The caption at the
 bottom of the screen will turn yellow and can be edited.  Hit enter to confirm
 and save the caption, or escape to cancel editing
-.It d , D
+.It d
 Toggle filename display
 .Pq see Cm --draw-filename
-.It f , F
+.It f
 Save the current filelist to a unique filename
-.It h , H
+.It h
 Pause/Continue the slideshow.  When it is paused, it will not automatically
 change slides based on
 .Cm --slideshow-delay
-.It m , M
+.It m
 Show menu
-.It n , N , Ao space Ac , Aq right
+.It n , Ao space Ac , Aq right arrow
 Show next image
-.It o , O
+.It o
 Toggle pointer visibility
-.It p , P , Ao backspace Ac , Aq left
+.It p , Ao backspace Ac , Aq left arrow
 Show previous image
-.It q , Q
+.It q
 Quit feh
-.It r , R
+.It r
 Reload current image.  Useful for webcams
-.It s , S
+.It s
 Save the current image to a unique filename
-.It v , V
+.It v
 Toggle fullscreen
-.It w , W
+.It w
 Change window size to fit current image size
-.It x , X
+.It x
 Close current window
-.It z , Z
+.It z
 Jump to a random position in the current filelist
 .It < , >
 In place editing - rotate the images 90 degrees (counter)clockwise.
@@ -601,7 +601,7 @@ used with JPEG images.  Rotating in the reverse direction will make them go
 away.  See
 .Xr jpegtran 1
 for more about lossless JPEG rotation
-.It 0 , 1 , ... , 9
+.It 0 .. 9
 Execute the corresponding action
 .Pq 0 = Cm --action , No 1 = Cm --action1 No etc.
 .It Aq return
@@ -617,9 +617,9 @@ Go forward ~5% of the filelist
 Go backward ~5% of the filelist
 .It Aq escape
 Quit the slideshow
-.It + , =
+.It +
 Increase reload delay
-.It - , _
+.It -
 Decrease reload delay
 .It Aq delete
 Remove current file from filelist
diff --git a/src/keyevents.c b/src/keyevents.c
index f0564bc..e513775 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -316,73 +316,58 @@ void feh_event_handle_keypress(XEvent * ev)
 
 	switch (*kbuf) {
 	case 'a':
-	case 'A':
 		opt.draw_actions = !opt.draw_actions;
 		winwidget_rerender_all(0, 1);
 		break;
 	case 'd':
-	case 'D':
 		opt.draw_filename = !opt.draw_filename;
 		winwidget_rerender_all(0, 1);
 		break;
 	case 'n':
-	case 'N':
 	case ' ':
 		if (opt.slideshow)
 			slideshow_change_image(winwid, SLIDE_NEXT);
 		break;
 	case 'o':
-	case 'O':
 		winwidget_set_pointer(winwid, opt.hide_pointer);
 		opt.hide_pointer = !opt.hide_pointer;
 		break;
 	case 'p':
-	case 'P':
 	case '\b':
 		if (opt.slideshow)
 			slideshow_change_image(winwid, SLIDE_PREV);
 		break;
 	case 'z':
-	case 'Z':
 		if (opt.slideshow)
 			slideshow_change_image(winwid, SLIDE_RAND);
 		break;
 	case 'q':
-	case 'Q':
 		winwidget_destroy_all();
 		break;
 	case 'c':
-	case 'C':
 		if (opt.caption_path)
 			winwid->caption_entry = 1;
 		winwidget_render_image(winwid, 0, 1);
 		break;
 	case 'r':
-	case 'R':
 		feh_reload_image(winwid, 0, 0);
 		break;
 	case 'h':
-	case 'H':
 		slideshow_pause_toggle(winwid);
 		break;
 	case 's':
-	case 'S':
 		slideshow_save_image(winwid);
 		break;
 	case 'f':
-	case 'F':
 		feh_save_filelist();
 		break;
 	case 'w':
-	case 'W':
 		winwidget_size_to_image(winwid);
 		break;
 	case 'm':
-	case 'M':
 		winwidget_show_menu(winwid);
 		break;
 	case 'x':
-	case 'X':
 		winwidget_destroy(winwid);
 		break;
 	case '>':
@@ -392,7 +377,6 @@ void feh_event_handle_keypress(XEvent * ev)
 		feh_edit_inplace_orient(winwid, 3);
 		break;
 	case 'v':
-	case 'V':
 #ifdef HAVE_LIBXINERAMA
 		if (opt.xinerama && xinerama_screens) {
 			int i, rect[4];
@@ -432,7 +416,6 @@ void feh_event_handle_keypress(XEvent * ev)
 					xinerama_screens[curr_screen].x_org, xinerama_screens[curr_screen].y_org);
 		}
 #endif				/* HAVE_LIBXINERAMA */
-	case '=':
 	case '+':
 		if (opt.reload < SLIDESHOW_RELOAD_MAX)
 			opt.reload++;
@@ -440,7 +423,6 @@ void feh_event_handle_keypress(XEvent * ev)
 			weprintf("Cannot set RELOAD higher than %d seconds.", opt.reload);
 		break;
 	case '-':
-	case '_':
 		if (opt.reload > 1)
 			opt.reload--;
 		else if (opt.verbose)
-- 
cgit v1.2.3