make --enable-osgviewer the default

[flightgear.git] / src / Input / input.cxx

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 704b25be86f5d58014f1a195dd47f95a56942665..09ef2c21d0bbafc740253fa7ac12609f67b2cbc8 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -102,6 +102,18 @@ getModAlt ()
   return bool(fgGetKeyModifiers() & KEYMOD_ALT);
 }
 
+static bool
+getModMeta ()
+{
+  return bool(fgGetKeyModifiers() & KEYMOD_META);
+}
+
+static bool
+getModSuper ()
+{
+  return bool(fgGetKeyModifiers() & KEYMOD_SUPER);
+}
+
 \f
 ////////////////////////////////////////////////////////////////////////
 // Implementation of FGInput.
@@ -151,6 +163,8 @@ FGInput::bind ()
   fgTie("/devices/status/keyboard/shift", getModShift);
   fgTie("/devices/status/keyboard/ctrl", getModCtrl);
   fgTie("/devices/status/keyboard/alt", getModAlt);
+  fgTie("/devices/status/keyboard/meta", getModMeta);
+  fgTie("/devices/status/keyboard/super", getModSuper);
 
   _key_event->tie("key", SGRawValuePointer<int>(&_key_code));
   _key_event->tie("pressed", SGRawValuePointer<bool>(&_key_pressed));
@@ -158,6 +172,8 @@ FGInput::bind ()
   _key_event->tie("modifier/shift", SGRawValuePointer<bool>(&_key_shift));
   _key_event->tie("modifier/ctrl", SGRawValuePointer<bool>(&_key_ctrl));
   _key_event->tie("modifier/alt", SGRawValuePointer<bool>(&_key_alt));
+  _key_event->tie("modifier/meta", SGRawValuePointer<bool>(&_key_meta));
+  _key_event->tie("modifier/super", SGRawValuePointer<bool>(&_key_super));
 }
 
 void
@@ -166,6 +182,8 @@ FGInput::unbind ()
   fgUntie("/devices/status/keyboard/shift");
   fgUntie("/devices/status/keyboard/ctrl");
   fgUntie("/devices/status/keyboard/alt");
+  fgUntie("/devices/status/keyboard/meta");
+  fgUntie("/devices/status/keyboard/super");
 
   _key_event->untie("key");
   _key_event->untie("pressed");
@@ -173,6 +191,8 @@ FGInput::unbind ()
   _key_event->untie("modifier/shift");
   _key_event->untie("modifier/ctrl");
   _key_event->untie("modifier/alt");
+  _key_event->untie("modifier/meta");
+  _key_event->untie("modifier/super");
 }
 
 void 
@@ -221,14 +241,18 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 
   _key_code = k;
   _key_modifiers = modifiers & ~KEYMOD_RELEASED;
-  _key_pressed = bool(!(modifiers & KEYMOD_RELEASED));
+  _key_pressed = !bool(modifiers & KEYMOD_RELEASED);
   _key_shift = bool(modifiers & KEYMOD_SHIFT);
   _key_ctrl = bool(modifiers & KEYMOD_CTRL);
   _key_alt = bool(modifiers & KEYMOD_ALT);
+  _key_meta = bool(modifiers & KEYMOD_META);
+  _key_super = bool(modifiers & KEYMOD_SUPER);
   _key_event->fireValueChanged();
   if (!_key_code)
-      return;
+    return;
 
+  k = _key_code;
+  modifiers = _key_modifiers | (_key_pressed ? KEYMOD_NONE : KEYMOD_RELEASED);
   button &b = _key_bindings[k];
 
                                 // Key pressed.
@@ -949,6 +973,14 @@ FGInput::_read_bindings (const SGPropertyNode * node,
   if (node->getChild("mod-alt") != 0)
     _read_bindings(node->getChild("mod-alt"), binding_list,
                    modifiers|KEYMOD_ALT);
+
+  if (node->getChild("mod-meta") != 0)
+    _read_bindings(node->getChild("mod-meta"), binding_list,
+                   modifiers|KEYMOD_META);
+
+  if (node->getChild("mod-super") != 0)
+    _read_bindings(node->getChild("mod-super"), binding_list,
+                   modifiers|KEYMOD_SUPER);
 }
 
 
@@ -1092,6 +1124,8 @@ FGInput::mouse_mode::~mouse_mode ()
 FGInput::mouse::mouse ()
   : x(-1),
     y(-1),
+    save_x(-1),
+    save_y(-1),
     nModes(1),
     current_mode(0),
     modes(0)