rename --zoom-rate to --zoom-step and switch to percent (01d96e16) · Commits · derf / feh

man/feh.pre

+3 −3

Original line number	Diff line number	Diff line
		@@ -988,11 +988,11 @@ zoom the image like the
		.Cm --bg-fill
		mode.
		.
		.It Cm --zoom-rate Ar ratio
		.It Cm --zoom-step Ar percent
		.
		Zoom images in and out by
		.Ar ratio
		.Pq default: 1.25
		.Ar percent
		.Pq default: 25
		when using the zoom keys and buttons.
		.
		.El

+6 −6

Original line number	Diff line number	Diff line
		@@ -395,7 +395,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
		{"bg-center" , 0, 0, OPTION_bg_center},
		{"bg-scale" , 0, 0, OPTION_bg_scale},
		{"zoom" , 1, 0, OPTION_zoom},
		{"zoom-rate" , 1, 0, OPTION_zoom_rate},
		{"zoom-step" , 1, 0, OPTION_zoom_step},
		{"no-screen-clip", 0, 0, OPTION_no_screen_clip},
		{"index-info" , 1, 0, OPTION_index_info},
		{"magick-timeout", 1, 0, OPTION_magick_timeout},
		@@ -840,13 +840,13 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
		case OPTION_window_id:
		opt.x11_windowid = atol(optarg);
		break;
		case OPTION_zoom_rate:
		case OPTION_zoom_step:
		opt.zoom_rate = atof(optarg);
		if ((opt.zoom_rate <= 0.0) \|\| (opt.zoom_rate == 1.0)) {
		weprintf("Zooming disabled due to --zoom-rate=%f", opt.zoom_rate);
		if ((opt.zoom_rate <= 0)) {
		weprintf("Zooming disabled due to --zoom-step=%f", opt.zoom_rate);
		opt.zoom_rate = 1.0;
		} else if (opt.zoom_rate < 1.0) {
		opt.zoom_rate = 1.0 / opt.zoom_rate;
		} else {
		opt.zoom_rate = 1 + ((float)opt.zoom_rate / 100);
		}
		break;
		default:

+1 −1