Commit 421139a8 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'ErnieE5-master'

parents 215732ab 4b2cd183

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ install-man: 
install-doc:

	@echo installing docs to ${doc_dir}

	@mkdir -p ${doc_dir}

	@cp AUTHORS ChangeLog README TODO ${doc_dir}

	@chmod 644 ${doc_dir}/AUTHORS ${doc_dir}/ChangeLog ${doc_dir}/README \

	@cp AUTHORS ChangeLog README.md TODO ${doc_dir}

	@chmod 644 ${doc_dir}/AUTHORS ${doc_dir}/ChangeLog ${doc_dir}/README.md \

		${doc_dir}/TODO



install-bin:

man/feh.pre

+5 −0
Original line number Diff line number Diff line
@@ -1414,6 +1414,11 @@ Zoom to 100% 
.

Zoom to fit the window size

.

.It ! Bq zoom_fill

.

Zoom to fill the window size like

.Cm --bg-fill

.

.El

.

.Ss MENU KEYS

src/keyevents.c

+14 −3
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ void init_keyevents(void) { 
	feh_set_kb(&keys.zoom_out  , 0, XK_Down      , 0, XK_KP_Subtract,0, 0);

	feh_set_kb(&keys.zoom_default, 0, XK_KP_Multiply, 0, XK_asterisk,0, 0);

	feh_set_kb(&keys.zoom_fit  , 0, XK_KP_Divide , 0, XK_slash     , 0, 0);

	feh_set_kb(&keys.zoom_fill , 0, XK_exclam    , 0, 0            , 0, 0);

	feh_set_kb(&keys.size_to_image, 0, XK_w      , 0, 0            , 0, 0);

	feh_set_kb(&keys.render    , 0, XK_KP_Begin  , 0, XK_R         , 0, 0);

	feh_set_kb(&keys.toggle_actions, 0, XK_a, 0, 0, 0, 0);
@@ -439,6 +440,8 @@ fehkey *feh_str_to_kb(char *action) 
		return &keys.zoom_default;

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

		return &keys.zoom_fit;

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

		return &keys.zoom_fill;

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

		return &keys.size_to_image;

	else if (!strcmp(action, "render"))
@@ -653,6 +656,14 @@ void feh_event_handle_generic(winwidget winwid, unsigned int state, KeySym keysy 
		winwidget_center_image(winwid);

		winwidget_render_image(winwid, 0, 0);

	}

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

		int save_zoom = opt.zoom_mode;

		opt.zoom_mode = ZOOM_MODE_FILL;

		feh_calc_needed_zoom(&winwid->zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);

		winwidget_center_image(winwid);

		winwidget_render_image(winwid, 0, 0);

		opt.zoom_mode = save_zoom;

	}

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

		if (winwid->type == WIN_TYPE_THUMBNAIL)

			feh_thumbnail_show_selected();

src/options.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ struct __fehkb { 
	struct __fehkey zoom_out;

	struct __fehkey zoom_default;

	struct __fehkey zoom_fit;

	struct __fehkey zoom_fill;

	struct __fehkey render;

	struct __fehkey toggle_actions;

	struct __fehkey toggle_filenames;