Revised scale mode and zoom level handling

- Scale mode is not reset to default value upon image loading anymore
- New default key binding to change mode to scale-down
- Removed scale mode setting from config.h
- Removed -d command line option, as this is now the default at startup

1 files changed, 3 insertions, 6 deletions

diff --git a/options.c b/options.c
index 5e6ac02..c074677 100644
--- a/options.c
+++ b/options.c
@@ -33,7 +33,7 @@ const options_t *options = (const options_t*) &_options;
 
 void print_usage(void)
 {
-	printf("usage: sxiv [-bcdFfhioqrstvZ] [-G GAMMA] [-g GEOMETRY] [-n NUM] "
+	printf("usage: sxiv [-bcFfhioqrstvZ] [-G GAMMA] [-g GEOMETRY] [-n NUM] "
 	       "[-N NAME] [-S DELAY] [-z ZOOM] FILES...\n");
 }
 
@@ -52,7 +52,7 @@ void parse_options(int argc, char **argv)
 	_options.recursive = false;
 	_options.startnum = 0;
 
-	_options.scalemode = SCALE_MODE;
+	_options.scalemode = SCALE_DOWN;
 	_options.zoom = 1.0;
 	_options.gamma = 0;
 	_options.slideshow = 0;
@@ -67,7 +67,7 @@ void parse_options(int argc, char **argv)
 	_options.thumb_mode = false;
 	_options.clean_cache = false;
 
-	while ((opt = getopt(argc, argv, "bcdFfG:g:hin:N:oqrS:stvZz:")) != -1) {
+	while ((opt = getopt(argc, argv, "bcFfG:g:hin:N:oqrS:stvZz:")) != -1) {
 		switch (opt) {
 			case '?':
 				print_usage();
@@ -78,9 +78,6 @@ void parse_options(int argc, char **argv)
 			case 'c':
 				_options.clean_cache = true;
 				break;
-			case 'd':
-				_options.scalemode = SCALE_DOWN;
-				break;
 			case 'F':
 				_options.fixed_win = true;
 				break;