X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2Finput.hxx;h=f26f21a9333796adc6dba60521c8b45a8f6dc207;hb=11d15b451347674fba77648700d23c5aaec3c6c2;hp=8358412da4130775b234359b0c501090338b926f;hpb=f695b5b4791889229d6db12f917115417a83e28c;p=flightgear.git

diff --git a/src/Input/input.hxx b/src/Input/input.hxx
index 8358412da..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,50 +30,15 @@
 # error This library requires C++
 #endif
 
-#include <simgear/compiler.h>
+#include <simgear/structure/subsystem_mgr.hxx>
 
-#include <simgear/misc/commands.hxx>
-#include <simgear/misc/props.hxx>
+
 
-#include <Main/fgfs.hxx>
-#include <Main/globals.hxx>
 
-#include <map>
-#include <vector>
-
-SG_USING_STD(map);
-SG_USING_STD(vector);
-
-/**
- * An input binding of some sort.
- *
- * <p>This class represents a binding that can be assigned to a
- * keyboard key, a joystick button or axis, or even a panel
- * instrument.</p>
- */
-class FGBinding
-{
-public:
-
-  FGBinding ();
-  FGBinding (const SGPropertyNode * node);
-  virtual ~FGBinding ();
-
-  virtual const string &getCommandName () const { return _command_name; }
-  virtual SGCommandMgr::command_t getCommand () const { return _command; }
-  virtual const SGPropertyNode * getArg () { return _arg; }
-  
-  virtual void read (const SGPropertyNode * node);
-
-  virtual void fire () const;
-//   virtual void fire (double value);
-//   virtual void fire (int xdelta, int ydelta);
-
-private:
-  string _command_name;
-  SGCommandMgr::command_t _command;
-  const SGPropertyNode * _arg;
-};
+
+////////////////////////////////////////////////////////////////////////
+// General input mapping support.
+////////////////////////////////////////////////////////////////////////
 
 
 /**
@@ -81,59 +48,19 @@ private:
  * keyboard, joystick, mouse, or even panel switches -- in a consistent
  * way, and to allow users to rebind any of the actions at runtime.</p>
  */
-class FGInput : public FGSubsystem
+class FGInput : public SGSubsystemGroup
 {
 public:
-
-  enum {
-    FG_MOD_NONE = 0,
-    FG_MOD_SHIFT = 1,
-    FG_MOD_CTRL = 2,
-    FG_MOD_ALT = 4,
-    FG_MOD_MAX = 8			// one past all modifiers
-  };
-
-  FGInput();
-  virtual ~FGInput();
-
-  //
-  // Implementation of FGSubsystem.
-  //
-  virtual void init ();
-  virtual void bind ();
-  virtual void unbind ();
-  virtual void update ();
-
-
   /**
-   * Handle a single keystroke.
-   *
-   * <p>Note: for special keys, the integer key code will be the Glut
-   * code + 256.</p>
-   *
-   * @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
+   * Default constructor.
    */
-  virtual void doKey (int k, int modifiers, int x, int y);
-
-
-private:
+  FGInput ();
 
   /**
-   * Look up the bindings for a key code.
+   * Destructor.
    */
-  const vector<FGBinding> * _find_bindings (int k, int modifiers);
-
-  typedef map<int,vector<FGBinding> > keyboard_map;
-  keyboard_map _key_bindings[FG_MOD_MAX];
+  virtual ~FGInput();
 
 };
 
-extern FGInput current_input;
-
-#endif // _CONTROLS_HXX
+#endif // _INPUT_HXX