FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commented out "fix" that explictly sets the key modifier state as this change

Browse Source 
actually broke the key modifier state management.
This commit is contained in:
Robert Osfield
2007-07-05 10:51:47 +00:00
parent afc722d43b
commit 70bbb06dd5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@@ -1000,14 +1000,14 @@ bool GraphicsWindowCarbon::handleKeyboardEvent(EventRef theEvent)
case kEventRawKeyDown:
case kEventRawKeyRepeat:
{
getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
//getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
getEventQueue()->keyPress(keychar);
break;
}
case kEventRawKeyUp:
{
getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
//getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
getEventQueue()->keyRelease(keychar);
break;
}

4
src/osgViewer/GraphicsWindowWin32.cpp
View File

@@ -2104,7 +2104,7 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
int keySymbol = 0;
unsigned int modifierMask = 0;
adaptKey(wParam, lParam, keySymbol, modifierMask);
getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
//getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
getEventQueue()->keyPress(keySymbol, eventTime);
}
break;
@@ -2118,7 +2118,7 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
int keySymbol = 0;
unsigned int modifierMask = 0;
adaptKey(wParam, lParam, keySymbol, modifierMask);
getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
//getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
getEventQueue()->keyRelease(keySymbol, eventTime);
}
break;

4
src/osgViewer/GraphicsWindowX11.cpp
View File

@@ -963,7 +963,7 @@ void GraphicsWindowX11::checkEvents()
unsigned int modifierMask = 0;
adaptKey(ev.xkey, keySymbol, modifierMask);
getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
//getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
getEventQueue()->keyPress(keySymbol, eventTime);
break;
}
@@ -978,7 +978,7 @@ void GraphicsWindowX11::checkEvents()
unsigned int modifierMask = 0;
adaptKey(ev.xkey, keySymbol, modifierMask);
getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
//getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
getEventQueue()->keyRelease(keySymbol, eventTime);
break;
}