fly/flightgear
1
0
Fork 0
Code Activity

- export modifier bitmask

Browse source 
- consider negative keys returned from an event handler as invalid
  (was 0 before)
- warning--
This commit is contained in:
mfranz 2008-04-26 13:25:08 +00:00
parent 7a904ea0ac
commit 4c5d7bb0f9
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Input/input.cxx
View file

@ -84,6 +84,12 @@ static FGInput * default_input = 0;
// Local functions. // Local functions.
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
static int
getModifiers ()
{
return fgGetKeyModifiers() >> 1;
}
static bool static bool
getModShift () getModShift ()
{ {
@ -166,6 +172,7 @@ FGInput::postinit ()
void void
FGInput::bind () FGInput::bind ()
{ {
fgTie("/devices/status/keyboard", getModifiers);
fgTie("/devices/status/keyboard/shift", getModShift); fgTie("/devices/status/keyboard/shift", getModShift);
fgTie("/devices/status/keyboard/ctrl", getModCtrl); fgTie("/devices/status/keyboard/ctrl", getModCtrl);
fgTie("/devices/status/keyboard/alt", getModAlt); fgTie("/devices/status/keyboard/alt", getModAlt);
@ -187,6 +194,7 @@ FGInput::bind ()
void void
FGInput::unbind () FGInput::unbind ()
{ {
fgUntie("/devices/status/keyboard");
fgUntie("/devices/status/keyboard/shift"); fgUntie("/devices/status/keyboard/shift");
fgUntie("/devices/status/keyboard/ctrl"); fgUntie("/devices/status/keyboard/ctrl");
fgUntie("/devices/status/keyboard/alt"); fgUntie("/devices/status/keyboard/alt");
@ -250,7 +258,7 @@ FGInput::doKey (int k, int modifiers, int x, int y)
} }
_key_code = k; _key_code = k;
_key_modifiers = modifiers & ~KEYMOD_RELEASED; _key_modifiers = modifiers >> 1;
_key_pressed = !bool(modifiers & KEYMOD_RELEASED); _key_pressed = !bool(modifiers & KEYMOD_RELEASED);
_key_shift = bool(modifiers & KEYMOD_SHIFT); _key_shift = bool(modifiers & KEYMOD_SHIFT);
_key_ctrl = bool(modifiers & KEYMOD_CTRL); _key_ctrl = bool(modifiers & KEYMOD_CTRL);
@ -259,11 +267,13 @@ FGInput::doKey (int k, int modifiers, int x, int y)
_key_super = bool(modifiers & KEYMOD_SUPER); _key_super = bool(modifiers & KEYMOD_SUPER);
_key_hyper = bool(modifiers & KEYMOD_HYPER); _key_hyper = bool(modifiers & KEYMOD_HYPER);
_key_event->fireValueChanged(); _key_event->fireValueChanged();
if (!_key_code) if (_key_code < 0)
return; return;
k = _key_code; k = _key_code;
modifiers = _key_modifiers | (_key_pressed ? KEYMOD_NONE : KEYMOD_RELEASED); modifiers = _key_modifiers << 1;
if (!_key_pressed)
modifiers |= KEYMOD_RELEASED;
button &b = _key_bindings[k]; button &b = _key_bindings[k];
// Key pressed. // Key pressed.

4
src/Input/input.hxx
View file

@ -233,13 +233,13 @@ private:
virtual ~mouse (); virtual ~mouse ();
int x; int x;
int y; int y;
int save_x;
int save_y;
SGPropertyNode_ptr mode_node; SGPropertyNode_ptr mode_node;
SGPropertyNode_ptr mouse_button_nodes[MAX_MOUSE_BUTTONS]; SGPropertyNode_ptr mouse_button_nodes[MAX_MOUSE_BUTTONS];
int nModes; int nModes;
int current_mode; int current_mode;
double timeout; double timeout;
int save_x;
int save_y;
mouse_mode * modes; mouse_mode * modes;
}; };