2005-10-30 12:47:56 +01:00
|
|
|
$NetBSD: patch-aa,v 1.3 2005/10/30 11:47:56 wiz Exp $
|
2004-07-19 20:37:14 +02:00
|
|
|
|
|
|
|
Make default keys match documentation.
|
2004-07-26 20:00:17 +02:00
|
|
|
Also, add settings for joystick.
|
2004-07-19 20:37:14 +02:00
|
|
|
|
2005-10-30 12:47:56 +01:00
|
|
|
--- src/drivers/pc/input.c.orig 2004-09-11 10:04:33.000000000 +0200
|
2004-07-19 20:37:14 +02:00
|
|
|
+++ src/drivers/pc/input.c
|
2005-10-30 12:47:56 +01:00
|
|
|
@@ -276,6 +276,10 @@ static void KeyboardCommands(void)
|
2004-07-26 20:00:17 +02:00
|
|
|
|
|
|
|
#define MK(x) {{BUTTC_KEYBOARD},{0},{MKK(x)},1}
|
|
|
|
#define MK2(x1,x2) {{BUTTC_KEYBOARD},{0},{MKK(x1),MKK(x2)},2}
|
|
|
|
+#define MKJA(x, a, d) {{BUTTC_KEYBOARD, BUTTC_JOYSTICK}, \
|
|
|
|
+ {0, 0},{MKK(x),0x8000|((d)<<14)|(a)},2}
|
|
|
|
+#define MKJB(x, a) {{BUTTC_KEYBOARD, BUTTC_JOYSTICK}, \
|
|
|
|
+ {0, 0},{MKK(x),(a)},2}
|
|
|
|
|
|
|
|
#define MKZ() {{0},{0},{0},0}
|
|
|
|
|
2005-10-30 12:47:56 +01:00
|
|
|
@@ -284,8 +288,13 @@ static void KeyboardCommands(void)
|
2004-07-19 20:37:14 +02:00
|
|
|
ButtConfig GamePadConfig[4][10]={
|
|
|
|
/* Gamepad 1 */
|
|
|
|
{
|
|
|
|
- MK(KP3), MK(KP2), MK(TAB), MK(ENTER), MK(W),MK(Z),
|
|
|
|
- MK(A), MK(S), MKZ(), MKZ()
|
2005-10-30 12:47:56 +01:00
|
|
|
+ MKJB(LEFTALT, 2), MKJB(LEFTCONTROL, 0), MKJB(TAB, 5), MKJB(ENTER, 7),
|
2004-07-26 20:00:17 +02:00
|
|
|
+ MKJA(CURSORUP, 1, 1), MKJA(CURSORDOWN, 1, 0),
|
|
|
|
+ MKJA(CURSORLEFT, 0, 1), MKJA(CURSORRIGHT, 0, 0), MKZ(), MKZ()
|
|
|
|
+#if 0
|
2004-07-19 20:37:14 +02:00
|
|
|
+ MK(LEFTALT), MK(LEFTCONTROL), MK(TAB), MK(ENTER), MK(CURSORUP),
|
|
|
|
+ MK(CURSORDOWN), MK(CURSORLEFT), MK(CURSORRIGHT), MKZ(), MKZ()
|
2004-07-26 20:00:17 +02:00
|
|
|
+#endif
|
2004-07-19 20:37:14 +02:00
|
|
|
},
|
|
|
|
|
|
|
|
/* Gamepad 2 */
|