Give function keys their own ZC_* defines to avoid offending Clang.

diff --git a/src/common/frotz.h b/src/common/frotz.h
index 644184353a4ee833f3d1081ea0fdf2013a60cf09..9785a34b9624577cd06059ae4848a39a6a43cc73 100644 (file)
--- a/src/common/frotz.h
+++ b/src/common/frotz.h
@@ -338,6 +338,18 @@ extern const char build_timestamp[];
 #define ZC_ARROW_RIGHT 0x84
 #define ZC_ARROW_MAX 0x84
 #define ZC_FKEY_MIN 0x85
+#define ZC_FKEY_F1 0x85
+#define ZC_FKEY_F2 0x86
+#define ZC_FKEY_F3 0x87
+#define ZC_FKEY_F4 0x88
+#define ZC_FKEY_F5 0x89
+#define ZC_FKEY_F6 0x8a
+#define ZC_FKEY_F7 0x8b
+#define ZC_FKEY_F8 0x8c
+#define ZC_FKEY_F9 0x8d
+#define ZC_FKEY_F10 0x8e
+#define ZC_FKEY_F11 0x8f
+#define ZC_FKEY_F12 0x90
 #define ZC_FKEY_MAX 0x90
 #define ZC_NUMPAD_MIN 0x91
 #define ZC_NUMPAD_MAX 0x9a

diff --git a/src/dumb/dumb_input.c b/src/dumb/dumb_input.c
index af8c9d3b6e16e931ef7f75f0cf42e948c98affe1..674d289c9bf0e60cffbbcae8e1a3012b6f6ed8cb 100644 (file)
--- a/src/dumb/dumb_input.c
+++ b/src/dumb/dumb_input.c
@@ -141,10 +141,16 @@ static void translate_special_chars(char *s)
       case 'X': *dest++ = ZC_HKEY_QUIT; break;
       case 'D': *dest++ = ZC_HKEY_DEBUG; break;
       case 'H': *dest++ = ZC_HKEY_HELP; break;
-      case '1': case '2': case '3': case '4':
-      case '5': case '6': case '7': case '8': case '9':
-       *dest++ = ZC_FKEY_MIN + src[-1] - '0' - 1; break;
-      case '0': *dest++ = ZC_FKEY_MIN + 9; break;
+      case '1': *dest++ = ZC_FKEY_F1; break;
+      case '2': *dest++ = ZC_FKEY_F2; break;
+      case '3': *dest++ = ZC_FKEY_F3; break;
+      case '4': *dest++ = ZC_FKEY_F4; break;
+      case '5': *dest++ = ZC_FKEY_F5; break;
+      case '6': *dest++ = ZC_FKEY_F6; break;
+      case '7': *dest++ = ZC_FKEY_F7; break;
+      case '8': *dest++ = ZC_FKEY_F8; break;
+      case '9': *dest++ = ZC_FKEY_F9; break;
+      case '0': *dest++ = ZC_FKEY_F10; break;
       default:
        fprintf(stderr, "DUMB-FROTZ: unknown escape char: %c\n", src[-1]);
        fprintf(stderr, "Enter \\help to see the list\n");