From 61f83c411202b089752f8d1002c0f325f518a4f8 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Thu, 8 Nov 2018 20:42:37 +0100
Subject: Change default toggle_fullscreen key to "f"
This is in line with other software. save_filelist now defaults to "L".
---
ChangeLog | 3 +++
man/feh.pre | 14 +++++++-------
src/keyevents.c | 4 ++--
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f2ec192..bbfab1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@ git HEAD
* Remove deprecated collage mode (-c/--collage)
* Remove deprecated option --cycle-once (use --on-last-slide=quit instead)
* Remove deprecated option --menu-bg
+ * Change default save_filelist key from "f" to "L" (mnemonic: fileList)
+ * Change default toggle_fullscreen key from "v" to "f" as this is also
+ used by mplayer, mpv and similar
* flip and rotation (keys "<", ">", "|", and "_") no longer change the
underlying file. This leaves delete ("Ctrl+Delete") as the only
destructive action which is enabled by default
diff --git a/man/feh.pre b/man/feh.pre
index 35ff062..f6db8c4 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -1436,10 +1436,9 @@ Toggle filename display
.Pq optional feature, $MAN_EXIF$ in this build
Toggle EXIF tag display
.
-.It f Bq save_filelist
+.It f Bq toggle_fullscreen
.
-Save the current filelist as
-.Qq feh_PID_ID_filelist
+Toggle fullscreen
.
.It g Bq toggle_fixed_geometry
.
@@ -1463,6 +1462,11 @@ When enabled,
.Nm
will keep zoom and X, Y offset when switching images.
.
+.It L Bq save_filelist
+.
+Save the current filelist as
+.Qq feh_PID_ID_filelist
+.
.It m Bq toggle_menu
.
Show menu.
@@ -1499,10 +1503,6 @@ Useful for webcams
Save the current image as
.Qq feh_PID_ID_FILENAME
.
-.It v Bq toggle_fullscreen
-.
-Toggle fullscreen
-.
.It w Bq size_to_image
.
Change window size to fit current image size
diff --git a/src/keyevents.c b/src/keyevents.c
index 43bc82a..6c2f06e 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -195,10 +195,10 @@ void init_keyevents(void) {
feh_set_kb("toggle_caption" , 0, XK_c, 0, 0, 0, 0);
feh_set_kb("toggle_pause" , 0, XK_h, 0, 0, 0, 0);
feh_set_kb("toggle_menu" , 0, XK_m, 0, 0, 0, 0);
- feh_set_kb("toggle_fullscreen" , 0, XK_v, 0, 0, 0, 0);
+ feh_set_kb("toggle_fullscreen" , 0, XK_f, 0, 0, 0, 0);
feh_set_kb("reload_image" , 0, XK_r, 0, 0, 0, 0);
feh_set_kb("save_image" , 0, XK_s, 0, 0, 0, 0);
- feh_set_kb("save_filelist" , 0, XK_f, 0, 0, 0, 0);
+ feh_set_kb("save_filelist" , 0, XK_L, 0, 0, 0, 0);
feh_set_kb("orient_1" , 0, XK_greater, 0, 0, 0, 0);
feh_set_kb("orient_3" , 0, XK_less, 0, 0, 0, 0);
feh_set_kb("flip" , 0, XK_underscore, 0, 0, 0, 0);
--
cgit v1.2.3