From f0f6644fae8673378936a15781ce96e55f66bec4 Mon Sep 17 00:00:00 2001
From: Bert <ber.t@gmx.com>
Date: Sun, 20 Feb 2011 00:28:28 +0100
Subject: Replaced -T flag with -tt; default thumbnail size

---
 config.h  |  3 ++-
 main.c    |  6 ------
 options.c | 10 ++++------
 thumbs.c  | 13 ++++++-------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/config.h b/config.h
index 93bc424..0646787 100644
--- a/config.h
+++ b/config.h
@@ -22,4 +22,5 @@ static const float zoom_levels[] = {
 	100.0, 150.0, 200.0, 400.0, 800.0
 };
 
-#define THUMB_SIZE  50
+/* default dimension of thumbnails (width == height):    */
+#define THUMB_SIZE  60
diff --git a/main.c b/main.c
index 9b5b41b..b555c4d 100644
--- a/main.c
+++ b/main.c
@@ -411,12 +411,6 @@ void on_keypress(XKeyEvent *kev) {
 			case XK_Right:
 				changed = tns_move_selection(&tns, &win, TNS_RIGHT);
 				break;
-
-			/* scroll */
-			case XK_bracketleft:
-				break;
-			case XK_bracketright:
-				break;
 		}
 	}
 
diff --git a/options.c b/options.c
index ca3be0c..ac9ae86 100644
--- a/options.c
+++ b/options.c
@@ -31,7 +31,7 @@ options_t _options;
 const options_t *options = (const options_t*) &_options;
 
 void print_usage() {
-	printf("usage: sxiv [-dFfhpqrsTtvZ] [-g GEOMETRY] [-z ZOOM] FILES...\n");
+	printf("usage: sxiv [-dFfhpqrstvZ] [-g GEOMETRY] [-z ZOOM] FILES...\n");
 }
 
 void print_version() {
@@ -54,7 +54,7 @@ void parse_options(int argc, char **argv) {
 	_options.quiet = 0;
 	_options.recursive = 0;
 
-	while ((opt = getopt(argc, argv, "dFfg:hpqrsTtvZz:")) != -1) {
+	while ((opt = getopt(argc, argv, "dFfg:hpqrstvZz:")) != -1) {
 		switch (opt) {
 			case '?':
 				print_usage();
@@ -86,11 +86,9 @@ void parse_options(int argc, char **argv) {
 			case 's':
 				_options.scalemode = SCALE_FIT;
 				break;
-			case 'T':
-				_options.thumbnails = 2;
-				break;
 			case 't':
-				_options.thumbnails = MAX(_options.thumbnails, 1);
+				if (_options.thumbnails < 2)
+					++_options.thumbnails;
 				break;
 			case 'v':
 				print_version();
diff --git a/thumbs.c b/thumbs.c
index aea40ee..cae660d 100644
--- a/thumbs.c
+++ b/thumbs.c
@@ -218,18 +218,17 @@ int tns_scroll(tns_t *tns, tnsdir_t dir) {
 
 	old = tns->first;
 
-	if (dir == TNS_DOWN && tns->first + tns->cols * tns->rows < tns->cnt)
+	if (dir == TNS_DOWN && tns->first + tns->cols * tns->rows < tns->cnt) {
 		tns->first += tns->cols;
-	else if (dir == TNS_UP && tns->first >= tns->cols)
+		tns_check_view(tns, True);
+		tns->dirty = 1;
+	} else if (dir == TNS_UP && tns->first >= tns->cols) {
 		tns->first -= tns->cols;
-
-	if (tns->first != old) {
 		tns_check_view(tns, True);
 		tns->dirty = 1;
-		return 1;
-	} else {
-		return 0;
 	}
+
+	return tns->first != old;
 }
 
 int tns_translate(tns_t *tns, int x, int y) {
-- 
cgit v1.2.3