X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2Finput.cxx;h=06122defdc0dd2380a1306ddd1e379d2740c3bca;hb=ab381e5c013292935c598dbe80bdd092bcbdd3ff;hp=16f1465ffbd839b2cc36a2489126afee329f0422;hpb=112a531f4259c50ed4774d6e47855fca0d8b0ad4;p=flightgear.git

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 16f1465ff..06122defd 100644
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -37,6 +37,12 @@
 #include STL_STRING
 #include <vector>
 
+#include <GL/glut.h>
+
+#include <plib/pu.h>
+
+#include <simgear/compiler.h>
+
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/props.hxx>
@@ -48,26 +54,15 @@
 #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>
-
-#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"
 
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(ifstream);
+#endif
 SG_USING_STD(string);
 SG_USING_STD(vector);
 
@@ -83,24 +78,37 @@ SG_USING_STD(vector);
 ////////////////////////////////////////////////////////////////////////
 
 FGBinding::FGBinding ()
-  : _command(0), _arg(0)
+  : _command(0),
+    _arg(new SGPropertyNode),
+    _setting(0),
+    _command_state(0)
 {
 }
 
 FGBinding::FGBinding (const SGPropertyNode * node)
-  : _command(0), _arg(0)
+  : _command(0),
+    _arg(new SGPropertyNode),
+    _setting(0),
+    _command_state(0)
 {
   read(node);
 }
 
 FGBinding::~FGBinding ()
 {
-  // no op
+//   delete _arg;			// Delete the saved arguments
+//   delete _command_state;	// Delete the saved command state
 }
 
 void
 FGBinding::read (const SGPropertyNode * node)
 {
+  const SGPropertyNode * conditionNode = node->getChild("condition");
+  if (conditionNode != 0) {
+    cerr << "Adding condition to binding" << endl;
+    setCondition(fgReadCondition(conditionNode));
+  }
+
   _command_name = node->getStringValue("command", "");
   if (_command_name == "") {
     SG_LOG(SG_INPUT, SG_ALERT, "No command supplied for binding.");
@@ -114,31 +122,36 @@ FGBinding::read (const SGPropertyNode * node)
     _arg = 0;
     return;
   }
-  _arg = node;			// FIXME: don't use whole node!!!
+
+  delete _arg;
+  _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) {
+      SG_LOG(SG_INPUT, SG_ALERT, "No command attached to binding");
+    } else if (!(*_command)(_arg, &_command_state)) {
+      SG_LOG(SG_INPUT, SG_ALERT, "Failed to execute command "
+	     << _command_name);
+    }
+  }
 }
 
 void
 FGBinding::fire (double setting) const
 {
-  SGPropertyNode arg;
-  copyProperties(_arg, &arg);
-  arg.setDoubleValue("setting", setting);
-  _fire(&arg);
-}
-
-void
-FGBinding::_fire(const SGPropertyNode * arg) 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();
   }
 }
 
@@ -184,7 +197,7 @@ FGInput::unbind ()
 }
 
 void 
