1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
Subject: Check for Enter + Return in user input
Forwarded: http://sourceforge.net/p/bomberclone/mailman/bomberclone-devel
--- a/src/game.c
+++ b/src/game.c
@@ -916,7 +916,7 @@
bman.state = GS_startup;
}
- if ((keys[SDLK_RETURN] || keys[SDLK_LCTRL] || keys[SDLK_RCTRL]) && (!keypressed)
+ if ((keys[SDLK_RETURN] || keys[SDLK_KP_ENTER] || keys[SDLK_LCTRL] || keys[SDLK_RCTRL]) && (!keypressed)
&& (event.type = SDL_KEYDOWN)) {
done = 1;
keypressed = 1;
--- a/src/keyb.c
+++ b/src/keyb.c
@@ -259,7 +259,7 @@
menu_displaytext ("Keyboard Config", "Please press the new key\nfor this function.");
keys = SDL_GetKeyState (NULL);
- if (keys[SDLK_RETURN] || keys[SDLK_ESCAPE])
+ if (keys[SDLK_RETURN] || keys[SDLK_KP_ENTER] || keys[SDLK_ESCAPE])
keypressed = 1;
timestamp = SDL_GetTicks (); // needed for time sync.
--- a/src/keybinput.c
+++ b/src/keybinput.c
@@ -65,7 +65,7 @@
ki->len = strlen (ki->text);
}
- if (keybinput_oldkey == SDLK_RETURN && event->type == SDL_KEYUP)
+ if ((keybinput_oldkey == SDLK_RETURN || keybinput_oldkey == SDLK_KP_ENTER) && event->type == SDL_KEYUP)
keyu = 1;
else if (keybinput_oldkey == SDLK_ESCAPE && event->type == SDL_KEYUP)
keyu = -1;
--- a/src/menubools.c
+++ b/src/menubools.c
@@ -40,7 +40,7 @@
menu_focus_prev ((_menu *) mi->menu);
else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN)
menu_focus_next ((_menu *) mi->menu);
- else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) {
+ else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL) {
*(int *)mi->ptrdata = !(*(int *)mi->ptrdata);
menu_draw_bool (mi);
}
--- a/src/menubuttons.c
+++ b/src/menubuttons.c
@@ -95,7 +95,7 @@
menu_focus_prev ((_menu *)mi->menu);
else if (event->key.keysym.sym == SDLK_RIGHT || event->key.keysym.sym == SDLK_DOWN)
menu_focus_next ((_menu *)mi->menu);
- else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL)
+ else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_LCTRL || event->key.keysym.sym == SDLK_RCTRL)
return 1;
break;
}
--- a/src/menuentrys.c
+++ b/src/menuentrys.c
@@ -150,7 +150,7 @@
menu_focus_prev ((_menu *)mi->menu);
else if (event->key.keysym.sym == SDLK_DOWN)
menu_focus_next ((_menu *)mi->menu);
- else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL)
+ else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL)
menu_entry_save (mi);
else if (event->key.keysym.sym == SDLK_ESCAPE)
menu_entry_restore (mi);
--- a/src/menulists.c
+++ b/src/menulists.c
@@ -296,7 +296,7 @@
menu_list_select_prev (mi);
else if (event->key.keysym.sym == SDLK_DOWN)
menu_list_select_next (mi);
- else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL)
+ else if (event->key.keysym.sym == SDLK_RETURN || event->key.keysym.sym == SDLK_KP_ENTER || event->key.keysym.sym == SDLK_RCTRL || event->key.keysym.sym == SDLK_RCTRL)
return 1;
break;
case (SDL_KEYUP):
--- a/src/playermenu.c
+++ b/src/playermenu.c
@@ -176,7 +176,7 @@
/*
* select the current gfx if aviable
*/
- else if (event.key.keysym.sym == SDLK_RETURN
+ else if (event.key.keysym.sym == SDLK_RETURN || event.key.keysym.sym == SDLK_KP_ENTER
|| event.key.keysym.sym == SDLK_LCTRL || event.key.keysym.sym == SDLK_RCTRL
|| event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_drop] || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_special]
|| event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_max + BCPK_drop] || event.key.keysym.sym == keyb_gamekeys.keycode[BCPK_max + BCPK_special]) {
|
