Revision: 55859
http://sourceforge.net/p/brlcad/code/55859
Author: carlmoore
Date: 2013-06-26 16:49:45 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
old 'h' dropped in favor of 'S 1024'; implement h,?,run-with-no-arguments for
help
Modified Paths:
--------------
brlcad/trunk/doc/docbook/system/man1/en/fbgrid.xml
brlcad/trunk/src/fb/fbgrid.c
Modified: brlcad/trunk/doc/docbook/system/man1/en/fbgrid.xml
===================================================================
--- brlcad/trunk/doc/docbook/system/man1/en/fbgrid.xml 2013-06-26 16:46:52 UTC
(rev 55858)
+++ brlcad/trunk/doc/docbook/system/man1/en/fbgrid.xml 2013-06-26 16:49:45 UTC
(rev 55859)
@@ -16,7 +16,7 @@
<refsynopsisdiv xml:id="synopsis">
<cmdsynopsis sepchar=" ">
<command>fbgrid</command>
- <arg choice="opt" rep="norepeat">-hcbdo </arg>
+ <arg choice="opt" rep="norepeat">-cbdo </arg>
<arg choice="opt" rep="norepeat">-F
<replaceable>framebuffer</replaceable></arg>
<arg choice="opt" rep="norepeat">-S
<replaceable>squaresize</replaceable></arg>
<arg choice="opt" rep="norepeat">-W <replaceable>width</replaceable></arg>
@@ -36,11 +36,7 @@
<citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>).
If this variable is not set, the default device for your system will
be used.
-If the
-<option>-h</option>
-option is used, a
-1024x1024 grid is written;
-alternatively, the
+The
<option>-SWN</option>
options can all be used in the normal way to specify the size of
the grid (see
Modified: brlcad/trunk/src/fb/fbgrid.c
===================================================================
--- brlcad/trunk/src/fb/fbgrid.c 2013-06-26 16:46:52 UTC (rev 55858)
+++ brlcad/trunk/src/fb/fbgrid.c 2013-06-26 16:49:45 UTC (rev 55859)
@@ -46,7 +46,7 @@
void grid(FBIO *fbiop, unsigned char *line, int spacing), oldflavor(void);
static char usage[] = "\
-Usage: fbgrid [-h -c] [-b | -d | -o] [-F framebuffer]\n\
+Usage: fbgrid [-c] [-b | -d | -o] [-F framebuffer]\n\
[-S squaresize] [-W width] [-N height]\n";
int
@@ -54,12 +54,8 @@
{
int c;
- while ((c = bu_getopt(argc, argv, "hcbdoF:s:w:n:S:W:N:")) != -1) {
+ while ((c = bu_getopt(argc, argv, "cbdoF:s:w:n:S:W:N:h?")) != -1) {
switch (c) {
- case 'h':
- /* high-res */
- fbheight = fbwidth = 1024;
- break;
case 'c':
clear = 1;
break;
@@ -94,6 +90,9 @@
}
}
+ if (argc == 1 && isatty(fileno(stdin)) && isatty(fileno(stdout)))
+ return 0;
+
if (argc > ++bu_optind)
fprintf(stderr, "fbgrid: excess argument(s) ignored\n");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
