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

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

diff --git a/src/Input/input.hxx b/src/Input/input.hxx
index 99116dbe648200d6a9c7cd0cb1505343ada88d1a..9491685ec7315ce46857428a3d3a19e6a330175f 100644 (file)
--- a/src/Input/input.hxx
+++ b/src/Input/input.hxx
@@ -233,23 +233,17 @@ private:
     virtual ~mouse ();
     int x;
     int y;
+    int save_x;
+    int save_y;
     SGPropertyNode_ptr mode_node;
     SGPropertyNode_ptr mouse_button_nodes[MAX_MOUSE_BUTTONS];
     int nModes;
     int current_mode;
     double timeout;
-    int save_x;
-    int save_y;
     mouse_mode * modes;
   };
 
 
-  /**
-   * Initialize key bindings.
-   */
-  void _init_keyboard ();
-
-
   /**
    * Initialize joystick bindings.
    */
@@ -277,9 +271,10 @@ private:
                            const string name);
 
   /**
-   * Initialize nasal parts that had to wait for the nasal to get
-   * functional.
+   * Initialize key bindings, as well as those joystick parts that
+   * depend on a working Nasal subsystem.
    */
+  void _postinit_keyboard ();
   void _postinit_joystick ();
 
   /**
@@ -327,12 +322,26 @@ private:
   /**
    * Nasal module name/namespace.
    */
-  char _module[32];
+  string _module;
 
   /**
    * List of currently pressed mouse button events
    */
   std::map<int, std::list<SGSharedPtr<SGPickCallback> > > _activePickCallbacks;
+
+  /**
+   * Key listener interface.
+   */
+  SGPropertyNode_ptr _key_event;
+  int  _key_code;
+  int  _key_modifiers;
+  bool _key_pressed;
+  bool _key_shift;
+  bool _key_ctrl;
+  bool _key_alt;
+  bool _key_meta;
+  bool _key_super;
+  bool _key_hyper;
 };
 
 #endif // _INPUT_HXX