Remove unused functions / function arguments

3 files changed, 6 insertions, 13 deletions

diff --git a/src/events.c b/src/events.c
index 815bd7e..7caa4d2 100644
--- a/src/events.c
+++ b/src/events.c
@@ -36,7 +36,6 @@ feh_event_handler *ev_handler[LASTEvent];
 static void feh_event_handle_ButtonPress(XEvent * ev);
 static void feh_event_handle_ButtonRelease(XEvent * ev);
 static void feh_event_handle_ConfigureNotify(XEvent * ev);
-static void feh_event_handle_EnterNotify(XEvent * ev);
 static void feh_event_handle_LeaveNotify(XEvent * ev);
 static void feh_event_handle_MotionNotify(XEvent * ev);
 static void feh_event_handle_ClientMessage(XEvent * ev);
@@ -52,7 +51,6 @@ void feh_event_init(void)
 	ev_handler[ButtonPress] = feh_event_handle_ButtonPress;
 	ev_handler[ButtonRelease] = feh_event_handle_ButtonRelease;
 	ev_handler[ConfigureNotify] = feh_event_handle_ConfigureNotify;
-	ev_handler[EnterNotify] = feh_event_handle_EnterNotify;
 	ev_handler[LeaveNotify] = feh_event_handle_LeaveNotify;
 	ev_handler[MotionNotify] = feh_event_handle_MotionNotify;
 	ev_handler[ClientMessage] = feh_event_handle_ClientMessage;
@@ -312,11 +310,6 @@ static void feh_event_handle_ConfigureNotify(XEvent * ev)
 	return;
 }
 
-static void feh_event_handle_EnterNotify(XEvent * ev)
-{
-	return;
-}
-
 static void feh_event_handle_LeaveNotify(XEvent * ev)
 {
 	if ((menu_root) && (ev->xcrossing.window == menu_root->win)) {
diff --git a/src/menu.c b/src/menu.c
index 4be7f39..88bbff9 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -689,7 +689,7 @@ void feh_menu_calc_size(feh_menu * m)
 	return;
 }
 
-void feh_menu_draw_item(feh_menu * m, feh_menu_item * i, Imlib_Image im, int ox, int oy)
+void feh_menu_draw_item(feh_menu_item * i, Imlib_Image im, int ox, int oy)
 {
 	D(5, ("drawing item %p (text %s) on menu %p (name %s)\n", i, i->text, m, m->name));
 
@@ -752,7 +752,7 @@ void feh_menu_draw_item(feh_menu * m, feh_menu_item * i, Imlib_Image im, int ox,
 						   FEH_MENUITEM_PAD_BOTTOM
 						   -
 						   FEH_MENU_SUBMENU_H) /
-						  2), im, ox, oy, MENU_ITEM_IS_SELECTED(i));
+						  2), im, ox, oy);
 		}
 		if (i->is_toggle) {
 			D(5, ("toggleable item\n"));
@@ -830,7 +830,7 @@ void feh_menu_draw_to_buf(feh_menu * m, Imlib_Image im, int ox, int oy)
 
 	for (i = m->items; i; i = i->next) {
 		if (RECTS_INTERSECT(i->x, i->y, i->w, i->h, ox, oy, w, h))
-			feh_menu_draw_item(m, i, im, ox, oy);
+			feh_menu_draw_item(i, im, ox, oy);
 	}
 	return;
 }
@@ -861,7 +861,7 @@ void feh_menu_draw_toggle_at(int x, int y, int w, int h, Imlib_Image dst, int ox
 	return;
 }
 
-void feh_menu_draw_submenu_at(int x, int y, Imlib_Image dst, int ox, int oy, int selected)
+void feh_menu_draw_submenu_at(int x, int y, Imlib_Image dst, int ox, int oy)
 {
 	ImlibPolygon poly;
 
diff --git a/src/menu.h b/src/menu.h
index 3e727ac..9e8cd21 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -137,7 +137,7 @@ feh_menu_item *feh_menu_add_toggle_entry(feh_menu * m, char *text,
 					 int action, void *data, void (*func_free) (void *data), int setting);
 void feh_menu_entry_get_size(feh_menu * m, feh_menu_item * i, int *w, int *h);
 void feh_menu_calc_size(feh_menu * m);
-void feh_menu_draw_item(feh_menu * m, feh_menu_item * i, Imlib_Image im, int ox, int oy);
+void feh_menu_draw_item(feh_menu_item * i, Imlib_Image im, int ox, int oy);
 void feh_menu_redraw(feh_menu * m);
 void feh_menu_move(feh_menu * m, int x, int y);
 void feh_menu_slide_all_menus_relative(int dx, int dy);
@@ -149,7 +149,7 @@ void feh_menu_init_thumbnail_viewer(void);
 void feh_menu_init_thumbnail_win(void);
 void feh_menu_draw_to_buf(feh_menu * m, Imlib_Image im, int ox, int oy);
 void feh_menu_draw_menu_bg(feh_menu * m, Imlib_Image im, int ox, int oy);
-void feh_menu_draw_submenu_at(int x, int y, Imlib_Image dst, int ox, int oy, int selected);
+void feh_menu_draw_submenu_at(int x, int y, Imlib_Image dst, int ox, int oy);
 void feh_menu_draw_separator_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy);
 void feh_menu_item_draw_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int selected);
 void feh_menu_draw_toggle_at(int x, int y, int w, int h, Imlib_Image dst, int ox, int oy, int on);