const int MAX_MICE = 1;
const int MAX_MOUSE_BUTTONS = 8;
+typedef std::vector<SGSceneryPick> SGSceneryPicks;
+typedef SGSharedPtr<SGPickCallback> SGPickCallbackPtr;
+typedef std::list<SGPickCallbackPtr> SGPickCallbackList;
+
////////////////////////////////////////////////////////////////////////
/**
* List of currently pressed mouse button events
*/
-class ActivePickCallbacks : public std::map<int, std::list<SGSharedPtr<SGPickCallback> > > {
-public:
+class ActivePickCallbacks:
+ public std::map<int, SGPickCallbackList>
+{
+ public:
void update( double dt, unsigned int keyModState );
void init( int button, const osgGA::GUIEventAdapter* ea );
};
// 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;
+ SGSceneryPicks pickList;
if (!globals->get_renderer()->pick(pickList, windowPos)) {
return;
}
- std::vector<SGSceneryPick>::const_iterator i;
+ SGSceneryPicks::const_iterator i;
for (i = pickList.begin(); i != pickList.end(); ++i) {
- if (i->callback->buttonPressed(button, ea, i->info)) {
+ if (i->callback->buttonPressed(button, *ea, i->info)) {
(*this)[button].push_back(i->callback);
return;
}
{
// handle repeatable mouse press events
for( iterator mi = begin(); mi != end(); ++mi ) {
- std::list<SGSharedPtr<SGPickCallback> >::iterator li;
+ SGPickCallbackList::iterator li;
for (li = mi->second.begin(); li != mi->second.end(); ++li) {
(*li)->update(dt, keyModState);
}
mouse_mode * modes;
};
+static
+const SGSceneryPick*
+getPick( const SGSceneryPicks& pick_list,
+ const SGPickCallback* cb )
+{
+ for(size_t i = 0; i < pick_list.size(); ++i)
+ if( pick_list[i].callback == cb )
+ return &pick_list[i];
+
+ return 0;
+}
+
////////////////////////////////////////////////////////////////////////
class FGMouseInput::FGMouseInputPrivate : public SGPropertyChangeListener
{
public:
FGMouseInputPrivate() :
+ initialized(false),
haveWarped(false),
xSizeNode(fgGetNode("/sim/startup/xsize", false ) ),
ySizeNode(fgGetNode("/sim/startup/ysize", false ) ),
mouseYNode(fgGetNode("/devices/status/mice/mouse/y", true))
{
tooltipTimeoutDone = false;
-
+ hoverPickScheduled = false;
+ tooltipsEnabled = false;
+
fgGetNode("/sim/mouse/hide-cursor", true )->addChangeListener(this, true);
fgGetNode("/sim/mouse/cursor-timeout-sec", true )->addChangeListener(this, true);
fgGetNode("/sim/mouse/right-button-mode-cycle-enabled", true)->addChangeListener(this, true);
fgGetNode("/sim/mouse/tooltip-delay-msec", true)->addChangeListener(this, true);
fgGetNode("/sim/mouse/click-shows-tooltip", true)->addChangeListener(this, true);
+ fgGetNode("/sim/mouse/tooltips-enabled", true)->addChangeListener(this, true);
fgGetNode("/sim/mouse/drag-sensitivity", true)->addChangeListener(this, true);
fgGetNode("/sim/mouse/invert-mouse-wheel", true)->addChangeListener(this, true);
}
}
}
+ void scheduleHoverPick(const osg::Vec2d& windowPos)
+ {
+ hoverPickScheduled = true;
+ hoverPos = windowPos;
+ }
+
void doHoverPick(const osg::Vec2d& windowPos)
{
- std::vector<SGSceneryPick> pickList;
+ FGMouseCursor::Cursor cur = FGMouseCursor::CURSOR_ARROW;
+ bool explicitCursor = false;
+ bool didPick = false;
+
SGPickCallback::Priority priority = SGPickCallback::PriorityScenery;
-
- if (globals->get_renderer()->pick(pickList, windowPos)) {
+ SGSceneryPicks pickList;
+ globals->get_renderer()->pick(pickList, windowPos);
+
+ SGSceneryPicks::const_iterator i;
+ for( i = pickList.begin(); i != pickList.end(); ++i )
+ {
+ bool done = i->callback->hover(windowPos, i->info);
+ std::string curName(i->callback->getCursor());
+ if (!curName.empty()) {
+ explicitCursor = true;
+ cur = FGMouseCursor::cursorFromString(curName.c_str());
+ }
- std::vector<SGSceneryPick>::const_iterator i;
- for (i = pickList.begin(); i != pickList.end(); ++i) {
- if (i->callback->hover(windowPos, i->info)) {
- return;
- }
-
// if the callback is of higher prioirty (lower enum index),
// record that.
- if (i->callback->getPriority() < priority) {
- priority = i->callback->getPriority();
- }
+ if (i->callback->getPriority() < priority) {
+ priority = i->callback->getPriority();
+ }
+
+ if (done) {
+ didPick = true;
+ break;
}
- } // of have valid pick
-
- if (priority == SGPickCallback::PriorityPanel) {
- FGMouseCursor::instance()->setCursor(FGMouseCursor::CURSOR_HAND);
- } else {
- // restore normal cursor
- FGMouseCursor::instance()->setCursor(FGMouseCursor::CURSOR_ARROW);
+ } // of picks iteration
+
+ // Check if any pick from the previous iteration has disappeared. If so
+ // notify the callback that the mouse has left its element.
+ for( i = _previous_picks.begin(); i != _previous_picks.end(); ++i )
+ {
+ if( !getPick(pickList, i->callback) )
+ i->callback->mouseLeave(windowPos);
+ }
+ _previous_picks = pickList;
+
+ if (!explicitCursor && (priority == SGPickCallback::PriorityPanel)) {
+ cur = FGMouseCursor::CURSOR_HAND;
}
- updateHover();
+ FGMouseCursor::instance()->setCursor(cur);
+ if (!didPick) {
+ SGPropertyNode_ptr args(new SGPropertyNode);
+ globals->get_commands()->execute("update-hover", args);
+
+ }
}
- void updateHover()
+ void doMouseMoveWithCallbacks(const osgGA::GUIEventAdapter* ea)
{
- SGPropertyNode_ptr args(new SGPropertyNode);
- globals->get_commands()->execute("update-hover", args);
+ FGMouseCursor::Cursor cur = FGMouseCursor::CURSOR_CLOSED_HAND;
+
+ osg::Vec2d windowPos;
+ flightgear::eventToWindowCoords(ea, windowPos.x(), windowPos.y());
+
+ SGSceneryPicks pickList;
+ if( !globals->get_renderer()->pick(pickList, windowPos) )
+ return;
+
+ for( ActivePickCallbacks::iterator mi = activePickCallbacks.begin();
+ mi != activePickCallbacks.end();
+ ++mi )
+ {
+ SGPickCallbackList::iterator li;
+ for( li = mi->second.begin(); li != mi->second.end(); ++li )
+ {
+ const SGSceneryPick* pick = getPick(pickList, *li);
+ (*li)->mouseMoved(*ea, pick ? &pick->info : 0);
+
+ std::string curName((*li)->getCursor());
+ if( !curName.empty() )
+ cur = FGMouseCursor::cursorFromString(curName.c_str());
+ }
+ }
+
+ FGMouseCursor::instance()->setCursor(cur);
}
-
// implement the property-change-listener interfacee
virtual void valueChanged( SGPropertyNode * node )
{
rightClickModeCycle = node->getBoolValue();
} else if (node->getNameString() == "click-shows-tooltip") {
clickTriggersTooltip = node->getBoolValue();
-
+ } else if (node->getNameString() == "tooltips-enabled") {
+ tooltipsEnabled = node->getBoolValue();
}
}
ActivePickCallbacks activePickCallbacks;
+ SGSceneryPicks _previous_picks;
mouse mice[MAX_MICE];
+ bool initialized;
bool hideCursor, haveWarped;
bool tooltipTimeoutDone;
bool clickTriggersTooltip;
int tooltipDelayMsec, cursorTimeoutMsec;
bool rightClickModeCycle;
+ bool tooltipsEnabled;
SGPropertyNode_ptr xSizeNode;
SGPropertyNode_ptr ySizeNode;
SGPropertyNode_ptr xAccelNode;
SGPropertyNode_ptr yAccelNode;
SGPropertyNode_ptr mouseXNode, mouseYNode;
+
+ bool hoverPickScheduled;
+ osg::Vec2d hoverPos;
};
void FGMouseInput::init()
{
+ if (d->initialized) {
+ SG_LOG(SG_INPUT, SG_WARN, "Duplicate init of FGMouseInput");
+
+ return;
+ }
+
+ d->initialized = true;
+
SG_LOG(SG_INPUT, SG_DEBUG, "Initializing mouse bindings");
- string module = "";
+ std::string module = "";
SGPropertyNode * mouse_nodes = fgGetNode("/input/mice");
if (mouse_nodes == 0) {
if (mode_node->hasChild("x-axis-ctrl")) {
read_bindings(mode_node->getChild("x-axis-ctrl"), m.modes[j].x_bindings, KEYMOD_CTRL, module );
}
+ if (mode_node->hasChild("x-axis-shift")) {
+ read_bindings(mode_node->getChild("x-axis-shift"), m.modes[j].x_bindings, KEYMOD_SHIFT, module );
+ }
+ if (mode_node->hasChild("x-axis-ctrl-shift")) {
+ read_bindings(mode_node->getChild("x-axis-ctrl-shift"), m.modes[j].x_bindings, KEYMOD_CTRL|KEYMOD_SHIFT, module );
+ }
if (mode_node->hasChild("y-axis-ctrl")) {
read_bindings(mode_node->getChild("y-axis-ctrl"), m.modes[j].y_bindings, KEYMOD_CTRL, module );
}
+ if (mode_node->hasChild("y-axis-shift")) {
+ read_bindings(mode_node->getChild("y-axis-shift"), m.modes[j].y_bindings, KEYMOD_SHIFT, module );
+ }
+ if (mode_node->hasChild("y-axis-ctrl-shift")) {
+ read_bindings(mode_node->getChild("y-axis-ctrl-shift"), m.modes[j].y_bindings, KEYMOD_CTRL|KEYMOD_SHIFT, module );
+ }
} // of modes iteration
}
void FGMouseInput::update ( double dt )
{
+ if (!d->initialized) {
+ SG_LOG(SG_INPUT, SG_WARN, "update of mouse before init");
+ }
+
mouse &m = d->mice[0];
int mode = m.mode_node->getIntValue();
if (mode != m.current_mode) {
}
}
- // if delay is <= 0, disable tooltips
+ if ((mode == 0) && d->hoverPickScheduled) {
+ d->doHoverPick(d->hoverPos);
+ d->hoverPickScheduled = false;
+ }
+
if ( !d->tooltipTimeoutDone &&
- (d->tooltipDelayMsec > 0) &&
+ d->tooltipsEnabled &&
(m.timeSinceLastMove.elapsedMSec() > d->tooltipDelayMsec))
{
d->tooltipTimeoutDone = true;
void FGMouseInput::doMouseClick (int b, int updown, int x, int y, bool mainWindow, const osgGA::GUIEventAdapter* ea)
{
+ if (!d->initialized) {
+ // can occur during reset
+ return;
+ }
+
int modifiers = fgGetKeyModifiers();
mouse &m = d->mice[0];
// requested, and return if one of
// them consumes the event.
- if (updown != MOUSE_BUTTON_DOWN) {
+ osg::Vec2d windowPos;
+ flightgear::eventToWindowCoords(ea, windowPos.x(), windowPos.y());
+
+ SGSceneryPicks pickList;
+ globals->get_renderer()->pick(pickList, windowPos);
+
+ if( updown != MOUSE_BUTTON_DOWN )
+ {
// Execute the mouse up event in any case, may be we should
// stop processing here?
- while (!d->activePickCallbacks[b].empty()) {
- d->activePickCallbacks[b].front()->buttonReleased(ea->getModKeyMask());
- d->activePickCallbacks[b].pop_front();
+
+ SGPickCallbackList& callbacks = d->activePickCallbacks[b];
+
+ while( !callbacks.empty() )
+ {
+ SGPickCallbackPtr& cb = callbacks.front();
+ const SGSceneryPick* pick = getPick(pickList, cb);
+ cb->buttonReleased(ea->getModKeyMask(), *ea, pick ? &pick->info : 0);
+
+ callbacks.pop_front();
}
}
if (mode.pass_through) {
// remove once PUI uses standard picking mechanism
if (0 <= x && 0 <= y && puMouse(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) {
- d->activePickCallbacks.init( b, ea );
+ return; // pui handled it
+
+ // pui didn't want the click event so compute a
+ // scenegraph intersection point corresponding to the mouse click
+ if (updown == MOUSE_BUTTON_DOWN) {
+ d->activePickCallbacks.init( b, ea );
+
+ if (d->clickTriggersTooltip) {
+ SGPropertyNode_ptr args(new SGPropertyNode);
+ args->setStringValue("reason", "click");
+ globals->get_commands()->execute("tooltip-timeout", args);
+ d->tooltipTimeoutDone = true;
}
- }
- }
+ } else {
+ // do a hover pick now, to fix up cursor
+ d->doHoverPick(windowPos);
+ } // mouse button was released
+ } // of pass-through mode
// OK, PUI and the panel didn't want the click
if (b >= MAX_MOUSE_BUTTONS) {
return;
}
- m.modes[m.current_mode].buttons[b].update( modifiers, 0 != updown, x, y);
-
- if (d->clickTriggersTooltip) {
- SGPropertyNode_ptr args(new SGPropertyNode);
- args->setStringValue("reason", "click");
- globals->get_commands()->execute("tooltip-timeout", args);
- d->tooltipTimeoutDone = true;
- }
+ m.modes[m.current_mode].buttons[b].update( modifiers, 0 != updown, x, y);
}
void FGMouseInput::processMotion(int x, int y, const osgGA::GUIEventAdapter* ea)
{
if (!d->activePickCallbacks[0].empty()) {
- //SG_LOG(SG_GENERAL, SG_INFO, "mouse-motion, have active pick callback");
- BOOST_FOREACH(SGPickCallback* cb, d->activePickCallbacks[0]) {
- cb->mouseMoved(ea);
- }
+ d->doMouseMoveWithCallbacks(ea);
return;
}
if (modeIndex == 0) {
osg::Vec2d windowPos;
flightgear::eventToWindowCoords(ea, windowPos.x(), windowPos.y());
- d->doHoverPick(windowPos);
+ d->scheduleHoverPick(windowPos);
// mouse has moved, so we may need to issue tooltip-timeout command again
d->tooltipTimeoutDone = false;
}
void FGMouseInput::doMouseMotion (int x, int y, const osgGA::GUIEventAdapter* ea)
{
+ if (!d->initialized) {
+ // can occur during reset
+ return;
+ }
+
mouse &m = d->mice[0];
if (m.current_mode < 0 || m.current_mode >= m.nModes) {
m.timeSinceLastMove.stamp();
FGMouseCursor::instance()->mouseMoved();
+ // TODO Get rid of this as soon as soon as cursor hide timeout works globally
+ if( ea->getHandled() )
+ return;
+
processMotion(x, y, ea);
m.x = x;
projects / flightgear.git / blobdiff