Permalink
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
reald committed Feb 28, 2012
2 parents 46801fe + 69ecc5c commit e0bedc0438cf4ab4eafe43afca0886ad63591560
Showing with 22 additions and 10 deletions.
  1. +2 −0 ChangeLog
  2. +3 −0 README
  3. +12 −7 man/feh.pre
  4. +5 −3 src/keyevents.c
View
@@ -5,6 +5,8 @@ git HEAD
* format specifier %P now prints the number of pixels with k/M suffix,
like %S. Printing the program name ("feh") is no longer supported
* feh --list now uses %S/%P to print image size and amount of pixels
+ * Fix zoom_default key (caused blurry images in some cases due to a bad
+ workaround)
Thu, 02 Feb 2012 21:04:06 +0100 Daniel Friesel <derf@finalrewind.org>
View
3 README
@@ -56,6 +56,9 @@ variables instead of editing it. E.g.:
CFLAGS='-g -Os' make
export DESTDIR=/tmp/feh PREFIX=/usr; make && make install
+Builtin EXIF support is maintained by Dennis Real, see
+<https://github.com/reald/feh>.
+
Testing (non-X)
---------------
View
@@ -826,11 +826,13 @@ version
.Sh CONFIGURATION
.
.Nm
-has two config files:
+has three config files:
.Pa themes
-for theme definitions and
+for theme definitions,
.Pa keys
-for key bindings.
+for key bindings and
+.Pa buttons
+for mouse button bindings.
It will try to read them from
.Pa $XDG_CONFIG_HOME/feh/ ,
which
@@ -848,7 +850,8 @@ Note that mid-line comments are not supported.
.
.Sh THEMES CONFIG SYNTAX
.
-This file allows the naming of option groups, called themes.
+.Pa .config/feh/themes
+allows the naming of option groups, called themes.
.
.Pp
.
@@ -891,13 +894,14 @@ the end of a line, like in the shell.
.
.Pp
.
-You can combine these themes with commandline options. An example fehrc is
-provided with a couple of cool example themes.
+You can combine these themes with commandline options.
.
.
.Sh KEYS CONFIG SYNTAX
.
-This file defines the key bindings. It has entries of the form
+.Pa .config/feh/keys
+defines key bindings.
+It has entries of the form
.Qq Ar action Op Ar key1 Op Ar key2 Op Ar key3 .
.
.Pp
@@ -1194,6 +1198,7 @@ Select highlighted menu item
.
.Sh BUTTONS CONFIG SYNTAX
.
+.Pa .config/feh/buttons .
This works like the keys config file: the entries are of the form
.Qq Ar action Op Ar binding .
.
View
@@ -607,9 +607,11 @@ void feh_event_handle_keypress(XEvent * ev)
winwid->old_zoom = 1.001;
winwidget_center_image(winwid);
winwidget_render_image(winwid, 0, 0);
- /* --scale-down will also do weird stuff if zoom is 1.0 */
- if (opt.scale_down)
- winwid->zoom = 1.001;
+ /*
+ * --scale-down used to do weird stuff for zoom = 1.0, but setting
+ * it to another value here is not the way to go. Also, couldn't
+ * reproduce the issue -- 2012-02-16
+ */
}
else if (feh_is_kp(&keys.zoom_fit, keysym, state)) {
feh_calc_needed_zoom(&winwid->zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);

0 comments on commit e0bedc0

Please sign in to comment.