diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/feh.h | 2 | ||||
| -rw-r--r-- | src/help.raw | 1 | ||||
| -rw-r--r-- | src/menu.c | 21 | ||||
| -rw-r--r-- | src/options.c | 5 | ||||
| -rw-r--r-- | src/support.c | 4 |
5 files changed, 2 insertions, 31 deletions
@@ -89,7 +89,7 @@ enum mode_type { MODE_NORMAL = 0, MODE_PAN, MODE_ZOOM, MODE_ROTATE, MODE_BLUR, M }; enum bgmode_type { BG_MODE_NONE = 0, BG_MODE_TILE, BG_MODE_CENTER, - BG_MODE_SEAMLESS, BG_MODE_SCALE, BG_MODE_FILL, BG_MODE_MAX + BG_MODE_SCALE, BG_MODE_FILL, BG_MODE_MAX }; enum slide_change { SLIDE_NEXT, SLIDE_PREV, SLIDE_RAND, SLIDE_FIRST, SLIDE_LAST, diff --git a/src/help.raw b/src/help.raw index 2c9bf67..f2e7759 100644 --- a/src/help.raw +++ b/src/help.raw @@ -71,7 +71,6 @@ OPTIONS --bg-fill FILE Like --bg-scale, but preserves aspect ratio by zooming the image until it fits. May cut off corners - --bg-seamless FILE Like --bg-tile, but with blurry corners -C, --fontpath PATH Specify an extra directory to look in for fonts, can be used multiple times to add multiple paths. -M, --menu-font FONT Use FONT for the font in menus. @@ -51,7 +51,7 @@ void feh_menu_cb_opt_fullscreen(feh_menu * m, feh_menu_item * i); enum { CB_ABOUT = 1, CB_CLOSE, CB_EXIT, CB_RELOAD, CB_REMOVE, CB_DELETE, CB_RESET, CB_REMOVE_THUMB, CB_DELETE_THUMB, CB_BG_TILED, CB_BG_SCALED, - CB_BG_SEAMLESS, CB_BG_CENTERED, CB_BG_FILLED, CB_BG_TILED_NOFILE, + CB_BG_CENTERED, CB_BG_FILLED, CB_BG_TILED_NOFILE, CB_BG_SCALED_NOFILE, CB_BG_CENTERED_NOFILE, CB_BG_FILLED_NOFILE, CB_SORT_FILENAME, CB_SORT_IMAGENAME, CB_SORT_FILESIZE, CB_SORT_RANDOMIZE, CB_SAVE_IMAGE, CB_SAVE_FILELIST, CB_FIT, CB_OPT_DRAW_FILENAME, @@ -1023,7 +1023,6 @@ void feh_menu_init_common() num_desks = feh_wm_get_num_desks(); if (num_desks > 1) { feh_menu_add_entry(menu_bg, "Set Tiled", NULL, "TILED", 0, NULL, NULL); - feh_menu_add_entry(menu_bg, "Set Seamless", NULL, "SEAMLESS", 0, NULL, NULL); feh_menu_add_entry(menu_bg, "Set Scaled", NULL, "SCALED", 0, NULL, NULL); feh_menu_add_entry(menu_bg, "Set Centered", NULL, "CENTERED", 0, NULL, NULL); feh_menu_add_entry(menu_bg, "Set Filled", NULL, "FILLED", 0, NULL, NULL); @@ -1041,14 +1040,6 @@ void feh_menu_init_common() } m = feh_menu_new(); - m->name = estrdup("SEAMLESS"); - for (i = 0; i < num_desks; i++) { - snprintf(buf, sizeof(buf), "Desktop %d", i + 1); - feh_menu_add_entry(m, buf, NULL, NULL, CB_BG_SEAMLESS, - (void *) i, NULL); - } - - m = feh_menu_new(); m->name = estrdup("SCALED"); for (i = 0; i < num_desks; i++) { snprintf(buf, sizeof(buf), "Desktop %d", i + 1); @@ -1090,8 +1081,6 @@ void feh_menu_init_common() if (opt.slideshow || opt.multiwindow) { feh_menu_add_entry(menu_bg, "Set Tiled", NULL, NULL, CB_BG_TILED, NULL, NULL); - feh_menu_add_entry(menu_bg, "Set Seamless", NULL, - NULL, CB_BG_SEAMLESS, NULL, NULL); feh_menu_add_entry(menu_bg, "Set Scaled", NULL, NULL, CB_BG_SCALED, NULL, NULL); feh_menu_add_entry(menu_bg, "Set Centered", NULL, @@ -1101,8 +1090,6 @@ void feh_menu_init_common() } else { feh_menu_add_entry(menu_bg, "Set Tiled", NULL, NULL, CB_BG_TILED_NOFILE, NULL, NULL); - feh_menu_add_entry(menu_bg, "Set Seamless", NULL, - NULL, CB_BG_SEAMLESS, NULL, NULL); feh_menu_add_entry(menu_bg, "Set Scaled", NULL, NULL, CB_BG_SCALED_NOFILE, NULL, NULL); feh_menu_add_entry(menu_bg, "Set Centered", NULL, @@ -1302,12 +1289,6 @@ void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data) feh_wm_set_bg(path, m->fehwin->im, 0, 0, 0, (int) data, 1); free(path); break; - case CB_BG_SEAMLESS: - im = gib_imlib_clone_image(m->fehwin->im); - gib_imlib_image_tile(im); - feh_wm_set_bg(NULL, im, 0, 0, 0, (int) data, 1); - gib_imlib_free_image_and_decache(im); - break; case CB_BG_SCALED: path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename); feh_wm_set_bg(path, m->fehwin->im, 0, 1, 0, (int) data, 1); diff --git a/src/options.c b/src/options.c index f7381a7..08482ea 100644 --- a/src/options.c +++ b/src/options.c @@ -396,7 +396,6 @@ static void feh_parse_option_array(int argc, char **argv) {"bg-tile" , 1, 0, 200}, {"bg-center" , 1, 0, 201}, {"bg-scale" , 1, 0, 202}, - {"bg-seamless" , 1, 0, 203}, {"menu-style" , 1, 0, 204}, {"zoom" , 1, 0, 205}, {"no-screen-clip", 0, 0, 206}, @@ -675,10 +674,6 @@ static void feh_parse_option_array(int argc, char **argv) opt.bgmode = BG_MODE_SCALE; opt.output_file = estrdup(optarg); break; - case 203: - opt.bgmode = BG_MODE_SEAMLESS; - opt.output_file = estrdup(optarg); - break; case 218: opt.bgmode = BG_MODE_FILL; opt.output_file = estrdup(optarg); diff --git a/src/support.c b/src/support.c index 3b13416..a4bc02e 100644 --- a/src/support.c +++ b/src/support.c @@ -51,10 +51,6 @@ void feh_wm_set_bg_file(char *file, unsigned char bgmode) if (feh_load_image(&im, fil) == 0) eprintf("Couldn't load image in order to set bg"); switch (bgmode) { - case BG_MODE_SEAMLESS: - gib_imlib_image_tile(im); - feh_wm_set_bg(NULL, im, 0, 0, 0, 0, 1); - break; case BG_MODE_TILE: feh_wm_set_bg(file, im, 0, 0, 0, 0, 1); break; |