diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2015-06-26 16:48:47 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2015-06-26 16:48:47 +0200 |
| commit | 578a92d592d437c7221f849612e5ebbc172f7114 (patch) | |
| tree | 0e084315d8ca9141635f9c0e5fa9fdc13286dad1 /src/options.c | |
| parent | 29e14cfa95aebd584dc0d7c751277c73911c41ae (diff) | |
| parent | 9593169d627085699d60a52794d65e64a247c030 (diff) | |
Merge branch 'jdknight-master'
Diffstat (limited to 'src/options.c')
| -rw-r--r-- | src/options.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/options.c b/src/options.c index cbeb729..120541a 100644 --- a/src/options.c +++ b/src/options.c @@ -70,6 +70,7 @@ void init_parse_options(int argc, char **argv) #ifdef HAVE_LIBXINERAMA /* if we're using xinerama, then enable it by default */ opt.xinerama = 1; + opt.xinerama_index = -1; #endif /* HAVE_LIBXINERAMA */ feh_getopt_theme(argc, argv); @@ -404,6 +405,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) {"no-fehbg" , 0, 0, 236}, {"keep-zoom-vp" , 0, 0, 237}, {"scroll-step" , 1, 0, 238}, + {"xinerama-index", 1, 0, 239}, {0, 0, 0, 0} }; @@ -744,6 +746,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) case 238: opt.scroll_step = atoi(optarg); break; + case 239: + opt.xinerama_index = atoi(optarg); + break; default: break; } |