-FGInput::update ()
+FGInput::update (int dt)
 {
   _update_keyboard();
   _update_joystick();
@@ -193,6 +206,9 @@ FGInput::update ()
 void
 FGInput::doKey (int k, int modifiers, int x, int y)
 {
+    // SG_LOG( SG_INPUT, SG_INFO, "User pressed key " << k
+    // 	       << " with modifiers " << modifiers );
+
 				// Sanity check.
   if (k < 0 || k >= MAX_KEYS) {
     SG_LOG(SG_INPUT, SG_ALERT, "Key value " << k << " out of range");
@@ -203,15 +219,15 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 
 				// Key pressed.
   if (modifiers&FG_MOD_UP == 0) {
-    SG_LOG(SG_INPUT, SG_INFO, "User pressed key " << k
-	   << " with modifiers " << modifiers);
+    // SG_LOG( SG_INPUT, SG_INFO, "User pressed key " << k
+    //         << " with modifiers " << modifiers );
     if (!b.last_state || b.is_repeatable) {
       const binding_list_t &bindings =
 	_find_key_bindings(k, modifiers);
       int max = bindings.size();
       if (max > 0) {
 	for (int i = 0; i < max; i++)
-	  bindings[i].fire();
+	  bindings[i]->fire();
 	return;
       }
     }
@@ -219,15 +235,15 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 
 				// Key released.
   else {
-    SG_LOG(SG_INPUT, SG_INFO, "User released key " << k
-	   << " with modifiers " << modifiers);
+    // SG_LOG(SG_INPUT, SG_INFO, "User released key " << k
+    //        << " with modifiers " << modifiers);
     if (b.last_state) {
       const binding_list_t &bindings =
 	_find_key_bindings(k, modifiers);
       int max = bindings.size();
       if (max > 0) {
 	for (int i = 0; i < max; i++)
-	  bindings[i].fire();
+	  bindings[i]->fire();
 	return;
       }
     }
@@ -235,41 +251,15 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 
 
 				// Use the old, default actions.
-  SG_LOG(SG_INPUT, SG_INFO, "(No user binding.)");
-  float fov, tmp;
-  static bool winding_ccw = true;
-  int speed;
-  FGInterface *f = current_aircraft.fdm_state;
-  FGViewer *v = globals->get_current_view();
-  
+  // SG_LOG( SG_INPUT, SG_INFO, "(No user binding.)" );
+  if (modifiers&FG_MOD_UP)
+    return;
+
   // 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;
@@ -277,123 +267,6 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 	    // 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;
-        }
-
-// END SPECIALS
-
 	}
 
 
@@ -406,94 +279,9 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 	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 ) {
@@ -523,16 +311,6 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 	    }
  	    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();
@@ -614,9 +392,9 @@ FGInput::_init_joystick ()
     SG_LOG(SG_INPUT, SG_INFO, "Initializing joystick " << i);
 
 				// Set up range arrays
-    float minRange[naxes];
-    float maxRange[naxes];
-    float center[naxes];
+    float minRange[MAX_AXES];
+    float maxRange[MAX_AXES];
+    float center[MAX_AXES];
 
 				// Initialize with default values
     js->getMinRange(minRange);
@@ -631,7 +409,8 @@ FGInput::_init_joystick ()
     //
     // Initialize the axes.
     //
-    for (int j = 0; j < naxes; j++) {
+    int j;
+    for (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);
@@ -648,25 +427,26 @@ FGInput::_init_joystick ()
       center[j] = axis_node->getDoubleValue("center", center[j]);
 
       _read_bindings(axis_node, a.bindings, FG_MOD_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);
     }
 
     //
     // 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;
-      }
-
-      button &b = _joystick_bindings[i].buttons[j];
-      
-      b.is_repeatable =
-	button_node->getBoolValue("repeatable", b.is_repeatable);
-
-				// Get the bindings for the button
-      _read_bindings(button_node, b.bindings, FG_MOD_NONE);
+    char buf[8];
+    for (j = 0; j < nbuttons; j++) {
+      sprintf(buf, "%d", j);
+      SG_LOG(SG_INPUT, SG_INFO, "Initializing button " << j);
+      _init_button(js_node->getChild("button", j),
+		   _joystick_bindings[i].buttons[j],
+		   buf);
+		   
     }
 
     js->setMinRange(minRange);
@@ -676,6 +456,22 @@ FGInput::_init_joystick ()
 }
 
 
+inline void
+FGInput::_init_button (const SGPropertyNode * node,
+		       button &b,
+		       const string name)
+{	
+  if (node == 0)
+    SG_LOG(SG_INPUT, SG_INFO, "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, FG_MOD_NONE);
+  }
+}
+
+
 void
 FGInput::_update_keyboard ()
 {
@@ -688,10 +484,13 @@ FGInput::_update_joystick ()
 {
   int modifiers = FG_MOD_NONE;	// FIXME: any way to get the real ones?
   int buttons;
-  float js_val, diff;
+  // float js_val, diff;
   float axis_values[MAX_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())
@@ -701,7 +500,7 @@ FGInput::_update_joystick ()
 
 
 				// Fire bindings for the axes.
-    for (int j = 0; j < _joystick_bindings[i].naxes; j++) {
+    for ( j = 0; j < _joystick_bindings[i].naxes; j++) {
       axis &a = _joystick_bindings[i].axes[j];
       
 				// Do nothing if the axis position
@@ -713,36 +512,53 @@ FGInput::_update_joystick ()
 	a.last_value = axis_values[j];
 // 	SG_LOG(SG_INPUT, SG_INFO, "There are "
 // 	       << a.bindings[modifiers].size() << " bindings");
-	for (int k = 0; k < a.bindings[modifiers].size(); k++)
-	  a.bindings[modifiers][k].fire(axis_values[j]);
+	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?
+      if (a.low.bindings[modifiers].size())
+	_update_button(_joystick_bindings[i].axes[j].low,
+		       modifiers,
+		       axis_values[j] < a.low_threshold);
+      
+      if (a.high.bindings[modifiers].size())
+	_update_button(_joystick_bindings[i].axes[j].high,
+		       modifiers,
+		       axis_values[j] > a.high_threshold);
     }
 
 				// Fire bindings for the buttons.
-    for (int j = 0; j < _joystick_bindings[i].nbuttons; j++) {
-      bool pressed = ((buttons & (1 << j)) > 0);
-      button &b = _joystick_bindings[i].buttons[j];
+    for (j = 0; j < _joystick_bindings[i].nbuttons; j++) {
+      _update_button(_joystick_bindings[i].buttons[j],
+		     modifiers,
+		     (buttons & (1 << j)) > 0);
+    }
+  }
+}
+
 
-      if (pressed) {
+void
+FGInput::_update_button (button &b, int modifiers, bool pressed)
+{
+  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 (int k = 0; k < b.bindings[modifiers].size(); k++)
-	    b.bindings[modifiers][k].fire();
-	}
-      } else {
+    if (!b.last_state || b.is_repeatable) {
+      // SG_LOG( SG_INPUT, SG_INFO, "Button has been pressed" );
+      for (unsigned int k = 0; k < b.bindings[modifiers].size(); k++)
+	b.bindings[modifiers][k]->fire();
+    }
+  } else {
 				// The release event is never repeated.
-	modifiers |= FG_MOD_UP;
-	if (b.last_state)
-// 	  SG_LOG(SG_INPUT, SG_INFO, "Button " << j << " has been released");
-	  for (int k = 0; k < b.bindings[modifiers].size(); k++)
-	    b.bindings[modifiers][k].fire();
-      }
-	  
-      b.last_state = pressed;
+    if (b.last_state) {
+      // SG_LOG( SG_INPUT, SG_INFO, "Button has been released" );
+      for (unsigned int k = 0; k < b.bindings[modifiers|FG_MOD_UP].size(); k++)
+	b.bindings[modifiers|FG_MOD_UP][k]->fire();
     }
   }
-}
+	  
+  b.last_state = pressed;
+}  
 
 
 void
