[Scummvm-cvs-logs] scummvm master -> bfecb37501b6fdc35f2802216db5fb2b0e54b8ee

dhewg dhewg at wiibrew.org
Sat May 7 19:45:59 CEST 2011


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:
bfecb37501 ANDROID: Get rid of Fn->ALT metakey mapping


Commit: bfecb37501b6fdc35f2802216db5fb2b0e54b8ee
    https://github.com/scummvm/scummvm/commit/bfecb37501b6fdc35f2802216db5fb2b0e54b8ee
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-05-07T10:44:21-07:00

Commit Message:
ANDROID: Get rid of Fn->ALT metakey mapping

Thanks to Ge0rG for the analysis

Changed paths:
    backends/platform/android/events.cpp



diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index 2f140f0..0d74e1c 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -461,8 +461,12 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
 
 		if (arg4 & JMETA_SHIFT)
 			e.kbd.flags |= Common::KBD_SHIFT;
-		if (arg4 & JMETA_ALT)
-			e.kbd.flags |= Common::KBD_ALT;
+		// JMETA_ALT is Fn on physical keyboards!
+		// when mapping this to ALT - as we know it from PC keyboards - all
+		// Fn combos will be broken (like Fn+q, which needs to end as 1 and
+		// not ALT+1). Do not want.
+		//if (arg4 & JMETA_ALT)
+		//	e.kbd.flags |= Common::KBD_ALT;
 		if (arg4 & (JMETA_SYM | JMETA_CTRL))
 			e.kbd.flags |= Common::KBD_CTRL;
 






More information about the Scummvm-git-logs mailing list