#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>
+#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 <Model/panelnode.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include "input.hxx"
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
SG_USING_STD(ifstream);
-#endif
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);
\f
////////////////////////////////////////////////////////////////////////
-// Local data structures.
+// Local variables.
////////////////////////////////////////////////////////////////////////
+static FGInput * default_input = 0;
+
+
\f
////////////////////////////////////////////////////////////////////////
// Implementation of FGBinding.
FGBinding::FGBinding ()
: _command(0),
_arg(new SGPropertyNode),
- _setting(0),
- _command_state(0)
+ _setting(0)
{
}
FGBinding::FGBinding (const SGPropertyNode * node)
: _command(0),
- _arg(new SGPropertyNode),
- _setting(0),
- _command_state(0)
+ _arg(0),
+ _setting(0)
{
read(node);
}
-FGBinding::~FGBinding ()
-{
-// 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));
- }
+ if (conditionNode != 0)
+ setCondition(sgReadCondition(globals->get_props(), conditionNode));
_command_name = node->getStringValue("command", "");
if (_command_name.empty()) {
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;
- }
-
- delete _arg;
_arg = new SGPropertyNode;
_setting = 0;
copyProperties(node, _arg); // FIXME: don't use whole node!!!
FGBinding::fire () const
{
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, &_command_state)) {
+ } else if (!(*_command)(_arg)) {
SG_LOG(SG_INPUT, SG_ALERT, "Failed to execute command "
- << _command_name);
+ << _command_name);
}
}
}
FGBinding::fire (double setting) const
{
if (test()) {
- // A value is automatically added to
- // the args
- if (_setting == 0) // save the setting node for efficiency
+ // 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();
// 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
_init_joystick();
_init_mouse();
- glutKeyboardFunc(GLUTkey);
- glutKeyboardUpFunc(GLUTkeyup);
- glutSpecialFunc(GLUTspecialkey);
- glutSpecialUpFunc(GLUTspecialkeyup);
- glutMouseFunc (GLUTmouse);
- glutMotionFunc (GLUTmotion);
- glutPassiveMotionFunc (GLUTmotion);
+ fgRegisterKeyHandler(keyHandler);
+ fgRegisterMouseClickHandler(mouseClickHandler);
+ fgRegisterMouseMotionHandler(mouseMotionHandler);
}
void
-FGInput::bind ()
+FGInput::reinit ()
{
- // no op
+ init();
+}
+
+void
+FGInput::update (double dt)
+{
+ _update_keyboard();
+ _update_joystick(dt);
+ _update_mouse(dt);
}
void
-FGInput::unbind ()
+FGInput::suspend ()
{
- // no op
+ // NO-OP
}
-void
-FGInput::update (double dt)
+void
+FGInput::resume ()
{
- _update_keyboard();
- _update_joystick();
- _update_mouse();
+ // NO-OP
+}
+
+bool
+FGInput::is_suspended () const
+{
+ return false;
}
void
-FGInput::doKey (int k, int modifiers, int x, int y)
+FGInput::makeDefault (bool status)
{
- SG_LOG( SG_INPUT, SG_DEBUG, "User pressed key " << k
- << " with modifiers " << modifiers );
+ if (status)
+ default_input = this;
+ else if (default_input == this)
+ default_input = 0;
+}
- // Sanity check.
+void
+FGInput::doKey (int k, int modifiers, int x, int y)
+{
+ // Sanity check.
if (k < 0 || k >= MAX_KEYS) {
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) {
+ // Key pressed.
+ if (modifiers&KEYMOD_RELEASED == 0) {
SG_LOG( SG_INPUT, SG_DEBUG, "User pressed key " << k
- << " with modifiers " << modifiers );
+ << " 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_DEBUG, "User released key " << k
- << " with modifiers " << modifiers);
+ << " 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;
}
}
}
-
-
- // Use the old, default actions.
- SG_LOG( SG_INPUT, SG_DEBUG, "(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 72: // H key
- HUD_brightkey( true );
- return;
- case 73: // I key
- // Minimal Hud
- fgHUDInit2(¤t_aircraft);
- return;
- }
-
-
- } else {
- SG_LOG( SG_INPUT, SG_DEBUG, "" );
- switch (k) {
- case 104: // h key
- HUD_masterswitch( true );
- return;
- case 105: // i key
- fgHUDInit(¤t_aircraft); // normal HUD
- return;
-
-// START SPECIALS
-
- case 256+GLUT_KEY_F6: // F6 toggles Autopilot target location
- if ( globals->get_autopilot()->get_HeadingMode() !=
- FGAutopilot::FG_HEADING_WAYPOINT ) {
- globals->get_autopilot()->set_HeadingMode(
- FGAutopilot::FG_HEADING_WAYPOINT );
- globals->get_autopilot()->set_HeadingEnabled( true );
- } else {
- globals->get_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_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
-
- }
}
void
FGInput::doMouseClick (int b, int updown, int x, int y)
{
- int modifiers = FG_MOD_NONE; // FIXME: any way to get the real ones?
+ int modifiers = fgGetKeyModifiers();
mouse &m = _mouse_bindings[0];
mouse_mode &mode = m.modes[m.current_mode];
- // Let the property manager know.
+ // Let the property manager know.
if (b >= 0 && b < MAX_MOUSE_BUTTONS)
- m.mouse_button_nodes[b]->setBoolValue(updown == GLUT_DOWN);
+ 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.
+ // 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 ((current_panel != 0) &&
- current_panel->doMouseAction(b, updown, x, y))
+ 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;
}
- // OK, PUI and the panel didn't want the click
+ // 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");
+ << " where only " << MAX_MOUSE_BUTTONS << " expected");
return;
}
void
FGInput::doMouseMotion (int x, int y)
{
- int modifiers = FG_MOD_NONE; // FIXME: any way to get the real ones?
+ // 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];
- if (m.current_mode < 0 || m.current_mode >= m.nModes)
- return;
+
+ 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))
- return;
+ // 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.
+ // 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.y_bindings[modifiers][i]->fire(double(delta), double(ysize));
}
- // Constrain the mouse if requested
+ // Constrain the mouse if requested
if (mode.constrained) {
bool need_warp = false;
if (x <= 0) {
}
if (need_warp)
- glutWarpPointer(x, y);
+ fgWarpMouse(x, y);
}
m.x = x;
m.y = y;
void
FGInput::_init_keyboard ()
{
- // TODO: zero the old bindings first.
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing key bindings");
SGPropertyNode * key_nodes = fgGetNode("/input/keyboard");
if (key_nodes == 0) {
for (unsigned int i = 0; i < keys.size(); i++) {
int index = keys[i]->getIndex();
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);
}
}
void
FGInput::_init_joystick ()
{
- // TODO: zero the old bindings first.
+ 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) {
jsJoystick * js = new jsJoystick(i);
_joystick_bindings[i].js = js;
if (js->notWorking()) {
- SG_LOG(SG_INPUT, SG_WARN, "Joystick " << i << " not found");
+ SG_LOG(SG_INPUT, SG_DEBUG, "Joystick " << i << " not found");
continue;
} else {
-#ifdef FG_PLIB_JOYSTICK_GETNAME
+ bool found_js = false;
const char * name = js->getName();
- std::cout << "Looking for bindings for joystick \""
- << name << '"' << std::endl;
+ 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];
- std::cout << " Trying \"" << node->getStringValue("name") << '"' << std::endl;
- if (!strcmp(node->getStringValue("name"), name)) {
- std::cout << " Found bindings" << std::endl;
- js_node = node;
- break;
- }
+ 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;
}
-#endif
}
#ifdef WIN32
JOYCAPS jsCaps ;
#else
int nbuttons = MAX_JOYSTICK_BUTTONS;
#endif
-
+
int naxes = js->getNumAxes();
if (naxes > MAX_JOYSTICK_AXES) naxes = MAX_JOYSTICK_AXES;
_joystick_bindings[i].naxes = naxes;
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing joystick " << i);
- // Set up range arrays
+ // 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];
//
// Initialize the axes.
//
+ vector<SGPropertyNode_ptr> axes = js_node->getChildren("axis");
+ size_t nb_axes = axes.size();
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_DEBUG, "No bindings for axis " << j);
- axis_node = js_node->getChild("axis", j, true);
+ 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");
_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.
//
+ vector<SGPropertyNode_ptr> buttons = js_node->getChildren("button");
char buf[32];
- for (j = 0; j < nbuttons; j++) {
- sprintf(buf, "%d", j);
- SG_LOG(SG_INPUT, SG_DEBUG, "Initializing button " << j);
- _init_button(js_node->getChild("button", j),
- _joystick_bindings[i].buttons[j],
- buf);
-
+ 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);
+ }
+
+ if (n_but >= (size_t)nbuttons) {
+ SG_LOG(SG_INPUT, SG_DEBUG, "Dropping bindings for button " << n_but);
+ continue;
+ }
+
+ 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);
}
//
-// Map of all known GLUT cursor names
+// 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
//
-struct {
+static struct {
const char * name;
int cursor;
} mouse_cursor_map[] = {
- { "right-arrow", GLUT_CURSOR_RIGHT_ARROW },
- { "left-arrow", GLUT_CURSOR_LEFT_ARROW },
- { "info", GLUT_CURSOR_INFO },
- { "destroy", GLUT_CURSOR_DESTROY },
- { "help", GLUT_CURSOR_HELP },
- { "cycle", GLUT_CURSOR_CYCLE },
- { "spray", GLUT_CURSOR_SPRAY },
- { "wait", GLUT_CURSOR_WAIT },
- { "text", GLUT_CURSOR_TEXT },
- { "crosshair", GLUT_CURSOR_CROSSHAIR },
- { "up-down", GLUT_CURSOR_UP_DOWN },
- { "left-right", GLUT_CURSOR_LEFT_RIGHT },
- { "top-side", GLUT_CURSOR_TOP_SIDE },
- { "bottom-side", GLUT_CURSOR_BOTTOM_SIDE },
- { "left-side", GLUT_CURSOR_LEFT_SIDE },
- { "right-side", GLUT_CURSOR_RIGHT_SIDE },
- { "top-left-corner", GLUT_CURSOR_TOP_LEFT_CORNER },
- { "top-right-corner", GLUT_CURSOR_TOP_RIGHT_CORNER },
- { "bottom-right-corner", GLUT_CURSOR_BOTTOM_RIGHT_CORNER },
- { "bottom-left-corner", GLUT_CURSOR_BOTTOM_LEFT_CORNER },
- { "inherit", GLUT_CURSOR_INHERIT },
- { "none", GLUT_CURSOR_NONE },
- { "full-crosshair", GLUT_CURSOR_FULL_CROSSHAIR },
+ { "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 ()
{
SGPropertyNode * mouse_node = mouse_nodes->getChild("mouse", i, true);
mouse &m = _mouse_bindings[i];
- // Grab node pointers
+ // Grab node pointers
char buf[64];
sprintf(buf, "/devices/status/mice/mouse[%d]/mode", i);
- m.mode_node = fgGetNode(buf, true);
- m.mode_node->setIntValue(0);
+ 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
+ // 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
+ // 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 = GLUT_CURSOR_INHERIT;
+ 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;
- }
+ 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
+ // 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
+ // 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);
+ 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 the axis bindings for this mode
_read_bindings(mode_node->getChild("x-axis", 0, true),
- m.modes[j].x_bindings,
- FG_MOD_NONE);
+ m.modes[j].x_bindings,
+ KEYMOD_NONE);
_read_bindings(mode_node->getChild("y-axis", 0, true),
- m.modes[j].y_bindings,
- FG_MOD_NONE);
+ m.modes[j].y_bindings,
+ KEYMOD_NONE);
}
}
}
void
FGInput::_init_button (const SGPropertyNode * node,
- button &b,
- const string name)
-{
+ 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, FG_MOD_NONE);
+ // Get the bindings for the button
+ _read_bindings(node, b.bindings, KEYMOD_NONE);
}
}
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_JOYSTICK_AXES];
js->read(&buttons, axis_values);
- // Fire bindings for the axes.
+ // 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_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]);
+// 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?
- if (a.low.bindings[modifiers].size())
- _update_button(_joystick_bindings[i].axes[j].low,
- modifiers,
- axis_values[j] < a.low_threshold,
- -1, -1);
+ // 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);
+ 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.
+ // Fire bindings for the buttons.
for (j = 0; j < _joystick_bindings[i].nbuttons; j++) {
- _update_button(_joystick_bindings[i].buttons[j],
- modifiers,
- (buttons & (1 << j)) > 0,
- -1, -1);
+ 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 ()
+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) {
- glutSetCursor(m.modes[mode].cursor);
+ fgSetMouseCursor(m.modes[mode].cursor);
m.x = fgGetInt("/sim/startup/xsize", 800) / 2;
m.y = fgGetInt("/sim/startup/ysize", 600) / 2;
- glutWarpPointer(m.x, m.y);
+ fgWarpMouse(m.x, m.y);
} else {
SG_LOG(SG_INPUT, SG_DEBUG, "Mouse mode " << mode << " out of range");
- glutSetCursor(GLUT_CURSOR_INHERIT);
+ fgSetMouseCursor(MOUSE_CURSOR_POINTER);
}
}
+
+ 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 {
+ m.timeout -= dt;
+ if ( m.timeout <= 0.0 ) {
+ fgSetMouseCursor(MOUSE_CURSOR_NONE);
+ m.timeout = 0.0;
+ }
+ }
+ m.save_x = m.x;
+ m.save_y = m.y;
+ }
}
void
FGInput::_update_button (button &b, int modifiers, bool pressed,
- int x, int y)
+ int x, int y)
{
if (pressed) {
- // The press event may be repeated.
+ // 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);
+ b.bindings[modifiers][k]->fire(x, y);
}
} else {
- // The release event is never repeated.
+ // 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|FG_MOD_UP].size(); k++)
- b.bindings[modifiers|FG_MOD_UP][k]->fire(x, y);
+ 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)
{
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_DEBUG, "Reading binding "
- << bindings[i]->getStringValue("command"));
+ << 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 *> &
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];
}
FGInput::button::~button ()
{
- // FIXME: memory leak
-// for (int i = 0; i < FG_MOD_MAX; i++)
+ // FIXME: memory leak
+// for (int i = 0; i < KEYMOD_MAX; i++)
// for (int j = 0; i < bindings[i].size(); j++)
// delete bindings[i][j];
}
FGInput::axis::~axis ()
{
-// for (int i = 0; i < FG_MOD_MAX; i++)
+// for (int i = 0; i < KEYMOD_MAX; i++)
// for (int j = 0; i < bindings[i].size(); j++)
// delete bindings[i][j];
}
////////////////////////////////////////////////////////////////////////
FGInput::mouse_mode::mouse_mode ()
- : cursor(GLUT_CURSOR_INHERIT),
+ : cursor(MOUSE_CURSOR_POINTER),
constrained(false),
pass_through(false),
buttons(0)
FGInput::mouse_mode::~mouse_mode ()
{
- // FIXME: memory leak
-// for (int i = 0; i < FG_MOD_MAX; i++) {
+ // 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];
delete [] modes;
}
-
-\f
////////////////////////////////////////////////////////////////////////
-// Implementation of GLUT callbacks.
+// Implementation of OS callbacks.
////////////////////////////////////////////////////////////////////////
-
-/**
- * Construct the modifiers.
- */
-static inline int get_mods ()
+void keyHandler(int key, int keymod, int mousex, int mousey)
{
- int glut_modifiers = glutGetModifiers();
- int modifiers = 0;
+ if((keymod & KEYMOD_RELEASED) == 0)
+ if(puKeyboard(key, PU_DOWN))
+ return;
- 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;
+ if(default_input)
+ default_input->doKey(key, keymod, mousex, mousey);
}
-
-\f
-////////////////////////////////////////////////////////////////////////
-// GLUT C callbacks.
-////////////////////////////////////////////////////////////////////////
-
-void
-GLUTkey(unsigned char k, int x, int y)
+void mouseClickHandler(int button, int updown, 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);
+ if(default_input)
+ default_input->doMouseClick(button, updown, x, y);
}
-void
-GLUTkeyup(unsigned char k, int x, int y)
-{
- current_input.doKey(k, get_mods()|FGInput::FG_MOD_UP, x, y);
-}
-
-void
-GLUTspecialkey(int k, int x, int y)
+void mouseMotionHandler(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);
+ if (default_input != 0)
+ default_input->doMouseMotion(x, y);
}
-
-void
-GLUTspecialkeyup(int k, int x, int y)
-{
- current_input.doKey(k + 256, get_mods()|FGInput::FG_MOD_UP, x, y);
-}
-
-void
-GLUTmouse (int button, int updown, int x, int y)
-{
- current_input.doMouseClick(button, updown, x, y);
-}
-
-void
-GLUTmotion (int x, int y)
-{
- current_input.doMouseMotion(x, y);
-}
-
-// end of input.cxx
projects / flightgear.git / blobdiff