commit 3e3f4a167a6cb701f335653a2d172a5132343253
parent c98528f8d3daec05026491a50b938a036cbf5440
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Wed, 7 Sep 2022 11:27:20 +0200
tweaks: elide a function that does not need to be a separate function
Also elide three calls of tolower(), using ORing with 0x20 instead,
as we're dealing with plain ASCII here.
Rename a variable too, away from a double abbreviation.
Diffstat:
| M | src/winio.c | | | 41 | ++++++++++++++++------------------------- |
1 file changed, 16 insertions(+), 25 deletions(-)
diff --git a/src/winio.c b/src/winio.c
@@ -1348,41 +1348,32 @@ int get_kbinput(WINDOW *frame, bool showcursor)
#ifdef ENABLE_UTF8
#define INVALID_DIGIT -77
-/* If the given symbol is a valid hexadecimal digit, multiply it by factor
- * and add the result to the given unicode, and return PROCEED to signify
- * okay. When not a hexadecimal digit, return the symbol itself. */
-long add_unicode_digit(int symbol, long *unicode)
-{
- if ('0' <= symbol && symbol <= '9')
- *unicode = (*unicode << 4) + symbol - '0';
- else if ('a' <= tolower(symbol) && tolower(symbol) <= 'f')
- *unicode = (*unicode << 4) + tolower(symbol) - 'a' + 10;
- else if (symbol == '\r' || symbol == ' ')
- return *unicode;
- else
- return INVALID_DIGIT;
-
- return PROCEED;
-}
-
/* For each consecutive call, gather the given symbol into a six-digit Unicode
* (from 000000 to 10FFFF, case-insensitive). When it is complete, return the
- * assembled Unicode; until then, return PROCEED when the symbol is valid. */
+ * assembled Unicode; until then, return PROCEED when the symbol is valid; and
+ * return an error code for anything other than hexadecimal, Space, and Enter. */
long assemble_unicode(int symbol)
{
static long unicode = 0;
static int digits = 0;
- long retval = PROCEED;
+ long outcome = PROCEED;
- retval = add_unicode_digit(symbol, &unicode);
+ if ('0' <= symbol && symbol <= '9')
+ unicode = (unicode << 4) + symbol - '0';
+ else if ('a' <= (symbol | 0x20) && (symbol | 0x20) <= 'f')
+ unicode = (unicode << 4) + (symbol | 0x20) - 'a' + 10;
+ else if (symbol == '\r' || symbol == ' ')
+ outcome = unicode;
+ else
+ outcome = INVALID_DIGIT;
/* If also the sixth digit was a valid hexadecimal value, then the
* Unicode sequence is complete, so return it (when it's valid). */
- if (++digits == 6 && retval == PROCEED)
- retval = (unicode < 0x110000) ? unicode : INVALID_DIGIT;
+ if (++digits == 6 && outcome == PROCEED)
+ outcome = (unicode < 0x110000) ? unicode : INVALID_DIGIT;
/* Show feedback only when editing, not when at a prompt. */
- if (retval == PROCEED && currmenu == MMAIN) {
+ if (outcome == PROCEED && currmenu == MMAIN) {
char partial[7] = "......";
/* Construct the partial result, left-padded with dots. */
@@ -1394,12 +1385,12 @@ long assemble_unicode(int symbol)
}
/* If we have an end result, reset the value and the counter. */
- if (retval != PROCEED) {
+ if (outcome != PROCEED) {
unicode = 0;
digits = 0;
}
- return retval;
+ return outcome;
}
#endif /* ENABLE_UTF8 */
