[Performous-commit] Tapio Vierros : Numpad Enter now works also ( to perhaps avoid layout problems).

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 7f93f7e3f516fc769ca304c14ab973ec4834d0be

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Jan 17 18:13:07 2010 +0200

Numpad Enter now works also (to perhaps avoid layout problems).

---

 game/joystick.cc |    6 +++---
 game/main.cc     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index be7ad92..5132a0f 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -91,7 +91,7 @@ input::NavButton input::getNav(SDL_Event const &e) {
 		else if (k == SDLK_DOWN && !(mod & KMOD_CTRL)) return input::DOWN;
 		else if (k == SDLK_LEFT) return input::LEFT;
 		else if (k == SDLK_RIGHT) return input::RIGHT;
-		else if (k == SDLK_RETURN) return input::START;
+		else if (k == SDLK_RETURN || k == SDLK_KP_ENTER) return input::START;
 		else if (k == SDLK_ESCAPE) return input::CANCEL;
 		else if (k == SDLK_PAGEUP) return input::MOREUP;
 		else if (k == SDLK_PAGEDOWN) return input::MOREDOWN;
@@ -360,7 +360,7 @@ bool input::SDL::pushEvent(SDL_Event _e) {
 			if (_e.key.keysym.mod & (KMOD_CTRL|KMOD_SHIFT|KMOD_ALT|KMOD_META)) return false;
 
 			switch(_e.key.keysym.sym) {
-				case SDLK_RETURN:
+				case SDLK_RETURN: case SDLK_KP_ENTER:
 					if(!guitar) return false;
 					if (pickPressed[0]) return true; // repeating
 					pickPressed[0] = true;
@@ -509,7 +509,7 @@ bool input::SDL::pushEvent(SDL_Event _e) {
 			if (_e.key.keysym.mod & (KMOD_CTRL|KMOD_SHIFT|KMOD_ALT|KMOD_META)) return false;
 
 			switch(_e.key.keysym.sym) {
-				case SDLK_RETURN:
+				case SDLK_RETURN: case SDLK_KP_ENTER:
 					if(!guitar) return false;
 					pickPressed[0] = false;
 					return true;
diff --git a/game/main.cc b/game/main.cc
index 57f42ea..5d1790d 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -58,7 +58,7 @@ static void checkEvents_SDL(ScreenManager& sm, Window& window) {
 		  case SDL_KEYDOWN:
 			int keypressed  = event.key.keysym.sym;
 			SDLMod modifier = event.key.keysym.mod;
-			if ((keypressed == SDLK_RETURN && modifier & KMOD_ALT) || keypressed == SDLK_F11) {
+			if (((keypressed == SDLK_RETURN || keypressed == SDLK_KP_ENTER) && modifier & KMOD_ALT) || keypressed == SDLK_F11) {
 				config["graphic/fullscreen"].b() = !config["graphic/fullscreen"].b();
 				continue; // Already handled here...
 			}