Commit 6eb1ac73 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Rework menu.c & fix various compiler warnings (from menu_code) + update TODO

parent b15fe147

TODO

+2 −0
Original line number Diff line number Diff line
@@ -25,3 +25,5 @@ turned on (after that, it'll work for all images in the slideshow). 
Maybe I'll someday find out how to fix that :>



Make --start-at work with paths as well



Fix Memory leaks in the menu (sub-menus apparently never got properly free()d)

src/events.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static void feh_event_handle_MotionNotify(XEvent * ev) 
				if (selected_item)

					feh_menu_deselect_selected(m);

				if ((mouseover_item)

						&& ((mouseover_item->func)

						&& ((mouseover_item->action)

							|| (mouseover_item->submenu)

							|| (mouseover_item->func_gen_sub)))

					feh_menu_select(m, mouseover_item);

src/imlib.c

+4 −6
Original line number Diff line number Diff line
@@ -825,13 +825,11 @@ void feh_display_status(char stat) 
		}



		if (!(i % 50)) {

			int len;

			char buf[50];

			int len = gib_list_length(filelist);



			fprintf(stdout, " %5d/%d (%d)\n[%3d%%] ",

					i, init_len, len, ((int) ((float) i / init_len * 100)));



			len = gib_list_length(filelist);

			snprintf(buf, sizeof(buf),

					" %5d/%d (%d)\n[%3d%%] ", i, init_len, len, ((int) ((float) i / init_len * 100)));

			fprintf(stdout, buf);

		} else if ((!(i % 10)) && (!reset_output))

			fprintf(stdout, " ");

src/keyevents.c

+4 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ void feh_event_handle_keypress(XEvent * ev) 
			feh_menu_hide(menu_root, True);

			break;

		case XK_Left:

			feh_menu_select_parent(selected_menu, selected_item);

			feh_menu_select_parent(selected_menu);

			break;

		case XK_Down:

			feh_menu_select_next(selected_menu, selected_item);
@@ -90,7 +90,7 @@ void feh_event_handle_keypress(XEvent * ev) 
			feh_menu_select_prev(selected_menu, selected_item);

			break;

		case XK_Right:

			feh_menu_select_submenu(selected_menu, selected_item);

			feh_menu_select_submenu(selected_menu);

			break;

		case XK_Return:

			feh_menu_item_activate(selected_menu, selected_item);
@@ -104,7 +104,7 @@ void feh_event_handle_keypress(XEvent * ev) 


		switch (*kbuf) {

		case 'h':

			feh_menu_select_parent(selected_menu, selected_item);

			feh_menu_select_parent(selected_menu);

			break;

		case 'j':

			feh_menu_select_next(selected_menu, selected_item);
@@ -113,7 +113,7 @@ void feh_event_handle_keypress(XEvent * ev) 
			feh_menu_select_prev(selected_menu, selected_item);

			break;

		case 'l':

			feh_menu_select_submenu(selected_menu, selected_item);

			feh_menu_select_submenu(selected_menu);

			break;

		case ' ':

			feh_menu_item_activate(selected_menu, selected_item);

src/menu.c

+363 −530

File changed.

Preview size limit exceeded, changes collapsed.