X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2Finput.cxx;h=98432a6f01803e7b43d3737015601296a27927e1;hb=f88a9aab6a097c65960e978444f64f0ea8a022a1;hp=039a52e534f4aef0028f4077af918d82eea3bcc0;hpb=cce5426ac8a0acd3cc54119e7ec9361311e054bf;p=flightgear.git

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 039a52e53..98432a6f0 100644
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -37,33 +37,22 @@
 #include STL_STRING
 #include <vector>
 
+#include <simgear/compiler.h>
+
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/props.hxx>
+#include <simgear/props/props.hxx>
 
 #include <Aircraft/aircraft.hxx>
-#include <Autopilot/auto_gui.hxx>
-#include <Autopilot/newauto.hxx>
+#include <Autopilot/xmlauto.hxx>
 #include <Cockpit/hud.hxx>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
 #include <GUI/gui.h>
-#include <Scenery/tilemgr.hxx>
-#include <Objects/matlib.hxx>
-#include <Time/light.hxx>
-#include <Time/tmp.hxx>
+#include <Model/panelnode.hxx>
 
-#ifndef FG_OLD_WEATHER
-#  include <WeatherCM/FGLocalWeatherDatabase.h>
-#else
-#  include <Weather/weather.hxx>
-#endif
-
-#include <Main/bfi.hxx>
 #include <Main/globals.hxx>
-#include <Main/keyboard.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/options.hxx>
 
 #include "input.hxx"
 
@@ -71,74 +60,91 @@ SG_USING_STD(ifstream);
 SG_USING_STD(string);
 SG_USING_STD(vector);
 
+void mouseClickHandler(int button, int updown, int x, int y);
+void mouseMotionHandler(int x, int y);
+void keyHandler(int key, int keymod, int mousex, int mousey);
 
 
 ////////////////////////////////////////////////////////////////////////
-// Local data structures.
+// Local variables.
 ////////////////////////////////////////////////////////////////////////
 
+static FGInput * default_input = 0;
+
+
 
 ////////////////////////////////////////////////////////////////////////
 // Implementation of FGBinding.
 ////////////////////////////////////////////////////////////////////////
 
 FGBinding::FGBinding ()
-  : _command(0), _arg(0)
+  : _command(0),
+    _arg(new SGPropertyNode),
+    _setting(0)
 {
 }
 
 FGBinding::FGBinding (const SGPropertyNode * node)
-  : _command(0), _arg(0)
+  : _command(0),
+    _arg(0),
+    _setting(0)
 {
   read(node);
 }
 
