Commit 20dc3679 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Add toggle_info key (closes #48)

parent 481a0ec2

ChangeLog

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ git HEAD 
      <https://github.com/derf/feh/issues/45>

    * Use --zoom 100 to show all images at 100% in --fullscreen mode

      <https://github.com/derf/feh/issues/47>

    * Add toggle_info key to switch --info display on/off (defaults to 'i')

      <https://github.com/derf/feh/issues/48>



Thu, 19 May 2011 22:32:42 +0200  Daniel Friesel <derf@finalrewind.org>

man/feh.pre

+5 −0
Original line number Diff line number Diff line
@@ -940,6 +940,11 @@ Pause/Continue the slideshow. When it is paused, it will not automatically 
change slides based on

.Cm --slideshow-delay .

.

.It i Bq toggle_info

.

Toggle info display

.Pq see Cm --info

.

.It m Bq toggle_menu

.

Show menu.  Use the arrow keys and return to select items,

src/keyevents.c

+7 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ void init_keyevents(void) { 
	feh_set_kb(&keys.toggle_actions, 0, XK_a, 0, 0, 0, 0);

	feh_set_kb(&keys.toggle_aliasing, 0, XK_A, 0, 0, 0, 0);

	feh_set_kb(&keys.toggle_filenames, 0, XK_d, 0, 0, 0, 0);

	feh_set_kb(&keys.toggle_info, 0, XK_i, 0, 0, 0, 0);

	feh_set_kb(&keys.toggle_pointer, 0, XK_o, 0, 0, 0, 0);

	feh_set_kb(&keys.toggle_caption, 0, XK_c, 0, 0, 0, 0);

	feh_set_kb(&keys.toggle_pause, 0, XK_h, 0, 0, 0, 0);
@@ -250,6 +251,8 @@ void init_keyevents(void) { 
			cur_kb = &keys.toggle_aliasing;

		else if (!strcmp(action, "toggle_filenames"))

			cur_kb = &keys.toggle_filenames;

		else if (!strcmp(action, "toggle_info"))

			cur_kb = &keys.toggle_info;

		else if (!strcmp(action, "toggle_pointer"))

			cur_kb = &keys.toggle_pointer;

		else if (!strcmp(action, "toggle_caption"))
@@ -564,6 +567,10 @@ void feh_event_handle_keypress(XEvent * ev) 
		opt.draw_filename = !opt.draw_filename;

		winwidget_rerender_all(0);

	}

	else if (feh_is_kp(&keys.toggle_info, keysym, state)) {

		opt.draw_info = !opt.draw_info;

		winwidget_rerender_all(0);

	}

	else if (feh_is_kp(&keys.toggle_pointer, keysym, state)) {

		winwidget_set_pointer(winwid, opt.hide_pointer);

		opt.hide_pointer = !opt.hide_pointer;

src/options.c

+1 −0
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
			break;

		case 234:

			opt.info_cmd = estrdup(optarg);

			opt.draw_info = 1;

			break;

		case 235:

			opt.force_aliasing = 1;

src/options.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct __fehoptions { 
	unsigned char screen_clip;

	unsigned char hide_pointer;

	unsigned char draw_actions;

	unsigned char draw_info;

	unsigned char cache_thumbnails;

	unsigned char cycle_once;

	unsigned char hold_actions[10];
@@ -175,6 +176,7 @@ struct __fehkb { 
	struct __fehkey render;

	struct __fehkey toggle_actions;

	struct __fehkey toggle_filenames;

	struct __fehkey toggle_info;

	struct __fehkey toggle_pointer;

	struct __fehkey toggle_aliasing;

	struct __fehkey jump_random;