//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
# include <config.h>
#endif
-#ifdef HAVE_WINDOWS_H
-# include <windows.h>
-#endif
-
#include <simgear/compiler.h>
#include <math.h>
#include <ctype.h>
+#include <sstream>
-#include STL_FSTREAM
-#include STL_STRING
+#include <fstream>
+#include <string>
#include <vector>
#include <simgear/compiler.h>
#include <simgear/constants.h>
#include <simgear/debug/logstream.hxx>
+#include <simgear/math/SGMath.hxx>
#include <simgear/props/props.hxx>
+#include <simgear/scene/util/SGSceneUserData.hxx>
#include <Aircraft/aircraft.hxx>
#include <Autopilot/xmlauto.hxx>
#include "input.hxx"
-SG_USING_STD(ifstream);
-SG_USING_STD(string);
-SG_USING_STD(vector);
+#include <Scenery/scenery.hxx>
+#include <Main/renderer.hxx>
-void mouseClickHandler(int button, int updown, int x, int y);
+using std::ifstream;
+using std::ostringstream;
+using std::string;
+using std::vector;
+
+void mouseClickHandler(int button, int updown, int x, int y, bool mainWindow, const osgGA::GUIEventAdapter*);
void mouseMotionHandler(int x, int y);
void keyHandler(int key, int keymod, int mousex, int mousey);
static FGInput * default_input = 0;
-
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of FGBinding.
+// Local functions.
////////////////////////////////////////////////////////////////////////
-FGBinding::FGBinding ()
- : _command(0),
- _arg(new SGPropertyNode),
- _setting(0)
+static int
+getModifiers ()
{
+ return fgGetKeyModifiers() >> 1;
}
-FGBinding::FGBinding (const SGPropertyNode * node)
- : _command(0),
- _arg(0),
- _setting(0)
+static bool
+getModShift ()
{
- read(node);
+ return (fgGetKeyModifiers() & KEYMOD_SHIFT) != 0;
}
-void
-FGBinding::read (const SGPropertyNode * node)
+static bool
+getModCtrl ()
{
- const SGPropertyNode * conditionNode = node->getChild("condition");
- if (conditionNode != 0)
- setCondition(sgReadCondition(globals->get_props(), conditionNode));
-
- _command_name = node->getStringValue("command", "");
- if (_command_name.empty()) {
- SG_LOG(SG_INPUT, SG_WARN, "No command supplied for binding.");
- _command = 0;
- return;
- }
-
- _arg = new SGPropertyNode;
- _setting = 0;
- copyProperties(node, _arg); // FIXME: don't use whole node!!!
+ return (fgGetKeyModifiers() & KEYMOD_CTRL) != 0;
}
-void
-FGBinding::fire () const
+static bool
+getModAlt ()
{
- 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);
- }
- }
+ return (fgGetKeyModifiers() & KEYMOD_ALT) != 0;
}
-void
-FGBinding::fire (double offset, double max) const
+static bool
+getModMeta ()
{
- if (test()) {
- _arg->setDoubleValue("offset", offset/max);
- fire();
- }
+ return (fgGetKeyModifiers() & KEYMOD_META) != 0;
}
-void
-FGBinding::fire (double setting) const
+static bool
+getModSuper ()
{
- 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();
- }
+ return (fgGetKeyModifiers() & KEYMOD_SUPER) != 0;
}
+static bool
+getModHyper ()
+{
+ return (fgGetKeyModifiers() & KEYMOD_HYPER) != 0;
+}
\f
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-FGInput::FGInput ()
+FGInput::FGInput () :
+ _key_event(fgGetNode("/devices/status/keyboard/event", true))
{
if (default_input == 0)
default_input = this;
void
FGInput::init ()
{
- _init_keyboard();
_init_joystick();
_init_mouse();
FGInput::postinit ()
{
_postinit_joystick();
+ _postinit_keyboard();
+}
+
+void
+FGInput::bind ()
+{
+ fgTie("/devices/status/keyboard", getModifiers);
+ fgTie("/devices/status/keyboard/shift", getModShift);
+ fgTie("/devices/status/keyboard/ctrl", getModCtrl);
+ fgTie("/devices/status/keyboard/alt", getModAlt);
+ fgTie("/devices/status/keyboard/meta", getModMeta);
+ fgTie("/devices/status/keyboard/super", getModSuper);
+ fgTie("/devices/status/keyboard/hyper", getModHyper);
+
+ _key_event->tie("key", SGRawValuePointer<int>(&_key_code));
+ _key_event->tie("pressed", SGRawValuePointer<bool>(&_key_pressed));
+ _key_event->tie("modifier", SGRawValuePointer<int>(&_key_modifiers));
+ _key_event->tie("modifier/shift", SGRawValuePointer<bool>(&_key_shift));
+ _key_event->tie("modifier/ctrl", SGRawValuePointer<bool>(&_key_ctrl));
+ _key_event->tie("modifier/alt", SGRawValuePointer<bool>(&_key_alt));
+ _key_event->tie("modifier/meta", SGRawValuePointer<bool>(&_key_meta));
+ _key_event->tie("modifier/super", SGRawValuePointer<bool>(&_key_super));
+ _key_event->tie("modifier/hyper", SGRawValuePointer<bool>(&_key_hyper));
+}
+
+void
+FGInput::unbind ()
+{
+ fgUntie("/devices/status/keyboard");
+ fgUntie("/devices/status/keyboard/shift");
+ fgUntie("/devices/status/keyboard/ctrl");
+ fgUntie("/devices/status/keyboard/alt");
+ fgUntie("/devices/status/keyboard/meta");
+ fgUntie("/devices/status/keyboard/super");
+ fgUntie("/devices/status/keyboard/hyper");
+
+ _key_event->untie("key");
+ _key_event->untie("pressed");
+ _key_event->untie("modifier");
+ _key_event->untie("modifier/shift");
+ _key_event->untie("modifier/ctrl");
+ _key_event->untie("modifier/alt");
+ _key_event->untie("modifier/meta");
+ _key_event->untie("modifier/super");
+ _key_event->untie("modifier/hyper");
}
void
return;
}
+ _key_code = k;
+ _key_modifiers = modifiers >> 1;
+ _key_pressed = (modifiers & KEYMOD_RELEASED) == 0;
+ _key_shift = (modifiers & KEYMOD_SHIFT) != 0;
+ _key_ctrl = (modifiers & KEYMOD_CTRL) != 0;
+ _key_alt = (modifiers & KEYMOD_ALT) != 0;
+ _key_meta = (modifiers & KEYMOD_META) != 0;
+ _key_super = (modifiers & KEYMOD_SUPER) != 0;
+ _key_hyper = (modifiers & KEYMOD_HYPER) != 0;
+ _key_event->fireValueChanged();
+ if (_key_code < 0)
+ return;
+
+ k = _key_code;
+ modifiers = _key_modifiers << 1;
+ if (!_key_pressed)
+ modifiers |= KEYMOD_RELEASED;
button &b = _key_bindings[k];
// Key pressed.
- if (modifiers&KEYMOD_RELEASED == 0) {
+ if (!(modifiers & KEYMOD_RELEASED)) {
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);
- int max = bindings.size();
- if (max > 0) {
- for (int i = 0; i < max; i++)
- bindings[i]->fire();
- return;
- }
+ const binding_list_t &bindings = _find_key_bindings(k, modifiers);
+
+ for (unsigned int i = 0; i < bindings.size(); i++)
+ bindings[i]->fire();
+ b.last_state = 1;
}
}
// Key released.
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);
- int max = bindings.size();
- if (max > 0) {
- for (int i = 0; i < max; i++)
- bindings[i]->fire();
- return;
- }
+ const binding_list_t &bindings = _find_key_bindings(k, modifiers);
+ for (unsigned int i = 0; i < bindings.size(); i++)
+ bindings[i]->fire();
+ b.last_state = 0;
}
}
}
void
-FGInput::doMouseClick (int b, int updown, int x, int y)
+FGInput::doMouseClick (int b, int updown, int x, int y, bool mainWindow, const osgGA::GUIEventAdapter* ea)
{
int modifiers = fgGetKeyModifiers();
// Pass on to PUI and the panel if
// requested, and return if one of
// them consumes the event.
+
+ if (updown != MOUSE_BUTTON_DOWN) {
+ // Execute the mouse up event in any case, may be we should
+ // stop processing here?
+ while (!_activePickCallbacks[b].empty()) {
+ _activePickCallbacks[b].front()->buttonReleased();
+ _activePickCallbacks[b].pop_front();
+ }
+ }
+
if (mode.pass_through) {
- if (puMouse(b, updown, x, y))
+ if (0 <= x && 0 <= y && puMouse(b, updown, x, y))
return;
- else if ((globals->get_current_panel() != 0) &&
+ else if (0 <= x && 0 <= y && (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))
+ else if (0 <= x && 0 <= y && fgHandle3DPanelMouseEvent(b, updown, x, y))
return;
+ else {
+ // pui didn't want the click event so compute a
+ // scenegraph intersection point corresponding to the mouse click
+ if (updown == MOUSE_BUTTON_DOWN) {
+
+ // Get the list of hit callbacks. Take the first callback that
+ // accepts the mouse button press and ignore the rest of them
+ // That is they get sorted by distance and by scenegraph depth.
+ // The nearest one is the first one and the deepest
+ // (the most specialized one in the scenegraph) is the first.
+ std::vector<SGSceneryPick> pickList;
+ if (FGRenderer::pick(pickList, ea)) {
+ std::vector<SGSceneryPick>::const_iterator i;
+ for (i = pickList.begin(); i != pickList.end(); ++i) {
+ if (i->callback->buttonPressed(b, i->info)) {
+ _activePickCallbacks[b].push_back(i->callback);
+ 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");
// 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;
+ if (x <= (xsize * .25) || x >= (xsize * .75)) {
+ x = int(xsize * .5);
need_warp = true;
}
- if (y <= 0) {
- y = ysize - 2;
- need_warp = true;
- } else if (y >= (ysize-1)) {
- y = 1;
+ if (y <= (ysize * .25) || y >= (ysize * .75)) {
+ y = int(ysize * .5);
need_warp = true;
}
if (need_warp)
fgWarpMouse(x, y);
}
- m.x = x;
- m.y = y;
-}
-void
-FGInput::_init_keyboard ()
-{
- SG_LOG(SG_INPUT, SG_DEBUG, "Initializing key bindings");
- SGPropertyNode * key_nodes = fgGetNode("/input/keyboard");
- if (key_nodes == 0) {
- SG_LOG(SG_INPUT, SG_WARN, "No key bindings (/input/keyboard)!!");
- key_nodes = fgGetNode("/input/keyboard", true);
- }
-
- 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_DEBUG, "Binding key " << index);
+ if (m.x != x)
+ fgSetInt("/devices/status/mice/mouse/x", m.x = x);
- _key_bindings[index].bindings->clear();
- _key_bindings[index].is_repeatable = keys[i]->getBoolValue("repeatable");
- _read_bindings(keys[i], _key_bindings[index].bindings, KEYMOD_NONE);
- }
+ if (m.y != y)
+ fgSetInt("/devices/status/mice/mouse/y", m.y = y);
}
// TODO: zero the old bindings first.
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing joystick bindings");
SGPropertyNode * js_nodes = fgGetNode("/input/joysticks", true);
- _which_joystick = js_nodes->getNode("which", true);
// read all joystick xml files into /input/joysticks/js_named[1000++]
SGPath path(globals->get_fg_root());
jsmap[names[j]->getStringValue()] = n;
}
+ // set up js[] nodes
for (int i = 0; i < MAX_JOYSTICKS; i++) {
jsJoystick * js = new jsJoystick(i);
_joystick_bindings[i].js = js;
+
if (js->notWorking()) {
SG_LOG(SG_INPUT, SG_DEBUG, "Joystick " << i << " not found");
continue;
<< "\"\nUsing default: \"" << source << '"');
} else {
- throw sg_throwable(string("No joystick configuration file with "
- "<name>default</name> entry found!"));
+ throw sg_exception(string("No joystick configuration file with <name>")
+ + name + "</name> entry found!");
}
js_node = js_nodes->getChild("js", i, true);
copyProperties(named, js_node);
js_node->setStringValue("id", name);
}
+ }
+
+ // get rid of unused config nodes
+ js_nodes->removeChildren("js-named", false);
+}
+
+void
+FGInput::_postinit_keyboard()
+{
+ SG_LOG(SG_INPUT, SG_DEBUG, "Initializing key bindings");
+ _module = "__kbd";
+ SGPropertyNode * key_nodes = fgGetNode("/input/keyboard");
+ if (key_nodes == 0) {
+ SG_LOG(SG_INPUT, SG_WARN, "No key bindings (/input/keyboard)!!");
+ key_nodes = fgGetNode("/input/keyboard", true);
+ }
+
+ FGNasalSys *nasalsys = (FGNasalSys *)globals->get_subsystem("nasal");
+ vector<SGPropertyNode_ptr> nasal = key_nodes->getChildren("nasal");
+ for (unsigned int j = 0; j < nasal.size(); j++) {
+ nasal[j]->setStringValue("module", _module.c_str());
+ nasalsys->handleCommand(nasal[j]);
+ }
+
+ 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_DEBUG, "Binding key " << index);
+
+ _key_bindings[index].bindings->clear();
+ _key_bindings[index].is_repeatable = keys[i]->getBoolValue("repeatable");
+ _key_bindings[index].last_state = 0;
+ _read_bindings(keys[i], _key_bindings[index].bindings, KEYMOD_NONE);
+ }
+}
+
+
+void
+FGInput::_postinit_joystick()
+{
+ FGNasalSys *nasalsys = (FGNasalSys *)globals->get_subsystem("nasal");
+ SGPropertyNode *js_nodes = fgGetNode("/input/joysticks");
+
+ for (int i = 0; i < MAX_JOYSTICKS; i++) {
+ SGPropertyNode_ptr js_node = js_nodes->getChild("js", i);
+ jsJoystick *js = _joystick_bindings[i].js;
+ if (!js_node || js->notWorking())
+ continue;
#ifdef WIN32
JOYCAPS jsCaps ;
joyGetDevCaps( i, &jsCaps, sizeof(jsCaps) );
- int nbuttons = jsCaps.wNumButtons;
+ unsigned int nbuttons = jsCaps.wNumButtons;
if (nbuttons > MAX_JOYSTICK_BUTTONS) nbuttons = MAX_JOYSTICK_BUTTONS;
#else
- int nbuttons = MAX_JOYSTICK_BUTTONS;
+ unsigned int nbuttons = MAX_JOYSTICK_BUTTONS;
#endif
int naxes = js->getNumAxes();
_joystick_bindings[i].axes = new axis[naxes];
_joystick_bindings[i].buttons = new button[nbuttons];
+ //
+ // Initialize nasal groups.
+ //
+ ostringstream str;
+ str << "__js" << i;
+ _module = str.str();
+ nasalsys->createModule(_module.c_str(), _module.c_str(), "", 0);
+
+ vector<SGPropertyNode_ptr> nasal = js_node->getChildren("nasal");
+ unsigned int j;
+ for (j = 0; j < nasal.size(); j++) {
+ nasal[j]->setStringValue("module", _module.c_str());
+ nasalsys->handleCommand(nasal[j]);
+ }
//
// Initialize the axes.
//
vector<SGPropertyNode_ptr> axes = js_node->getChildren("axis");
size_t nb_axes = axes.size();
- int j;
- for (j = 0; j < (int)nb_axes; j++) {
+ for (j = 0; j < nb_axes; j++ ) {
const SGPropertyNode * axis_node = axes[j];
const SGPropertyNode * num_node = axis_node->getChild("number");
int n_axis = axis_node->getIndex();
//
vector<SGPropertyNode_ptr> buttons = js_node->getChildren("button");
char buf[32];
- for (j = 0; (j < (int)buttons.size()) && (j < nbuttons); j++) {
+ for (j = 0; j < 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();
n_but = num_node->getIntValue(TGT_PLATFORM,n_but);
}
- if (n_but >= (size_t)nbuttons) {
+ if (n_but >= nbuttons) {
SG_LOG(SG_INPUT, SG_DEBUG, "Dropping bindings for button " << n_but);
continue;
}
js->setMaxRange(maxRange);
js->setCenter(center);
}
-
- for (unsigned int m = 0; m < js_named.size(); m++)
- js_nodes->removeChild("js-named", js_named[m]->getIndex(), false);
-}
-
-
-void
-FGInput::_postinit_joystick()
-{
- SGPropertyNode *js_nodes = fgGetNode("/input/joysticks");
- vector<SGPropertyNode_ptr> js = js_nodes->getChildren("js");
- for (unsigned int i = 0; i < js.size(); i++) {
- _which_joystick->setIntValue(i);
-
- vector<SGPropertyNode_ptr> nasal = js[i]->getChildren("nasal");
- for (unsigned int j = 0; j < nasal.size(); j++)
- ((FGNasalSys*)globals->get_subsystem("nasal"))->handleCommand(nasal[j]);
- }
}
FGInput::_init_mouse ()
{
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing mouse bindings");
+ _module = "";
SGPropertyNode * mouse_nodes = fgGetNode("/input/mice");
if (mouse_nodes == 0) {
void
FGInput::_update_joystick (double dt)
{
- int modifiers = KEYMOD_NONE; // FIXME: any way to get the real ones?
- int buttons;
- // float js_val, diff;
float axis_values[MAX_JOYSTICK_AXES];
+ int modifiers = fgGetKeyModifiers();
+ int buttons;
- int i;
- int j;
-
- for ( i = 0; i < MAX_JOYSTICKS; i++) {
+ for (int i = 0; i < MAX_JOYSTICKS; i++) {
jsJoystick * js = _joystick_bindings[i].js;
if (js == 0 || js->notWorking())
continue;
- _which_joystick->setIntValue(i);
js->read(&buttons, axis_values);
// Fire bindings for the axes.
- for ( j = 0; j < _joystick_bindings[i].naxes; j++) {
+ for (int 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.
if (fabs(axis_values[j] - a.last_value) > a.tolerance) {
-// SG_LOG(SG_INPUT, SG_DEBUG, "Axis " << j << " has moved");
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]);
+ for (unsigned int k = 0; k < a.bindings[KEYMOD_NONE].size(); k++)
+ a.bindings[KEYMOD_NONE][k]->fire(axis_values[j]);
}
-
+
// do we have to emulate axis buttons?
a.last_dt += dt;
if(a.last_dt >= a.interval_sec) {
modifiers,
axis_values[j] < a.low_threshold,
-1, -1);
-
+
if (a.high.bindings[modifiers].size())
_update_button(_joystick_bindings[i].axes[j].high,
modifiers,
}
// Fire bindings for the buttons.
- for (j = 0; j < _joystick_bindings[i].nbuttons; j++) {
+ for (int 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) {
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);
+ if (fgGetMouseCursor() == MOUSE_CURSOR_NONE)
+ fgSetMouseCursor(m.modes[mode].cursor);
} else {
m.timeout -= dt;
if ( m.timeout <= 0.0 ) {
m.save_x = m.x;
m.save_y = m.y;
}
+
+ // handle repeatable mouse press events
+ std::map<int, std::list<SGSharedPtr<SGPickCallback> > >::iterator mi;
+ for (mi = _activePickCallbacks.begin();
+ mi != _activePickCallbacks.end(); ++mi) {
+ std::list<SGSharedPtr<SGPickCallback> >::iterator li;
+ for (li = mi->second.begin(); li != mi->second.end(); ++li) {
+ (*li)->update(dt);
+ }
+ }
}
void
// 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++)
+ 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.
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"));
- binding_list[modifiers].push_back(new FGBinding(bindings[i]));
+ const char *cmd = bindings[i]->getStringValue("command");
+ SG_LOG(SG_INPUT, SG_DEBUG, "Reading binding " << cmd);
+
+ if (!strcmp(cmd, "nasal") && !_module.empty())
+ bindings[i]->setStringValue("module", _module.c_str());
+ binding_list[modifiers].push_back(new SGBinding(bindings[i], globals->get_props()));
}
// Read nested bindings for modifiers
if (node->getChild("mod-alt") != 0)
_read_bindings(node->getChild("mod-alt"), binding_list,
modifiers|KEYMOD_ALT);
+
+ if (node->getChild("mod-meta") != 0)
+ _read_bindings(node->getChild("mod-meta"), binding_list,
+ modifiers|KEYMOD_META);
+
+ if (node->getChild("mod-super") != 0)
+ _read_bindings(node->getChild("mod-super"), binding_list,
+ modifiers|KEYMOD_SUPER);
+
+ if (node->getChild("mod-hyper") != 0)
+ _read_bindings(node->getChild("mod-hyper"), binding_list,
+ modifiers|KEYMOD_HYPER);
}
-const vector<FGBinding *> &
+const FGInput::binding_list_t&
FGInput::_find_key_bindings (unsigned int k, int modifiers)
{
unsigned char kc = (unsigned char)k;
FGInput::button::button ()
: is_repeatable(false),
- last_state(-1)
+ interval_sec(0),
+ last_dt(0),
+ last_state(0)
{
}
: last_value(9999999),
tolerance(0.002),
low_threshold(-0.9),
- high_threshold(0.9)
+ high_threshold(0.9),
+ interval_sec(0),
+ last_dt(0)
{
}
////////////////////////////////////////////////////////////////////////
FGInput::joystick::joystick ()
+ : jsnum(0),
+ js(0),
+ naxes(0),
+ nbuttons(0),
+ axes(0),
+ buttons(0)
{
}
FGInput::mouse::mouse ()
: x(-1),
y(-1),
+ save_x(-1),
+ save_y(-1),
nModes(1),
current_mode(0),
modes(0)
default_input->doKey(key, keymod, mousex, mousey);
}
-void mouseClickHandler(int button, int updown, int x, int y)
+void mouseClickHandler(int button, int updown, int x, int y, bool mainWindow, const osgGA::GUIEventAdapter* ea)
{
if(default_input)
- default_input->doMouseClick(button, updown, x, y);
+ default_input->doMouseClick(button, updown, x, y, mainWindow, ea);
}
void mouseMotionHandler(int x, int y)
projects / flightgear.git / blobdiff