From d908996f76406bde3de13edb72d341ed74082045 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 26 Sep 2011 20:05:08 +0200 Subject: Add support for multiple files in --bg-options (closes #64) Squashed commit of the following: commit 55e66e15af898f4c01d7d265013124fefce795e4 Author: Daniel Friesel Date: Mon Sep 26 19:59:46 2011 +0200 Save all filenames in ~/.fehbg commit afc2774f315fc379aa96de58decf8370772036af Author: Daniel Friesel Date: Mon Sep 26 19:24:38 2011 +0200 Update test/bg --bg-fill images (off-by-one due to changed implementation) commit bd4210cff2e895414df12868f6cab7f193c5adf5 Author: Daniel Friesel Date: Mon Sep 26 14:47:00 2011 +0200 Fix feh_wm_set_bg_maxed commit d9ada9dc2a74aef6ae0924e9c0ff296b94ee25bc Author: Daniel Friesel Date: Mon Sep 26 14:39:11 2011 +0200 Fix for non-xinerama setups commit be2cf0f1f8c00b737e7141a372d3cbc9db4c949f Author: Daniel Friesel Date: Mon Sep 26 14:24:44 2011 +0200 Move wallpaper calculation code into separate functions commit 4e07c1f9734569fdd778a813c5a85c63b51b3175 Author: Daniel Friesel Date: Mon Sep 26 13:01:46 2011 +0200 Remove unnecessary temporary variable commit 23d1d733b21d1560e1fbcadddc34cae3d666b21d Author: Daniel Friesel Date: Mon Sep 26 12:46:25 2011 +0200 Initial conversion, works with --bg-scale --- src/options.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'src/options.c') diff --git a/src/options.c b/src/options.c index cf32bb0..def17f0 100644 --- a/src/options.c +++ b/src/options.c @@ -103,9 +103,6 @@ void init_parse_options(int argc, char **argv) D(("Options parsed\n")); - if (opt.bgmode) - return; - filelist_len = gib_list_length(filelist); if (!filelist_len) show_mini_usage(); @@ -395,9 +392,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) {"start-at" , 1, 0, '|'}, {"debug" , 0, 0, '+'}, {"output-dir" , 1, 0, 'j'}, - {"bg-tile" , 1, 0, 200}, - {"bg-center" , 1, 0, 201}, - {"bg-scale" , 1, 0, 202}, + {"bg-tile" , 0, 0, 200}, + {"bg-center" , 0, 0, 201}, + {"bg-scale" , 0, 0, 202}, {"menu-style" , 1, 0, 204}, {"zoom" , 1, 0, 205}, {"no-screen-clip", 0, 0, 206}, @@ -411,8 +408,8 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) {"action7" , 1, 0, 215}, {"action8" , 1, 0, 216}, {"action9" , 1, 0, 217}, - {"bg-fill" , 1, 0, 218}, - {"bg-max" , 1, 0, 219}, + {"bg-fill" , 0, 0, 218}, + {"bg-max" , 0, 0, 219}, {"index-name" , 1, 0, 230}, {"index-size" , 1, 0, 231}, {"index-dim" , 1, 0, 232}, @@ -672,23 +669,18 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) break; case 200: opt.bgmode = BG_MODE_TILE; - opt.output_file = estrdup(optarg); break; case 201: opt.bgmode = BG_MODE_CENTER; - opt.output_file = estrdup(optarg); break; case 202: opt.bgmode = BG_MODE_SCALE; - opt.output_file = estrdup(optarg); break; case 218: opt.bgmode = BG_MODE_FILL; - opt.output_file = estrdup(optarg); break; case 219: opt.bgmode = BG_MODE_MAX; - opt.output_file = estrdup(optarg); break; case 204: free(opt.menu_style); -- cgit v1.2.3