@@ -750,11 +566,12 @@ FGInput::_read_bindings (const SGPropertyNode * node,
 			 binding_list_t * binding_list,
 			 int modifiers)
 {
+  SG_LOG(SG_INPUT, SG_INFO, "Reading all bindings");
   vector<const SGPropertyNode *> 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]));
+    binding_list[modifiers].push_back(new FGBinding(bindings[i]));
   }
 
 				// Read nested bindings for modifiers
@@ -776,7 +593,7 @@ FGInput::_read_bindings (const SGPropertyNode * node,
 }
 
 
-const vector<FGBinding> &
+const vector<FGBinding *> &
 FGInput::_find_key_bindings (unsigned int k, int modifiers)
 {
   button &b = _key_bindings[k];
@@ -807,4 +624,152 @@ FGInput::_find_key_bindings (unsigned int k, int modifiers)
     return b.bindings[modifiers];
 }
 
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGInput::button.
+////////////////////////////////////////////////////////////////////////
+
+FGInput::button::button ()
+  : is_repeatable(false),
+    last_state(-1)
+{
+}
+
+FGInput::button::~button ()
+{
+				// FIXME: memory leak
+//   for (int i = 0; i < FG_MOD_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 < FG_MOD_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 GLUT callbacks.
+////////////////////////////////////////////////////////////////////////
+
+
+/**
+ * Construct the modifiers.
+ */
+static inline int get_mods ()
+{
+  int glut_modifiers = glutGetModifiers();
+  int modifiers = 0;
+
+  if (glut_modifiers & GLUT_ACTIVE_SHIFT)
+    modifiers |= FGInput::FG_MOD_SHIFT;
+  if (glut_modifiers & GLUT_ACTIVE_CTRL)
+    modifiers |= FGInput::FG_MOD_CTRL;
+  if (glut_modifiers & GLUT_ACTIVE_ALT)
+    modifiers |= FGInput::FG_MOD_ALT;
+
+  return modifiers;
+}
+
+
+/**
+ * Key-down event handler for Glut.
+ *
+ * <p>Pass the value on to the FGInput module unless PUI wants it.</p>
+ *
+ * @param k The integer value for the key pressed.
+ * @param x (unused)
+ * @param y (unused)
+ */
+void GLUTkey(unsigned char k, int x, int y)
+{
+				// Give PUI a chance to grab it first.
+  if (!puKeyboard(k, PU_DOWN))
+    current_input.doKey(k, get_mods(), x, y);
+}
+
+
+/**
+ * Key-up event handler for GLUT.
+ *
+ * <p>PUI doesn't use this, so always pass it to the input manager.</p>
+ *
+ * @param k The integer value for the key pressed.
+ * @param x (unused)
+ * @param y (unused)
+ */
+void GLUTkeyup(unsigned char k, int x, int y)
+{
+  current_input.doKey(k, get_mods()|FGInput::FG_MOD_UP, x, y);
+}
+
+
+/**
+ * Special key-down handler for Glut.
+ *
+ * <p>Pass the value on to the FGInput module unless PUI wants it.
+ * The key value will have 256 added to it.</p>
+ *
+ * @param k The integer value for the key pressed (will have 256 added
+ * to it).
+ * @param x (unused)
+ * @param y (unused)
+ */
+void GLUTspecialkey(int k, int x, int y)
+{
+				// Give PUI a chance to grab it first.
+  if (!puKeyboard(k + PU_KEY_GLUT_SPECIAL_OFFSET, PU_DOWN))
+    current_input.doKey(k + 256, get_mods(), x, y);
+}
+
+
+/**
+ * Special key-up handler for Glut.
+ *
+ * @param k The integer value for the key pressed (will have 256 added
+ * to it).
+ * @param x (unused)
+ * @param y (unused)
+ */
+void GLUTspecialkeyup(int k, int x, int y)
+{
+  current_input.doKey(k + 256, get_mods()|FGInput::FG_MOD_UP, x, y);
+}
+
 // end of input.cxx