make the state of the Meta and Super modifier keys available. These keys

are not available out-of-the-box on all systems and keyboards, and should
therefore not be used in files committed to CVS. This makes them well
suited for local key bindings, as they aren't likely to get overwritten
with later releases. SDL supports Meta and Super, OSG supports only Meta,
and GLUT supports neither.

(Somehow this part escaped the previous commit. :-)

diff --git a/src/Main/FGManipulator.cxx b/src/Main/FGManipulator.cxx
index 499c843e3c26b6083500dadae077bfa2331ef36c..9249892f6e48b603a441cd4296b17838f36f131f 100644 (file)
--- a/src/Main/FGManipulator.cxx
+++ b/src/Main/FGManipulator.cxx
@@ -99,6 +99,9 @@ static int osgToFGModifiers(int modifiers)
     if (modifiers & (osgGA::GUIEventAdapter::MODKEY_LEFT_ALT |
                     osgGA::GUIEventAdapter::MODKEY_RIGHT_ALT))
        result |= KEYMOD_ALT;
+    if (modifiers & (osgGA::GUIEventAdapter::MODKEY_LEFT_META |
+                    osgGA::GUIEventAdapter::MODKEY_RIGHT_META))
+       result |= KEYMOD_META;
     return result;
 }