[Performous-commit] Tapio Vierros : Handle keys with modifiers (e.g. CTRL) outside joystick.

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

Module: performous
Branch: master
Commit: e7bd15bab970f7dc5bc51f4d53b63288446a875e

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Jan  3 22:48:56 2010 +0200

Handle keys with modifiers (e.g. CTRL) outside joystick.
This allows e.g. volume control in dancing.

---

 game/joystick.cc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index 77accb4..90f4c2e 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -290,6 +290,7 @@ bool input::SDL::pushEvent(SDL_Event _e) {
 		case SDL_KEYDOWN: {
 			if(!config["game/keyboard_guitar"].b() && !config["game/keyboard_dancepad"].b())
 			  return false;
+			if (_e.key.keysym.mod & (KMOD_CTRL|KMOD_SHIFT|KMOD_ALT|KMOD_META)) return false;
 			int button = 0;
 			event.type = input::Event::PRESS;
 			if(config["game/keyboard_guitar"].b() && devices[input::Private::KEYBOARD_ID].assigned()) {
@@ -368,6 +369,7 @@ bool input::SDL::pushEvent(SDL_Event _e) {
 		case SDL_KEYUP: {
 			if(!config["game/keyboard_guitar"].b() && !config["game/keyboard_dancepad"].b())
 			  return false;
+			if (_e.key.keysym.mod & (KMOD_CTRL|KMOD_SHIFT|KMOD_ALT|KMOD_META)) return false;
 			int button = 0;
 			event.type = input::Event::RELEASE;
 			if(config["game/keyboard_guitar"].b() && devices[input::Private::KEYBOARD_ID].assigned()) {