fly/flightgear
1
0
Fork 0
Code Activity

Canvas: generate keypress event for text input.

Browse source
This commit is contained in:
Thomas Geymayer 2014-08-11 00:28:43 +02:00
parent 271cf1420d
commit 45ab3a20a2
1 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/Canvas/gui_mgr.cxx
View file

@ -138,6 +138,8 @@ class DesktopGroup:
bool handleMouse(const osgGA::GUIEventAdapter& ea); bool handleMouse(const osgGA::GUIEventAdapter& ea);
bool handleKeyboard(const osgGA::GUIEventAdapter& ea); bool handleKeyboard(const osgGA::GUIEventAdapter& ea);
bool handleEvent( const sc::EventPtr& event,
const sc::WindowPtr& active_window );
bool handleRootEvent(const sc::EventPtr& event); bool handleRootEvent(const sc::EventPtr& event);
void handleResize(int x, int y, int width, int height); void handleResize(int x, int y, int width, int height);
@ -510,24 +512,12 @@ bool DesktopGroup::handleKeyboard(const osgGA::GUIEventAdapter& ea)
if( !_transform->getNumChildren() || !_handle_events ) if( !_transform->getNumChildren() || !_handle_events )
return false; return false;
sc::WindowPtr active_window = _focus_window.lock();
if( !active_window )
{
int type = (ea.getEventType() == osgGA::GUIEventAdapter::KEYDOWN)
? sc::Event::KEY_DOWN
: sc::Event::KEY_UP;
if( !numEventHandler(type) )
// TODO handle global shortcuts/grabs/etc.
return false;
}
sc::KeyboardEventPtr event(new sc::KeyboardEvent(ea)); sc::KeyboardEventPtr event(new sc::KeyboardEvent(ea));
// Detect key repeat (of non modifier keys) // Detect key repeat (of non modifier keys)
if( !event->isModifier() ) if( !event->isModifier() )
{ {
if( event->type == sc::Event::KEY_DOWN ) if( event->getType() == sc::Event::KEY_DOWN )
{ {
if( event->keyCode() == _last_key_down_no_mod ) if( event->keyCode() == _last_key_down_no_mod )
event->setRepeat(true); event->setRepeat(true);
@ -540,21 +530,39 @@ bool DesktopGroup::handleKeyboard(const osgGA::GUIEventAdapter& ea)
} }
} }
if( active_window ) sc::WindowPtr active_window = _focus_window.lock();
return active_window->handleEvent(event); bool handled = handleEvent(event, active_window);
else
return handleRootEvent(event); if( event->getType() == sc::Event::KEY_DOWN
&& !event->defaultPrevented()
&& event->isPrint() )
{
sc::KeyboardEventPtr keypress( new sc::KeyboardEvent(*event) );
keypress->type = sc::Event::KEY_PRESS;
handled |= handleEvent(keypress, active_window);
}
return handled;
}
//------------------------------------------------------------------------------
bool DesktopGroup::handleEvent( const sc::EventPtr& event,
const sc::WindowPtr& active_window )
{
return active_window
? active_window->handleEvent(event)
: handleRootEvent(event);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool DesktopGroup::handleRootEvent(const sc::EventPtr& event) bool DesktopGroup::handleRootEvent(const sc::EventPtr& event)
{ {
event->default_prevented = false;
sc::Element::handleEvent(event); sc::Element::handleEvent(event);
// preventDefault() on DesktopGroup stops propagation to internal event // stopPropagation() on DesktopGroup stops propagation to internal event
// handling. // handling.
return event->default_prevented; return event->propagation_stopped;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------