diff options
author | Daniel Friesel <derf@finalrewind.org> | 2014-08-27 19:46:13 +0200 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2014-08-27 19:46:13 +0200 |
commit | d3c0aa11daf16c03be51e8fcb113d32320ef531c (patch) | |
tree | 817696db27535ceb859f3bffdf085878b6baad17 /src | |
parent | 3e284a9ac8959360278389cd537509a24f83c120 (diff) | |
parent | a15831215a8f8076a35fcb0781a1cb0289b216b7 (diff) |
Merge branch 'verbose-to-stderr' of https://github.com/nbirnel/feh into nbirnel-verbose-to-stderr
Diffstat (limited to 'src')
-rw-r--r-- | src/collage.c | 10 | ||||
-rw-r--r-- | src/filelist.c | 2 | ||||
-rw-r--r-- | src/imlib.c | 16 | ||||
-rw-r--r-- | src/index.c | 6 | ||||
-rw-r--r-- | src/slideshow.c | 2 | ||||
-rw-r--r-- | src/thumbnail.c | 6 |
6 files changed, 21 insertions, 21 deletions
diff --git a/src/collage.c b/src/collage.c index 711e3a4..bcb30fa 100644 --- a/src/collage.c +++ b/src/collage.c @@ -69,7 +69,7 @@ void init_collage_mode(void) ": No size restriction specified for collage.\n" " You did specify a background however, so the\n" " collage size has defaulted to the size of the image\n", - stdout); + stderr); opt.limit_w = bg_w; opt.limit_h = bg_h; } else { @@ -78,7 +78,7 @@ void init_collage_mode(void) ": No size restriction specified for collage.\n" " - For collage mode, you need to specify width and height.\n" " Using defaults (width 800, height 600)\n", - stdout); + stderr); opt.limit_w = 800; opt.limit_h = 600; } @@ -185,7 +185,7 @@ void init_collage_mode(void) } } if (opt.verbose) - fputs("\n", stdout); + fputs("\n", stderr); if (opt.output && opt.output_file) { char output_buf[1024]; @@ -199,8 +199,8 @@ void init_collage_mode(void) tw = gib_imlib_image_get_width(im_main); th = gib_imlib_image_get_height(im_main); - fprintf(stdout, PACKAGE ": File saved as %s\n", output_buf); - fprintf(stdout, + fprintf(stderr, PACKAGE ": File saved as %s\n", output_buf); + fprintf(stderr, " - Image is %dx%d pixels and contains %d thumbnails\n", tw, th, (tw / opt.thumb_w) * (th / opt.thumb_h)); } diff --git a/src/filelist.c b/src/filelist.c index b1a369a..f31f05b 100644 --- a/src/filelist.c +++ b/src/filelist.c @@ -600,7 +600,7 @@ void feh_save_filelist() tmpname = feh_unique_filename("", "filelist"); if (opt.verbose) - printf("saving filelist to filename '%s'\n", tmpname); + fprintf(stderr, "saving filelist to filename '%s'\n", tmpname); feh_write_filelist(filelist, tmpname); free(tmpname); diff --git a/src/imlib.c b/src/imlib.c index c8bb993..36c8dff 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -276,7 +276,7 @@ int feh_load_image(Imlib_Image * im, feh_file * file) if ((err) || (!im)) { if (opt.verbose && !opt.quiet) { - fputs("\n", stdout); + fputs("\n", stderr); reset_output = 1; } feh_imlib_print_load_error(file->filename, NULL, err); @@ -994,7 +994,7 @@ void feh_display_status(char stat) D(("filelist %p, filelist->next %p\n", filelist, filelist->next)); if (!stat) { - putc('\n', stdout); + putc('\n', stderr); init_len = 0; i = 0; return; @@ -1007,24 +1007,24 @@ void feh_display_status(char stat) if (reset_output) { /* There's just been an error message. Unfortunate ;) */ for (j = 0; j < (((i % 50) + ((i % 50) / 10)) + 7); j++) - putc(' ', stdout); + putc(' ', stderr); } if (!(i % 50)) { int len = gib_list_length(filelist); - fprintf(stdout, " %5d/%d (%d)\n[%3d%%] ", + fprintf(stderr, " %5d/%d (%d)\n[%3d%%] ", i, init_len, len, ((int) ((float) i / init_len * 100))); } else if ((!(i % 10)) && (!reset_output)) - putc(' ', stdout); + putc(' ', stderr); reset_output = 0; } else - fputs("[ 0%] ", stdout); + fputs("[ 0%] ", stderr); - fprintf(stdout, "%c", stat); - fflush(stdout); + fprintf(stderr, "%c", stat); + fflush(stderr); i++; return; } diff --git a/src/index.c b/src/index.c index 5d4ed39..db2c9d2 100644 --- a/src/index.c +++ b/src/index.c @@ -303,7 +303,7 @@ void init_index_mode(void) } } if (opt.verbose) - putc('\n', stdout); + putc('\n', stderr); if (opt.title_font) { int fw, fh, fx, fy; @@ -336,8 +336,8 @@ void init_index_mode(void) tw = gib_imlib_image_get_width(im_main); th = gib_imlib_image_get_height(im_main); - fprintf(stdout, PACKAGE " - File saved as %s\n", output_buf); - fprintf(stdout, + fprintf(stderr, PACKAGE " - File saved as %s\n", output_buf); + fprintf(stderr, " - Image is %dx%d pixels and contains %d thumbnails\n", tw, th, thumbnailcount); } } diff --git a/src/slideshow.c b/src/slideshow.c index a18c1f8..08db2cb 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -662,7 +662,7 @@ void slideshow_save_image(winwidget win) } if (opt.verbose) - printf("saving image to filename '%s'\n", tmpname); + fprintf(stderr, "saving image to filename '%s'\n", tmpname); ungib_imlib_save_image_with_error_return(win->im, tmpname, &err); diff --git a/src/thumbnail.c b/src/thumbnail.c index ed2a16b..1719fdc 100644 --- a/src/thumbnail.c +++ b/src/thumbnail.c @@ -357,7 +357,7 @@ void init_thumbnail_mode(void) winwidget_render_image(winwid, 0, 1); if (opt.verbose) - putc('\n', stdout); + putc('\n', stderr); if (opt.title_font) { int fw, fh, fx, fy; @@ -391,8 +391,8 @@ void init_thumbnail_mode(void) tw = gib_imlib_image_get_width(td.im_main); th = gib_imlib_image_get_height(td.im_main); - fprintf(stdout, PACKAGE " - File saved as %s\n", output_buf); - fprintf(stdout, + fprintf(stderr, PACKAGE " - File saved as %s\n", output_buf); + fprintf(stderr, " - Image is %dx%d pixels and contains %d thumbnails\n", tw, th, thumbnailcount); } |