-FGBinding::~FGBinding ()
-{
-  // no op
-}
-
 void
 FGBinding::read (const SGPropertyNode * node)
 {
+  const SGPropertyNode * conditionNode = node->getChild("condition");
+  if (conditionNode != 0)
+    setCondition(sgReadCondition(globals->get_props(), conditionNode));
+
   _command_name = node->getStringValue("command", "");
-  if (_command_name == "") {
-    SG_LOG(SG_INPUT, SG_ALERT, "No command supplied for binding.");
+  if (_command_name.empty()) {
+    SG_LOG(SG_INPUT, SG_WARN, "No command supplied for binding.");
     _command = 0;
     return;
   }
 
-  _command = globals->get_commands()->getCommand(_command_name);
-  if (_command == 0) {
-    SG_LOG(SG_INPUT, SG_ALERT, "Command " << _command_name << " is undefined");
-    _arg = 0;
-    return;
-  }
-  _arg = node;			// FIXME: don't use whole node!!!
+  _arg = new SGPropertyNode;
+  _setting = 0;
+  copyProperties(node, _arg);  // FIXME: don't use whole node!!!
 }
 
 void
 FGBinding::fire () const
 {
-  _fire(_arg);
+  if (test()) {
+    if (_command == 0)
+      _command = globals->get_commands()->getCommand(_command_name);
+    if (_command == 0) {
+      SG_LOG(SG_INPUT, SG_WARN, "No command attached to binding");
+    } else if (!(*_command)(_arg)) {
+      SG_LOG(SG_INPUT, SG_ALERT, "Failed to execute command "
+             << _command_name);
+    }
+  }
 }
 
 void
-FGBinding::fire (double setting) const
+FGBinding::fire (double offset, double max) const
 {
-  SGPropertyNode arg;
-  copyProperties(_arg, &arg);
-  arg.setDoubleValue("setting", setting);
-  _fire(&arg);
+  if (test()) {
+    _arg->setDoubleValue("offset", offset/max);
+    fire();
+  }
 }
 
 void
-FGBinding::_fire(const SGPropertyNode * arg) const
+FGBinding::fire (double setting) const
 {
-  if (_command == 0) {
-    SG_LOG(SG_INPUT, SG_ALERT, "No command attached to binding");
-  } else if (!(*_command)(arg)) {
-    SG_LOG(SG_INPUT, SG_ALERT, "Failed to execute command " << _command_name);
+  if (test()) {
+                                // A value is automatically added to
+                                // the args
+    if (_setting == 0)          // save the setting node for efficiency
+      _setting = _arg->getChild("setting", 0, true);
+    _setting->setDoubleValue(setting);
+    fire();
   }
 }
 
@@ -148,20 +154,17 @@ FGBinding::_fire(const SGPropertyNode * arg) const
 // Implementation of FGInput.
 ////////////////////////////////////////////////////////////////////////
 
-				// From main.cxx
-extern void fgReshape( int width, int height );
-
-FGInput current_input;
-
 
 FGInput::FGInput ()
 {
-  // no op
+    if (default_input == 0)
+        default_input = this;
 }
 
 FGInput::~FGInput ()
 {
-  // no op
+    if (default_input == this)
+        default_input = 0;
 }
 
 void
@@ -169,410 +172,218 @@ FGInput::init ()
 {
   _init_keyboard();
   _init_joystick();
+  _init_mouse();
+
+  fgRegisterKeyHandler(keyHandler);
+  fgRegisterMouseClickHandler(mouseClickHandler);
+  fgRegisterMouseMotionHandler(mouseMotionHandler);
+}
+
+void
+FGInput::reinit ()
+{
+    init();
+}
+
+void 
+FGInput::update (double dt)
+{
+  _update_keyboard();
+  _update_joystick(dt);
+  _update_mouse(dt);
 }
 
 void
-FGInput::bind ()
+FGInput::suspend ()
 {
-  // no op
+    // NO-OP
 }
 
 void
-FGInput::unbind ()
+FGInput::resume ()
 {
-  // no op
+    // NO-OP
 }
 
-void 
-FGInput::update ()
+bool
+FGInput::is_suspended () const
 {
-  _update_keyboard();
-  _update_joystick();
+    return false;
+}
+
+void
+FGInput::makeDefault (bool status)
+{
+    if (status)
+        default_input = this;
+    else if (default_input == this)
+        default_input = 0;
 }
 
 void
 FGInput::doKey (int k, int modifiers, int x, int y)
 {
-				// Sanity check.
+                                // Sanity check.
   if (k < 0 || k >= MAX_KEYS) {
-    SG_LOG(SG_INPUT, SG_ALERT, "Key value " << k << " out of range");
+    SG_LOG(SG_INPUT, SG_WARN, "Key value " << k << " out of range");
     return;
   }
 
   button &b = _key_bindings[k];
 
-				// Key pressed.
-  if (modifiers&FG_MOD_UP == 0) {
-    // SG_LOG(SG_INPUT, SG_INFO, "User pressed key " << k
-    //        << " with modifiers " << modifiers);
+                                // Key pressed.
+  if (modifiers&KEYMOD_RELEASED == 0) {
+    SG_LOG( SG_INPUT, SG_DEBUG, "User pressed key " << k
+            << " with modifiers " << modifiers );
     if (!b.last_state || b.is_repeatable) {
       const binding_list_t &bindings =
-	_find_key_bindings(k, modifiers);
+        _find_key_bindings(k, modifiers);
       int max = bindings.size();
       if (max > 0) {
-	for (int i = 0; i < max; i++)
-	  bindings[i].fire();
-	return;
+        for (int i = 0; i < max; i++)
+          bindings[i]->fire();
+        return;
       }
     }
   }
-
-				// Key released.
+                                // Key released.
   else {
-    // SG_LOG(SG_INPUT, SG_INFO, "User released key " << k
-    //        << " with modifiers " << modifiers);
+    SG_LOG(SG_INPUT, SG_DEBUG, "User released key " << k
+           << " with modifiers " << modifiers);
     if (b.last_state) {
       const binding_list_t &bindings =
-	_find_key_bindings(k, modifiers);
+        _find_key_bindings(k, modifiers);
       int max = bindings.size();
       if (max > 0) {
-	for (int i = 0; i < max; i++)
-	  bindings[i].fire();
-	return;
+        for (int i = 0; i < max; i++)
+          bindings[i]->fire();
+        return;
       }
     }
   }
+}
 
+void
+FGInput::doMouseClick (int b, int updown, int x, int y)
+{
+  int modifiers = fgGetKeyModifiers();
+
+  mouse &m = _mouse_bindings[0];
+  mouse_mode &mode = m.modes[m.current_mode];
+
+                                // Let the property manager know.
+  if (b >= 0 && b < MAX_MOUSE_BUTTONS)
+    m.mouse_button_nodes[b]->setBoolValue(updown == MOUSE_BUTTON_DOWN);
+
+                                // Pass on to PUI and the panel if
+                                // requested, and return if one of
+                                // them consumes the event.
+  if (mode.pass_through) {
+    if (puMouse(b, updown, x, y))
+      return;
+    else if ((globals->get_current_panel() != 0) &&
+             globals->get_current_panel()->getVisibility() &&
+             globals->get_current_panel()->doMouseAction(b, updown, x, y))
+      return;
+    else if (fgHandle3DPanelMouseEvent(b, updown, x, y))
+      return;
+  }
 
-				// Use the old, default actions.
-  SG_LOG(SG_INPUT, SG_INFO, "(No user binding.)");
-  if (modifiers&FG_MOD_UP)
+                                // OK, PUI and the panel didn't want the click
+  if (b >= MAX_MOUSE_BUTTONS) {
+    SG_LOG(SG_INPUT, SG_ALERT, "Mouse button " << b
+           << " where only " << MAX_MOUSE_BUTTONS << " expected");
     return;
+  }
 
-  float fov, tmp;
-  static bool winding_ccw = true;
-  int speed;
-  FGInterface *f = current_aircraft.fdm_state;
-  FGViewer *v = globals->get_current_view();
-  
-  // everything after here will be removed sooner or later...
-
-  if (modifiers & FG_MOD_SHIFT) {
-
-	switch (k) {
-	case 7: // Ctrl-G key
-	    current_autopilot->set_AltitudeMode( 
-                  FGAutopilot::FG_ALTITUDE_GS1 );
-	    current_autopilot->set_AltitudeEnabled(
-		  ! current_autopilot->get_AltitudeEnabled()
-	        );
-	    return;
-	case 18: // Ctrl-R key
-	    // temporary
-	    winding_ccw = !winding_ccw;
-	    if ( winding_ccw ) {
-		glFrontFace ( GL_CCW );
-	    } else {
-		glFrontFace ( GL_CW );
-	    }
-	    return;
-	case 20: // Ctrl-T key
-	    current_autopilot->set_AltitudeMode( 
-                  FGAutopilot::FG_ALTITUDE_TERRAIN );
-	    current_autopilot->set_AltitudeEnabled(
-		  ! current_autopilot->get_AltitudeEnabled()
-	        );
-	    return;
-	case 72: // H key
-	    HUD_brightkey( true );
-	    return;
-	case 73: // I key
-	    // Minimal Hud
-	    fgHUDInit2(&current_aircraft);
-	    return;
-	case 77: // M key
-	    globals->inc_warp( -60 );
-	    fgUpdateSkyAndLightingParams();
-	    return;
-	case 84: // T key
-	    globals->inc_warp_delta( -30 );
-	    fgUpdateSkyAndLightingParams();
-	    return;
-	case 87: // W key
-#if defined(FX) && !defined(WIN32)
-	    global_fullscreen = ( !global_fullscreen );
-#  if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
-	    XMesaSetFXmode( global_fullscreen ? 
-			    XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW );
-#  endif
-#endif
-	    return;
-	case 88: // X key
-	    fov = globals->get_current_view()->get_fov();
-	    fov *= 1.05;
-	    if ( fov > FG_FOV_MAX ) {
-		fov = FG_FOV_MAX;
-	    }
-	    globals->get_current_view()->set_fov(fov);
-	    // v->force_update_fov_math();
-	    return;
-	case 90: // Z key
-#ifndef FG_OLD_WEATHER
-	    tmp = WeatherDatabase->getWeatherVisibility();
-	    tmp /= 1.10;
-	    WeatherDatabase->setWeatherVisibility( tmp );
-#else
-	    tmp = current_weather.get_visibility();   // in meters
-	    tmp /= 1.10;
-	    current_weather.set_visibility( tmp );
-#endif
-	    return;
-
-// START SPECIALS
-
- 	case 256+GLUT_KEY_F1: {
- 	    ifstream input("fgfs.sav");
- 	    if (input.good() && fgLoadFlight(input)) {
-   	        input.close();
- 		SG_LOG(SG_INPUT, SG_INFO, "Restored flight from fgfs.sav");
- 	    } else {
- 	        SG_LOG(SG_INPUT, SG_ALERT, "Cannot load flight from fgfs.sav");
- 	    }
- 	    return;
- 	}
- 	case 256+GLUT_KEY_F2: {
- 	    SG_LOG(SG_INPUT, SG_INFO, "Saving flight");
- 	    ofstream output("fgfs.sav");
- 	    if (output.good() && fgSaveFlight(output)) {
- 		output.close();
- 		SG_LOG(SG_INPUT, SG_INFO, "Saved flight to fgfs.sav");
- 	    } else {
- 	        SG_LOG(SG_INPUT, SG_ALERT, "Cannot save flight to fgfs.sav");
- 	    }
- 	    return;
- 	}
-	case 256+GLUT_KEY_F3: {
-            string panel_path =
-                fgGetString("/sim/panel/path", "Panels/Default/default.xml");
-            FGPanel * new_panel = fgReadPanel(panel_path);
-            if (new_panel == 0) {
-                SG_LOG(SG_INPUT, SG_ALERT,
-                       "Error reading new panel from " << panel_path);
-                return;
-            }
-            SG_LOG(SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path);
-            current_panel->unbind();
-            delete current_panel;
-            current_panel = new_panel;
-	    current_panel->bind();
-            return;
-	}
-	case 256+GLUT_KEY_F4: {
-            SGPath props_path(globals->get_fg_root());
-            props_path.append("preferences.xml");
-            SG_LOG(SG_INPUT, SG_INFO, "Rereading global preferences");
-            if (!readProperties(props_path.str(), globals->get_props())) {
-                SG_LOG(SG_INPUT, SG_ALERT,
-                       "Failed to reread global preferences from "
-                       << props_path.str());
-            } else {
-                SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
-            }
-            return;
-	}
-	case 256+GLUT_KEY_F5: {
-            current_panel->setYOffset(current_panel->getYOffset() - 5);
-            fgReshape(fgGetInt("/sim/startup/xsize"),
-                      fgGetInt("/sim/startup/ysize"));
-            return;
-	}
-	case 256+GLUT_KEY_F6: {
-            current_panel->setYOffset(current_panel->getYOffset() + 5);
-            fgReshape(fgGetInt("/sim/startup/xsize"),
-                      fgGetInt("/sim/startup/ysize"));
-            return;
-	}
-	case 256+GLUT_KEY_F7: {
-            current_panel->setXOffset(current_panel->getXOffset() - 5);
-            return;
-	}
-	case 256+GLUT_KEY_F8: {
-            current_panel->setXOffset(current_panel->getXOffset() + 5);
-            return;
-	}
-        case 256+GLUT_KEY_F10: {
-            fgToggleFDMdataLogging();
-            return;
-        }
+  _update_button(m.modes[m.current_mode].buttons[b], modifiers, 0 != updown, x, y);
+}
 
-// END SPECIALS
+void
+FGInput::doMouseMotion (int x, int y)
+{
+  // Don't call fgGetKeyModifiers() here, until we are using a
+  // toolkit that supports getting the mods from outside a key
+  // callback.  Glut doesn't.
+  int modifiers = KEYMOD_NONE;
 
-	}
+  int xsize = fgGetInt("/sim/startup/xsize", 800);
+  int ysize = fgGetInt("/sim/startup/ysize", 600);
 
+  mouse &m = _mouse_bindings[0];
 
-    } else {
-	SG_LOG( SG_INPUT, SG_DEBUG, "" );
-	switch (k) {
-	case 104: // h key
-	    HUD_masterswitch( true );
-	    return;
-	case 105: // i key
-	    fgHUDInit(&current_aircraft);  // normal HUD
-	    return;
-	case 109: // m key
-	    globals->inc_warp( 60 );
-	    fgUpdateSkyAndLightingParams();
-	    return;
-	case 112: // p key
-	    globals->set_freeze( ! globals->get_freeze() );
-
-	    {
-		SGBucket p( f->get_Longitude() * SGD_RADIANS_TO_DEGREES,
-			    f->get_Latitude() * SGD_RADIANS_TO_DEGREES );
-		SGPath tile_path( globals->get_fg_root() );
-		tile_path.append( "Scenery" );
-		tile_path.append( p.gen_base_path() );
-		tile_path.append( p.gen_index_str() );
-
-		// printf position and attitude information
-		SG_LOG( SG_INPUT, SG_INFO,
-			"Lon = " << f->get_Longitude() * SGD_RADIANS_TO_DEGREES
-			<< "  Lat = " << f->get_Latitude() * SGD_RADIANS_TO_DEGREES
-			<< "  Altitude = " << f->get_Altitude() * SG_FEET_TO_METER
-			);
-		SG_LOG( SG_INPUT, SG_INFO,
-			"Heading = " << f->get_Psi() * SGD_RADIANS_TO_DEGREES 
-			<< "  Roll = " << f->get_Phi() * SGD_RADIANS_TO_DEGREES
-			<< "  Pitch = " << f->get_Theta() * SGD_RADIANS_TO_DEGREES );
-		SG_LOG( SG_INPUT, SG_INFO, tile_path.c_str());
-	    }
-	    return;
-	case 116: // t key
-	    globals->inc_warp_delta( 30 );
-	    fgUpdateSkyAndLightingParams();
-	    return;
-	case 120: // x key
-	    fov = globals->get_current_view()->get_fov();
-	    fov /= 1.05;
-	    if ( fov < FG_FOV_MIN ) {
-		fov = FG_FOV_MIN;
-	    }
-	    globals->get_current_view()->set_fov(fov);
-	    // v->force_update_fov_math();
-	    return;
-	case 122: // z key
-#ifndef FG_OLD_WEATHER
-	    tmp = WeatherDatabase->getWeatherVisibility();
-	    tmp *= 1.10;
-	    WeatherDatabase->setWeatherVisibility( tmp );
-#else
-	    tmp = current_weather.get_visibility();   // in meters
-	    tmp *= 1.10;
-	    current_weather.set_visibility( tmp );
-#endif
-	    return;
-	case 27: // ESC
-	    // if( fg_DebugOutput ) {
-	    //   fclose( fg_DebugOutput );
-	    // }
-	    SG_LOG( SG_INPUT, SG_ALERT, 
-		    "Program exit requested." );
-	    ConfirmExitDialog();
-	    return;
-
-// START SPECIALS
-
-	case 256+GLUT_KEY_F2: // F2 Reload Tile Cache...
-	    {
-		bool freeze = globals->get_freeze();
-		SG_LOG(SG_INPUT, SG_INFO, "ReIniting TileCache");
-		if ( !freeze ) 
-		    globals->set_freeze( true );
-		BusyCursor(0);
-		if ( global_tile_mgr.init() ) {
-		    // Load the local scenery data
-		    global_tile_mgr.update( 
-		        cur_fdm_state->get_Longitude() * SGD_RADIANS_TO_DEGREES,
-			cur_fdm_state->get_Latitude() * SGD_RADIANS_TO_DEGREES );
-		} else {
-		    SG_LOG( SG_GENERAL, SG_ALERT, 
-			    "Error in Tile Manager initialization!" );
-		    exit(-1);
-		}
-		BusyCursor(1);
-		if ( !freeze )
-		   globals->set_freeze( false );
-		return;
-	    }
-        case 256+GLUT_KEY_F4: // F4 Update lighting manually
-	    fgUpdateSkyAndLightingParams();
-            return;
-        case 256+GLUT_KEY_F6: // F6 toggles Autopilot target location
-	    if ( current_autopilot->get_HeadingMode() !=
-		 FGAutopilot::FG_HEADING_WAYPOINT ) {
-		current_autopilot->set_HeadingMode(
-		    FGAutopilot::FG_HEADING_WAYPOINT );
-		current_autopilot->set_HeadingEnabled( true );
-	    } else {
-		current_autopilot->set_HeadingMode(
-		    FGAutopilot::FG_TC_HEADING_LOCK );
-	    }
-	    return;
-	case 256+GLUT_KEY_F8: {// F8 toggles fog ... off fastest nicest...
-	    const string &fog = fgGetString("/sim/rendering/fog");
-	    if (fog == "disabled") {
-	      fgSetString("/sim/rendering/fog", "fastest");
-	      SG_LOG(SG_INPUT, SG_INFO, "Fog enabled, hint=fastest");
-	    } else if (fog == "fastest") {
-	      fgSetString("/sim/rendering/fog", "nicest");
-	      SG_LOG(SG_INPUT, SG_INFO, "Fog enabled, hint=nicest");
-	    } else if (fog == "nicest") {
-	      fgSetString("/sim/rendering/fog", "disabled");
-	      SG_LOG(SG_INPUT, SG_INFO, "Fog disabled");
-	    } else {
-	      fgSetString("/sim/rendering/fog", "disabled");
-	      SG_LOG(SG_INPUT, SG_ALERT, "Unrecognized fog type "
-		     << fog << ", changed to 'disabled'");
-	    }
- 	    return;
-	}
- 	case 256+GLUT_KEY_F9: // F9 toggles textures on and off...
-	    SG_LOG( SG_INPUT, SG_INFO, "Toggling texture" );
-	    if ( fgGetBool("/sim/rendering/textures")) {
-		fgSetBool("/sim/rendering/textures", false);
-		material_lib.set_step( 1 );
-	    } else {
-		fgSetBool("/sim/rendering/textures", true);
-		material_lib.set_step( 0 );
-	    }
- 	    return;
-	case 256+GLUT_KEY_F10: // F10 toggles menu on and off...
-	    SG_LOG(SG_INPUT, SG_INFO, "Invoking call back function");
-	    guiToggleMenu();
-	    return;
-	case 256+GLUT_KEY_F11: // F11 Altitude Dialog.
-	    SG_LOG(SG_INPUT, SG_INFO, "Invoking Altitude call back function");
-	    NewAltitude( NULL );
-	    return;
-	case 256+GLUT_KEY_F12: // F12 Heading Dialog...
-	    SG_LOG(SG_INPUT, SG_INFO, "Invoking Heading call back function");
-	    NewHeading( NULL );
-	    return;
-	}
-
-// END SPECIALS
+  if (m.current_mode < 0 || m.current_mode >= m.nModes) {
+      m.x = x;
+      m.y = y;
+      return;
+  }
+  mouse_mode &mode = m.modes[m.current_mode];
+
+                                // Pass on to PUI if requested, and return
+                                // if PUI consumed the event.
+  if (mode.pass_through && puMouse(x, y)) {
+      m.x = x;
+      m.y = y;
+      return;
+  }
 
+                                // OK, PUI didn't want the event,
+                                // so we can play with it.
+  if (x != m.x) {
+    int delta = x - m.x;
+    for (unsigned int i = 0; i < mode.x_bindings[modifiers].size(); i++)
+      mode.x_bindings[modifiers][i]->fire(double(delta), double(xsize));
+  }
+  if (y != m.y) {
+    int delta = y - m.y;
+    for (unsigned int i = 0; i < mode.y_bindings[modifiers].size(); i++)
+      mode.y_bindings[modifiers][i]->fire(double(delta), double(ysize));
+  }
+
+                                // Constrain the mouse if requested
+  if (mode.constrained) {
+    bool need_warp = false;
+    if (x <= 0) {
+      x = xsize - 2;
+      need_warp = true;
+    } else if (x >= (xsize-1)) {
+      x = 1;
+      need_warp = true;
     }
-}
 
+    if (y <= 0) {
+      y = ysize - 2;
+      need_warp = true;
+    } else if (y >= (ysize-1)) {
+      y = 1;
+      need_warp = true;
+    }
+
+    if (need_warp)
+      fgWarpMouse(x, y);
+  }
+  m.x = x;
+  m.y = y;
+}
 
 void
 FGInput::_init_keyboard ()
 {
-				// TODO: zero the old bindings first.
-  SG_LOG(SG_INPUT, SG_INFO, "Initializing key bindings");
+  SG_LOG(SG_INPUT, SG_DEBUG, "Initializing key bindings");
   SGPropertyNode * key_nodes = fgGetNode("/input/keyboard");
   if (key_nodes == 0) {
-    SG_LOG(SG_INPUT, SG_ALERT, "No key bindings (/input/keyboard)!!");
-    return;
+    SG_LOG(SG_INPUT, SG_WARN, "No key bindings (/input/keyboard)!!");
+    key_nodes = fgGetNode("/input/keyboard", true);
   }
   
-  vector<SGPropertyNode *> keys = key_nodes->getChildren("key");
+  vector<SGPropertyNode_ptr> keys = key_nodes->getChildren("key");
   for (unsigned int i = 0; i < keys.size(); i++) {
     int index = keys[i]->getIndex();
-    SG_LOG(SG_INPUT, SG_INFO, "Binding key " << index);
+    SG_LOG(SG_INPUT, SG_DEBUG, "Binding key " << index);
+
+    _key_bindings[index].bindings->clear();
     _key_bindings[index].is_repeatable = keys[i]->getBoolValue("repeatable");
-    _read_bindings(keys[i], _key_bindings[index].bindings, FG_MOD_NONE);
+    _read_bindings(keys[i], _key_bindings[index].bindings, KEYMOD_NONE);
   }
 }
 
@@ -580,53 +391,76 @@ FGInput::_init_keyboard ()
 void
 FGInput::_init_joystick ()
 {
-				// TODO: zero the old bindings first.
-  SG_LOG(SG_INPUT, SG_INFO, "Initializing joystick bindings");
+  jsInit();
+                                // TODO: zero the old bindings first.
+  SG_LOG(SG_INPUT, SG_DEBUG, "Initializing joystick bindings");
   SGPropertyNode * js_nodes = fgGetNode("/input/joysticks");
   if (js_nodes == 0) {
-    SG_LOG(SG_INPUT, SG_ALERT, "No joystick bindings (/input/joysticks)!!");
-    return;
+    SG_LOG(SG_INPUT, SG_WARN, "No joystick bindings (/input/joysticks)!!");
+    js_nodes = fgGetNode("/input/joysticks", true);
   }
 
   for (int i = 0; i < MAX_JOYSTICKS; i++) {
-    const SGPropertyNode * js_node = js_nodes->getChild("js", i);
+    SGPropertyNode_ptr js_node = js_nodes->getChild("js", i);
     if (js_node == 0) {
-      SG_LOG(SG_INPUT, SG_ALERT, "No bindings for joystick " << i);
-      continue;
+      SG_LOG(SG_INPUT, SG_DEBUG, "No bindings for joystick " << i);
+      js_node = js_nodes->getChild("js", i, true);
     }
     jsJoystick * js = new jsJoystick(i);
     _joystick_bindings[i].js = js;
     if (js->notWorking()) {
-      SG_LOG(SG_INPUT, SG_INFO, "Joystick " << i << " not found");
+      SG_LOG(SG_INPUT, SG_DEBUG, "Joystick " << i << " not found");
       continue;
+    } else {
+      bool found_js = false;
+      const char * name = js->getName();
+      SG_LOG(SG_INPUT, SG_INFO, "Looking for bindings for joystick \""
+             << name << '"');
+      vector<SGPropertyNode_ptr> nodes = js_nodes->getChildren("js-named");
+      for (unsigned int i = 0; i < nodes.size(); i++) {
+        SGPropertyNode_ptr node = nodes[i];
+        vector<SGPropertyNode_ptr> name_nodes = node->getChildren("name");
+        for (unsigned int j = 0; j < name_nodes.size(); j++) {
+            const char * js_name = name_nodes[j]->getStringValue();
+            SG_LOG(SG_INPUT, SG_INFO, "  Trying \"" << js_name << '"');
+            if (!strcmp(js_name, name)) {
+                SG_LOG(SG_INPUT, SG_INFO, "  Found bindings");
+                js_node = node;
+                found_js = true;
+                break;
+            }
+        }
+        if (found_js)
+            break;
+      }
     }
 #ifdef WIN32
     JOYCAPS jsCaps ;
     joyGetDevCaps( i, &jsCaps, sizeof(jsCaps) );
     int nbuttons = jsCaps.wNumButtons;
-    if (nbuttons > MAX_BUTTONS) nbuttons = MAX_BUTTONS;
+    if (nbuttons > MAX_JOYSTICK_BUTTONS) nbuttons = MAX_JOYSTICK_BUTTONS;
 #else
-    int nbuttons = MAX_BUTTONS;
+    int nbuttons = MAX_JOYSTICK_BUTTONS;
 #endif
-	
+        
     int naxes = js->getNumAxes();
-    if (naxes > MAX_AXES) naxes = MAX_AXES;
+    if (naxes > MAX_JOYSTICK_AXES) naxes = MAX_JOYSTICK_AXES;
     _joystick_bindings[i].naxes = naxes;
     _joystick_bindings[i].nbuttons = nbuttons;
 
-    SG_LOG(SG_INPUT, SG_INFO, "Initializing joystick " << i);
+    SG_LOG(SG_INPUT, SG_DEBUG, "Initializing joystick " << i);
 
-				// Set up range arrays
-    float minRange[naxes];
-    float maxRange[naxes];
-    float center[naxes];
+                                // Set up range arrays
+    float minRange[MAX_JOYSTICK_AXES];
+    float maxRange[MAX_JOYSTICK_AXES];
+    float center[MAX_JOYSTICK_AXES];
 
-				// Initialize with default values
+                                // Initialize with default values
     js->getMinRange(minRange);
     js->getMaxRange(maxRange);
     js->getCenter(center);
 
-				// Allocate axes and buttons
+                                // Allocate axes and buttons
     _joystick_bindings[i].axes = new axis[naxes];
     _joystick_bindings[i].buttons = new button[nbuttons];
 
@@ -634,42 +468,77 @@ FGInput::_init_joystick ()
     //
     // Initialize the axes.
     //
-    for (int j = 0; j < naxes; j++) {
-      const SGPropertyNode * axis_node = js_node->getChild("axis", j);
-      if (axis_node == 0) {
-	SG_LOG(SG_INPUT, SG_INFO, "No bindings for axis " << j);
-	continue;
+    vector<SGPropertyNode_ptr> axes = js_node->getChildren("axis");
+    size_t nb_axes = axes.size();
+    int j;
+    for (j = 0; j < (int)nb_axes; j++) {
+      const SGPropertyNode * axis_node = axes[j];
+      const SGPropertyNode * num_node = axis_node->getChild("number");
+      size_t n_axis = axis_node->getIndex();
+      if (num_node != 0) {
+          n_axis = num_node->getIntValue(TGT_PLATFORM, -1);
+
+          // Silently ignore platforms that are not specified within the
+          // <number></number> section
+          if (n_axis < 0)
+             continue;
       }
-      
-      axis &a = _joystick_bindings[i].axes[j];
 
-      js->setDeadBand(j, axis_node->getDoubleValue("dead-band", 0.0));
+      if (n_axis >= (size_t)naxes) {
+          SG_LOG(SG_INPUT, SG_DEBUG, "Dropping bindings for axis " << n_axis);
+          continue;
+      }
+      axis &a = _joystick_bindings[i].axes[n_axis];
+
+      js->setDeadBand(n_axis, axis_node->getDoubleValue("dead-band", 0.0));
 
       a.tolerance = axis_node->getDoubleValue("tolerance", 0.002);
-      minRange[j] = axis_node->getDoubleValue("min-range", minRange[j]);
-      maxRange[j] = axis_node->getDoubleValue("max-range", maxRange[j]);
-      center[j] = axis_node->getDoubleValue("center", center[j]);
+      minRange[n_axis] = axis_node->getDoubleValue("min-range", minRange[n_axis]);
+      maxRange[n_axis] = axis_node->getDoubleValue("max-range", maxRange[n_axis]);
+      center[n_axis] = axis_node->getDoubleValue("center", center[n_axis]);
 
-      _read_bindings(axis_node, a.bindings, FG_MOD_NONE);
+      _read_bindings(axis_node, a.bindings, KEYMOD_NONE);
+
+      // Initialize the virtual axis buttons.
+      _init_button(axis_node->getChild("low"), a.low, "low");
+      a.low_threshold = axis_node->getDoubleValue("low-threshold", -0.9);
+      
+      _init_button(axis_node->getChild("high"), a.high, "high");
+      a.high_threshold = axis_node->getDoubleValue("high-threshold", 0.9);
+      a.interval_sec = axis_node->getDoubleValue("interval-sec",0.0);
+      a.last_dt = 0.0;
     }
 
     //
     // Initialize the buttons.
     //
-    for (int j = 0; j < nbuttons; j++) {
-      const SGPropertyNode * button_node = js_node->getChild("button", j);
-      if (button_node == 0) {
-	SG_LOG(SG_INPUT, SG_INFO, "No bindings for button " << j);
-	continue;
+    vector<SGPropertyNode_ptr> buttons = js_node->getChildren("button");
+    char buf[32];
+    for (j = 0; (j < (int)buttons.size()) && (j < nbuttons); j++) {
+      const SGPropertyNode * button_node = buttons[j];
+      const SGPropertyNode * num_node = button_node->getChild("number");
+      size_t n_but = button_node->getIndex();
+      if (num_node != 0) {
+          n_but = num_node->getIntValue(TGT_PLATFORM,n_but);
       }
 
-      button &b = _joystick_bindings[i].buttons[j];
-      
-      b.is_repeatable =
-	button_node->getBoolValue("repeatable", b.is_repeatable);
+      if (n_but >= (size_t)nbuttons) {
+          SG_LOG(SG_INPUT, SG_DEBUG, "Dropping bindings for button " << n_but);
+          continue;
+      }
 
-				// Get the bindings for the button
-      _read_bindings(button_node, b.bindings, FG_MOD_NONE);
+      sprintf(buf, "%d", n_but);
+      SG_LOG(SG_INPUT, SG_DEBUG, "Initializing button " << n_but);
+      _init_button(button_node,
+                   _joystick_bindings[i].buttons[n_but],
+                   buf);
+      
+      // get interval-sec property             
+      button &b = _joystick_bindings[i].buttons[n_but];
+      if (button_node != 0) {
+        b.interval_sec = button_node->getDoubleValue("interval-sec",0.0);
+        b.last_dt = 0.0;
+      }
     }
 
     js->setMinRange(minRange);
@@ -678,6 +547,118 @@ FGInput::_init_joystick ()
   }
 }
 
+// 
+// Map of all known cursor names
+// This used to contain all the Glut cursors, but those are
+// not defined by other toolkits.  It now supports only the cursor
+// images we actually use, in the interest of portability.  Someday,
+// it would be cool to write an OpenGL cursor renderer, with the
+// cursors defined as textures referenced in the property tree.  This
+// list could then be eliminated. -Andy
+//
+static struct {
+  const char * name;
+  int cursor;
+} mouse_cursor_map[] = {
+  { "none", MOUSE_CURSOR_NONE },
+  { "inherit", MOUSE_CURSOR_POINTER },
+  { "wait", MOUSE_CURSOR_WAIT },
+  { "crosshair", MOUSE_CURSOR_CROSSHAIR },
+  { "left-right", MOUSE_CURSOR_LEFTRIGHT },
+  { 0, 0 }
+};
+
+void
+FGInput::_init_mouse ()
+{
+  SG_LOG(SG_INPUT, SG_DEBUG, "Initializing mouse bindings");
+
+  SGPropertyNode * mouse_nodes = fgGetNode("/input/mice");
+  if (mouse_nodes == 0) {
+    SG_LOG(SG_INPUT, SG_WARN, "No mouse bindings (/input/mice)!!");
+    mouse_nodes = fgGetNode("/input/mice", true);
+  }
+
+  int j;
+  for (int i = 0; i < MAX_MICE; i++) {
+    SGPropertyNode * mouse_node = mouse_nodes->getChild("mouse", i, true);
+    mouse &m = _mouse_bindings[i];
+
+                                // Grab node pointers
+    char buf[64];
+    sprintf(buf, "/devices/status/mice/mouse[%d]/mode", i);
+    m.mode_node = fgGetNode(buf);
+    if (m.mode_node == NULL) {
+      m.mode_node = fgGetNode(buf, true);
+      m.mode_node->setIntValue(0);
+    }
+    for (j = 0; j < MAX_MOUSE_BUTTONS; j++) {
+      sprintf(buf, "/devices/status/mice/mouse[%d]/button[%d]", i, j);
+      m.mouse_button_nodes[j] = fgGetNode(buf, true);
+      m.mouse_button_nodes[j]->setBoolValue(false);
+    }
+
+                                // Read all the modes
+    m.nModes = mouse_node->getIntValue("mode-count", 1);
+    m.modes = new mouse_mode[m.nModes];
+
+    for (int j = 0; j < m.nModes; j++) {
+      int k;
+
+                                // Read the mouse cursor for this mode
+      SGPropertyNode * mode_node = mouse_node->getChild("mode", j, true);
+      const char * cursor_name =
+        mode_node->getStringValue("cursor", "inherit");
+      m.modes[j].cursor = MOUSE_CURSOR_POINTER;
+      for (k = 0; mouse_cursor_map[k].name != 0; k++) {
+        if (!strcmp(mouse_cursor_map[k].name, cursor_name)) {
+          m.modes[j].cursor = mouse_cursor_map[k].cursor;
+          break;
+        }
+      }
+
+                                // Read other properties for this mode
+      m.modes[j].constrained = mode_node->getBoolValue("constrained", false);
+      m.modes[j].pass_through = mode_node->getBoolValue("pass-through", false);
+
+                                // Read the button bindings for this mode
+      m.modes[j].buttons = new button[MAX_MOUSE_BUTTONS];
+      char buf[32];
+      for (k = 0; k < MAX_MOUSE_BUTTONS; k++) {
+        sprintf(buf, "mouse button %d", k);
+        SG_LOG(SG_INPUT, SG_DEBUG, "Initializing mouse button " << k);
+        _init_button(mode_node->getChild("button", k),
+                     m.modes[j].buttons[k],
+                     buf);
+      }
+
+                                // Read the axis bindings for this mode
+      _read_bindings(mode_node->getChild("x-axis", 0, true),
+                     m.modes[j].x_bindings,
+                     KEYMOD_NONE);
+      _read_bindings(mode_node->getChild("y-axis", 0, true),
+                     m.modes[j].y_bindings,
+                     KEYMOD_NONE);
+    }
+  }
+}
+
+
+void
+FGInput::_init_button (const SGPropertyNode * node,
+                       button &b,
+                       const string name)
+{       
+  if (node == 0) {
+    SG_LOG(SG_INPUT, SG_DEBUG, "No bindings for button " << name);
+  } else {
+    b.is_repeatable = node->getBoolValue("repeatable", b.is_repeatable);
+    
+                // Get the bindings for the button
+    _read_bindings(node, b.bindings, KEYMOD_NONE);
+  }
+}
+
 
 void
 FGInput::_update_keyboard ()
@@ -687,14 +668,17 @@ FGInput::_update_keyboard ()
 
 
 void
-FGInput::_update_joystick ()
+FGInput::_update_joystick (double dt)
 {
-  int modifiers = FG_MOD_NONE;	// FIXME: any way to get the real ones?
+  int modifiers = KEYMOD_NONE;  // FIXME: any way to get the real ones?
   int buttons;
-  float js_val, diff;
-  float axis_values[MAX_AXES];
+  // float js_val, diff;
+  float axis_values[MAX_JOYSTICK_AXES];
 
-  for (int i = 0; i < MAX_JOYSTICKS; i++) {
+  int i;
+  int j;
+
+  for ( i = 0; i < MAX_JOYSTICKS; i++) {
 
     jsJoystick * js = _joystick_bindings[i].js;
     if (js == 0 || js->notWorking())
@@ -703,110 +687,310 @@ FGInput::_update_joystick ()
     js->read(&buttons, axis_values);
 
 
-				// Fire bindings for the axes.
-    for (int j = 0; j < _joystick_bindings[i].naxes; j++) {
+                                // Fire bindings for the axes.
+    for ( j = 0; j < _joystick_bindings[i].naxes; j++) {
       axis &a = _joystick_bindings[i].axes[j];
       
-				// Do nothing if the axis position
-				// is unchanged; only a change in
-				// position fires the bindings.
+                                // Do nothing if the axis position
+                                // is unchanged; only a change in
+                                // position fires the bindings.
       if (fabs(axis_values[j] - a.last_value) > a.tolerance) {
-// 	SG_LOG(SG_INPUT, SG_INFO, "Axis " << j << " has moved");
-	SGPropertyNode node;
-	a.last_value = axis_values[j];
-// 	SG_LOG(SG_INPUT, SG_INFO, "There are "
-// 	       << a.bindings[modifiers].size() << " bindings");
-	for (unsigned int k = 0; k < a.bindings[modifiers].size(); k++)
-	  a.bindings[modifiers][k].fire(axis_values[j]);
+//      SG_LOG(SG_INPUT, SG_DEBUG, "Axis " << j << " has moved");
+        SGPropertyNode node;
+        a.last_value = axis_values[j];
+//      SG_LOG(SG_INPUT, SG_DEBUG, "There are "
+//             << a.bindings[modifiers].size() << " bindings");
+        for (unsigned int k = 0; k < a.bindings[modifiers].size(); k++)
+          a.bindings[modifiers][k]->fire(axis_values[j]);
+      }
+     
+                                // do we have to emulate axis buttons?
+      a.last_dt += dt;
+      if(a.last_dt >= a.interval_sec) {
+        if (a.low.bindings[modifiers].size())
+          _update_button(_joystick_bindings[i].axes[j].low,
+                         modifiers,
+                         axis_values[j] < a.low_threshold,
+                         -1, -1);
+      
+        if (a.high.bindings[modifiers].size())
+          _update_button(_joystick_bindings[i].axes[j].high,
+                         modifiers,
+                         axis_values[j] > a.high_threshold,
+                         -1, -1);
+         a.last_dt -= a.interval_sec;
       }
     }
 
-				// Fire bindings for the buttons.
-    for (int j = 0; j < _joystick_bindings[i].nbuttons; j++) {
-      bool pressed = ((buttons & (1 << j)) > 0);
+                                // Fire bindings for the buttons.
+    for (j = 0; j < _joystick_bindings[i].nbuttons; j++) {
       button &b = _joystick_bindings[i].buttons[j];
+      b.last_dt += dt;
+      if(b.last_dt >= b.interval_sec) {
+        _update_button(_joystick_bindings[i].buttons[j],
+                       modifiers,
+                       (buttons & (1 << j)) > 0,
+                       -1, -1);
+        b.last_dt -= b.interval_sec;
+      }
+    }
+  }
+}
+
+void
+FGInput::_update_mouse ( double dt )
+{
+  mouse &m = _mouse_bindings[0];
+  int mode =  m.mode_node->getIntValue();
+  if (mode != m.current_mode) {
+    m.current_mode = mode;
+    m.timeout = fgGetDouble( "/sim/mouse/cursor-timeout-sec", 10.0 );
+    if (mode >= 0 && mode < m.nModes) {
+      fgSetMouseCursor(m.modes[mode].cursor);
+      m.x = fgGetInt("/sim/startup/xsize", 800) / 2;
+      m.y = fgGetInt("/sim/startup/ysize", 600) / 2;
+      fgWarpMouse(m.x, m.y);
+    } else {
+      SG_LOG(SG_INPUT, SG_DEBUG, "Mouse mode " << mode << " out of range");
+      fgSetMouseCursor(MOUSE_CURSOR_POINTER);
+    }
+  }
 
-      if (pressed) {
-				// The press event may be repeated.
-	if (!b.last_state || b.is_repeatable) {
-// 	  SG_LOG(SG_INPUT, SG_INFO, "Button " << j << " has been pressed");
-	  for (unsigned int k = 0; k < b.bindings[modifiers].size(); k++)
-	    b.bindings[modifiers][k].fire();
-	}
+  if ( fgGetBool( "/sim/mouse/hide-cursor", true ) ) {
+      if ( m.x != m.save_x || m.y != m.save_y ) {
+          m.timeout = fgGetDouble( "/sim/mouse/cursor-timeout-sec", 10.0 );
+          fgSetMouseCursor(m.modes[mode].cursor);
       } else {
-				// The release event is never repeated.
-	if (b.last_state)
-// 	  SG_LOG(SG_INPUT, SG_INFO, "Button " << j << " has been released");
-	  for (int k = 0; k < b.bindings[modifiers|FG_MOD_UP].size(); k++)
-	    b.bindings[modifiers|FG_MOD_UP][k].fire();
+          m.timeout -= dt;
+          if ( m.timeout <= 0.0 ) {
+              fgSetMouseCursor(MOUSE_CURSOR_NONE);
+              m.timeout = 0.0;
+          }
       }
-	  
-      b.last_state = pressed;
-    }
+      m.save_x = m.x;
+      m.save_y = m.y;
   }
 }
 
+void
+FGInput::_update_button (button &b, int modifiers, bool pressed,
+                         int x, int y)
+{
+  if (pressed) {
+                                // The press event may be repeated.
+    if (!b.last_state || b.is_repeatable) {
+      SG_LOG( SG_INPUT, SG_DEBUG, "Button has been pressed" );
+      for (unsigned int k = 0; k < b.bindings[modifiers].size(); k++)
+        b.bindings[modifiers][k]->fire(x, y);
+    }
+  } else {
+                                // The release event is never repeated.
+    if (b.last_state) {
+      SG_LOG( SG_INPUT, SG_DEBUG, "Button has been released" );
+      for (unsigned int k = 0; k < b.bindings[modifiers|KEYMOD_RELEASED].size(); k++)
+        b.bindings[modifiers|KEYMOD_RELEASED][k]->fire(x, y);
+    }
+  }
+          
+  b.last_state = pressed;
+}  
+
 
 void
 FGInput::_read_bindings (const SGPropertyNode * node, 
-			 binding_list_t * binding_list,
-			 int modifiers)
+                         binding_list_t * binding_list,
+                         int modifiers)
 {
-  vector<const SGPropertyNode *> bindings = node->getChildren("binding");
+  SG_LOG(SG_INPUT, SG_DEBUG, "Reading all bindings");
+  vector<SGPropertyNode_ptr> bindings = node->getChildren("binding");
   for (unsigned int i = 0; i < bindings.size(); i++) {
-    SG_LOG(SG_INPUT, SG_INFO, "Reading binding "
-	   << bindings[i]->getStringValue("command"));
-    binding_list[modifiers].push_back(FGBinding(bindings[i]));
+    SG_LOG(SG_INPUT, SG_DEBUG, "Reading binding "
+           << bindings[i]->getStringValue("command"));
+    binding_list[modifiers].push_back(new FGBinding(bindings[i]));
   }
 
-				// Read nested bindings for modifiers
+                                // Read nested bindings for modifiers
   if (node->getChild("mod-up") != 0)
     _read_bindings(node->getChild("mod-up"), binding_list,
-		   modifiers|FG_MOD_UP);
+                   modifiers|KEYMOD_RELEASED);
 
   if (node->getChild("mod-shift") != 0)
     _read_bindings(node->getChild("mod-shift"), binding_list,
-		   modifiers|FG_MOD_SHIFT);
+                   modifiers|KEYMOD_SHIFT);
 
   if (node->getChild("mod-ctrl") != 0)
     _read_bindings(node->getChild("mod-ctrl"), binding_list,
-		   modifiers|FG_MOD_CTRL);
+                   modifiers|KEYMOD_CTRL);
 
   if (node->getChild("mod-alt") != 0)
     _read_bindings(node->getChild("mod-alt"), binding_list,
-		   modifiers|FG_MOD_ALT);
+                   modifiers|KEYMOD_ALT);
 }
 
 
-const vector<FGBinding> &
+const vector<FGBinding *> &
 FGInput::_find_key_bindings (unsigned int k, int modifiers)
 {
+  unsigned char kc = (unsigned char)k;
   button &b = _key_bindings[k];
 
-				// Try it straight, first.
+                                // Try it straight, first.
   if (b.bindings[modifiers].size() > 0)
     return b.bindings[modifiers];
 
-				// Try removing the control modifier
-				// for control keys.
-  else if ((modifiers&FG_MOD_CTRL) && iscntrl(k))
-    return _find_key_bindings(k, modifiers&~FG_MOD_CTRL);
+                                // Alt-Gr is CTRL+ALT
+  else if (modifiers&(KEYMOD_CTRL|KEYMOD_ALT))
+    return _find_key_bindings(k, modifiers&~(KEYMOD_CTRL|KEYMOD_ALT));
+
+                                // Try removing the control modifier
+                                // for control keys.
+  else if ((modifiers&KEYMOD_CTRL) && iscntrl(kc))
+    return _find_key_bindings(k, modifiers&~KEYMOD_CTRL);
 
-				// Try removing shift modifier 
-				// for upper case or any punctuation
-				// (since different keyboards will
-				// shift different punctuation types)
-  else if ((modifiers&FG_MOD_SHIFT) && (isupper(k) || ispunct(k)))
-    return _find_key_bindings(k, modifiers&~FG_MOD_SHIFT);
+                                // Try removing shift modifier 
+                                // for upper case or any punctuation
+                                // (since different keyboards will
+                                // shift different punctuation types)
+  else if ((modifiers&KEYMOD_SHIFT) && (isupper(kc) || ispunct(kc)))
+    return _find_key_bindings(k, modifiers&~KEYMOD_SHIFT);
 
-				// Try removing alt modifier for
-				// high-bit characters.
-  else if ((modifiers&FG_MOD_ALT) && k >= 128 && k < 256)
-    return _find_key_bindings(k, modifiers&~FG_MOD_ALT);
+                                // Try removing alt modifier for
+                                // high-bit characters.
+  else if ((modifiers&KEYMOD_ALT) && k >= 128 && k < 256)
+    return _find_key_bindings(k, modifiers&~KEYMOD_ALT);
 
-				// Give up and return the empty vector.
+                                // Give up and return the empty vector.
   else
     return b.bindings[modifiers];
 }
 
-// end of input.cxx
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGInput::button.
+////////////////////////////////////////////////////////////////////////
+
+FGInput::button::button ()
+  : is_repeatable(false),
+    last_state(-1)
+{
+}
+
+FGInput::button::~button ()
+{
+                                // FIXME: memory leak
+//   for (int i = 0; i < KEYMOD_MAX; i++)
+//     for (int j = 0; i < bindings[i].size(); j++)
+//       delete bindings[i][j];
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGInput::axis.
+////////////////////////////////////////////////////////////////////////
+
+FGInput::axis::axis ()
+  : last_value(9999999),
+    tolerance(0.002),
+    low_threshold(-0.9),
+    high_threshold(0.9)
+{
+}
+
+FGInput::axis::~axis ()
+{
+//   for (int i = 0; i < KEYMOD_MAX; i++)
+//     for (int j = 0; i < bindings[i].size(); j++)
+//       delete bindings[i][j];
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGInput::joystick.
+////////////////////////////////////////////////////////////////////////
+
+FGInput::joystick::joystick ()
+{
+}
+
+FGInput::joystick::~joystick ()
+{
+//   delete js;
+  delete[] axes;
+  delete[] buttons;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGInput::mouse_mode
+////////////////////////////////////////////////////////////////////////
+
+FGInput::mouse_mode::mouse_mode ()
+  : cursor(MOUSE_CURSOR_POINTER),
+    constrained(false),
+    pass_through(false),
+    buttons(0)
+{
+}
+
+FGInput::mouse_mode::~mouse_mode ()
+{
+                                // FIXME: memory leak
+//   for (int i = 0; i < KEYMOD_MAX; i++) {
+//     int j;
+//     for (j = 0; i < x_bindings[i].size(); j++)
+//       delete bindings[i][j];
+//     for (j = 0; j < y_bindings[i].size(); j++)
+//       delete bindings[i][j];
+//   }
+  delete [] buttons;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGInput::mouse
+////////////////////////////////////////////////////////////////////////
+
+FGInput::mouse::mouse ()
+  : x(-1),
+    y(-1),
+    nModes(1),
+    current_mode(0),
+    modes(0)
+{
+}
+
+FGInput::mouse::~mouse ()
+{
+  delete [] modes;
+}
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of OS callbacks.
+////////////////////////////////////////////////////////////////////////
+
+void keyHandler(int key, int keymod, int mousex, int mousey)
+{
+    if((keymod & KEYMOD_RELEASED) == 0)
+        if(puKeyboard(key, PU_DOWN))
+            return;
+
+    if(default_input)
+        default_input->doKey(key, keymod, mousex, mousey);
+}
+
+void mouseClickHandler(int button, int updown, int x, int y)
+{
+    if(default_input)
+        default_input->doMouseClick(button, updown, x, y);
+}
+
+void mouseMotionHandler(int x, int y)
+{
+    if (default_input != 0)
+        default_input->doMouseMotion(x, y);
+}