nsxivf0f6644
Replaced -T flag with -tt; default thumbnail size
+12 −20
4 files changed
| @@ -22,4 +22,5 @@ static const float zoom_levels[] = { | |||
| 22 | 22 | 100.0, 150.0, 200.0, 400.0, 800.0 | |
| 23 | 23 | }; | |
| 24 | 24 | ||
| 25 | − | #define THUMB_SIZE 50 | |
| 25 | + | /* default dimension of thumbnails (width == height): */ | |
| 26 | + | #define THUMB_SIZE 60 | |
| @@ -411,12 +411,6 @@ void on_keypress(XKeyEvent *kev) { | |||
| 411 | 411 | case XK_Right: | |
| 412 | 412 | changed = tns_move_selection(&tns, &win, TNS_RIGHT); | |
| 413 | 413 | break; | |
| 414 | − | ||
| 415 | − | /* scroll */ | |
| 416 | − | case XK_bracketleft: | |
| 417 | − | break; | |
| 418 | − | case XK_bracketright: | |
| 419 | − | break; | |
| 420 | 414 | } | |
| 421 | 415 | } | |
| 422 | 416 | ||
| @@ -31,7 +31,7 @@ options_t _options; | |||
| 31 | 31 | const options_t *options = (const options_t*) &_options; | |
| 32 | 32 | ||
| 33 | 33 | void print_usage() { | |
| 34 | − | printf("usage: sxiv [-dFfhpqrsTtvZ] [-g GEOMETRY] [-z ZOOM] FILES...\n"); | |
| 34 | + | printf("usage: sxiv [-dFfhpqrstvZ] [-g GEOMETRY] [-z ZOOM] FILES...\n"); | |
| 35 | 35 | } | |
| 36 | 36 | ||
| 37 | 37 | void print_version() { | |
| @@ -54,7 +54,7 @@ void parse_options(int argc, char **argv) { | |||
| 54 | 54 | _options.quiet = 0; | |
| 55 | 55 | _options.recursive = 0; | |
| 56 | 56 | ||
| 57 | − | while ((opt = getopt(argc, argv, "dFfg:hpqrsTtvZz:")) != -1) { | |
| 57 | + | while ((opt = getopt(argc, argv, "dFfg:hpqrstvZz:")) != -1) { | |
| 58 | 58 | switch (opt) { | |
| 59 | 59 | case '?': | |
| 60 | 60 | print_usage(); | |
| @@ -86,11 +86,9 @@ void parse_options(int argc, char **argv) { | |||
| 86 | 86 | case 's': | |
| 87 | 87 | _options.scalemode = SCALE_FIT; | |
| 88 | 88 | break; | |
| 89 | − | case 'T': | |
| 90 | − | _options.thumbnails = 2; | |
| 91 | − | break; | |
| 92 | 89 | case 't': | |
| 93 | − | _options.thumbnails = MAX(_options.thumbnails, 1); | |
| 90 | + | if (_options.thumbnails < 2) | |
| 91 | + | ++_options.thumbnails; | |
| 94 | 92 | break; | |
| 95 | 93 | case 'v': | |
| 96 | 94 | print_version(); | |
| @@ -218,18 +218,17 @@ int tns_scroll(tns_t *tns, tnsdir_t dir) { | |||
| 218 | 218 | ||
| 219 | 219 | old = tns->first; | |
| 220 | 220 | ||
| 221 | − | if (dir == TNS_DOWN && tns->first + tns->cols * tns->rows < tns->cnt) | |
| 221 | + | if (dir == TNS_DOWN && tns->first + tns->cols * tns->rows < tns->cnt) { | |
| 222 | 222 | tns->first += tns->cols; | |
| 223 | − | else if (dir == TNS_UP && tns->first >= tns->cols) | |
| 223 | + | tns_check_view(tns, True); | |
| 224 | + | tns->dirty = 1; | |
| 225 | + | } else if (dir == TNS_UP && tns->first >= tns->cols) { | |
| 224 | 226 | tns->first -= tns->cols; | |
| 225 | − | ||
| 226 | − | if (tns->first != old) { | |
| 227 | 227 | tns_check_view(tns, True); | |
| 228 | 228 | tns->dirty = 1; | |
| 229 | − | return 1; | |
| 230 | − | } else { | |
| 231 | − | return 0; | |
| 232 | 229 | } | |
| 230 | + | ||
| 231 | + | return tns->first != old; | |
| 233 | 232 | } | |
| 234 | 233 | ||
| 235 | 234 | int tns_translate(tns_t *tns, int x, int y) { | |