Option Refactor and addition of Zoom Rate (#589)

* fixed for simpler parenthesis matching

* absolute file path for .fehbg, moved script creation into helper function

* Removed unused variable.

* added early exit condition as per Ferada's suggestion

* Added enum for options to improve readability

* migrated options to enum.

* added support for zoom specification through options

* added man entry for zoom-rate

* added help entry for zoom-rate commands

* updated man to have warnings about strange values for zoom options

* fix memory leak (free exec_absolute_path)

* added detection for path vs env PATH launch for use in .fehbg script gen.

* Added enum for options to improve readability

* migrated options to enum.

* added support for zoom specification through options

* added man entry for zoom-rate

* added help entry for zoom-rate commands

* updated man to have warnings about strange values for zoom options

* Update help.raw

removed zoom-in/out

* removed zoom-in/out from options

* updated man/help entry to remove in/out zoom specification

* sanitize --zoom-rate in options parser; use a single variable for storing it

Co-authored-by: Daniel Friesel <derf@finalrewind.org>

1 files changed, 108 insertions, 0 deletions

diff --git a/src/options.h b/src/options.h
index 7ca699b..ea76b24 100644
--- a/src/options.h
+++ b/src/options.h
@@ -127,6 +127,7 @@ struct __fehoptions {
 	int offset_y;
 	int default_zoom;
 	int zoom_mode;
+	double zoom_rate;
 	unsigned char adjust_reload;
 	int xinerama_index;
 	char *x11_class;
@@ -150,6 +151,113 @@ struct __fehoptions {
 	Imlib_Font menu_fn;
 };
 
+enum __feh_option {
+OPTION_debug = '+',
+OPTION_scale_down = '.',
+OPTION_max_dimension = '<',
+OPTION_min_dimension = '>',
+OPTION_title_font = '@',
+OPTION_action = 'A',
+OPTION_image_bg = 'B',
+OPTION_fontpath = 'C',
+OPTION_slideshow_delay = 'D',
+OPTION_thumb_height = 'E',
+OPTION_fullscreen = 'F',
+OPTION_draw_actions = 'G',
+OPTION_limit_height = 'H',
+OPTION_fullindex = 'I',
+OPTION_thumb_redraw = 'J',
+OPTION_caption_path = 'K',
+OPTION_customlist = 'L',
+OPTION_menu_font = 'M',
+OPTION_no_menus = 'N',
+OPTION_output_only = 'O',
+OPTION_cache_thumbnails = 'P',
+OPTION_reload = 'R',
+OPTION_sort = 'S',
+OPTION_theme = 'T',
+OPTION_loadable = 'U',
+OPTION_verbose = 'V',
+OPTION_limit_width = 'W',
+OPTION_ignore_aspect = 'X',
+OPTION_hide_pointer = 'Y',
+OPTION_auto_zoom = 'Z',
+OPTION_title = '^',
+OPTION_alpha = 'a',
+OPTION_bg = 'b',
+OPTION_draw_filename = 'd',
+OPTION_font = 'e',
+OPTION_filelist = 'f',
+OPTION_geometry = 'g',
+OPTION_help = 'h',
+OPTION_index = 'i',
+OPTION_output_dir = 'j',
+OPTION_keep_http = 'k',
+OPTION_list = 'l',
+OPTION_montage = 'm',
+OPTION_reverse = 'n',
+OPTION_output = 'o',
+OPTION_preload = 'p',
+OPTION_quiet = 'q',
+OPTION_recursive = 'r',
+OPTION_stretch = 's',
+OPTION_thumbnails = 't',
+OPTION_unloadable = 'u',
+OPTION_version = 'v',
+OPTION_multiwindow = 'w',
+OPTION_borderless = 'x',
+OPTION_thumb_width = 'y',
+OPTION_randomize = 'z',
+OPTION_start_at = '|',
+OPTION_thumb_title = '~',
+OPTION_bg_title,
+OPTION_bg_center,
+OPTION_bg_scale,
+OPTION_bg_fill,
+OPTION_bg_max,
+OPTION_zoom,
+OPTION_zoom_rate,
+OPTION_zoom_in_rate,
+OPTION_zoom_out_rate,
+OPTION_keep_zoom_vp,
+OPTION_no_screen_clip,
+OPTION_index_info,
+OPTION_magick_timeout,
+OPTION_action1,
+OPTION_action2,
+OPTION_action3,
+OPTION_action4,
+OPTION_action5,
+OPTION_action6,
+OPTION_action7,
+OPTION_action8,
+OPTION_action9,
+OPTION_no_jump_on_resort,
+OPTION_edit,
+OPTION_draw_exif,
+OPTION_auto_rotate,
+OPTION_no_xinerama,
+OPTION_draw_tinted,
+OPTION_info,
+OPTION_force_aliasing,
+OPTION_no_fehbg,
+OPTION_scroll_step,
+OPTION_xinerama_index,
+OPTION_insecure,
+OPTION_no_recursive,
+OPTION_cache_size,
+OPTION_on_last_slide,
+OPTION_conversion_timeout,
+OPTION_version_sort,
+OPTION_offset,
+OPTION_auto_reload,
+OPTION_class,
+OPTION_no_conversion_cache,
+OPTION_window_id,
+};
+
+//typedef enum __fehoption fehoption;
+
 struct __fehkey {
 	unsigned int keysyms[3];
 	unsigned int keystates[3];