diff options
| author | Dennis Real <github@tildepipe.org> | 2012-03-06 21:42:40 +0100 |
|---|---|---|
| committer | Dennis Real <github@tildepipe.org> | 2012-03-06 21:42:40 +0100 |
| commit | 93a90e60d0cf093ca71c34f4f5dbfde974f433f0 (patch) | |
| tree | 6fc47bd6b773f602db5e4c59dc952c046f76d869 | |
| parent | a81465d019593cfd1e506eb66f20f6b5e10488f3 (diff) | |
| parent | 52d5da9c0d6e4f10b5cba384297821008dbbed2b (diff) | |
Merge branch 'master' of git://github.com/derf/feh
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | src/keyevents.c | 8 |
3 files changed, 7 insertions, 9 deletions
@@ -1,12 +1,11 @@ -git HEAD +Tue, 06 Mar 2012 13:13:35 +0100 Daniel Friesel <derf@finalrewind.org> +* Release v2.4 * exif-support fixes by Dennis Real * format specifier %S now uses the appropriate suffix (B/kB/MB) * 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) * make --quiet and --verbose behave more like their documented way, never ignore out of memory errors * Use ImageMagick (convert) as loader for unsupported file formats @@ -24,6 +24,7 @@ Recommended ----------- * jpegtran (supplied by the jpeg library, for lossless image rotation) + * convert (supplied by ImageMagick, can be used to load unsuppoted formats) Installation ------------ @@ -44,10 +45,10 @@ Available flags are: * curl (default 1) - use libcurl to view http:// and similar images * debug (default 0) - debug build, enables --debug + * exif (default 0) - Builtin EXIF tag display support * help (default 0) - include help text (refers to the manpage otherwise) * stat64 (default 0) - Support CIFS shares from 64bit hosts on 32bit machines * xinerama (default 1) - Support Xinerama/XRandR multiscreen setups - * exif (default 0) - Builtin EXIF tag display support So, by default libcurl and Xinerama are enabled, the rest is disabled. diff --git a/src/keyevents.c b/src/keyevents.c index fd8a4d2..0ada751 100644 --- a/src/keyevents.c +++ b/src/keyevents.c @@ -607,11 +607,9 @@ void feh_event_handle_keypress(XEvent * ev) winwid->old_zoom = 1.001; winwidget_center_image(winwid); winwidget_render_image(winwid, 0, 0); - /* - * --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 - */ + /* --scale-down will also do weird stuff if zoom is 1.0 */ + if (opt.scale_down) + winwid->zoom = 1.001; } 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); |