From bf52095c2a870571475b6a7731428f5533882ac8 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sun, 26 Feb 2012 09:56:01 +0100 Subject: feh_printf: Fix/Add %S/%P for human-readable sizes, use them in --list --- src/list.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/list.c') diff --git a/src/list.c b/src/list.c index e052c05..3cb9a3d 100644 --- a/src/list.c +++ b/src/list.c @@ -37,7 +37,7 @@ void init_list_mode(void) mode = "list"; if (!opt.customlist) - fputs("NUM\tFORMAT\tWIDTH\tHEIGHT\tPIXELS\tSIZE(bytes)\tALPHA\tFILENAME\n", + fputs("NUM\tFORMAT\tWIDTH\tHEIGHT\tPIXELS\tSIZE\tALPHA\tFILENAME\n", stdout); for (l = filelist; l; l = l->next) { @@ -45,10 +45,12 @@ void init_list_mode(void) if (opt.customlist) printf("%s\n", feh_printf(opt.customlist, file)); else - printf("%d\t%s\t%d\t%d\t%d\t%d\t\t%c\t%s\n", ++j, + printf("%d\t%s\t%d\t%d\t%s", ++j, file->info->format, file->info->width, - file->info->height, file->info->pixels, - file->info->size, + file->info->height, + format_size(file->info->pixels)); + printf("\t%s\t\t%c\t%s\n", + format_size(file->info->size), file->info->has_alpha ? 'X' : '-', file->filename); feh_action_run(file, opt.actions[0]); -- cgit v1.2.3