1 files changed, 23 insertions, 21 deletions

diff --git a/src/index.c b/src/index.c
index 5d4ed39..b0b6923 100644
--- a/src/index.c
+++ b/src/index.c
@@ -1,7 +1,7 @@
 /* index.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2011 Daniel Friesel.
+Copyright (C) 2010-2020 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
@@ -59,7 +59,6 @@ void init_index_mode(void)
 	int lineno;
 	unsigned char trans_bg = 0;
 	int index_image_width, index_image_height;
-	char *s;
 	gib_list *line, *lines;
 
 	if (opt.montage) {
@@ -132,7 +131,7 @@ void init_index_mode(void)
 				weprintf(
 					"The image size you specified (%dx%d) is not large\n"
 					"enough to hold all %d thumbnails. To fit all the thumbnails,\n"
-					"either decrease their size, choos e asmaller font,\n"
+					"either decrease their size, choose a smaller font,\n"
 					"or use a larger image (like %dx%d)",
 					opt.limit_w, opt.limit_h, filelist_len, w, h);
 			h = opt.limit_h;
@@ -148,8 +147,16 @@ void init_index_mode(void)
 	index_image_height = h + title_area_h;
 	im_main = imlib_create_image(index_image_width, index_image_height);
 
-	if (!im_main)
-		eprintf("Imlib error creating index image, are you low on RAM?");
+	if (!im_main) {
+		if (index_image_height >= 32768 || index_image_width >= 32768) {
+			eprintf("Failed to create %dx%d pixels (%d MB) index image.\n"
+					"This is probably due to Imlib2 issues when dealing with images larger than 32k x 32k pixels.",
+					index_image_width, index_image_height, index_image_width * index_image_height * 4 / (1024*1024));
+		} else {
+			eprintf("Failed to create %dx%d pixels (%d MB) index image. Do you have enough RAM?",
+					index_image_width, index_image_height, index_image_width * index_image_height * 4 / (1024*1024));
+		}
+	}
 
 	if (bg_im)
 		gib_imlib_blend_image_onto_image(im_main, bg_im,
@@ -163,15 +170,9 @@ void init_index_mode(void)
 		gib_imlib_image_fill_rectangle(im_main, 0, 0, w, h + title_area_h, 0, 0, 0, 255);
 	}
 
-	/* Create the window title at this point */
-
-	if (!opt.title)
-		s = estrdup(PACKAGE " [index mode]");
-	else
-		s = estrdup(feh_printf(opt.title, NULL, NULL));
-
 	if (opt.display) {
-		winwid = winwidget_create_from_image(im_main, s, WIN_TYPE_SINGLE);
+		winwid = winwidget_create_from_image(im_main, WIN_TYPE_SINGLE);
+		winwidget_rename(winwid, PACKAGE " [index mode]");
 		winwidget_show(winwid);
 	}
 
@@ -303,7 +304,7 @@ void init_index_mode(void)
 		}
 	}
 	if (opt.verbose)
-		putc('\n', stdout);
+		putc('\n', stderr);
 
 	if (opt.title_font) {
 		int fw, fh, fx, fy;
@@ -324,20 +325,22 @@ void init_index_mode(void)
 
 		if (opt.output_dir)
 			snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file);
-		else
-			strncpy(output_buf, opt.output_file, 1024);
+		else {
+			strncpy(output_buf, opt.output_file, 1023);
+			output_buf[1023] = '\0';
+		}
 
-		ungib_imlib_save_image_with_error_return(im_main, output_buf, &err);
+		gib_imlib_save_image_with_error_return(im_main, output_buf, &err);
 		if (err) {
-			feh_imlib_print_load_error(output_buf, im_main, err);
+			feh_print_load_error(output_buf, im_main, err, LOAD_ERROR_IMLIB);
 		}
 		else if (opt.verbose) {
 			int tw, th;
 
 			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);
 		}
 	}
@@ -345,7 +348,6 @@ void init_index_mode(void)
 	if (!opt.display)
 		gib_imlib_free_image_and_decache(im_main);
 
-	free(s);
 	return;
 }