[Scummvm-git-logs] scummvm master -> b92341002552f2750e804a7ab19cb808b6260539

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b923410025 GLK: Don't treat Caps, Num and Scroll Lock as standard keypresses


Commit: b92341002552f2750e804a7ab19cb808b6260539
    https://github.com/scummvm/scummvm/commit/b92341002552f2750e804a7ab19cb808b6260539
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2019-03-02T15:45:55+01:00

Commit Message:
GLK: Don't treat Caps, Num and Scroll Lock as standard keypresses

Technically, they're lock keys rather than modifier keys, but we
may as well treat them as the same thing here.

My keyboard doesn't have an F-lock key, and I can't find any key
code for it, so I don't know if that one has to be excluded too.

Changed paths:
    engines/glk/events.cpp


diff --git a/engines/glk/events.cpp b/engines/glk/events.cpp
index ed6ad9b..f1ff970 100644
--- a/engines/glk/events.cpp
+++ b/engines/glk/events.cpp
@@ -371,7 +371,9 @@ bool Events::isModifierKey(const Common::KeyCode &keycode) const {
 	return keycode == Common::KEYCODE_LCTRL || keycode == Common::KEYCODE_LALT
 		|| keycode == Common::KEYCODE_RCTRL || keycode == Common::KEYCODE_RALT
 		|| keycode == Common::KEYCODE_LSHIFT || keycode == Common::KEYCODE_RSHIFT
-		|| keycode == Common::KEYCODE_LSUPER || keycode == Common::KEYCODE_RSUPER;
+		|| keycode == Common::KEYCODE_LSUPER || keycode == Common::KEYCODE_RSUPER
+		|| keycode == Common::KEYCODE_CAPSLOCK || keycode == Common::KEYCODE_NUMLOCK
+		|| keycode == Common::KEYCODE_SCROLLOCK;
 }
 
 void Events::waitForPress() {