Remove unneeded inclusions of windows.h, GL.h and GLU.H

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

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index d150dd93eb40aa5f7e95b9bc515e7ca078308bb3..21d96e6582f12d9dd16d9aed0f3fdbc346a0de3f 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -24,18 +24,14 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <math.h>
 #include <ctype.h>
 #include <sstream>
 
-#include STL_FSTREAM
-#include STL_STRING
+#include <fstream>
+#include <string>
 #include <vector>
 
 #include <simgear/compiler.h>
@@ -84,6 +80,12 @@ static FGInput * default_input = 0;
 // Local functions.
 ////////////////////////////////////////////////////////////////////////
 
+static int
+getModifiers ()
+{
+  return fgGetKeyModifiers() >> 1;
+}
+
 static bool
 getModShift ()
 {
@@ -114,6 +116,12 @@ getModSuper ()
   return bool(fgGetKeyModifiers() & KEYMOD_SUPER);
 }
 
+static bool
+getModHyper ()
+{
+  return bool(fgGetKeyModifiers() & KEYMOD_HYPER);
+}
+
 \f
 ////////////////////////////////////////////////////////////////////////
 // Implementation of FGInput.
@@ -160,11 +168,13 @@ FGInput::postinit ()
 void
 FGInput::bind ()
 {
+  fgTie("/devices/status/keyboard", getModifiers);
   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);
+  fgTie("/devices/status/keyboard/hyper", getModHyper);
 
   _key_event->tie("key", SGRawValuePointer<int>(&_key_code));
   _key_event->tie("pressed", SGRawValuePointer<bool>(&_key_pressed));
@@ -174,16 +184,19 @@ FGInput::bind ()
   _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));
+  _key_event->tie("modifier/hyper", SGRawValuePointer<bool>(&_key_hyper));
 }
 
 void
 FGInput::unbind ()
 {
+  fgUntie("/devices/status/keyboard");
   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");
+  fgUntie("/devices/status/keyboard/hyper");
 
   _key_event->untie("key");
   _key_event->untie("pressed");
@@ -193,6 +206,7 @@ FGInput::unbind ()
   _key_event->untie("modifier/alt");
   _key_event->untie("modifier/meta");
   _key_event->untie("modifier/super");
+  _key_event->untie("modifier/hyper");
 }
 
 void 
@@ -240,17 +254,22 @@ FGInput::doKey (int k, int modifiers, int x, int y)
   }
 
   _key_code = k;
-  _key_modifiers = modifiers & ~KEYMOD_RELEASED;
+  _key_modifiers = modifiers >> 1;
   _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_hyper = bool(modifiers & KEYMOD_HYPER);
   _key_event->fireValueChanged();
-  if (!_key_code)
+  if (_key_code < 0)
     return;
 
+  k = _key_code;
+  modifiers = _key_modifiers << 1;
+  if (!_key_pressed)
+      modifiers |= KEYMOD_RELEASED;
   button &b = _key_bindings[k];
 
                                 // Key pressed.
@@ -304,8 +323,6 @@ FGInput::doMouseClick (int b, int updown, int x, int y, bool mainWindow, const o
   }
 
   if (mode.pass_through) {
-    // The pu stuff seems to need that. May be it does opengl picking ...
-    fgMakeCurrent();
     if (0 <= x && 0 <= y && puMouse(b, updown, x, y))
       return;
     else if (0 <= x && 0 <= y && (globals->get_current_panel() != 0) &&
@@ -979,6 +996,10 @@ FGInput::_read_bindings (const SGPropertyNode * node,
   if (node->getChild("mod-super") != 0)
     _read_bindings(node->getChild("mod-super"), binding_list,
                    modifiers|KEYMOD_SUPER);
+
+  if (node->getChild("mod-hyper") != 0)
+    _read_bindings(node->getChild("mod-hyper"), binding_list,
+                   modifiers|KEYMOD_HYPER);
 }
 
 
@@ -1122,6 +1143,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)