ref: b478d66c58707eb392d7132ab3106a2c1b2cacfd
parent: 1a090dd9f9adad6afdf93274fc5f381b4d9f7342
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Tue Oct 22 13:14:34 EDT 2024
put key codes into an enum, add mouse4 and mouse5
--- a/in_sdl.c
+++ b/in_sdl.c
@@ -11,6 +11,8 @@
K_MOUSE1,
K_MOUSE3,
K_MOUSE2,
+ K_MOUSE3,
+ K_MOUSE5,
};
void
--- a/keys.c
+++ b/keys.c
@@ -44,6 +44,7 @@
{"DOWNARROW", K_DOWNARROW}, {"LEFTARROW", K_LEFTARROW}, {"RIGHTARROW", K_RIGHTARROW},+ {"SEMICOLON", ';'}, // because a raw semicolon seperates commands {"ALT", K_ALT}, {"CTRL", K_CTRL},@@ -68,10 +69,15 @@
{"PGUP", K_PGUP}, {"HOME", K_HOME}, {"END", K_END},+ {"PAUSE", K_PAUSE}, {"MOUSE1", K_MOUSE1}, {"MOUSE2", K_MOUSE2}, {"MOUSE3", K_MOUSE3},+ {"MOUSE4", K_MOUSE4},+ {"MOUSE5", K_MOUSE5},+ {"MWHEELUP", K_MWHEELUP},+ {"MWHEELDOWN", K_MWHEELDOWN}, {"JOY1", K_JOY1}, {"JOY2", K_JOY2},@@ -110,13 +116,6 @@
{"AUX30", K_AUX30}, {"AUX31", K_AUX31}, {"AUX32", K_AUX32},-
- {"PAUSE", K_PAUSE},-
- {"MWHEELUP", K_MWHEELUP},- {"MWHEELDOWN", K_MWHEELDOWN},-
- {"SEMICOLON", ';'}, // because a raw semicolon seperates commands {nil,0}};
--- a/keys.h
+++ b/keys.h
@@ -1,101 +1,91 @@
//
// these are the key numbers that should be passed to Key_Event
//
-#define K_TAB 9
-#define K_ENTER 13
-#define K_ESCAPE 27
-#define K_SPACE 32
+enum {+ K_TAB = '\t',
+ K_ENTER = '\r',
+ K_ESCAPE = '\e',
+ K_SPACE = ' ',
+ // normal keys should be passed as lowercased ascii
-// normal keys should be passed as lowercased ascii
+ K_BACKSPACE = 127,
+ K_UPARROW,
+ K_DOWNARROW,
+ K_LEFTARROW,
+ K_RIGHTARROW,
+ K_ALT,
+ K_CTRL,
+ K_SHIFT,
+ K_F1,
+ K_F2,
+ K_F3,
+ K_F4,
+ K_F5,
+ K_F6,
+ K_F7,
+ K_F8,
+ K_F9,
+ K_F10,
+ K_F11,
+ K_F12,
+ K_INS,
+ K_DEL,
+ K_PGDN,
+ K_PGUP,
+ K_HOME,
+ K_END,
+ K_PAUSE,
-#define K_BACKSPACE 127
-#define K_UPARROW 128
-#define K_DOWNARROW 129
-#define K_LEFTARROW 130
-#define K_RIGHTARROW 131
+ // mouse buttons generate virtual keys
+ K_MOUSE1,
+ K_MOUSE2,
+ K_MOUSE3,
+ K_MOUSE4,
+ K_MOUSE5,
+ K_MWHEELUP,
+ K_MWHEELDOWN,
-#define K_ALT 132
-#define K_CTRL 133
-#define K_SHIFT 134
-#define K_F1 135
-#define K_F2 136
-#define K_F3 137
-#define K_F4 138
-#define K_F5 139
-#define K_F6 140
-#define K_F7 141
-#define K_F8 142
-#define K_F9 143
-#define K_F10 144
-#define K_F11 145
-#define K_F12 146
-#define K_INS 147
-#define K_DEL 148
-#define K_PGDN 149
-#define K_PGUP 150
-#define K_HOME 151
-#define K_END 152
+ // joystick buttons
+ K_JOY1,
+ K_JOY2,
+ K_JOY3,
+ K_JOY4,
-#define K_PAUSE 255
-
-//
-// mouse buttons generate virtual keys
-//
-#define K_MOUSE1 200
-#define K_MOUSE2 201
-#define K_MOUSE3 202
-
-//
-// joystick buttons
-//
-#define K_JOY1 203
-#define K_JOY2 204
-#define K_JOY3 205
-#define K_JOY4 206
-
-//
-// aux keys are for multi-buttoned joysticks to generate so they can use
-// the normal binding process
-//
-#define K_AUX1 207
-#define K_AUX2 208
-#define K_AUX3 209
-#define K_AUX4 210
-#define K_AUX5 211
-#define K_AUX6 212
-#define K_AUX7 213
-#define K_AUX8 214
-#define K_AUX9 215
-#define K_AUX10 216
-#define K_AUX11 217
-#define K_AUX12 218
-#define K_AUX13 219
-#define K_AUX14 220
-#define K_AUX15 221
-#define K_AUX16 222
-#define K_AUX17 223
-#define K_AUX18 224
-#define K_AUX19 225
-#define K_AUX20 226
-#define K_AUX21 227
-#define K_AUX22 228
-#define K_AUX23 229
-#define K_AUX24 230
-#define K_AUX25 231
-#define K_AUX26 232
-#define K_AUX27 233
-#define K_AUX28 234
-#define K_AUX29 235
-#define K_AUX30 236
-#define K_AUX31 237
-#define K_AUX32 238
-
-// JACK: Intellimouse(c) Mouse Wheel Support
-
-#define K_MWHEELUP 239
-#define K_MWHEELDOWN 240
-
-
+ // aux keys are for multi-buttoned joysticks to generate so they can use
+ // the normal binding process
+ K_AUX1,
+ K_AUX2,
+ K_AUX3,
+ K_AUX4,
+ K_AUX5,
+ K_AUX6,
+ K_AUX7,
+ K_AUX8,
+ K_AUX9,
+ K_AUX10,
+ K_AUX11,
+ K_AUX12,
+ K_AUX13,
+ K_AUX14,
+ K_AUX15,
+ K_AUX16,
+ K_AUX17,
+ K_AUX18,
+ K_AUX19,
+ K_AUX20,
+ K_AUX21,
+ K_AUX22,
+ K_AUX23,
+ K_AUX24,
+ K_AUX25,
+ K_AUX26,
+ K_AUX27,
+ K_AUX28,
+ K_AUX29,
+ K_AUX30,
+ K_AUX31,
+ K_AUX32,
+};
typedef enum {key_game, key_console, key_message, key_menu} keydest_t;