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/menu.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/menu.c') diff --git a/src/menu.c b/src/menu.c index 8a3258b..b90161d 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1256,35 +1256,35 @@ void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data) switch (action) { case CB_BG_TILED: path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename); - feh_wm_set_bg(path, m->fehwin->im, 0, 0, 0, (int) data, 1); + feh_wm_set_bg(path, m->fehwin->im, 0, 0, 0, (int) data, 0); free(path); break; case CB_BG_SCALED: path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename); - feh_wm_set_bg(path, m->fehwin->im, 0, 1, 0, (int) data, 1); + feh_wm_set_bg(path, m->fehwin->im, 0, 1, 0, (int) data, 0); free(path); break; case CB_BG_CENTERED: path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename); - feh_wm_set_bg(path, m->fehwin->im, 1, 0, 0, (int) data, 1); + feh_wm_set_bg(path, m->fehwin->im, 1, 0, 0, (int) data, 0); free(path); break; case CB_BG_FILLED: path = feh_absolute_path(FEH_FILE(m->fehwin->file->data)->filename); - feh_wm_set_bg(path, m->fehwin->im, 0, 0, 1, (int) data, 1); + feh_wm_set_bg(path, m->fehwin->im, 0, 0, 1, (int) data, 0); free(path); break; case CB_BG_TILED_NOFILE: - feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, 0, (int) data, 1); + feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, 0, (int) data, 0); break; case CB_BG_SCALED_NOFILE: - feh_wm_set_bg(NULL, m->fehwin->im, 0, 1, 0, (int) data, 1); + feh_wm_set_bg(NULL, m->fehwin->im, 0, 1, 0, (int) data, 0); break; case CB_BG_CENTERED_NOFILE: - feh_wm_set_bg(NULL, m->fehwin->im, 1, 0, 0, (int) data, 1); + feh_wm_set_bg(NULL, m->fehwin->im, 1, 0, 0, (int) data, 0); break; case CB_BG_FILLED_NOFILE: - feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, 1, (int) data, 1); + feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, 1, (int) data, 0); break; case CB_CLOSE: winwidget_destroy(m->fehwin); -- cgit v1.2.3