From b2535d55c693033f560934df8988ff61b94cb7ac Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 13 Jul 2007 11:17:41 +0000
Subject: [PATCH] Introduced new GUIEventAdatper singleton for sharing the
 current state between multiple GraphicsWindows, this singleton is accessable
 via GUIEventEvent::getAccumulatedEventState().

Added use of this new singleton in GraphicsWindow* implementations.

Added WindowSizeHandler to osgkeyboard to help with debugging of event state
between windows.
---
 examples/osgkeyboard/osgkeyboard.cpp   | 4 ++++
 include/osgGA/GUIEventAdapter          | 7 +++++++
 src/osgGA/GUIEventAdapter.cpp          | 7 +++++++
 src/osgViewer/GraphicsWindowCarbon.cpp | 4 ++++
 src/osgViewer/GraphicsWindowWin32.cpp  | 2 ++
 src/osgViewer/GraphicsWindowX11.cpp    | 2 ++
 6 files changed, 26 insertions(+)

diff --git a/examples/osgkeyboard/osgkeyboard.cpp b/examples/osgkeyboard/osgkeyboard.cpp
index 1666405a4..fb13f183a 100644
--- a/examples/osgkeyboard/osgkeyboard.cpp
+++ b/examples/osgkeyboard/osgkeyboard.cpp
@@ -371,6 +371,9 @@ public:
         {
 
 #if 1
+
+//            osg::notify(osg::NOTICE)<<"Mouse "<<ea.getButtonMask()<<std::endl;
+
             #define PRINT(mask) osg::notify(osg::NOTICE)<<#mask<<" ="<<(ea.getModKeyMask() & mask)<<std::endl;
             switch(ea.getEventType())
             {
@@ -423,6 +426,7 @@ int main(int , char **)
     osg::ref_ptr<KeyboardModel> keyboardModel = new KeyboardModel;
 
     viewer.addEventHandler(new osgViewer::StatsHandler);
+    viewer.addEventHandler(new osgViewer::WindowSizeHandler());
     viewer.addEventHandler(new KeyboardEventHandler(keyboardModel.get()));
     viewer.setSceneData( keyboardModel->getScene() );
 
diff --git a/include/osgGA/GUIEventAdapter b/include/osgGA/GUIEventAdapter
index f81f05f47..ddb505a16 100644
--- a/include/osgGA/GUIEventAdapter
+++ b/include/osgGA/GUIEventAdapter
@@ -254,6 +254,13 @@ public:
 
         META_Object(osgGA, GUIEventAdapter);
         
+
+        /** Get the accumulated event state singleton.
+          * Typically all EventQueue will share this single GUIEventAdapter object for tracking
+          * the mouse position, keyboard and mouse masks. */
+        static osg::ref_ptr<GUIEventAdapter>& getAccumulatedEventState();
+        
+
         /** Set whether this event has been handled by an event handler or not.*/
         void setHandled(bool handled) { _handled = handled; }
 
diff --git a/src/osgGA/GUIEventAdapter.cpp b/src/osgGA/GUIEventAdapter.cpp
index 01215ed1b..eddd480b2 100644
--- a/src/osgGA/GUIEventAdapter.cpp
+++ b/src/osgGA/GUIEventAdapter.cpp
@@ -15,6 +15,13 @@
 
 using namespace osgGA;
 
+
+osg::ref_ptr<GUIEventAdapter>& GUIEventAdapter::getAccumulatedEventState()
+{
+    static osg::ref_ptr<GUIEventAdapter> s_eventState = new GUIEventAdapter;
+    return s_eventState;
+}
+
 GUIEventAdapter::GUIEventAdapter():
     _handled(false),
     _eventType(NONE),
diff --git a/src/osgViewer/GraphicsWindowCarbon.cpp b/src/osgViewer/GraphicsWindowCarbon.cpp
index 1bf966dca..259f834a8 100644
--- a/src/osgViewer/GraphicsWindowCarbon.cpp
+++ b/src/osgViewer/GraphicsWindowCarbon.cpp
@@ -485,6 +485,10 @@ struct OSXCarbonWindowingSystemInterface : public osg::GraphicsContext::Windowin
 
 void GraphicsWindowCarbon::init()
 {
+    if (_initialized) return;
+
+    getEventQueue()->setCurrentEventState(osgGA::GUIEventAdapter::getAccumulatedEventState().get());
+
     _windowTitleHeight = 0;
     _closeRequested = false;
     _ownsWindow = false;
diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp
index 883dc9903..e13a2f5a5 100644
--- a/src/osgViewer/GraphicsWindowWin32.cpp
+++ b/src/osgViewer/GraphicsWindowWin32.cpp
@@ -1010,6 +1010,8 @@ void GraphicsWindowWin32::init()
 {
     if (_initialized) return;
 
+    getEventQueue()->setCurrentEventState(osgGA::GUIEventAdapter::getAccumulatedEventState().get());
+
     WindowData *windowData = _traits.get() ? dynamic_cast<WindowData*>(_traits->inheritedWindowData.get()) : 0;
     HWND windowHandle = windowData ? windowData->_hwnd : 0;
 
diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp
index b1dcd919c..27e76afaa 100644
--- a/src/osgViewer/GraphicsWindowX11.cpp
+++ b/src/osgViewer/GraphicsWindowX11.cpp
@@ -456,6 +456,8 @@ void GraphicsWindowX11::init()
         return;
     }
     
+    getEventQueue()->setCurrentEventState(osgGA::GUIEventAdapter::getAccumulatedEventState().get());
+    
     WindowData* inheritedWindowData =  dynamic_cast<WindowData*>(_traits->inheritedWindowData.get());
 
     _display = XOpenDisplay(_traits->displayName().c_str());