X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2Finput.hxx;h=f26f21a9333796adc6dba60521c8b45a8f6dc207;hb=cff6b2034de866df70a2b29feb3383ee8ccbbef6;hp=6ddf78dc8b8a56914e68da3af286d18012b5db83;hpb=2795fefa71d739ff4a79fed1277daae50c4ee3c4;p=flightgear.git
diff --git a/src/Input/input.hxx b/src/Input/input.hxx
index 6ddf78dc8..f26f21a93 100644
--- a/src/Input/input.hxx
+++ b/src/Input/input.hxx
@@ -1,8 +1,10 @@
// input.hxx -- handle user input from various sources.
//
// Written by David Megginson, started May 2001.
+// Major redesign by Torsten Dreyer, started August 2009
//
// Copyright (C) 2001 David Megginson, david@megginson.com
+// Copyright (C) 2009 Torsten Dreyer, Torsten (at) t3r _dot_ de
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
@@ -16,7 +18,7 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
@@ -28,109 +30,15 @@
# error This library requires C++
#endif
-#include
+#include
-#include
+
-#include
-#include
-#include
-#include
-
-#include
*/
-class FGInput : public FGSubsystem
+class FGInput : public SGSubsystemGroup
{
public:
-
- enum {
- FG_MOD_NONE = 0,
- FG_MOD_UP = 1, // key- or button-up
- FG_MOD_SHIFT = 2,
- FG_MOD_CTRL = 4,
- FG_MOD_ALT = 8,
- FG_MOD_MAX = 16 // enough to handle all combinations
- };
-
- FGInput();
- virtual ~FGInput();
-
- //
- // Implementation of FGSubsystem.
- //
- virtual void init ();
- virtual void bind ();
- virtual void unbind ();
- virtual void update ();
-
-
- /**
- * Handle a single keystroke.
- *
- * Note: for special keys, the integer key code will be the Glut
- * code + 256.
- *
- * @param k The integer key code, as returned by glut.
- * @param modifiers Modifier keys pressed (bitfield).
- * @param x The mouse x position at the time of keypress.
- * @param y The mouse y position at the time of keypress.
- * @see #FG_MOD_SHIFT
- * @see #FG_MOD_CTRL
- * @see #FG_MOD_ALT
- */
- virtual void doKey (int k, int modifiers, int x, int y);
-
-
-private:
-
- typedef vector binding_list_t;
-
- // Constants
- enum
- {
- MAX_KEYS = 1024,
-
- #ifdef WIN32
- MAX_JOYSTICKS = 2,
- #else
- MAX_JOYSTICKS = 10,
- #endif
- MAX_AXES = _JS_MAX_AXES,
- MAX_BUTTONS = 32
- };
-
-
- /**
- * Settings for a key or button.
- */
- struct button {
- button ()
- : is_repeatable(false),
- last_state(-1)
- {}
- bool is_repeatable;
- int last_state;
- binding_list_t bindings[FG_MOD_MAX];
- };
-
-
- /**
- * Settings for a single joystick axis.
- */
- struct axis {
- axis ()
- : last_value(9999999),
- tolerance(0.002)
- {}
- float last_value;
- float tolerance;
- binding_list_t bindings[FG_MOD_MAX];
- };
-
-
- /**
- * Settings for a joystick.
- */
- struct joystick {
- virtual ~joystick () {
- delete js;
- delete[] axes;
- delete[] buttons;
- }
- int naxes;
- int nbuttons;
- jsJoystick * js;
- axis * axes;
- button * buttons;
- };
-
-
- /**
- * Initialize key bindings.
- */
- void _init_keyboard ();
-
-
- /**
- * Initialize joystick bindings.
- */
- void _init_joystick ();
-
-
- /**
- * Update the keyboard.
- */
- void _update_keyboard ();
-
-
- /**
- * Update the joystick.
- */
- void _update_joystick ();
-
-
/**
- * Read bindings and modifiers.
+ * Default constructor.
*/
- void _read_bindings (const SGPropertyNode * node,
- binding_list_t * binding_list,
- int modifiers);
+ FGInput ();
/**
- * Look up the bindings for a key code.
+ * Destructor.
*/
- const vector &_find_key_bindings (unsigned int k, int modifiers);
-
- button _key_bindings[MAX_KEYS];
- joystick _joystick_bindings[MAX_JOYSTICKS];
+ virtual ~FGInput();
};
-// Handle keyboard events
-void GLUTkey(unsigned char k, int x, int y);
-void GLUTkeyup(unsigned char k, int x, int y);
-void GLUTspecialkey(int k, int x, int y);
-void GLUTspecialkeyup(int k, int x, int y);
-
-extern FGInput current_input;
-
-#endif // _CONTROLS_HXX
+#endif // _INPUT_HXX