This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
discards 32d328e4884cda8f0757ea471020d2bdf004bac4 (commit)
via ca5a88e3b04234dac2182e21d53ddfafad38bdc4 (commit)
via 3461fdca342c0fde8dea08cb246627010f94ec80 (commit)
via 56aa236ffbfa4b3b38c2e79501664d04bb8acd67 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (32d328e4884cda8f0757ea471020d2bdf004bac4)
\
N -- N -- N (ca5a88e3b04234dac2182e21d53ddfafad38bdc4)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/ca5a88e3b04234dac2182e21d53ddfafad38bdc4
commit ca5a88e3b04234dac2182e21d53ddfafad38bdc4
Author: Doug Torrance <[email protected]>
Date: Sun Jun 7 23:59:26 2015 -0500
doc: Add manpage for wmiv.
diff --git a/debian/wmaker.manpages b/debian/wmaker.manpages
index f252a1c..ae73e30 100644
--- a/debian/wmaker.manpages
+++ b/debian/wmaker.manpages
@@ -11,3 +11,4 @@ doc/wmsetbg.1x
doc/WPrefs.1x
doc/wxcopy.1x
doc/wxpaste.1x
+doc/wmiv.1
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a79d68c..30d46f8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,6 +17,7 @@ dist_man_MANS = \
WindowMaker.1 \
wmagnify.1 \
wmgenmenu.1 \
+ wmiv.1 \
wmmenugen.1 \
WPrefs.1 \
wxcopy.1 \
@@ -50,7 +51,7 @@ am__v_CHKOPTS_0 = @echo " CHK $@" ;
am__v_CHKOPTS_1 =
check-local: wmaker-args WPrefs-args wmagnify-args geticonset-args
getstyle-args seticons-args setstyle-args \
- wdread-args wdwrite-args wmgenmenu-args wmmenugen-args wmsetbg-args
wxcopy-args wxpaste-args
+ wdread-args wdwrite-args wmgenmenu-args wmiv-args wmmenugen-args
wmsetbg-args wxcopy-args wxpaste-args
wmaker-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
@@ -92,6 +93,10 @@ wmgenmenu-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
--program "$(top_builddir)/util/wmgenmenu" --man-page
"$(top_srcdir)/doc/wmgenmenu.1"
+wmiv-args:
+ $(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
+ --program "$(top_builddir)/util/wmiv" --man-page
"$(top_srcdir)/doc/wmiv.1"
+
wmmenugen-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
--program "$(top_builddir)/util/wmmenugen" --man-page
"$(top_srcdir)/doc/wmmenugen.1"
@@ -109,4 +114,4 @@ wxpaste-args:
--program "$(top_builddir)/util/wxpaste" --man-page
"$(top_srcdir)/doc/wxpaste.1"
.PHONY: wmaker-args WPrefs-args wmagnify-args geticonset-args getstyle-args
seticons-args setstyle-args \
- wdread-args wdwrite-args wmgenmenu-args wmmenugen-args wmsetbg-args
wxcopy-args wxpaste-args
+ wdread-args wdwrite-args wmgenmenu-args wmiv-args wmmenugen-args
wmsetbg-args wxcopy-args wxpaste-args
diff --git a/doc/wmiv.1 b/doc/wmiv.1
new file mode 100644
index 0000000..4f92f98
--- /dev/null
+++ b/doc/wmiv.1
@@ -0,0 +1,49 @@
+.TH wmiv "1" "June 2015"
+.SH NAME
+wmiv: \- fast image viewer using wrlib
+.SH SYNOPSIS
+.B wmiv
+[\fI\,image(s)|directory\/\fR]
+.SH OPTIONS
+.TP
+.B \-\-help
+print help text
+.TP
+.B \-\-version
+print version
+.SH KEYS
+.TP
+[+]
+zoom in
+.TP
+[\-]
+zoom out
+.TP
+[Esc]
+actual size
+.TP
+[D]
+launch diaporama mode
+.TP
+[L]
+rotate image on the left
+.TP
+[Q]
+quit
+.TP
+[R]
+rotate image on the right
+.TP
+[right]
+next image
+.TP
+[left]
+previous image
+.TP
+[up]
+first image
+.TP
+[down]
+last image
+.SH "AUTHOR"
+wmiv is a part of Window Maker. It was written by David Maciejak.
http://repo.or.cz/w/wmaker-crm.git/commit/3461fdca342c0fde8dea08cb246627010f94ec80
commit 3461fdca342c0fde8dea08cb246627010f94ec80
Author: Doug Torrance <[email protected]>
Date: Sun Jun 7 23:59:25 2015 -0500
wmiv: Improve help text.
In particular, we add entries for the two command line options for `make
check` to work, add some whitespace for readability, and enclose the keys
in brackets so `make check` doesn't think the - key is one of the command
line options. We also capitalize Esc and the letter keys for readability.
diff --git a/util/wmiv.c b/util/wmiv.c
index 90bc88d..2fb1e15 100755
--- a/util/wmiv.c
+++ b/util/wmiv.c
@@ -717,21 +717,24 @@ int main(int argc, char **argv)
if (option != -1) {
switch (option) {
case 'h':
- fprintf(stderr, "Usage: %s [image(s)|directory]\n"
+ printf("Usage: %s [image(s)|directory]\n"
+ "Options:\n"
+ " -h, --help print this help text\n"
+ " -v, --version print version\n"
"Keys:\n"
- "+: zoom in\n"
- "-: zoom out\n"
- "esc: actual size\n"
+ " [+] zoom in\n"
+ " [-] zoom out\n"
+ " [Esc] actual size\n"
#ifdef HAVE_PTHREAD
- "d: launch diaporama mode\n"
+ " [D] launch diaporama mode\n"
#endif
- "l: rotate image on the left\n"
- "q: quit\n"
- "r: rotate image on the right\n"
- "right: next image\n"
- "left: previous image\n"
- "up: first image\n"
- "down: last image\n",
+ " [L] rotate image on the left\n"
+ " [Q] quit\n"
+ " [R] rotate image on the right\n"
+ " [right] next image\n"
+ " [left] previous image\n"
+ " [up] first image\n"
+ " [down] last image\n",
argv[0]);
return EXIT_SUCCESS;
case 'v':
http://repo.or.cz/w/wmaker-crm.git/commit/56aa236ffbfa4b3b38c2e79501664d04bb8acd67
commit 56aa236ffbfa4b3b38c2e79501664d04bb8acd67
Author: Doug Torrance <[email protected]>
Date: Sun Jun 7 12:16:31 2015 -0500
wmiv: Add long command line options --help and --version.
We will need --help for `make check` to work once we add a manpage.
diff --git a/util/wmiv.c b/util/wmiv.c
index 45cc4e3..90bc88d 100755
--- a/util/wmiv.c
+++ b/util/wmiv.c
@@ -34,6 +34,7 @@
#include <limits.h>
#include <unistd.h>
#include <sys/stat.h>
+#include <getopt.h>
#include "config.h"
#ifdef HAVE_EXIF
@@ -705,7 +706,14 @@ int main(int argc, char **argv)
red.red = 255;
red.green = red.blue = 0;
- option = getopt(argc, argv, "hv");
+ static struct option long_options[] = {
+ {"version", no_argument, 0, 'v'},
+ {"help", no_argument, 0, 'h'},
+ {0, 0, 0, 0}
+ };
+ int option_index = 0;
+
+ option = getopt_long (argc, argv, "hv", long_options, &option_index);
if (option != -1) {
switch (option) {
case 'h':
-----------------------------------------------------------------------
Summary of changes:
debian/wmaker.manpages | 1 +
doc/Makefile.am | 9 +++++++--
doc/wmiv.1 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
util/wmiv.c | 27 +++++++++++++++------------
4 files changed, 72 insertions(+), 14 deletions(-)
create mode 100644 doc/wmiv.1
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
