diff options
| author | Daniel Friesel <derf@derf.homelinux.org> | 2010-07-08 12:51:47 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@derf.homelinux.org> | 2010-07-08 12:51:47 +0200 |
| commit | 3aacde475ce9e5654fd16e25c3d31d52c06de5cb (patch) | |
| tree | 147a594dbe090749877929f45a59ec042c0d5804 /src | |
| parent | 477d49d4be8d10f108cbb8c7033e00ddeb02558b (diff) | |
Remove --menu-border option
Diffstat (limited to 'src')
| -rw-r--r-- | src/help.raw | 1 | ||||
| -rw-r--r-- | src/menu.c | 6 | ||||
| -rw-r--r-- | src/options.c | 5 | ||||
| -rw-r--r-- | src/options.h | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/src/help.raw b/src/help.raw index 825c20c..451d74f 100644 --- a/src/help.raw +++ b/src/help.raw @@ -77,7 +77,6 @@ OPTIONS -M, --menu-font FONT Use FONT for the font in menus. --menu-style FILE Use FILE as the style descriptor for menu text. -), --menu-bg BG Use BG for the background image in menus. - --menu-border INT Set border of menu images -B, --image-bg STYLE Set background for transparent images and the like. Accepted values: white, black, default -N, --no-menus Don't load or show any menus. @@ -111,10 +111,8 @@ feh_menu *feh_menu_new(void) if (!bg) { feh_load_image_char(&bg, opt.menu_bg); if (bg) { - border.left = opt.menu_border; - border.right = opt.menu_border; - border.top = opt.menu_border; - border.bottom = opt.menu_border; + border.left = border.right = border.top = border.bottom + = 4; imlib_context_set_image(bg); imlib_image_set_border(&border); } diff --git a/src/options.c b/src/options.c index 9094956..d9ee51f 100644 --- a/src/options.c +++ b/src/options.c @@ -59,7 +59,6 @@ void init_parse_options(int argc, char **argv) opt.image_bg = estrdup("default"); opt.menu_bg = estrdup(PREFIX "/share/feh/images/menubg_default.png"); opt.menu_style = estrdup(PREFIX "/share/feh/fonts/menu.style"); - opt.menu_border = 4; opt.reload_button = 0; opt.pan_button = 1; @@ -400,7 +399,6 @@ static void feh_parse_option_array(int argc, char **argv) {"menu-style" , 1, 0, 204}, {"zoom" , 1, 0, 205}, {"no-screen-clip", 0, 0, 206}, - {"menu-border" , 1, 0, 207}, {"caption-path" , 1, 0, 208}, {"action1" , 1, 0, 209}, {"action2" , 1, 0, 210}, @@ -693,9 +691,6 @@ static void feh_parse_option_array(int argc, char **argv) case 206: opt.screen_clip = 0; break; - case 207: - opt.menu_border = atoi(optarg); - break; case 208: opt.caption_path = estrdup(optarg); break; diff --git a/src/options.h b/src/options.h index be20687..59dc708 100644 --- a/src/options.h +++ b/src/options.h @@ -118,7 +118,6 @@ struct __fehoptions { unsigned int geom_w; unsigned int geom_h; int default_zoom; - int menu_border; unsigned char adjust_reload; unsigned char mode; |