diff options
Diffstat (limited to 'src/thumbnail.c')
| -rw-r--r-- | src/thumbnail.c | 1565 |
1 files changed, 760 insertions, 805 deletions
diff --git a/src/thumbnail.c b/src/thumbnail.c index b4f410d..70af5e0 100644 --- a/src/thumbnail.c +++ b/src/thumbnail.c @@ -1,6 +1,7 @@ /* thumbnail.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 @@ -30,836 +31,635 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "thumbnail.h" #include "md5.h" #include "feh_png.h" +#include "index.h" +#include "signals.h" -static char *create_index_dimension_string(int w, int h); -static char *create_index_size_string(char *file); -static char *create_index_title_string(int num, int w, int h); static gib_list *thumbnails = NULL; static thumbmode_data td; /* TODO Break this up a bit ;) */ /* TODO s/bit/lot */ -void -init_thumbnail_mode(void) +void init_thumbnail_mode(void) { /* moved to thumbnail_data: - Imlib_Image im_main; - Imlib_Image bg_im = NULL; - Imlib_Font fn = NULL; - Imlib_Font title_fn = NULL; - - int w = 800, h = 600; - int bg_w = 0, bg_h = 0; - - int text_area_w, text_area_h; - int max_column_w = 0; - */ - - - Imlib_Image im_temp; - int ww = 0, hh = 0, www, hhh, xxx, yyy; - int x = 0, y = 0; - winwidget winwid = NULL; - Imlib_Image im_thumb = NULL; - unsigned char trans_bg = 0; - int title_area_h = 0; - int tw = 0, th = 0; - int fw_name, fw_size, fw_dim, fh; - int thumbnailcount = 0; - feh_file *file = NULL; - gib_list *l, *last = NULL; - int lines; - int index_image_width, index_image_height; - int x_offset_name = 0, x_offset_dim = 0, x_offset_size = 0; - char *s; - - /* initialize thumbnail mode data */ - td.im_main = NULL; - td.im_bg = NULL; - td.font_main = NULL; - td.font_title = NULL; - - td.w = 640; - td.h = 480; - td.bg_w = 0; - td.bg_h = 0; - td.thumb_tot_h = 0; - td.text_area_w = 0; - td.text_area_h = 0; - - td.vertical = 0; - td.max_column_w = 0; - - D_ENTER(3); - - mode = "thumbnail"; - - td.font_main = gib_imlib_load_font(opt.font); - - if (opt.title_font) - { - int fh, fw; - - td.font_title = gib_imlib_load_font(opt.title_font); - gib_imlib_get_text_size(td.font_title, "W", NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); - title_area_h = fh + 4; - } - else - td.font_title = imlib_load_font(DEFAULT_FONT_TITLE); - - if ((!td.font_main) || (!td.font_title)) - eprintf("Error loading fonts"); - - /* Work out how tall the font is */ - gib_imlib_get_text_size(td.font_main, "W", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT); - /* For now, allow room for the right number of lines with small gaps */ - td.text_area_h = - ((th + 2) * (opt.index_show_name + opt.index_show_size + - opt.index_show_dim)) + 5; - - /* This includes the text area for index data */ - td.thumb_tot_h = opt.thumb_h + td.text_area_h; - - /* Use bg image dimensions for default size */ - if (opt.bg && opt.bg_file) - { - if (!strcmp(opt.bg_file, "trans")) - trans_bg = 1; - else - { - - D(3, ("Time to apply a background to blend onto\n")); - if (feh_load_image_char(&td.im_bg, opt.bg_file) != 0) - { - td.bg_w = gib_imlib_image_get_width(td.im_bg); - td.bg_h = gib_imlib_image_get_height(td.im_bg); - } - } - } - - /* figure out geometry for the main window and entries */ - feh_thumbnail_calculate_geometry(); - - index_image_width = td.w; - index_image_height = td.h + title_area_h; - td.im_main = imlib_create_image(index_image_width, index_image_height); - gib_imlib_image_set_has_alpha(td.im_main, 1); - - if (!td.im_main) - eprintf("Imlib error creating index image, are you low on RAM?"); - - if (td.im_bg) - gib_imlib_blend_image_onto_image(td.im_main, td.im_bg, - gib_imlib_image_has_alpha(td.im_bg), 0, 0, - td.bg_w, td.bg_h, 0, 0, td.w, td.h, 1, 0, 0); - else if (trans_bg) - { - gib_imlib_image_fill_rectangle(td.im_main, 0, 0, td.w, td.h + title_area_h, 0, 0, - 0, 0); - gib_imlib_image_set_has_alpha(td.im_main, 1); - } - else - { - /* Colour the background */ - gib_imlib_image_fill_rectangle(td.im_main, 0, 0, td.w, td.h + title_area_h, 0, 0, - 0, 255); - } - - /* Create title now */ - - if (!opt.title) - s = estrdup(PACKAGE " [thumbnail mode]"); - else - s = estrdup(feh_printf(opt.title, NULL)); - - if (opt.display) - { - winwid = winwidget_create_from_image(td.im_main, s, WIN_TYPE_THUMBNAIL); - winwidget_show(winwid); - } - - /* make sure we have an ~/.thumbnails/normal directory for storing - permanent thumbnails */ - td.cache_thumbnails = feh_thumbnail_setup_thumbnail_dir(); - td.cache_thumbnails = opt.cache_thumbnails; - - for (l = filelist; l; l = l->next) - { - file = FEH_FILE(l->data); - if (last) - { - filelist = feh_file_remove_from_list(filelist, last); - filelist_len--; - last = NULL; - } - D(4, ("About to load image %s\n", file->filename)); - /* if (feh_load_image(&im_temp, file) != 0) */ - if (feh_thumbnail_get_thumbnail(&im_temp, file) != 0) - { - if (opt.verbose) - feh_display_status('.'); - D(4, ("Successfully loaded %s\n", file->filename)); - www = opt.thumb_w; - hhh = opt.thumb_h; - ww = gib_imlib_image_get_width(im_temp); - hh = gib_imlib_image_get_height(im_temp); - thumbnailcount++; - if (gib_imlib_image_has_alpha(im_temp)) - imlib_context_set_blend(1); - else - imlib_context_set_blend(0); - - if (opt.aspect) - { - double ratio = 0.0; - - /* Keep the aspect ratio for the thumbnail */ - ratio = ((double) ww / hh) / ((double) www / hhh); - - if (ratio > 1.0) - hhh = opt.thumb_h / ratio; - else if (ratio != 1.0) - www = opt.thumb_w * ratio; - } - - if ((!opt.stretch) && ((www > ww) || (hhh > hh))) - { - /* Don't make the image larger unless stretch is specified */ - www = ww; - hhh = hh; - } - - im_thumb = - gib_imlib_create_cropped_scaled_image(im_temp, 0, 0, ww, hh, www, - hhh, 1); - gib_imlib_free_image_and_decache(im_temp); - - if (opt.alpha) - { - DATA8 atab[256]; - - D(3, ("Applying alpha options\n")); - gib_imlib_image_set_has_alpha(im_thumb, 1); - memset(atab, opt.alpha_level, sizeof(atab)); - gib_imlib_apply_color_modifier_to_rectangle(im_thumb, 0, 0, www, - hhh, NULL, NULL, NULL, - atab); - } - - td.text_area_w = opt.thumb_w; - /* Now draw on the info text */ - if (opt.index_show_name) - { - gib_imlib_get_text_size(td.font_main, file->name, NULL, &fw_name, &fh, - IMLIB_TEXT_TO_RIGHT); - if (fw_name > td.text_area_w) - td.text_area_w = fw_name; - } - if (opt.index_show_dim) - { - gib_imlib_get_text_size(td.font_main, create_index_dimension_string(ww, hh), - NULL, &fw_dim, &fh, IMLIB_TEXT_TO_RIGHT); - if (fw_dim > td.text_area_w) - td.text_area_w = fw_dim; - } - if (opt.index_show_size) - { - gib_imlib_get_text_size(td.font_main, - create_index_size_string(file->filename), - NULL, &fw_size, &fh, IMLIB_TEXT_TO_RIGHT); - if (fw_size > td.text_area_w) - td.text_area_w = fw_size; - } - if (td.text_area_w > opt.thumb_w) - td.text_area_w += 5; - - /* offsets for centering text */ - x_offset_name = (td.text_area_w - fw_name) / 2; - x_offset_dim = (td.text_area_w - fw_dim) / 2; - x_offset_size = (td.text_area_w - fw_size) / 2; - - if (td.vertical) - { - if (td.text_area_w > td.max_column_w) - td.max_column_w = td.text_area_w; - if (y > td.h - td.thumb_tot_h) - { - y = 0; - x += td.max_column_w; - td.max_column_w = 0; - } - if (x > td.w - td.text_area_w) - break; - } - else - { - if (x > td.w - td.text_area_w) - { - x = 0; - y += td.thumb_tot_h; - } - if (y > td.h - td.thumb_tot_h) - break; - } - - if (opt.aspect) - { - xxx = x + ((opt.thumb_w - www) / 2); - yyy = y + ((opt.thumb_h - hhh) / 2); - } - else - { - /* Ignore the aspect ratio and squash the image in */ - xxx = x; - yyy = y; - } - - /* Draw now */ - gib_imlib_blend_image_onto_image(td.im_main, im_thumb, - gib_imlib_image_has_alpha(im_thumb), - 0, 0, www, hhh, xxx, yyy, www, hhh, - 1, - gib_imlib_image_has_alpha(im_thumb), - 0); - - thumbnails = - gib_list_add_front(thumbnails, - feh_thumbnail_new(file, xxx, yyy, www, hhh)); - - gib_imlib_free_image_and_decache(im_thumb); - - lines = 0; - if (opt.index_show_name) - gib_imlib_text_draw(td.im_main, td.font_main, NULL, x + x_offset_name, - y + opt.thumb_h + (lines++ * (th + 2)) + 2, - file->name, IMLIB_TEXT_TO_RIGHT, 255, 255, - 255, 255); - if (opt.index_show_dim) - gib_imlib_text_draw(td.im_main, td.font_main, NULL, x + x_offset_dim, - y + opt.thumb_h + (lines++ * (th + 2)) + 2, - create_index_dimension_string(ww, hh), - IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255); - if (opt.index_show_size) - gib_imlib_text_draw(td.im_main, td.font_main, NULL, x + x_offset_size, - y + opt.thumb_h + (lines++ * (th + 2)) + 2, - create_index_size_string(file->filename), - IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255); - - if (td.vertical) - y += td.thumb_tot_h; - else - x += td.text_area_w; - } - else - { - if (opt.verbose) - feh_display_status('x'); - last = l; - } - if (opt.display) - { - winwidget_render_image(winwid, 0, 0); - if (!feh_main_iteration(0)) - exit(0); - } - } - if (opt.verbose) - fprintf(stdout, "\n"); - - if (opt.title_font) - { - int fw, fh, fx, fy; - char *s; - - s = create_index_title_string(thumbnailcount, td.w, td.h); - gib_imlib_get_text_size(td.font_title, s, NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); - fx = (index_image_width - fw) >> 1; - fy = index_image_height - fh - 2; - gib_imlib_text_draw(td.im_main, td.font_title, NULL, fx, fy, s, IMLIB_TEXT_TO_RIGHT, - 255, 255, 255, 255); - } - - if (opt.output && opt.output_file) - { - char output_buf[1024]; - - if (opt.output_dir) - snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file); - else - strncpy(output_buf, opt.output_file, 1024); - gib_imlib_save_image(td.im_main, output_buf); - if (opt.verbose) - { - int tw, th; - - 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, - " - Image is %dx%d pixels and contains %d thumbnails\n", - tw, th, thumbnailcount); - } - } - - if (!opt.display) - gib_imlib_free_image_and_decache(td.im_main); - - free(s); - D_RETURN_(3); -} + Imlib_Image im_main; + Imlib_Image bg_im = NULL; + Imlib_Font fn = NULL; + Imlib_Font title_fn = NULL; + int w = 800, h = 600; + int bg_w = 0, bg_h = 0; -static char * -create_index_size_string(char *file) -{ - static char str[50]; - int size = 0; - double kbs = 0.0; - struct stat st; - - D_ENTER(4); - if (stat(file, &st)) - kbs = 0.0; - else - { - size = st.st_size; - kbs = (double) size / 1000; - } - - snprintf(str, sizeof(str), "%.2fKb", kbs); - D_RETURN(4, str); -} + int text_area_w, text_area_h; + int max_column_w = 0; + */ -static char * -create_index_dimension_string(int w, int h) -{ - static char str[50]; + Imlib_Load_Error err; + Imlib_Image im_temp; + int ww = 0, hh = 0, www, hhh, xxx, yyy; + int orig_w, orig_h; + int x = 0, y = 0; + winwidget winwid = NULL; + Imlib_Image im_thumb = NULL; + unsigned char trans_bg = 0; + int title_area_h = 0; + int tw = 0, th = 0; + int fw, fh; + int thumbnailcount = 0; + feh_file *file = NULL; + gib_list *l, *last = NULL; + int lineno; + int index_image_width, index_image_height; + unsigned int thumb_counter = 0; + gib_list *line, *lines; + + /* initialize thumbnail mode data */ + td.im_main = NULL; + td.im_bg = NULL; + td.font_main = NULL; + td.font_title = NULL; + + td.w = 640; + td.h = 480; + td.bg_w = 0; + td.bg_h = 0; + td.thumb_tot_h = 0; + td.text_area_w = 0; + td.text_area_h = 0; + + td.vertical = 0; + td.max_column_w = 0; + + if (!opt.thumb_title) + opt.thumb_title = "%n"; + mode = "thumbnail"; + + if (opt.font) + td.font_main = gib_imlib_load_font(opt.font); + + if (!td.font_main) + td.font_main = gib_imlib_load_font(DEFAULT_FONT); + + if (opt.title_font) { + int fh, fw; + + td.font_title = gib_imlib_load_font(opt.title_font); + if (!td.font_title) + td.font_title = gib_imlib_load_font(DEFAULT_FONT_TITLE); + + gib_imlib_get_text_size(td.font_title, "W", NULL, &fw, &fh, + IMLIB_TEXT_TO_RIGHT); + title_area_h = fh + 4; + } else + td.font_title = imlib_load_font(DEFAULT_FONT_TITLE); + + if ((!td.font_main) || (!td.font_title)) + eprintf("Error loading fonts"); + + /* Work out how tall the font is */ + gib_imlib_get_text_size(td.font_main, "W", NULL, &tw, &th, + IMLIB_TEXT_TO_RIGHT); + get_index_string_dim(NULL, td.font_main, &fw, &fh); + td.text_area_h = fh + 5; + + /* This includes the text area for index data */ + td.thumb_tot_h = opt.thumb_h + td.text_area_h; + + /* Use bg image dimensions for default size */ + if (opt.bg && opt.bg_file) { + if (!strcmp(opt.bg_file, "trans")) + trans_bg = 1; + else { + + D(("Time to apply a background to blend onto\n")); + if (feh_load_image_char(&td.im_bg, opt.bg_file) != 0) { + td.bg_w = gib_imlib_image_get_width(td.im_bg); + td.bg_h = gib_imlib_image_get_height(td.im_bg); + } + } + } - D_ENTER(4); - snprintf(str, sizeof(str), "%dx%d", w, h); - D_RETURN(4, str); -} + /* figure out geometry for the main window and entries */ + feh_thumbnail_calculate_geometry(); -static char * -create_index_title_string(int num, int w, int h) -{ - static char str[50]; + index_image_width = td.w; + index_image_height = td.h + title_area_h; + D(("imlib_create_image(%d, %d)\n", index_image_width, index_image_height)); + td.im_main = imlib_create_image(index_image_width, index_image_height); - D_ENTER(4); - snprintf(str, sizeof(str), - PACKAGE " index - %d thumbnails, %d by %d pixels", num, w, h); - D_RETURN(4, str); -} + if (!td.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)); + } + } -feh_thumbnail * -feh_thumbnail_new(feh_file * file, int x, int y, int w, int h) -{ - feh_thumbnail *thumb; + gib_imlib_image_set_has_alpha(td.im_main, 1); + + if (td.im_bg) + gib_imlib_blend_image_onto_image(td.im_main, td.im_bg, + gib_imlib_image_has_alpha + (td.im_bg), 0, 0, td.bg_w, td.bg_h, 0, 0, + td.w, td.h, 1, 0, 0); + else if (trans_bg) { + gib_imlib_image_fill_rectangle(td.im_main, 0, 0, td.w, + td.h + title_area_h, 0, 0, 0, 0); + gib_imlib_image_set_has_alpha(td.im_main, 1); + } else { + /* Colour the background */ + gib_imlib_image_fill_rectangle(td.im_main, 0, 0, td.w, + td.h + title_area_h, 0, 0, 0, 255); + } + + + if (opt.display) { + winwid = winwidget_create_from_image(td.im_main, WIN_TYPE_THUMBNAIL); + winwidget_rename(winwid, PACKAGE " [thumbnail mode]"); + winwidget_show(winwid); + } + + td.cache_thumbnails = opt.cache_thumbnails; + + if (td.cache_thumbnails) { + if (opt.thumb_w > opt.thumb_h) + td.cache_dim = opt.thumb_w; + else + td.cache_dim = opt.thumb_h; + + if (td.cache_dim > 1024) { + /* Not specified by XDG thumbnail standard */ + td.cache_thumbnails = 0; + } else if (td.cache_dim > 512) { + td.cache_dim = 1024; + td.cache_dir = estrdup("xx-large"); + } else if (td.cache_dim > 256) { + td.cache_dim = 512; + td.cache_dir = estrdup("x-large"); + } else if (td.cache_dim > 128) { + td.cache_dim = 256; + td.cache_dir = estrdup("large"); + } else { + td.cache_dim = 128; + td.cache_dir = estrdup("normal"); + } + feh_thumbnail_setup_thumbnail_dir(); + } + + for (l = filelist; l; l = l->next) { + file = FEH_FILE(l->data); + if (last) { + filelist = feh_file_remove_from_list(filelist, last); + last = NULL; + } + D(("About to load image %s\n", file->filename)); + /* if (feh_load_image(&im_temp, file) != 0) */ + if (feh_thumbnail_get_thumbnail(&im_temp, file, &orig_w, &orig_h) + != 0) { + if (opt.verbose) + feh_display_status('.'); + D(("Successfully loaded %s\n", file->filename)); + www = opt.thumb_w; + hhh = opt.thumb_h; + ww = gib_imlib_image_get_width(im_temp); + hh = gib_imlib_image_get_height(im_temp); + + if (!orig_w) { + orig_w = ww; + orig_h = hh; + } + + thumbnailcount++; + if (gib_imlib_image_has_alpha(im_temp)) + imlib_context_set_blend(1); + else + imlib_context_set_blend(0); + + if (opt.aspect) { + double ratio = 0.0; + + /* Keep the aspect ratio for the thumbnail */ + ratio = ((double) ww / hh) / ((double) www / hhh); + + if (ratio > 1.0) + hhh = opt.thumb_h / ratio; + else if (ratio != 1.0) + www = opt.thumb_w * ratio; + } + + if ((!opt.stretch) && ((www > ww) || (hhh > hh))) { + /* Don't make the image larger unless stretch is specified */ + www = ww; + hhh = hh; + } + + im_thumb = gib_imlib_create_cropped_scaled_image(im_temp, 0, 0, + ww, hh, www, hhh, 1); + gib_imlib_free_image_and_decache(im_temp); + + if (opt.alpha) { + DATA8 atab[256]; + + D(("Applying alpha options\n")); + gib_imlib_image_set_has_alpha(im_thumb, 1); + memset(atab, opt.alpha_level, sizeof(atab)); + gib_imlib_apply_color_modifier_to_rectangle + (im_thumb, 0, 0, www, hhh, NULL, NULL, NULL, atab); + } - D_ENTER(4); + td.text_area_w = opt.thumb_w; + /* Now draw on the info text */ + if (opt.index_info) { + get_index_string_dim(file, td.font_main, &fw, &fh); + if (fw > td.text_area_w) + td.text_area_w = fw; + if (fh > td.text_area_h) { + td.text_area_h = fh + 5; + td.thumb_tot_h = opt.thumb_h + td.text_area_h; + } + } + if (td.text_area_w > opt.thumb_w) + td.text_area_w += 5; + + if (td.vertical) { + if (td.text_area_w > td.max_column_w) + td.max_column_w = td.text_area_w; + if (y > td.h - td.thumb_tot_h) { + y = 0; + x += td.max_column_w; + td.max_column_w = 0; + } + if (x > td.w - td.text_area_w) + break; + } else { + if (x > td.w - td.text_area_w) { + x = 0; + y += td.thumb_tot_h; + } + if (y > td.h - td.thumb_tot_h) + break; + } + + /* center image relative to the text below it (if any) */ + xxx = x + ((td.text_area_w - www) / 2); + yyy = y; + + if (opt.aspect) + yyy += (opt.thumb_h - hhh) / 2; + + /* Draw now */ + gib_imlib_blend_image_onto_image(td.im_main, + im_thumb, + gib_imlib_image_has_alpha + (im_thumb), 0, 0, + www, hhh, xxx, + yyy, www, hhh, 1, + gib_imlib_image_has_alpha(im_thumb), 0); + + thumbnails = gib_list_add_front(thumbnails, + feh_thumbnail_new(file, xxx, yyy, www, hhh)); + + gib_imlib_free_image_and_decache(im_thumb); + + lineno = 0; + if (opt.index_info) { + line = lines = feh_wrap_string(create_index_string(file), + opt.thumb_w * 3, td.font_main, NULL); + + while (line) { + gib_imlib_get_text_size(td.font_main, (char *) line -> data, + NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); + gib_imlib_text_draw(td.im_main, td.font_main, NULL, + x + ((td.text_area_w - fw) >> 1), + y + opt.thumb_h + (lineno++ * (th + 2)) + 2, + (char *) line->data, + IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255); + line = line->next; + } + gib_list_free_and_data(lines); + } + + if (td.vertical) + y += td.thumb_tot_h; + else + x += td.text_area_w; + } else { + if (opt.verbose) + feh_display_status('x'); + last = l; + } + if (opt.display) { + /* thumb_counter is unsigned, so no need to catch overflows */ + if (++thumb_counter == opt.thumb_redraw) { + winwidget_render_image(winwid, 0, 1); + thumb_counter = 0; + } + if (!feh_main_iteration(0)) + exit(0); + } + } + + if (thumb_counter != 0) + winwidget_render_image(winwid, 0, 1); + + if (opt.verbose) + putc('\n', stderr); + + if (opt.title_font) { + int fw, fh, fx, fy; + char *s; + + s = create_index_title_string(thumbnailcount, td.w, td.h); + gib_imlib_get_text_size(td.font_title, s, NULL, &fw, &fh, + IMLIB_TEXT_TO_RIGHT); + fx = (index_image_width - fw) >> 1; + fy = index_image_height - fh - 2; + gib_imlib_text_draw(td.im_main, td.font_title, NULL, fx, + fy, s, IMLIB_TEXT_TO_RIGHT, 255, 255, 255, 255); + + if (opt.display) + winwidget_render_image(winwid, 0, 1); + } + + if (opt.output && opt.output_file) { + char output_buf[1024]; + + if (opt.output_dir) + snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file); + else { + strncpy(output_buf, opt.output_file, 1023); + output_buf[1023] = '\0'; + } + gib_imlib_save_image_with_error_return(td.im_main, output_buf, &err); + if (err) { + feh_print_load_error(output_buf, td.im_main, err, LOAD_ERROR_IMLIB); + } + else if (opt.verbose) { + int tw, th; + + tw = gib_imlib_image_get_width(td.im_main); + th = gib_imlib_image_get_height(td.im_main); + 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); + } + } + + if (!opt.display) + gib_imlib_free_image_and_decache(td.im_main); + else if (opt.start_list_at) { + for (l = thumbnails; l; l = l->next) { + if (!strcmp(opt.start_list_at, FEH_THUMB(l->data)->file->filename)) { + free(opt.start_list_at); + opt.start_list_at = NULL; + feh_thumbnail_select(winwid, FEH_THUMB(l->data)); + break; + } + } + } - thumb = (feh_thumbnail *) emalloc(sizeof(feh_thumbnail)); - thumb->x = x; - thumb->y = y; - thumb->w = w; - thumb->h = h; - thumb->file = file; - thumb->exists = 1; - D_RETURN(4, thumb); + return; } -feh_file * -feh_thumbnail_get_file_from_coords(int x, int y) +feh_thumbnail *feh_thumbnail_new(feh_file * file, int x, int y, int w, int h) { - gib_list *l; - feh_thumbnail *thumb; - - D_ENTER(4); - - for (l = thumbnails; l; l = l->next) - { - thumb = FEH_THUMB(l->data); - if (XY_IN_RECT(x, y, thumb->x, thumb->y, thumb->w, thumb->h)) - { - if (thumb->exists) - { - D_RETURN(4, thumb->file); - } - } - } - D(4, ("No matching %d %d\n", x, y)); - D_RETURN(4, NULL); + feh_thumbnail *thumb; + + thumb = (feh_thumbnail *) emalloc(sizeof(feh_thumbnail)); + thumb->x = x; + thumb->y = y; + thumb->w = w; + thumb->h = h; + thumb->file = file; + thumb->exists = 1; + + return(thumb); } -feh_thumbnail * -feh_thumbnail_get_thumbnail_from_coords(int x, int y) +feh_file *feh_thumbnail_get_file_from_coords(int x, int y) { - gib_list *l; - feh_thumbnail *thumb; - - D_ENTER(4); - - for (l = thumbnails; l; l = l->next) - { - thumb = FEH_THUMB(l->data); - if (XY_IN_RECT(x, y, thumb->x, thumb->y, thumb->w, thumb->h)) - { - if (thumb->exists) - { - D_RETURN(4, thumb); - } - } - } - D(4, ("No matching %d %d\n", x, y)); - D_RETURN(4, NULL); + gib_list *l; + feh_thumbnail *thumb; + + for (l = thumbnails; l; l = l->next) { + thumb = FEH_THUMB(l->data); + if (XY_IN_RECT(x, y, thumb->x, thumb->y, thumb->w, thumb->h)) { + if (thumb->exists) { + return(thumb->file); + } + } + } + D(("No matching %d %d\n", x, y)); + return(NULL); } -feh_thumbnail * -feh_thumbnail_get_from_file(feh_file * file) +feh_thumbnail *feh_thumbnail_get_thumbnail_from_coords(int x, int y) { - gib_list *l; - feh_thumbnail *thumb; - - D_ENTER(4); - - for (l = thumbnails; l; l = l->next) - { - thumb = FEH_THUMB(l->data); - if (thumb->file == file) - { - if (thumb->exists) - { - D_RETURN(4, thumb); - } - } - } - D(4, ("No match\n")); - D_RETURN(4, NULL); + gib_list *l; + feh_thumbnail *thumb; + + for (l = thumbnails; l; l = l->next) { + thumb = FEH_THUMB(l->data); + if (XY_IN_RECT(x, y, thumb->x, thumb->y, thumb->w, thumb->h)) { + if (thumb->exists) { + return(thumb); + } + } + } + D(("No matching %d %d\n", x, y)); + return(NULL); } +feh_thumbnail *feh_thumbnail_get_from_file(feh_file * file) +{ + gib_list *l; + feh_thumbnail *thumb; + + for (l = thumbnails; l; l = l->next) { + thumb = FEH_THUMB(l->data); + if (thumb->file == file) { + if (thumb->exists) { + return(thumb); + } + } + } + D(("No match\n")); + return(NULL); +} -void -feh_thumbnail_mark_removed(feh_file * file, int deleted) +void feh_thumbnail_mark_removed(feh_file * file, int deleted) { - feh_thumbnail *thumb; - winwidget w; - - D_ENTER(4); - - thumb = feh_thumbnail_get_from_file(file); - if (thumb) - { - w = winwidget_get_first_window_of_type(WIN_TYPE_THUMBNAIL); - if (w) - { - td.font_main = imlib_load_font(DEFAULT_FONT_TITLE); - if (deleted) - gib_imlib_image_fill_rectangle(w->im, thumb->x, thumb->y, - thumb->w, thumb->h, 255, 0, 0, - 150); - else - gib_imlib_image_fill_rectangle(w->im, thumb->x, thumb->y, - thumb->w, thumb->h, 0, 0, 255, - 150); - if (td.font_main) - { - int tw, th; - - gib_imlib_get_text_size(td.font_main, "X", NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT); - gib_imlib_text_draw(w->im, td.font_main, NULL, thumb->x + ((thumb->w - tw) / 2), - thumb->y + ((thumb->h - th) / 2), "X", - IMLIB_TEXT_TO_RIGHT, 205, 205, 50, 255); - } - else - weprintf(DEFAULT_FONT_TITLE); - winwidget_render_image(w, 0, 1); - } - thumb->exists = 0; - } - D_RETURN_(4); + feh_thumbnail *thumb; + winwidget w; + + thumb = feh_thumbnail_get_from_file(file); + if (thumb) { + w = winwidget_get_first_window_of_type(WIN_TYPE_THUMBNAIL); + if (w) { + int tw, th; + if (deleted) + gib_imlib_image_fill_rectangle(w->im, thumb->x, thumb->y, + thumb->w, thumb->h, 255, 0, 0, 150); + else + gib_imlib_image_fill_rectangle(w->im, thumb->x, thumb->y, + thumb->w, thumb->h, 0, 0, 255, 150); + + gib_imlib_get_text_size(td.font_main, "X", NULL, &tw, &th, + IMLIB_TEXT_TO_RIGHT); + gib_imlib_text_draw(w->im, td.font_main, NULL, + thumb->x + ((thumb->w - tw) / 2), + thumb->y + ((thumb->h - th) / 2), "X", + IMLIB_TEXT_TO_RIGHT, 205, 205, 50, 255); + winwidget_render_image(w, 0, 1); + } + thumb->exists = 0; + } + return; } -void -feh_thumbnail_calculate_geometry(void) +void feh_thumbnail_calculate_geometry(void) { - gib_list *l; - feh_file *file; + if (!opt.limit_w && !opt.limit_h) { + if (td.im_bg) { + opt.limit_w = td.bg_w; + opt.limit_h = td.bg_h; + } else + opt.limit_w = 800; + } - int x = 0, y = 0; - int fw, fh; + /* Here we need to whiz through the files, and look at the filenames and + info in the selected font, work out how much space we need, and + calculate the size of the image we will require */ + + if (opt.limit_w) { + td.w = opt.limit_w; + + index_calculate_height(td.font_main, td.w, &td.h, &td.thumb_tot_h); - if (!opt.limit_w && !opt.limit_h) - { - if (td.im_bg) - { - if (opt.verbose) - fprintf(stdout, - PACKAGE " - No size restriction specified for index.\n" - " You did specify a background however, so the\n" - " index size has defaulted to the size of the image\n"); - opt.limit_w = td.bg_w; - opt.limit_h = td.bg_h; - } - else - { - if (opt.verbose) - fprintf(stdout, - PACKAGE " - No size restriction specified for index.\n" - " Using defaults (width limited to 640)\n"); - opt.limit_w = 640; - } - } - - - /* Here we need to whiz through the files, and look at the filenames and - info in the selected font, work out how much space we need, and - calculate the size of the image we will require */ - - if (opt.limit_w && opt.limit_h) - { - int rec_h = 0; - - td.w = opt.limit_w; - td.h = opt.limit_h; - - /* Work out if this is big enough, and give a warning if not */ - - /* Pretend we are limiting width by that specified, loop through, and - see it we fit in the height specified. If not, continue the loop, - and recommend the final value instead. Carry on and make the index - anyway. */ - - for (l = filelist; l; l = l->next) - { - file = FEH_FILE(l->data); - td.text_area_w = opt.thumb_w; - if (opt.index_show_name) - { - gib_imlib_get_text_size(td.font_main, file->name, NULL, &fw, &fh, - IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - if (opt.index_show_dim) - { - gib_imlib_get_text_size(td.font_main, - create_index_dimension_string(1000, 1000), - NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - if (opt.index_show_size) - { - gib_imlib_get_text_size(td.font_main, - create_index_size_string(file->filename), - NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - if (td.text_area_w > opt.thumb_w) - td.text_area_w += 5; - - if ((x > td.w - td.text_area_w)) - { - x = 0; - y += td.thumb_tot_h; - } - - x += td.text_area_w; - } - rec_h = y + td.thumb_tot_h; - - if (td.h < rec_h) - { - weprintf("The image size you specified (%d by %d) is not large\n" - "enough to hold all the thumnails you specified (%d). To fit all\n" - "the thumnails, either decrease their size, choose a smaller font,\n" - "or use a larger image (may I recommend %d by %d?)", - opt.limit_w, opt.limit_h, filelist_len, opt.limit_w, rec_h); - } - } - else if (opt.limit_h) - { - td.vertical = 1; - td.h = opt.limit_h; - /* calc w */ - for (l = filelist; l; l = l->next) - { - file = FEH_FILE(l->data); - td.text_area_w = opt.thumb_w; - /* Calc width of text */ - if (opt.index_show_name) - { - gib_imlib_get_text_size(td.font_main, file->name, NULL, &fw, &fh, - IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - if (opt.index_show_dim) - { - gib_imlib_get_text_size(td.font_main, - create_index_dimension_string(1000, 1000), - NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - if (opt.index_show_size) - { - gib_imlib_get_text_size(td.font_main, - create_index_size_string(file->filename), - NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - if (td.text_area_w > opt.thumb_w) - td.text_area_w += 5; - - if (td.text_area_w > td.max_column_w) - td.max_column_w = td.text_area_w; - - if ((y > td.h - td.thumb_tot_h)) - { - y = 0; - x += td.max_column_w; - td.max_column_w = 0; - } - - y += td.thumb_tot_h; - } - td.w = x + td.text_area_w; - td.max_column_w = 0; - } - else if (opt.limit_w) - { - td.w = opt.limit_w; - /* calc h */ - - for (l = filelist; l; l = l->next) - { - file = FEH_FILE(l->data); - td.text_area_w = opt.thumb_w; - if (opt.index_show_name) - { - gib_imlib_get_text_size(td.font_main, file->name, NULL, &fw, &fh, - IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - if (opt.index_show_dim) - { - gib_imlib_get_text_size(td.font_main, - create_index_dimension_string(1000, 1000), - NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - if (opt.index_show_size) - { - gib_imlib_get_text_size(td.font_main, - create_index_size_string(file->filename), - NULL, &fw, &fh, IMLIB_TEXT_TO_RIGHT); - if (fw > td.text_area_w) - td.text_area_w = fw; - } - - if (td.text_area_w > opt.thumb_w) - td.text_area_w += 5; - - if ((x > td.w - td.text_area_w)) - { - x = 0; - y += td.thumb_tot_h; - } - - x += td.text_area_w; - } - td.h = y + td.thumb_tot_h; - } + if (opt.limit_h) { + if (td.h> opt.limit_h) + weprintf( + "The image size you specified (%dx%d) is not large\n" + "enough to hold all %d thumbnails. To fit all\n" + "the thumnails, 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, opt.limit_w, td.h); + td.h = opt.limit_h; + } + } else if (opt.limit_h) { + td.vertical = 1; + td.h = opt.limit_h; + + index_calculate_width(td.font_main, &td.w, td.h, &td.thumb_tot_h); + } } -int -feh_thumbnail_get_thumbnail(Imlib_Image *image, feh_file *file) +int feh_thumbnail_get_thumbnail(Imlib_Image * image, feh_file * file, + int * orig_w, int * orig_h) { int status = 0; char *thumb_file = NULL, *uri = NULL; + *orig_w = 0; + *orig_h = 0; + if (!file || !file->filename) - return(0); + return (0); - if (td.cache_thumbnails) - { + if (td.cache_thumbnails) { uri = feh_thumbnail_get_name_uri(file->filename); thumb_file = feh_thumbnail_get_name(uri); - status = feh_thumbnail_get_generated(image, file, thumb_file, uri); + + if (thumb_file == NULL) { + free(uri); + return feh_load_image(image, file); + } + + status = feh_thumbnail_get_generated(image, file, thumb_file, + orig_w, orig_h); if (!status) - status = feh_thumbnail_generate(image, file, thumb_file, uri); - - printf("uri is %s, thumb_file is %s\n", uri, thumb_file); + status = feh_thumbnail_generate(image, file, thumb_file, uri, + orig_w, orig_h); + + D(("uri is %s, thumb_file is %s\n", uri, thumb_file)); free(uri); free(thumb_file); - } - else + } else status = feh_load_image(image, file); return status; } -char* -feh_thumbnail_get_name(char *uri) +static char *feh_thumbnail_get_prefix(void) { - char *home = NULL, *thumb_file = NULL, *md5_name = NULL; + char *dir = NULL, *home, *xdg_cache_home; - /* FIXME: make sure original file isn't under ~/.thumbnails */ + // TODO: perhaps make sure that either of those paths aren't /-terminated + xdg_cache_home = getenv("XDG_CACHE_HOME"); + if (xdg_cache_home && xdg_cache_home[0] == '/') { + dir = estrjoin("/", xdg_cache_home, "thumbnails", td.cache_dir, NULL); + } else { + home = getenv("HOME"); + if (home && home[0] == '/') { + dir = estrjoin("/", home, ".cache/thumbnails", td.cache_dir, NULL); + } + } + return dir; +} - md5_name = feh_thumbnail_get_name_md5(uri); +char *feh_thumbnail_get_name(char *uri) +{ + char *prefix, *thumb_file = NULL, *md5_name; - home = getenv("HOME"); - if (home) - { - thumb_file = estrjoin("/", home, ".thumbnails/normal", md5_name, NULL); - } + /* FIXME: make sure original file isn't under ~/.thumbnails */ - free(md5_name); + prefix = feh_thumbnail_get_prefix(); + if (prefix) { + md5_name = feh_thumbnail_get_name_md5(uri); + thumb_file = estrjoin("/", prefix, md5_name, NULL); + free(md5_name); + free(prefix); + } return thumb_file; } -char* -feh_thumbnail_get_name_uri(char *name) +char *feh_thumbnail_get_name_uri(char *name) { char *cwd, *uri = NULL; - /* FIXME: what happends with http, https, and ftp? MTime etc */ - if ((strncmp(name, "http://", 7) != 0) && - (strncmp(name, "https://", 8) != 0) && - (strncmp(name, "ftp://", 6) != 0) && - (strncmp(name, "file://", 7) != 0)) - { + /* FIXME: what happens with http, https, and ftp? MTime etc */ + if (!path_is_url(name)) { - /* make sure it's an absoulte path */ + /* make sure it's an absolute path */ /* FIXME: add support for ~, need to investigate if it's expanded - somewhere else before adding (unecessary) code */ + somewhere else before adding (unnecessary) code */ if (name[0] != '/') { + /* work around /some/path/./image.ext */ + if ((strncmp(name, "./", 2)) == 0) + name += 2; cwd = getcwd(NULL, 0); uri = estrjoin("/", "file:/", cwd, name, NULL); free(cwd); } else { uri = estrjoin(NULL, "file://", name, NULL); } - } - else + } else uri = estrdup(name); - + return uri; } -char* -feh_thumbnail_get_name_md5(char *uri) +char *feh_thumbnail_get_name_md5(char *uri) { int i; char *pos, *md5_name; @@ -868,13 +668,12 @@ feh_thumbnail_get_name_md5(char *uri) /* generate the md5 sum */ md5_init(&pms); - md5_append(&pms, uri, strlen(uri)); + md5_append(&pms, (unsigned char *)uri, strlen(uri)); md5_finish(&pms, digest); /* print the md5 as hex to a string */ - md5_name = emalloc(32 + 4 + 1 * sizeof(char)); /* md5 + .png + '\0' */ - for (i = 0, pos = md5_name; i < 16; i++, pos += 2) - { + md5_name = emalloc(32 + 4 + 1); /* md5 + .png + '\0' */ + for (i = 0, pos = md5_name; i < 16; i++, pos += 2) { sprintf(pos, "%02x", digest[i]); } sprintf(pos, ".png"); @@ -882,111 +681,267 @@ feh_thumbnail_get_name_md5(char *uri) return md5_name; } -int -feh_thumbnail_generate(Imlib_Image *image, feh_file *file, char *thumb_file, char *uri) +int feh_thumbnail_generate(Imlib_Image * image, feh_file * file, + char *thumb_file, char *uri, int * orig_w, int * orig_h) { int w, h, thumb_w, thumb_h; - char *c_mtime; Imlib_Image im_temp; struct stat sb; + char c_width[8], c_height[8]; + char *tmp_thumb_file, *prefix; + int tmp_fd; - if (feh_load_image(&im_temp, file) != 0) - { - w = gib_imlib_image_get_width(im_temp); - h = gib_imlib_image_get_height(im_temp); - thumb_w = 128; - thumb_h = 128; + if (feh_load_image(&im_temp, file) != 0) { + *orig_w = w = gib_imlib_image_get_width(im_temp); + *orig_h = h = gib_imlib_image_get_height(im_temp); + thumb_w = td.cache_dim; + thumb_h = td.cache_dim; - if ((w > 128) || (h > 128)) - { + if ((w > td.cache_dim) || (h > td.cache_dim)) { double ratio = (double) w / h; if (ratio > 1.0) - thumb_h = 128 / ratio; + thumb_h = td.cache_dim / ratio; else if (ratio != 1.0) - thumb_w = 128 * ratio; + thumb_w = td.cache_dim * ratio; + } else { + /* + * The image is smaller than the specified thumbnail size. + * Do not cache or transform it. + */ + *image = im_temp; + return 1; } *image = gib_imlib_create_cropped_scaled_image(im_temp, 0, 0, w, h, - thumb_w, thumb_h, 1); - - if (!stat(file->filename, &sb)) - { - char c_mtime[256]; - sprintf(c_mtime, "%d", sb.st_mtime); - feh_png_write_png(*image, thumb_file, - "Thumb::URI", uri, "Thumb::MTime", c_mtime); + thumb_w, thumb_h, 1); + + if (!stat(file->filename, &sb)) { + char c_mtime[128]; + sprintf(c_mtime, "%d", (int)sb.st_mtime); + snprintf(c_width, 8, "%d", w); + snprintf(c_height, 8, "%d", h); + prefix = feh_thumbnail_get_prefix(); + if (prefix == NULL) { + gib_imlib_free_image_and_decache(im_temp); + return 0; + } + tmp_thumb_file = estrjoin("/", prefix, ".feh_thumbnail_XXXXXX", NULL); + free(prefix); + tmp_fd = mkstemp(tmp_thumb_file); + if (!feh_png_write_png_fd(*image, tmp_fd, "Thumb::URI", uri, + "Thumb::MTime", c_mtime, + "Thumb::Image::Width", c_width, + "Thumb::Image::Height", c_height)) { + rename(tmp_thumb_file, thumb_file); + } else { + unlink(tmp_thumb_file); + } + close(tmp_fd); + free(tmp_thumb_file); } gib_imlib_free_image_and_decache(im_temp); - return(1); + return 1; } - return(0); + return 0; } -int -feh_thumbnail_get_generated(Imlib_Image *image, feh_file *file, char *thumb_file, char *uri) +int feh_thumbnail_get_generated(Imlib_Image * image, feh_file * file, + char *thumb_file, int * orig_w, int * orig_h) { struct stat sb; char *c_mtime; + char *c_width, *c_height; time_t mtime = 0; gib_hash *hash; - if (!stat(file->filename, &sb)) - { + if (!stat(file->filename, &sb)) { hash = feh_png_read_comments(thumb_file); - if (hash != NULL) - { - c_mtime = (char*) gib_hash_get(hash, "Thumb::MTime"); + if (hash != NULL) { + c_mtime = (char *) gib_hash_get(hash, "Thumb::MTime"); + c_width = (char *) gib_hash_get(hash, "Thumb::Image::Width"); + c_height = (char *) gib_hash_get(hash, "Thumb::Image::Height"); if (c_mtime != NULL) - mtime = (time_t) strtol(c_mtime, NULL,10); + mtime = (time_t) strtol(c_mtime, NULL, 10); + if (c_width != NULL) + *orig_w = atoi(c_width); + if (c_height != NULL) + *orig_h = atoi(c_height); gib_hash_free_and_data(hash); } /* FIXME: should we bother about Thumb::URI? */ - if (mtime == sb.st_mtime) - { - feh_load_image_char(image, thumb_file); + if (mtime == sb.st_mtime) { + feh_load_image_char(image, thumb_file); - return(1); + return (1); } } - return(0); + return (0); } -int -feh_thumbnail_setup_thumbnail_dir(void) +void feh_thumbnail_show_fullsize(feh_file *thumbfile) +{ + winwidget thumbwin = NULL; + gib_list *l; + + for (l = filelist; l; l = l->next) { + if (FEH_FILE(l->data) == thumbfile) { + break; + } + } + if (!l) { + eprintf("Cannot find %s in filelist, wtf", thumbfile->filename); + } + thumbwin = winwidget_get_first_window_of_type(WIN_TYPE_THUMBNAIL_VIEWER); + if (!thumbwin) { + thumbwin = winwidget_create_from_file( + l, + WIN_TYPE_THUMBNAIL_VIEWER); + if (thumbwin) + winwidget_show(thumbwin); + } else if (FEH_FILE(thumbwin->file->data) != thumbfile) { + thumbwin->file = l; +#ifdef HAVE_INOTIFY + winwidget_inotify_remove(thumbwin); +#endif + feh_reload_image(thumbwin, 1, 0); +#ifdef HAVE_INOTIFY + winwidget_inotify_add(thumbwin, thumbfile); +#endif + } +} + +void feh_thumbnail_select(winwidget winwid, feh_thumbnail *thumbnail) +{ + Imlib_Image origwin; + + if (thumbnail == td.selected) + return; + + if (thumbnail) { + origwin = winwid->im; + winwid->im = gib_imlib_clone_image(origwin); + gib_imlib_image_fill_rectangle(winwid->im, + thumbnail->x, thumbnail->y, thumbnail->w, + thumbnail->h, 50, 50, 255, 100); + gib_imlib_image_draw_rectangle(winwid->im, + thumbnail->x, thumbnail->y, thumbnail->w, + thumbnail->h, 255, 255, 255, 255); + gib_imlib_image_draw_rectangle(winwid->im, + thumbnail->x + 1, thumbnail->y + 1, + thumbnail->w - 2, thumbnail->h - 2, + 0, 0, 0, 255); + gib_imlib_image_draw_rectangle(winwid->im, + thumbnail->x + 2, thumbnail->y + 2, + thumbnail->w - 4, thumbnail->h - 4, + 255, 255, 255, 255); + winwidget_render_image(winwid, 0, 0); + gib_imlib_free_image_and_decache(winwid->im); + winwid->im = origwin; + } else + winwidget_render_image(winwid, 0, 0); + + td.selected = thumbnail; +} + +void feh_thumbnail_select_next(winwidget winwid, int jump) +{ + gib_list *l; + feh_thumbnail *thumb; + int len = 0, cur = 0, target = 0; + + for (l = thumbnails; l; l = l->next) { + thumb = FEH_THUMB(l->data); + if (thumb == td.selected) + cur = len; + len++; + } + + target = (cur + len - jump) % len; + + for (l = thumbnails; l; l = l->next) { + if (target-- == 0) { + feh_thumbnail_select(winwid, FEH_THUMB(l->data)); + } + } +} + +void feh_thumbnail_select_prev(winwidget winwid, int jump) +{ + gib_list *l; + feh_thumbnail *thumb; + int len = 0, cur = 0, target = 0; + + for (l = thumbnails; l; l = l->next) { + thumb = FEH_THUMB(l->data); + if (thumb == td.selected) + cur = len; + len++; + } + + target = (cur + jump) % len; + + for (l = thumbnails; l; l = l->next) { + if (target-- == 0) { + feh_thumbnail_select(winwid, FEH_THUMB(l->data)); + break; + } + } +} + +void feh_thumbnail_show_selected(void) +{ + if (td.selected && td.selected->file) + feh_thumbnail_show_fullsize(td.selected->file); +} + +feh_file* feh_thumbnail_get_selected_file(void) +{ + if (td.selected) + return td.selected->file; + return NULL; +} + +int feh_thumbnail_setup_thumbnail_dir(void) { int status = 0; struct stat sb; - char *dir, *dir_thumbnails, *home; + char *dir, *p; - home = getenv("HOME"); - if (home != NULL) - { - dir = estrjoin("/", home, ".thumbnails/normal", NULL); + dir = feh_thumbnail_get_prefix(); + if (dir) { if (!stat(dir, &sb)) { if (S_ISDIR(sb.st_mode)) - status = 1; + status = 1; else weprintf("%s should be a directory", dir); } else { - dir_thumbnails = estrjoin("/", home, ".thumbnails", NULL); - - if (stat(dir_thumbnails, &sb) != 0) - { - if (mkdir(dir_thumbnails, 0700) == -1) - weprintf("unable to create %s directory", dir_thumbnails); + for (p = dir + 1; *p; p++) { + if (*p != '/') { + continue; + } + + *p = 0; + if (stat(dir, &sb) != 0) { + if (mkdir(dir, 0700) == -1) { + weprintf("unable to create directory %s", dir); + } + } + *p = '/'; } - if (mkdir(dir, 0700) == -1) - weprintf("unable to create %s directory", dir); - else - status = 1; + if (stat(dir, &sb) != 0) { + if (mkdir(dir, 0700) == -1) { + weprintf("unable to create directory %s", dir); + } + } } + free(dir); } return status; |