summaryrefslogtreecommitdiff
path: root/src/list.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/list.c')
-rw-r--r--src/list.c159
1 files changed, 83 insertions, 76 deletions
diff --git a/src/list.c b/src/list.c
index 98f9fe7..0fdc6a5 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,6 +1,7 @@
/* list.c
Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2024 Birte Kristina Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -27,90 +28,96 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "filelist.h"
#include "options.h"
-void
-init_list_mode(void)
+void init_list_mode(void)
{
- gib_list *l;
- feh_file *file = NULL;
- int j = 0;
-
- D_ENTER(4);
-
- mode = "list";
-
- if (!opt.customlist)
- printf
- ("NUM\tFORMAT\tWIDTH\tHEIGHT\tPIXELS\tSIZE(bytes)\tALPHA\tFILENAME\n");
-
- for (l = filelist; l; l = l->next)
- {
- file = FEH_FILE(l->data);
- 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, file->info->format,
- file->info->width, file->info->height, file->info->pixels,
- file->info->size, file->info->has_alpha ? 'X' : '-',
- file->filename);
-
- feh_action_run(file,opt.actions[0]);
- }
- exit(0);
+ gib_list *l;
+ feh_file *file = NULL;
+ int j = 0;
+
+ mode = "list";
+
+ if (!opt.customlist)
+ fputs("NUM\tFORMAT\tWIDTH\tHEIGHT\tPIXELS\tSIZE\tALPHA\tFILENAME\n",
+ stdout);
+
+ for (l = filelist; l; l = l->next) {
+ file = FEH_FILE(l->data);
+ if (opt.customlist)
+ printf("%s\n", feh_printf(opt.customlist, file, NULL));
+ else {
+ printf("%d\t%s\t%d\t%d\t%s", ++j,
+ file->info->format, file->info->width,
+ file->info->height,
+ format_size(file->info->pixels));
+ printf("\t%s\t%c\t%s\n",
+ format_size(file->size),
+ file->info->has_alpha ? 'X' : '-', file->filename);
+ }
+
+ feh_action_run(file, opt.actions[0], NULL);
+ }
+ exit(0);
}
-void
-init_loadables_mode(void)
+void init_loadables_mode(void)
{
- D_ENTER(4);
- mode = "loadables";
- real_loadables_mode(1);
- D_RETURN_(4);
+ mode = "loadables";
+ real_loadables_mode(1);
+ return;
}
-void
-init_unloadables_mode(void)
+void init_unloadables_mode(void)
{
- D_ENTER(4);
- mode = "unloadables";
- real_loadables_mode(0);
- D_RETURN_(4);
+ mode = "unloadables";
+ real_loadables_mode(0);
+ return;
}
-
-void
-real_loadables_mode(int loadable)
+void real_loadables_mode(int loadable)
{
- feh_file *file;
- gib_list *l;
-
- D_ENTER(4);
- opt.quiet = 1;
-
- for (l = filelist; l; l = l->next)
- {
- Imlib_Image im = NULL;
-
- file = FEH_FILE(l->data);
-
- if (feh_load_image(&im, file))
- {
- /* loaded ok */
- if (loadable)
- {
- fprintf(stdout, "%s\n", file->filename);
- feh_action_run(file,opt.actions[0]);
- }
- gib_imlib_free_image_and_decache(im);
- }
- else
- {
- /* Oh dear. */
- if (!loadable)
- {
- fprintf(stdout, "%s\n", file->filename);
- feh_action_run(file,opt.actions[0]);
- }
- }
- }
- exit(0);
+ feh_file *file;
+ gib_list *l;
+ char ret = 0;
+
+ opt.quiet = 1;
+
+ for (l = filelist; l; l = l->next) {
+ Imlib_Image im = NULL;
+
+ file = FEH_FILE(l->data);
+
+ if (feh_load_image(&im, file)) {
+ /* loaded ok */
+ if (loadable) {
+ if (opt.verbose)
+ feh_display_status('.');
+ puts(file->filename);
+ fflush(stdout);
+ feh_action_run(file, opt.actions[0], NULL);
+ }
+ else {
+ if (opt.verbose)
+ feh_display_status('s');
+ ret = 1;
+ }
+ gib_imlib_free_image_and_decache(im);
+ } else {
+ /* Oh dear. */
+ if (!loadable) {
+ if (opt.verbose)
+ feh_display_status('.');
+ puts(file->filename);
+ fflush(stdout);
+ feh_action_run(file, opt.actions[0], NULL);
+ }
+ else {
+ if (opt.verbose)
+ feh_display_status('s');
+ ret = 1;
+ }
+ }
+ }
+ if (opt.verbose)
+ feh_display_status(0);
+ exit(ret);
}