From 094e0f2e481019bf175783d77f7fab593fef8ba1 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 20 May 2003 13:21:05 +0000
Subject: [PATCH] Fixes to the handling of mouse coords after changes in the
 default behavior of Producer.

---
 src/osgProducer/KeyboardMouseCallback.cpp | 18 +++++++++++++++---
 src/osgProducer/Viewer.cpp                |  2 ++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/osgProducer/KeyboardMouseCallback.cpp b/src/osgProducer/KeyboardMouseCallback.cpp
index acb3b185c..e158d6f97 100644
--- a/src/osgProducer/KeyboardMouseCallback.cpp
+++ b/src/osgProducer/KeyboardMouseCallback.cpp
@@ -1,4 +1,6 @@
 #include <osg/Math>
+#include <osg/Notify>
+
 #include <osgProducer/KeyboardMouseCallback>
 
 #include <float.h>
@@ -7,8 +9,8 @@ using namespace osgProducer;
 
 void KeyboardMouseCallback::mouseScroll( Producer::KeyboardMouseCallback::ScrollingMotion sm )
 {
-	osg::ref_ptr<EventAdapter> event = createEventAdapter();
-	event->adaptMouseScroll(getTime(), sm);
+    osg::ref_ptr<EventAdapter> event = createEventAdapter();
+    event->adaptMouseScroll(getTime(), sm);
 
     _eventQueueMutex.lock();
     _eventQueue.push_back(event);
@@ -131,6 +133,8 @@ void KeyboardMouseCallback::passiveMouseMotion( float mx, float my)
     _mx = mx;
     _my = my;
     
+    //std::cout << "mx="<<mx<<" my="<<my<<std::endl;
+
     osg::ref_ptr<EventAdapter> event = createEventAdapter();
     event->adaptMouseMotion(getTime(),mx,my);
     
@@ -185,7 +189,15 @@ EventAdapter* KeyboardMouseCallback::createEventAdapter()
     }
     else if (rs)
     {
-        ea->setWindowSize(-1.0f,-1.0f,1.0f,1.0f);
+        //ea->setWindowSize(-1.0f,-1.0f,1.0f,1.0f);
+        
+        const Producer::RenderSurface::InputRectangle &ir = 
+            rs->getInputRectangle();
+
+
+        osg::notify(osg::INFO) << "RenderSurface::InputRectange left="<<ir.left()<<"\twidth="<<ir.width()<<"\tbottom="<<ir.bottom()<<"\theight="<<ir.height()<<std::endl;
+       
+        ea->setWindowSize(0.0f,rs->getWindowHeight(),rs->getWindowWidth(),0.0f);
     }
     
     return ea;
diff --git a/src/osgProducer/Viewer.cpp b/src/osgProducer/Viewer.cpp
index f257bf2ce..049e48207 100644
--- a/src/osgProducer/Viewer.cpp
+++ b/src/osgProducer/Viewer.cpp
@@ -508,6 +508,8 @@ void Viewer::requestWarpPointer(float x,float y)
 {
     if (_kbmcb)
     {
+        osg::notify(osg::INFO) << "requestWarpPointer x= "<<x<<" y="<<y<<std::endl;
+    
         EventAdapter::_s_mx = x;
         EventAdapter::_s_my = y;
         _kbmcb->getKeyboardMouse()->positionPointer(x,y);