summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-07-04 13:43:51 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2010-07-04 13:43:51 +0200
commit9c59d4b10363a9ce6e05082426d86e7d29e0b6be (patch)
treeb61cf11df17ff7ee13ba66deb64e5c7ef21a0494
parent45051738e96b6e15af68c9240bf96d541843d127 (diff)
--full-screen -> --fullscreen (more correct[tm])
-rw-r--r--ChangeLog4
-rw-r--r--man/feh.14
-rw-r--r--src/help.raw4
-rw-r--r--src/options.c3
4 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cf1878..705d048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+git HEAD
+
+ * Add --fullscreen option, --full-screen is now deprecated
+
Fri, 25 Jun 2010 16:07:20 +0200 Daniel Friesel <derf@chaosdorf.de>
* Release v1.8
diff --git a/man/feh.1 b/man/feh.1
index 6ff55bd..7e28949 100644
--- a/man/feh.1
+++ b/man/feh.1
@@ -188,7 +188,7 @@ add multiple paths.
.It Cm -I , --fullindex
Same as Index mode, but you also get image size and dimensions printed
below each thumbnail.
-.It Cm -F , --full-screen
+.It Cm -F , --fullscreen
Make the window fullscreen.
.It Cm -g , --geometry Ar width No x Ar height
Limit (and don't change) the window size. Takes an X-style geometry
@@ -332,7 +332,7 @@ commandline options.
.It Cm -t , --thumbnails
Same as Index mode, but the thumbnails are clickable image launchers.
Note that
-.Cm --full-screen
+.Cm --fullscreen
does not affect the thumbnail window. It does, however, work for the image
windows launched from thumbnail mode.
.It Cm -~ , --thumb-title Ar string
diff --git a/src/help.raw b/src/help.raw
index aab873b..825c20c 100644
--- a/src/help.raw
+++ b/src/help.raw
@@ -23,8 +23,8 @@ OPTIONS
before attempting to display anything
-., --scale-down Automatically scale down images to fit the screen
size
- -F, --full-screen Make the window fullscreen
- -Z, --auto-zoom Zoom picture to screen size in fullscreen mode
+ -F, --fullscreen Make the window full screen
+ -Z, --auto-zoom Zoom picture to screen size in full screen mode
--zoom PERCENT Zooms images by a PERCENT, when in full screen
mode or when window geometry is fixed. If combined
with --auto-zoom, zooming will be limited to the
diff --git a/src/options.c b/src/options.c
index 5962ca1..9cfbcdc 100644
--- a/src/options.c
+++ b/src/options.c
@@ -339,7 +339,8 @@ static void feh_parse_option_array(int argc, char **argv)
{"loadable", 0, 0, 'U'}, /* okay */
{"unloadable", 0, 0, 'u'}, /* okay */
{"no-menus", 0, 0, 'N'},
- {"full-screen", 0, 0, 'F'},
+ {"full-screen", 0, 0, 'F'}, /* deprecated */
+ {"fullscreen", 0, 0, 'F'},
{"auto-zoom", 0, 0, 'Z'},
{"ignore-aspect", 0, 0, 'X'},
{"draw-filename", 0, 0, 'd'},