#include STL_STRING
#include <vector>
-#include GLUT_H
+#include FG_GLUT_H
#include <plib/pu.h>
#include <simgear/props/props.hxx>
#include <Aircraft/aircraft.hxx>
-#include <Autopilot/auto_gui.hxx>
-#include <Autopilot/newauto.hxx>
+// #include <Autopilot/auto_gui.hxx>
+#include <Autopilot/xmlauto.hxx>
#include <Cockpit/hud.hxx>
#include <Cockpit/panel.hxx>
#include <Cockpit/panel_io.hxx>
read(node);
}
-FGBinding::~FGBinding ()
-{
- delete _arg; // Delete the saved arguments
-}
-
void
FGBinding::read (const SGPropertyNode * node)
{
return;
}
- delete _arg;
_arg = new SGPropertyNode;
_setting = 0;
copyProperties(node, _arg); // FIXME: don't use whole node!!!
void
FGInput::update (double dt)
{
- _update_keyboard(dt);
+ _update_keyboard();
_update_joystick(dt);
- _update_mouse(dt);
+ _update_mouse();
}
void
void
FGInput::doKey (int k, int modifiers, int x, int y)
{
+ static SGPropertyNode *heading_enabled
+ = fgGetNode("/autopilot/locks/heading", true);
+
// Sanity check.
if (k < 0 || k >= MAX_KEYS) {
SG_LOG(SG_INPUT, SG_WARN, "Key value " << k << " out of range");
// 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 );
+ if ( strcmp( heading_enabled->getStringValue(),
+ "true-heading-hold" ) != 0 ) {
+ heading_enabled->setStringValue( "true-heading-hold" );
} else {
- globals->get_autopilot()->set_HeadingMode(
- FGAutopilot::FG_TC_HEADING_LOCK );
+ heading_enabled->setStringValue( "" );
}
return;
}
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);
}
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 {
bool found_js = false;
_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;
}
//
_init_button(js_node->getChild("button", j),
_joystick_bindings[i].buttons[j],
buf);
-
+
+ // get interval-sec property
+ button &b = _joystick_bindings[i].buttons[j];
+ const SGPropertyNode * button_node = js_node->getChild("button", j);
+ if (button_node != 0) {
+ b.interval_sec = button_node->getDoubleValue("interval-sec",0.0);
+ b.last_dt = 0.0;
+ }
}
js->setMinRange(minRange);
// 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);
void
-FGInput::_update_keyboard (double dt)
+FGInput::_update_keyboard ()
{
// no-op
}
void
FGInput::_update_joystick (double dt)
{
-#ifdef REMOVE_ME_AFTER_FLIGHTGEAR_0_9_2_RELEASE
- static double _last_dt = 0.0;
-#else
- static double _last_dt = 1.0;
-#endif
int modifiers = FG_MOD_NONE; // FIXME: any way to get the real ones?
- int i, j, buttons;
+ int buttons;
// float js_val, diff;
float axis_values[MAX_JOYSTICK_AXES];
-#ifdef REMOVE_ME_AFTER_FLIGHTGEAR_0_9_2_RELEASE
- _last_dt += dt;
-#endif
+ int i;
+ int j;
for ( i = 0; i < MAX_JOYSTICKS; i++) {
}
// do we have to emulate axis buttons?
- if (_last_dt > 0.05) {
+ 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.
- if (_last_dt > 0.05) {
- for (j = 0; j < _joystick_bindings[i].nbuttons; j++) {
+ 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;
}
}
}
-
-#if REMOVE_ME_AFTER_FLIGHTGEAR_0_9_2_RELEASE
- if (_last_dt > 0.05) {
- while(_last_dt >= 0.05)
- _last_dt -= 0.05;
- }
-#endif
}
void
-FGInput::_update_mouse (double dt)
+FGInput::_update_mouse ()
{
mouse &m = _mouse_bindings[0];
int mode = m.mode_node->getIntValue();
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++) {
- if (bindings[i]->nChildren() > 0) {
- SG_LOG(SG_INPUT, SG_DEBUG, "Reading binding "
- << bindings[i]->getStringValue("command"));
- binding_list[modifiers].push_back(new 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
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.
if (b.bindings[modifiers].size() > 0)
return b.bindings[modifiers];
+ // Alt-Gr is CTRL+ALT
+ else if (modifiers&(FG_MOD_CTRL|FG_MOD_ALT))
+ return _find_key_bindings(k, modifiers&~(FG_MOD_CTRL|FG_MOD_ALT));
+
// Try removing the control modifier
// for control keys.
- else if ((modifiers&FG_MOD_CTRL) && iscntrl(k))
+ else if ((modifiers&FG_MOD_CTRL) && iscntrl(kc))
return _find_key_bindings(k, modifiers&~FG_MOD_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)))
+ else if ((modifiers&FG_MOD_SHIFT) && (isupper(kc) || ispunct(kc)))
return _find_key_bindings(k, modifiers&~FG_MOD_SHIFT);
// Try removing alt modifier for