|
 |
73b847 |
From b14c87acb78f458ed27c80ef2a18d829bc982565 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Tue, 17 Dec 2019 18:15:37 +0100
|
|
|
73b847 |
Subject: [PATCH 155/181] examples: Iterate through fingers via first/last refs
|
|
|
73b847 |
|
|
|
73b847 |
---
|
|
|
73b847 |
examples/utilities.c | 26 ++++++++------------------
|
|
|
73b847 |
1 file changed, 8 insertions(+), 18 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/examples/utilities.c b/examples/utilities.c
|
|
|
73b847 |
index 379ad0a..eb18600 100644
|
|
|
73b847 |
--- a/examples/utilities.c
|
|
|
73b847 |
+++ b/examples/utilities.c
|
|
|
73b847 |
@@ -107,29 +107,19 @@ finger_to_string (FpFinger finger)
|
|
|
73b847 |
FpFinger
|
|
|
73b847 |
finger_chooser (void)
|
|
|
73b847 |
{
|
|
|
73b847 |
- int i;
|
|
|
73b847 |
- const FpFinger all_fingers[] = {
|
|
|
73b847 |
- FP_FINGER_LEFT_THUMB,
|
|
|
73b847 |
- FP_FINGER_LEFT_INDEX,
|
|
|
73b847 |
- FP_FINGER_LEFT_MIDDLE,
|
|
|
73b847 |
- FP_FINGER_LEFT_RING,
|
|
|
73b847 |
- FP_FINGER_LEFT_LITTLE,
|
|
|
73b847 |
- FP_FINGER_RIGHT_THUMB,
|
|
|
73b847 |
- FP_FINGER_RIGHT_INDEX,
|
|
|
73b847 |
- FP_FINGER_RIGHT_MIDDLE,
|
|
|
73b847 |
- FP_FINGER_RIGHT_RING,
|
|
|
73b847 |
- FP_FINGER_RIGHT_LITTLE,
|
|
|
73b847 |
- };
|
|
|
73b847 |
-
|
|
|
73b847 |
- for (i = all_fingers[0]; i <= G_N_ELEMENTS (all_fingers); ++i)
|
|
|
73b847 |
- g_print (" [%d] %s\n", (i - all_fingers[0]), finger_to_string (i));
|
|
|
73b847 |
+ int i = FP_FINGER_UNKNOWN;
|
|
|
73b847 |
+
|
|
|
73b847 |
+ for (i = FP_FINGER_FIRST; i <= FP_FINGER_LAST; ++i)
|
|
|
73b847 |
+ g_print (" [%d] %s\n", (i - FP_FINGER_FIRST), finger_to_string (i));
|
|
|
73b847 |
|
|
|
73b847 |
g_print ("> ");
|
|
|
73b847 |
if (!scanf ("%d%*c", &i))
|
|
|
73b847 |
return FP_FINGER_UNKNOWN;
|
|
|
73b847 |
|
|
|
73b847 |
- if (i < 0 || i >= G_N_ELEMENTS (all_fingers))
|
|
|
73b847 |
+ i += FP_FINGER_FIRST;
|
|
|
73b847 |
+
|
|
|
73b847 |
+ if (i < FP_FINGER_FIRST || i > FP_FINGER_LAST)
|
|
|
73b847 |
return FP_FINGER_UNKNOWN;
|
|
|
73b847 |
|
|
|
73b847 |
- return all_fingers[i];
|
|
|
73b847 |
+ return i;
|
|
|
73b847 |
}
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|