fly/flightgear
1
0
Fork 0
Code Activity

Created a new /devices property subtree to hold input device status

Browse source 
(currently just the mouse, but later the joystick and keyboard as
well).  Publish mouse button status to the property tree.
This commit is contained in:
david 2002-03-27 23:45:11 +00:00
parent 2129aba650
commit 24a812c0b6
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Input/input.cxx
View file

@ -359,6 +359,10 @@ FGInput::doMouseClick (int b, int updown, int x, int y)
mouse &m = _mouse_bindings[0]; mouse &m = _mouse_bindings[0];
mouse_mode &mode = m.modes[m.current_mode]; 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 == GLUT_DOWN);
// Pass on to PUI and the panel if // Pass on to PUI and the panel if
// requested, and return if one of // requested, and return if one of
// them consumes the event. // them consumes the event.
@ -611,6 +615,17 @@ FGInput::_init_mouse ()
SGPropertyNode * mouse_node = mouse_nodes->getChild("mouse", i, true); SGPropertyNode * mouse_node = mouse_nodes->getChild("mouse", i, true);
mouse &m = _mouse_bindings[i]; 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, 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.nModes = mouse_node->getIntValue("mode-count", 1);
m.modes = new mouse_mode[m.nModes]; m.modes = new mouse_mode[m.nModes];
@ -745,7 +760,7 @@ void
FGInput::_update_mouse () FGInput::_update_mouse ()
{ {
mouse &m = _mouse_bindings[0]; mouse &m = _mouse_bindings[0];
int mode = fgGetInt("/input/mice/mouse[0]/mode"); int mode = m.mode_node->getIntValue();
if (mode != m.current_mode) { if (mode != m.current_mode) {
m.current_mode = mode; m.current_mode = mode;
if (mode >= 0 && mode < m.nModes) { if (mode >= 0 && mode < m.nModes) {

2
src/Input/input.hxx
View file

@ -317,6 +317,8 @@ private:
virtual ~mouse (); virtual ~mouse ();
int x; int x;
int y; int y;
SGPropertyNode * mode_node;
SGPropertyNode * mouse_button_nodes[MAX_MOUSE_BUTTONS];
int nModes; int nModes;
int current_mode; int current_mode;
mouse_mode * modes; mouse_mode * modes;