Skip to content

Sort default options initialization in init_parse_options #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derf merged 2 commits into from
Apr 26, 2026
+19 −20
Merged

Sort default options initialization in init_parse_options #810

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4c300
Sort default options initialization in init_parse_options
elig0n Feb 2, 2026
bbc34d6
Update options.c
elig0n Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ fehoptions opt;

void init_parse_options(int argc, char **argv)
{
/* TODO: sort these to match declaration of __fehoptions */

/* For setting the command hint on X windows */
cmdargc = argc;
cmdargv = argv;
Expand All @@ -53,33 +51,35 @@ void init_parse_options(int argc, char **argv)
memset(&opt, 0, sizeof(fehoptions));
opt.display = 1;
opt.aspect = 1;
opt.slideshow_delay = 0.0;
opt.conversion_timeout = -1;
opt.use_conversion_cache = 1;
opt.jump_on_resort = 1;
#ifdef HAVE_INOTIFY
opt.auto_reload = 1;
#endif /* HAVE_INOTIFY */
#ifdef HAVE_LIBXINERAMA
/* if we're using xinerama, then enable it by default */
opt.xinerama = 1;
#endif /* HAVE_LIBXINERAMA */
opt.screen_clip = 1;
opt.menu_font = estrdup(DEFAULT_MENU_FONT);
opt.menu_font = estrdup(DEFAULT_MENU_FONT);
Comment thread
elig0n marked this conversation as resolved.
Outdated
opt.start_list_at = NULL;
opt.thumb_w = 60;
opt.thumb_h = 60;
opt.thumb_redraw = 10;
opt.scroll_step = 20;
opt.menu_font = estrdup(DEFAULT_MENU_FONT);
opt.font = NULL;
opt.max_height = opt.max_width = UINT_MAX;


opt.zoom_rate = 1.25;

opt.start_list_at = NULL;
opt.jump_on_resort = 1;

opt.screen_clip = 1;
opt.cache_size = 4;
#ifdef HAVE_LIBXINERAMA
/* if we're using xinerama, then enable it by default */
opt.xinerama = 1;
opt.xinerama_index = -1;
#endif /* HAVE_LIBXINERAMA */
#ifdef HAVE_INOTIFY
opt.auto_reload = 1;
#endif /* HAVE_INOTIFY */
opt.use_conversion_cache = 1;

opt.scroll_step = 20;
opt.cache_size = 4;
opt.max_height = opt.max_width = UINT_MAX;
opt.slideshow_delay = 0.0;
opt.conversion_timeout = -1;

feh_getopt_theme(argc, argv);

D(("About to check for theme configuration\n"));
Expand Down