[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master c9e6395: * src/ft{view, grid, string}.c (parse_
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2-demos] master c9e6395: * src/ft{view, grid, string}.c (parse_cmdline): Generalize batch mode... |
Date: |
Sun, 9 Jun 2019 22:46:06 -0400 (EDT) |
branch: master
commit c9e63958385947bee483af1d20d2b66279c6af7e
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
* src/ft{view,grid,string}.c (parse_cmdline): Generalize batch mode...
(usage): ... and mention it.
* src/ft{view,grid,string}.1: s/end/contain/.
---
ChangeLog | 6 ++++++
src/ftgrid.1 | 2 +-
src/ftgrid.c | 5 ++++-
src/ftstring.1 | 2 +-
src/ftstring.c | 5 ++++-
src/ftview.1 | 2 +-
src/ftview.c | 5 ++++-
7 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ed84f27..6923da1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2019-06-09 Alexei Podtelezhnikov <address@hidden>
+ * src/ft{view,grid,string}.c (parse_cmdline): Generalize batch mode...
+ (usage): ... and mention it.
+ * src/ft{view,grid,string}.1: s/end/contain/.
+
+2019-06-09 Alexei Podtelezhnikov <address@hidden>
+
* graph/batch/grbatch.c (gr_batch_surface_refresh_rect): Remove.
2019-06-09 Alexei Podtelezhnikov <address@hidden>
diff --git a/src/ftgrid.1 b/src/ftgrid.1
index 65dddf3..1b9f10e 100644
--- a/src/ftgrid.1
+++ b/src/ftgrid.1
@@ -89,7 +89,7 @@ Don't display named instances of variation fonts.
.TP
.BI \-k \ keys
Emulate sequence of keystrokes upon start-up.
-If the keystrokes end with 'q', the program operates in batch mode.
+If the keystrokes contain 'q', the program operates in batch mode.
.
.TP
.B \-v
diff --git a/src/ftgrid.c b/src/ftgrid.c
index f443e4a..263043b 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -1747,6 +1747,7 @@
" -d WxHxD Set the window width, height, and color depth\n"
" (default: 640x480x24).\n"
" -k keys Emulate sequence of keystrokes upon start-up.\n"
+ " If the keys contain `q', use batch mode.\n"
" -r R Use resolution R dpi (default: 72dpi).\n"
" -f index Specify first index to display (default: 0).\n"
" -e enc Specify encoding tag (default: no encoding).\n"
@@ -1818,7 +1819,9 @@
case 'k':
status.keys = optarg;
- if ( optarg[ strlen( optarg ) - 1 ] == 'q' )
+ while ( *optarg && *optarg != 'q' )
+ optarg++;
+ if ( *optarg == 'q' )
status.device = "batch";
break;
diff --git a/src/ftstring.1 b/src/ftstring.1
index 4e19581..8a67592 100644
--- a/src/ftstring.1
+++ b/src/ftstring.1
@@ -81,7 +81,7 @@ for rendering.
.TP
.BI \-k \ keys
Emulate sequence of keystrokes upon start-up.
-If the keystrokes end with 'q', the program operates in batch mode.
+If the keystrokes contain 'q', the program operates in batch mode.
.
.TP
.B \-v
diff --git a/src/ftstring.c b/src/ftstring.c
index 429f134..f44303f 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -631,6 +631,7 @@
" -d WxHxD Set the window width, height, and color depth\n"
" (default: 640x480x24).\n"
" -k keys Emulate sequence of keystrokes upon start-up.\n"
+ " If the keys contain `q', use batch mode.\n"
" -r R Use resolution R dpi (default: 72dpi).\n"
" -e enc Specify encoding tag (default: Unicode).\n"
" Common values: `unic' (Unicode), `symb' (symbol),\n"
@@ -673,7 +674,9 @@
case 'k':
status.keys = optarg;
- if ( optarg[ strlen( optarg ) - 1 ] == 'q' )
+ while ( *optarg && *optarg != 'q' )
+ optarg++;
+ if ( *optarg == 'q' )
status.device = "batch";
break;
diff --git a/src/ftview.1 b/src/ftview.1
index 8141d5f..02e234e 100644
--- a/src/ftview.1
+++ b/src/ftview.1
@@ -101,7 +101,7 @@ Preload file in memory to simulate memory-mapping.
.TP
.BI \-k \ keys
Emulate sequence of keystrokes upon start-up.
-If the keystrokes end with 'q', the program operates in batch mode.
+If the keystrokes contain 'q', the program operates in batch mode.
.
.TP
.B \-v
diff --git a/src/ftview.c b/src/ftview.c
index 60fc2dc..78e9113 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1796,6 +1796,7 @@
" -d WxHxD Set the window width, height, and color depth\n"
" (default: 640x480x24).\n"
" -k keys Emulate sequence of keystrokes upon start-up.\n"
+ " If the keys contain `q', use batch mode.\n"
" -r R Use resolution R dpi (default: 72dpi).\n"
" -f index Specify first index to display (default: 0).\n"
" -e enc Specify encoding tag (default: no encoding).\n"
@@ -1849,7 +1850,9 @@
case 'k':
status.keys = optarg;
- if ( optarg[ strlen( optarg ) - 1 ] == 'q' )
+ while ( *optarg && *optarg != 'q' )
+ optarg++;
+ if ( *optarg == 'q' )
status.device = "batch";
break;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master c9e6395: * src/ft{view, grid, string}.c (parse_cmdline): Generalize batch mode...,
Alexei Podtelezhnikov <=