Merge branch 'master' of git://github.com/derf/feh

4 files changed, 3 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a8be81..ba6faaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ git HEAD
     * feh(1): Document behaviour for duplicate key bindings
       <https://github.com/derf/feh/issues/91>
     * menu: simpler background, remove drop shadows
+    * Remove --menu-style support (deprecated in 1.12)
 
 Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>
 
diff --git a/src/menu.c b/src/menu.c
index 8caff10..ee045ae 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -566,7 +566,7 @@ void feh_menu_entry_get_size(feh_menu_item * i, int *w, int *h)
 	int tw, th;
 
 	if (i->text) {
-		gib_imlib_get_text_size(opt.menu_fn, i->text, opt.menu_style_l, &tw, &th, IMLIB_TEXT_TO_RIGHT);
+		gib_imlib_get_text_size(opt.menu_fn, i->text, NULL, &tw, &th, IMLIB_TEXT_TO_RIGHT);
 		*w = tw + FEH_MENUITEM_PAD_LEFT + FEH_MENUITEM_PAD_RIGHT;
 		*h = th + FEH_MENUITEM_PAD_TOP + FEH_MENUITEM_PAD_BOTTOM;
 	} else {
@@ -675,7 +675,7 @@ void feh_menu_draw_item(feh_menu_item * i, Imlib_Image im, int ox, int oy)
 		}
 
 		/* draw text */
-		gib_imlib_text_draw(im, opt.menu_fn, opt.menu_style_l,
+		gib_imlib_text_draw(im, opt.menu_fn, NULL,
 				i->x - ox + i->text_x, i->y - oy + FEH_MENUITEM_PAD_TOP,
 				i->text, IMLIB_TEXT_TO_RIGHT, 0, 0, 0, 255);
 		if (i->submenu) {
@@ -918,14 +918,6 @@ void feh_menu_init_common()
 			    ("couldn't load menu font %s, did you make install?\nAre you specifying a nonexistant font?\nDid you tell feh where to find it with --fontpath?",
 			     opt.menu_font);
 	}
-	if (!opt.menu_style_l) {
-		opt.menu_style_l = gib_style_new_from_ascii(opt.menu_style);
-		if (!opt.menu_style_l) {
-			weprintf
-			    ("couldn't load style file for menu fonts, (%s).\nDid you make install? Menus will look boring without the style file.",
-			     opt.menu_style);
-		}
-	}
 
 	m = feh_menu_new();
 	m->name = estrdup("SORT");
diff --git a/src/options.c b/src/options.c
index 0d4d745..c27e11e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -60,7 +60,6 @@ void init_parse_options(int argc, char **argv)
 	opt.menu_font = estrdup(DEFAULT_MENU_FONT);
 	opt.font = NULL;
 	opt.menu_bg = estrdup(PREFIX "/share/feh/images/menubg_default.png");
-	opt.menu_style = estrdup(PREFIX "/share/feh/fonts/menu.style");
 
 	opt.start_list_at = NULL;
 	opt.jump_on_resort = 1;
@@ -375,7 +374,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 		{"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},
 		{"index-info"    , 1, 0, 207},
@@ -629,11 +627,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 		case 219:
 			opt.bgmode = BG_MODE_MAX;
 			break;
-		case 204:
-			free(opt.menu_style);
-			opt.menu_style = estrdup(optarg);
-			weprintf("The --menu-style option is deprecated and will be removed by 2012");
-			break;
 		case 205:
 			if (!strcmp("fill", optarg))
 				opt.zoom_mode = ZOOM_MODE_FILL;
diff --git a/src/options.h b/src/options.h
index 898e9ff..cef4215 100644
--- a/src/options.h
+++ b/src/options.h
@@ -86,14 +86,11 @@ struct __fehoptions {
 	char *menu_font;
 	char *customlist;
 	char *menu_bg;
-	char *menu_style;
 	char *caption_path;
 	char *start_list_at;
 	char *info_cmd;
 	char *index_info;
 
-	gib_style *menu_style_l;
-
 	int force_aliasing;
 	int thumb_w;
 	int thumb_h;