Enable <mod-{shift,ctrl,alt,meta,super,hyper}> support for joystick

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

diff --git a/src/Input/input.hxx b/src/Input/input.hxx
index 3b3803e9fe7877100dd4ce4ee80b48dc6a38325d..e71d8620e17ca37307784c2a9154ee4081c35177 100644 (file)
--- a/src/Input/input.hxx
+++ b/src/Input/input.hxx
@@ -48,8 +48,8 @@
 #include <list>
 #include <vector>
 
-SG_USING_STD(map);
-SG_USING_STD(vector);
+using std::map;
+using std::vector;
 
 
 \f
@@ -233,13 +233,13 @@ 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;
   };
 
@@ -336,9 +336,12 @@ private:
   int  _key_code;
   int  _key_modifiers;
   bool _key_pressed;
+  bool _key_shift;
   bool _key_ctrl;
   bool _key_alt;
-  bool _key_shift;
+  bool _key_meta;
+  bool _key_super;
+  bool _key_hyper;
 };
 
 #endif // _INPUT_HXX