nsxiv004fcd5
Left bar shows file name as given by user
+6 −20
2 files changed
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION = git-20171123 | |
| 1 | + | VERSION = git-20171207 | |
| 2 | 2 | ||
| 3 | 3 | srcdir = . | |
| 4 | 4 | VPATH = $(srcdir) | |
| @@ -340,7 +340,6 @@ void update_info(void) | |||
| 340 | 340 | unsigned int i, fn, fw; | |
| 341 | 341 | char title[256]; | |
| 342 | 342 | const char * mark; | |
| 343 | − | bool ow_info; | |
| 344 | 343 | win_bar_t *l = &win.bar.l, *r = &win.bar.r; | |
| 345 | 344 | ||
| 346 | 345 | /* update window title */ | |
| @@ -359,15 +358,12 @@ void update_info(void) | |||
| 359 | 358 | l->p = l->buf; | |
| 360 | 359 | r->p = r->buf; | |
| 361 | 360 | if (mode == MODE_THUMB) { | |
| 362 | − | if (tns.loadnext < tns.end) { | |
| 361 | + | if (tns.loadnext < tns.end) | |
| 363 | 362 | bar_put(l, "Loading... %0*d", fw, tns.loadnext + 1); | |
| 364 | − | ow_info = false; | |
| 365 | − | } else if (tns.initnext < filecnt) { | |
| 363 | + | else if (tns.initnext < filecnt) | |
| 366 | 364 | bar_put(l, "Caching... %0*d", fw, tns.initnext + 1); | |
| 367 | − | ow_info = false; | |
| 368 | − | } else { | |
| 369 | − | ow_info = true; | |
| 370 | − | } | |
| 365 | + | else | |
| 366 | + | strncpy(l->buf, files[fileidx].name, l->size); | |
| 371 | 367 | bar_put(r, "%s%0*d/%d", mark, fw, fileidx + 1, filecnt); | |
| 372 | 368 | } else { | |
| 373 | 369 | bar_put(r, "%s", mark); | |
| @@ -385,18 +381,8 @@ void update_info(void) | |||
| 385 | 381 | bar_put(r, "%0*d/%d | ", fn, img.multi.sel + 1, img.multi.cnt); | |
| 386 | 382 | } | |
| 387 | 383 | bar_put(r, "%0*d/%d", fw, fileidx + 1, filecnt); | |
| 388 | − | ow_info = info.f.err != 0; | |
| 389 | − | } | |
| 390 | − | if (ow_info) { | |
| 391 | − | fn = strlen(files[fileidx].name); | |
| 392 | − | if (fn < l->size && | |
| 393 | − | win_textwidth(&win.env, files[fileidx].name, fn, true, NULL) + | |
| 394 | − | win_textwidth(&win.env, r->buf, r->p - r->buf, true, NULL) < win.w) | |
| 395 | − | { | |
| 384 | + | if (info.f.err) | |
| 396 | 385 | strncpy(l->buf, files[fileidx].name, l->size); | |
| 397 | − | } else { | |
| 398 | − | strncpy(l->buf, files[fileidx].base, l->size); | |
| 399 | − | } | |
| 400 | 386 | } | |
| 401 | 387 | } | |
| 402 | 388 | ||