From c289cdca57aee52aa192ab0503528097327b6d44 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 6 Nov 2006 13:22:57 +0000
Subject: [PATCH] =?UTF-8?q?Thanks=20to=20Bj=C3=B6rn=20Hein=20for=20spottin?=
 =?UTF-8?q?g=20mistakes=20in=20EventQueue.cpp=20and=20StateSetManipulator,?=
 =?UTF-8?q?=20now=20fixed=20by=20Robert=20Osfield.=20=20Problems=20were:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"StateSetManipulator.cpp (rev 1.12, l. 85): cyclePolygonMode() is called but
no aa.requestRedraw() afterwards. Is this intended?

EventQueue.cpp (rev 1.8): in keyRelease & keyPressed KEY_Alt_R was mapped to
MODKEY_LEFT_ALT"
---
 src/osgGA/EventQueue.cpp          | 4 ++--
 src/osgGA/StateSetManipulator.cpp | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/osgGA/EventQueue.cpp b/src/osgGA/EventQueue.cpp
index 6042cde94..c659d0bdb 100644
--- a/src/osgGA/EventQueue.cpp
+++ b/src/osgGA/EventQueue.cpp
@@ -263,7 +263,7 @@ void EventQueue::keyPress(GUIEventAdapter::KeySymbol key)
         case(GUIEventAdapter::KEY_Meta_L):       _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_LEFT_META | _accumulateEventState->getModKeyMask()); break;
         case(GUIEventAdapter::KEY_Meta_R):       _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_RIGHT_META | _accumulateEventState->getModKeyMask()); break;
         case(GUIEventAdapter::KEY_Alt_L):        _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_LEFT_ALT | _accumulateEventState->getModKeyMask()); break;
-        case(GUIEventAdapter::KEY_Alt_R):        _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_LEFT_ALT | _accumulateEventState->getModKeyMask()); break;
+        case(GUIEventAdapter::KEY_Alt_R):        _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_RIGHT_ALT | _accumulateEventState->getModKeyMask()); break;
         case(GUIEventAdapter::KEY_Caps_Lock):
         {
             if ((_accumulateEventState->getModKeyMask() & GUIEventAdapter::MODKEY_CAPS_LOCK)!=0) 
@@ -301,7 +301,7 @@ void EventQueue::keyRelease(GUIEventAdapter::KeySymbol key)
         case(GUIEventAdapter::KEY_Meta_L):       _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_META & _accumulateEventState->getModKeyMask()); break;
         case(GUIEventAdapter::KEY_Meta_R):       _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_RIGHT_META & _accumulateEventState->getModKeyMask()); break;
         case(GUIEventAdapter::KEY_Alt_L):        _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_ALT & _accumulateEventState->getModKeyMask()); break;
-        case(GUIEventAdapter::KEY_Alt_R):        _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_ALT & _accumulateEventState->getModKeyMask()); break;
+        case(GUIEventAdapter::KEY_Alt_R):        _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_RIGHT_ALT & _accumulateEventState->getModKeyMask()); break;
         default: break;
     }        
 
diff --git a/src/osgGA/StateSetManipulator.cpp b/src/osgGA/StateSetManipulator.cpp
index 352729214..49ca3c420 100644
--- a/src/osgGA/StateSetManipulator.cpp
+++ b/src/osgGA/StateSetManipulator.cpp
@@ -83,6 +83,7 @@ bool StateSetManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& aa)
 
             case 'w' :
                 cyclePolygonMode();
+                aa.requestRedraw();
                 break;
 
 #if COMPILE_TEXENVFILTER_USAGE
@@ -97,6 +98,7 @@ bool StateSetManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& aa)
 
                     // cycle through the available modes.
                     texenvfilter->setLodBias(texenvfilter->getLodBias()+0.1);
+                    aa.requestRedraw();
                 }
                 break;
 #endif