Changeset 12125

Timestamp:

01/27/11 17:23:48 (2 years ago)

Author:

robert

Message:

From Alexander Sinditskiy, "reason of this changes described in http://forum.openscenegraph.org/viewtopic.php?t=7596

and another problem is:
example osgkeyboard is not work (keys not highlight) if user have 2 keyboard layout native and english and current user layout is native

I try to explain my changes

we need something that is identify key without modifier keys and layout -> this is UnmodifedKey?

I think osg must have its own UnmodifiedKeys? table. Code must be run same on different platforms. This can de guaranteed by UnmodifiedKeys? table.

Mikhail Izmestev helped me. He implemented VirtualKey? changes in GraphicsWindowX11"

Location:

OpenSceneGraph/trunk

Files:

• examples/osgkeyboard/osgkeyboard.cpp (modified) (8 diffs)
• include/osgGA/EventQueue (modified) (1 diff)
• include/osgGA/GUIEventAdapter (modified) (3 diffs)
• include/osgViewer/api/Win32/GraphicsWindowWin32 (modified) (2 diffs)
• include/osgViewer/api/X11/GraphicsWindowX11 (modified) (1 diff)
• src/osgGA/EventQueue.cpp (modified) (3 diffs)
• src/osgGA/GUIEventAdapter.cpp (modified) (2 diffs)
• src/osgViewer/GraphicsWindowWin32.cpp (modified) (6 diffs)
• src/osgViewer/GraphicsWindowX11.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osgkeyboard/osgkeyboard.cpp

@@ -43 +43 @@
         osg::Group* getScene() { return _scene.get(); }
         
-        void keyChange(int key,int value);
+        void keyChange(int key, int virtualKey, int value);
         
 protected:
@@ -50 +50 @@
 
         osg::Switch* addKey(osg::Vec3& pos, int key,const std::string& text,float width, float height);
-        osg::Switch* addKey(int key,osg::Switch* sw);
 
         void createKeyboard();
@@ -62 +61 @@
 };
 
-void KeyboardModel::keyChange(int key,int value)
+void KeyboardModel::keyChange(int key, int virtualKey, int value)
 {
     osg::notify(osg::INFO) << "key value change, code="<<std::hex << key << "\t value="<< value << std::dec  << std::endl;
 
     // toggle the keys graphical representation on or off via osg::Swithc
-    KeyModelMap::iterator itr = _keyModelMap.find(key);
+    KeyModelMap::iterator itr = _keyModelMap.find(virtualKey);
     if (itr!=_keyModelMap.end())
     {
@@ -148 +147 @@
 }
 
-osg::Switch* KeyboardModel::addKey(int key,osg::Switch* sw)
-{
-    _keyModelMap[key] = sw;
-    return sw;
-}
-
 void KeyboardModel::createKeyboard()
 {
@@ -176 +169 @@
 
     addKey(pos,osgGA::GUIEventAdapter::KEY_Shift_L,"Shift",2.0f,0.5f);
-    addKey(pos,'\\',"\\",1.0f,1.0f);
-    addKey('Z',addKey(pos,'z',"Z",1.0f,1.0f));
-    addKey('X',addKey(pos,'x',"X",1.0f,1.0f));
-    addKey('C',addKey(pos,'c',"C",1.0f,1.0f));
-    addKey('V',addKey(pos,'v',"V",1.0f,1.0f));
-    addKey('B',addKey(pos,'b',"B",1.0f,1.0f));
-    addKey('N',addKey(pos,'n',"N",1.0f,1.0f));
-    addKey('M',addKey(pos,'m',"M",1.0f,1.0f));
-    addKey('<',addKey(pos,',',",",1.0f,1.0f));
-    addKey('>',addKey(pos,'.',".",1.0f,1.0f));
-    addKey('?',addKey(pos,'/',"/",1.0f,1.0f));
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Backslash,"\\",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Z,"Z",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_X,"X",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_C,"C",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_V,"V",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_B,"B",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_N,"N",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_M,"M",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Comma,",",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Period,".",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Slash,"/",1.0f,1.0f);
     addKey(pos,osgGA::GUIEventAdapter::KEY_Shift_R,"Shift",2.0f,0.5f);
 
@@ -193 +186 @@
     
     addKey(pos,osgGA::GUIEventAdapter::KEY_Caps_Lock,"Caps",2.0f,0.5f);
-    addKey('A',addKey(pos,'a',"A",1.0f,1.0f));
-    addKey('S',addKey(pos,'s',"S",1.0f,1.0f));
-    addKey('D',addKey(pos,'d',"D",1.0f,1.0f));
-    addKey('F',addKey(pos,'f',"F",1.0f,1.0f));
-    addKey('G',addKey(pos,'g',"G",1.0f,1.0f));
-    addKey('H',addKey(pos,'h',"H",1.0f,1.0f));
-    addKey('J',addKey(pos,'j',"J",1.0f,1.0f));
-    addKey('K',addKey(pos,'k',"K",1.0f,1.0f));
-    addKey('L',addKey(pos,'l',"L",1.0f,1.0f));
-    addKey(':',addKey(pos,';',";",1.0f,1.0f));
-    addKey('@',addKey(pos,'\'',"'",1.0f,1.0f));
-    addKey('~',addKey(pos,'#',"#",1.0f,1.0f));
+    addKey(pos,osgGA::GUIEventAdapter::KEY_A,"A",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_S,"S",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_D,"D",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_F,"F",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_G,"G",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_H,"H",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_J,"J",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_K,"K",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_L,"L",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Semicolon,";",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Quote,"'",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Hash,"#",1.0f,1.0f);
     addKey(pos,osgGA::GUIEventAdapter::KEY_Return,"Return",4.0f,0.5f);
 
@@ -211 +204 @@
     
     addKey(pos,osgGA::GUIEventAdapter::KEY_Tab,"Tab",2.0f,0.5f);
-    addKey('Q',addKey(pos,'q',"Q",1.0f,1.0f));
-    addKey('W',addKey(pos,'w',"W",1.0f,1.0f));
-    addKey('E',addKey(pos,'e',"E",1.0f,1.0f));
-    addKey('R',addKey(pos,'r',"R",1.0f,1.0f));
-    addKey('T',addKey(pos,'t',"T",1.0f,1.0f));
-    addKey('Y',addKey(pos,'y',"Y",1.0f,1.0f));
-    addKey('U',addKey(pos,'u',"U",1.0f,1.0f));
-    addKey('I',addKey(pos,'i',"I",1.0f,1.0f));
-    addKey('O',addKey(pos,'o',"O",1.0f,1.0f));
-    addKey('P',addKey(pos,'p',"P",1.0f,1.0f));
-    addKey('{',addKey(pos,'[',"[",1.0f,1.0f));
-    addKey('}',addKey(pos,']',"]",1.0f,1.0f));
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Q,"Q",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_W,"W",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_E,"E",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_R,"R",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_T,"T",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Y,"Y",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_U,"U",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_I,"I",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_O,"O",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_P,"P",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Leftbracket,"[",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Rightbracket,"]",1.0f,1.0f);
 
     pos.x() = 0.0f;
     pos.z() += 1.0f;
     
-    addKey(pos,'`',"`",1.0f,1.0f);
-    addKey(pos,'1',"1",1.0f,1.0f);
-    addKey(pos,'2',"2",1.0f,1.0f);
-    addKey(pos,'3',"3",1.0f,1.0f);
-    addKey(pos,'4',"4",1.0f,1.0f);
-    addKey(pos,'5',"5",1.0f,1.0f);
-    addKey(pos,'6',"6",1.0f,1.0f);
-    addKey(pos,'7',"7",1.0f,1.0f);
-    addKey(pos,'8',"8",1.0f,1.0f);
-    addKey(pos,'9',"9",1.0f,1.0f);
-    addKey(pos,'0',"0",1.0f,1.0f);
-    addKey(pos,'-',"-",1.0f,1.0f);
-    addKey(pos,'=',"=",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Backquote,"`",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_1,"1",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_2,"2",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_3,"3",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_4,"4",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_5,"5",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_6,"6",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_7,"7",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_8,"8",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_9,"9",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_0,"0",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Minus,"-",1.0f,1.0f);
+    addKey(pos,osgGA::GUIEventAdapter::KEY_Equals,"=",1.0f,1.0f);
     addKey(pos,osgGA::GUIEventAdapter::KEY_BackSpace,"Backspace",3.0f,0.5f);
 
@@ -406 +399 @@
                 case(osgGA::GUIEventAdapter::KEYDOWN):
                 {
-                    _keyboardModel->keyChange(ea.getKey(),1);
+                    _keyboardModel->keyChange(ea.getKey(), ea.getUnmodifiedKey(),1);
                     return true;
                 }
                 case(osgGA::GUIEventAdapter::KEYUP):
                 {
-                    _keyboardModel->keyChange(ea.getKey(),0);
+                    _keyboardModel->keyChange(ea.getKey(), ea.getUnmodifiedKey(),0);
                     return true;
                 }

OpenSceneGraph/trunk/include/osgGA/EventQueue

@@ -147 +147 @@
 
         /** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings.*/
-        void keyPress(int key) { keyPress(key, getTime()); }
+        void keyPress(int key, int unmodifiedKey = 0) { keyPress(key, getTime(), unmodifiedKey); }
 
         /** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings, with specified time.*/
-        void keyPress(int key, double time);
+        void keyPress(int key, double time, int unmodifiedKey = 0);
 
 
         /** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings.*/
-        void keyRelease(int key) { keyRelease(key, getTime()); }
+        void keyRelease(int key, int unmodifiedKey = 0) { keyRelease(key, getTime(), unmodifiedKey); }
 
         /** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings, with specified time.*/
-        void keyRelease(int key, double time);
+        void keyRelease(int key, double time, int unmodifiedKey = 0);
             
         GUIEventAdapter* touchBegan(unsigned int id, GUIEventAdapter::TouchPhase phase, float x, float y, double time);

OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter

@@ -59 +59 @@
         {
             KEY_Space           = 0x20,
-            
+
+            KEY_0               = '0',
+            KEY_1               = '1',
+            KEY_2               = '2',
+            KEY_3               = '3',
+            KEY_4               = '4',
+            KEY_5               = '5',
+            KEY_6               = '6',
+            KEY_7               = '7',
+            KEY_8               = '8',
+            KEY_9               = '9',
+            KEY_A               = 'a',
+            KEY_B               = 'b',
+            KEY_C               = 'c',
+            KEY_D               = 'd',
+            KEY_E               = 'e',
+            KEY_F               = 'f',
+            KEY_G               = 'g',
+            KEY_H               = 'h',
+            KEY_I               = 'i',
+            KEY_J               = 'j',
+            KEY_K               = 'k',
+            KEY_L               = 'l',
+            KEY_M               = 'm',
+            KEY_N               = 'n',
+            KEY_O               = 'o',
+            KEY_P               = 'p',
+            KEY_Q               = 'q',
+            KEY_R               = 'r',
+            KEY_S               = 's',
+            KEY_T               = 't',
+            KEY_U               = 'u',
+            KEY_V               = 'v',
+            KEY_W               = 'w',
+            KEY_X               = 'x',
+            KEY_Y               = 'y',
+            KEY_Z               = 'z',
+
+            KEY_Exclaim         = 0x21,
+            KEY_Quotedbl        = 0x22,
+            KEY_Hash            = 0x23,
+            KEY_Dollar          = 0x24,
+            KEY_Ampersand       = 0x26,
+            KEY_Quote           = 0x27,
+            KEY_Leftparen       = 0x28,
+            KEY_Rightparen      = 0x29,
+            KEY_Asterisk        = 0x2A,
+            KEY_Plus            = 0x2B,
+            KEY_Comma           = 0x2C,
+            KEY_Minus           = 0x2D,
+            KEY_Period          = 0x2E,
+            KEY_Slash           = 0x2F,
+            KEY_Colon           = 0x3A,
+            KEY_Semicolon       = 0x3B,
+            KEY_Less            = 0x3C,
+            KEY_Equals          = 0x3D,
+            KEY_Greater         = 0x3E,
+            KEY_Question        = 0x3F,
+            KEY_At              = 0x40,
+            KEY_Leftbracket     = 0x5B,
+            KEY_Backslash       = 0x5C,
+            KEY_Rightbracket    = 0x5D,
+            KEY_Caret           = 0x5E,
+            KEY_Underscore      = 0x5F,
+            KEY_Backquote       = 0x60,
+
             KEY_BackSpace       = 0xFF08,        /* back space, back char */
             KEY_Tab             = 0xFF09,
@@ -375 +440 @@
         virtual int getKey() const { return _key; }
 
+        /** set virtual key pressed. */
+        void setUnmodifiedKey(int key) { _unmodifiedKey = key; }
+        
+        /** get virtual key pressed. */
+        int getUnmodifiedKey() const { return _unmodifiedKey; }
+        
         /** set button pressed/released.*/
         void setButton(int button) { _button = button; }
@@ -520 +591 @@
         int _windowHeight;
         int _key;
+        int _unmodifiedKey;
         int _button;
         float _Xmin,_Xmax;

OpenSceneGraph/trunk/include/osgViewer/api/Win32/GraphicsWindowWin32

@@ -136 +136 @@
         bool setPixelFormat();
         
-        void adaptKey( WPARAM wParam, LPARAM lParam, int& keySymbol, unsigned int& modifierMask );
+        void adaptKey( WPARAM wParam, LPARAM lParam, int& keySymbol, unsigned int& modifierMask, int& unmodifiedKeySymbol );
                 
         void transformMouseXY(float& x, float& y);
@@ -179 +179 @@
         std::map<MouseCursor,HCURSOR> _mouseCursorMap;
 
-        std::map<int, bool> _keyMap;
+        std::map<std::pair<int, int>, bool> _keyMap;
 
         bool   _applyWorkaroundForMultimonitorMultithreadNVidiaWin32Issues;

OpenSceneGraph/trunk/include/osgViewer/api/X11/GraphicsWindowX11

@@ -164 +164 @@
 
         void transformMouseXY(float& x, float& y);
-        void adaptKey(XKeyEvent& keyevent, int& keySymbol);
+        void adaptKey(XKeyEvent& keyevent, int& keySymbol, int& unmodifiedKeySymbol);
         void forceKey(int key, double time, bool state);
         void rescanModifierMapping();

OpenSceneGraph/trunk/src/osgGA/EventQueue.cpp

@@ -275 +275 @@
 }
 
-void EventQueue::keyPress(int key, double time)
+void EventQueue::keyPress(int key, double time, int unmodifiedKey)
 {
     switch(key)
@@ -313 +313 @@
     event->setEventType(GUIEventAdapter::KEYDOWN);
     event->setKey(key);
-    event->setTime(time);
-    
-    addEvent(event);
-}
-
-void EventQueue::keyRelease(int key, double time)
+    event->setUnmodifiedKey(unmodifiedKey);
+    event->setTime(time);
+    
+    addEvent(event);
+}
+
+void EventQueue::keyRelease(int key, double time, int unmodifiedKey)
 {
     switch(key)
@@ -340 +341 @@
     event->setEventType(GUIEventAdapter::KEYUP);
     event->setKey(key);
+    event->setUnmodifiedKey(unmodifiedKey);
     event->setTime(time);
     

OpenSceneGraph/trunk/src/osgGA/GUIEventAdapter.cpp

@@ -32 +32 @@
     _windowHeight(1024),
     _key(0),
+    _unmodifiedKey(0),
     _button(0),
     _Xmin(-1.0),
@@ -58 +59 @@
     _windowHeight(rhs._windowHeight),
     _key(rhs._key),
+    _unmodifiedKey(rhs._unmodifiedKey),
     _button(rhs._button),
     _Xmin(rhs._Xmin),

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp

@@ -402 +402 @@
             _keymap[VK_F11          ] = osgGA::GUIEventAdapter::KEY_F11;
             _keymap[VK_F12          ] = osgGA::GUIEventAdapter::KEY_F12;
-            _keymap[0xc0            ] = '`';
-            _keymap['0'             ] = '0';
-            _keymap['1'             ] = '1';
-            _keymap['2'             ] = '2';
-            _keymap['3'             ] = '3';
-            _keymap['4'             ] = '4';
-            _keymap['5'             ] = '5';
-            _keymap['6'             ] = '6';
-            _keymap['7'             ] = '7';
-            _keymap['8'             ] = '8';
-            _keymap['9'             ] = '9';
-            _keymap[0xbd            ] = '-';
-            _keymap[0xbb            ] = '=';
+            _keymap[0xc0            ] = osgGA::GUIEventAdapter::KEY_Backquote;
+            _keymap['0'             ] = osgGA::GUIEventAdapter::KEY_0;
+            _keymap['1'             ] = osgGA::GUIEventAdapter::KEY_1;
+            _keymap['2'             ] = osgGA::GUIEventAdapter::KEY_2;
+            _keymap['3'             ] = osgGA::GUIEventAdapter::KEY_3;
+            _keymap['4'             ] = osgGA::GUIEventAdapter::KEY_4;
+            _keymap['5'             ] = osgGA::GUIEventAdapter::KEY_5;
+            _keymap['6'             ] = osgGA::GUIEventAdapter::KEY_6;
+            _keymap['7'             ] = osgGA::GUIEventAdapter::KEY_7;
+            _keymap['8'             ] = osgGA::GUIEventAdapter::KEY_8;
+            _keymap['9'             ] = osgGA::GUIEventAdapter::KEY_9;
+            _keymap[0xbd            ] = osgGA::GUIEventAdapter::KEY_Minus;
+            _keymap[0xbb            ] = osgGA::GUIEventAdapter::KEY_Equals;
             _keymap[VK_BACK         ] = osgGA::GUIEventAdapter::KEY_BackSpace;
             _keymap[VK_TAB          ] = osgGA::GUIEventAdapter::KEY_Tab;
-            _keymap['A'             ] = 'A';
-            _keymap['B'             ] = 'B';
-            _keymap['C'             ] = 'C';
-            _keymap['D'             ] = 'D';
-            _keymap['E'             ] = 'E';
-            _keymap['F'             ] = 'F';
-            _keymap['G'             ] = 'G';
-            _keymap['H'             ] = 'H';
-            _keymap['I'             ] = 'I';
-            _keymap['J'             ] = 'J';
-            _keymap['K'             ] = 'K';
-            _keymap['L'             ] = 'L';
-            _keymap['M'             ] = 'M';
-            _keymap['N'             ] = 'N';
-            _keymap['O'             ] = 'O';
-            _keymap['P'             ] = 'P';
-            _keymap['Q'             ] = 'Q';
-            _keymap['R'             ] = 'R';
-            _keymap['S'             ] = 'S';
-            _keymap['T'             ] = 'T';
-            _keymap['U'             ] = 'U';
-            _keymap['V'             ] = 'V';
-            _keymap['W'             ] = 'W';
-            _keymap['X'             ] = 'X';
-            _keymap['Y'             ] = 'Y';
-            _keymap['Z'             ] = 'Z';
-            _keymap[0xdb            ] = '[';
-            _keymap[0xdd            ] = ']';
-            _keymap[0xdc            ] = '\\';
+            _keymap['A'             ] = osgGA::GUIEventAdapter::KEY_A;
+            _keymap['B'             ] = osgGA::GUIEventAdapter::KEY_B;
+            _keymap['C'             ] = osgGA::GUIEventAdapter::KEY_C;
+            _keymap['D'             ] = osgGA::GUIEventAdapter::KEY_D;
+            _keymap['E'             ] = osgGA::GUIEventAdapter::KEY_E;
+            _keymap['F'             ] = osgGA::GUIEventAdapter::KEY_F;
+            _keymap['G'             ] = osgGA::GUIEventAdapter::KEY_G;
+            _keymap['H'             ] = osgGA::GUIEventAdapter::KEY_H;
+            _keymap['I'             ] = osgGA::GUIEventAdapter::KEY_I;
+            _keymap['J'             ] = osgGA::GUIEventAdapter::KEY_J;
+            _keymap['K'             ] = osgGA::GUIEventAdapter::KEY_K;
+            _keymap['L'             ] = osgGA::GUIEventAdapter::KEY_L;
+            _keymap['M'             ] = osgGA::GUIEventAdapter::KEY_M;
+            _keymap['N'             ] = osgGA::GUIEventAdapter::KEY_N;
+            _keymap['O'             ] = osgGA::GUIEventAdapter::KEY_O;
+            _keymap['P'             ] = osgGA::GUIEventAdapter::KEY_P;
+            _keymap['Q'             ] = osgGA::GUIEventAdapter::KEY_Q;
+            _keymap['R'             ] = osgGA::GUIEventAdapter::KEY_R;
+            _keymap['S'             ] = osgGA::GUIEventAdapter::KEY_S;
+            _keymap['T'             ] = osgGA::GUIEventAdapter::KEY_T;
+            _keymap['U'             ] = osgGA::GUIEventAdapter::KEY_U;
+            _keymap['V'             ] = osgGA::GUIEventAdapter::KEY_V;
+            _keymap['W'             ] = osgGA::GUIEventAdapter::KEY_W;
+            _keymap['X'             ] = osgGA::GUIEventAdapter::KEY_X;
+            _keymap['Y'             ] = osgGA::GUIEventAdapter::KEY_Y;
+            _keymap['Z'             ] = osgGA::GUIEventAdapter::KEY_Z;
+            _keymap[0xdb            ] = osgGA::GUIEventAdapter::KEY_Leftbracket;
+            _keymap[0xdd            ] = osgGA::GUIEventAdapter::KEY_Rightbracket;
+            _keymap[0xdc            ] = osgGA::GUIEventAdapter::KEY_Backslash;
             _keymap[VK_CAPITAL      ] = osgGA::GUIEventAdapter::KEY_Caps_Lock;
-            _keymap[0xba            ] = ';';
-            _keymap[0xde            ] = '\'';
+            _keymap[0xba            ] = osgGA::GUIEventAdapter::KEY_Semicolon;
+            _keymap[0xde            ] = osgGA::GUIEventAdapter::KEY_Quote;
             _keymap[VK_RETURN       ] = osgGA::GUIEventAdapter::KEY_Return;
             _keymap[VK_LSHIFT       ] = osgGA::GUIEventAdapter::KEY_Shift_L;
-            _keymap[0xbc            ] = ',';
-            _keymap[0xbe            ] = '.';
-            _keymap[0xbf            ] = '/';
+            _keymap[0xbc            ] = osgGA::GUIEventAdapter::KEY_Comma;
+            _keymap[0xbe            ] = osgGA::GUIEventAdapter::KEY_Period;
+            _keymap[0xbf            ] = osgGA::GUIEventAdapter::KEY_Slash;
             _keymap[VK_RSHIFT       ] = osgGA::GUIEventAdapter::KEY_Shift_R;
             _keymap[VK_LCONTROL     ] = osgGA::GUIEventAdapter::KEY_Control_L;
             _keymap[VK_LWIN         ] = osgGA::GUIEventAdapter::KEY_Super_L;
-            _keymap[VK_SPACE        ] = ' ';
+            _keymap[VK_SPACE        ] = osgGA::GUIEventAdapter::KEY_Space;
             _keymap[VK_LMENU        ] = osgGA::GUIEventAdapter::KEY_Alt_L;
             _keymap[VK_RMENU        ] = osgGA::GUIEventAdapter::KEY_Alt_R;
@@ -2238 +2238 @@
 }
 
-void GraphicsWindowWin32::adaptKey( WPARAM wParam, LPARAM lParam, int& keySymbol, unsigned int& modifierMask )
+void GraphicsWindowWin32::adaptKey( WPARAM wParam, LPARAM lParam, int& keySymbol, unsigned int& modifierMask, int& unmodifiedKeySymbol)
 {
     modifierMask = 0;
@@ -2304 +2304 @@
         keySymbol = osgGA::GUIEventAdapter::KEY_KP_Enter;
     }
-    else if ((keySymbol & 0xff00)==0) 
+    
+    unmodifiedKeySymbol = keySymbol;
+        
+    if ((keySymbol & 0xff00)==0) 
     {
         char asciiKey[2];
@@ -2480 +2483 @@
             {
                 int keySymbol = 0;
+                int unmodifiedKeySymbol = 0;
                 unsigned int modifierMask = 0;
-                adaptKey(wParam, lParam, keySymbol, modifierMask);
-                _keyMap[keySymbol] = true;
+                adaptKey(wParam, lParam, keySymbol, modifierMask, unmodifiedKeySymbol);
+                _keyMap[std::make_pair(keySymbol,unmodifiedKeySymbol)] = true;
                 //getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
-                getEventQueue()->keyPress(keySymbol, eventTime);
+                getEventQueue()->keyPress(keySymbol, eventTime, unmodifiedKeySymbol);
             }
             break;
@@ -2495 +2499 @@
             {
                 int keySymbol = 0;
+                int unmodifiedKeySymbol = 0;
                 unsigned int modifierMask = 0;
-                adaptKey(wParam, lParam, keySymbol, modifierMask);
-                _keyMap[keySymbol] = false;
+                adaptKey(wParam, lParam, keySymbol, modifierMask, unmodifiedKeySymbol);
+                _keyMap[std::make_pair(keySymbol, unmodifiedKeySymbol)] = false;
                 //getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
-                getEventQueue()->keyRelease(keySymbol, eventTime);
+                getEventQueue()->keyRelease(keySymbol, eventTime, unmodifiedKeySymbol);
             }
             break;
@@ -2539 +2544 @@
 
             // Release all keys that were pressed when the window lost focus.
-            for (std::map<int, bool>::iterator key = _keyMap.begin();
+            for (std::map<std::pair<int, int>, bool>::iterator key = _keyMap.begin();
                  key != _keyMap.end(); ++key)
             {
                 if (key->second)
                 {
-                    getEventQueue()->keyRelease(key->first);
+                    getEventQueue()->keyRelease(key->first.first, key->first.second);
                     key->second = false;
                 }

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.cpp

@@ -1415 +1415 @@
                 keyMapSetKey(_keyMap, ev.xkey.keycode);
                 int keySymbol = 0;
-                adaptKey(ev.xkey, keySymbol);
-
-                getEventQueue()->keyPress(keySymbol, eventTime);
+                int unmodifiedKeySymbol = 0;
+                adaptKey(ev.xkey, keySymbol, unmodifiedKeySymbol);
+
+                getEventQueue()->keyPress(keySymbol, eventTime, unmodifiedKeySymbol);
                 break;
             }
@@ -1446 +1447 @@
                 keyMapClearKey(_keyMap, ev.xkey.keycode);
                 int keySymbol = 0;
-                adaptKey(ev.xkey, keySymbol);
+                int unmodifiedKeySymbol = 0;
+                adaptKey(ev.xkey, keySymbol, unmodifiedKeySymbol);
                 
-                getEventQueue()->keyRelease(keySymbol, eventTime);
+                getEventQueue()->keyRelease(keySymbol, eventTime, unmodifiedKeySymbol);
                 break;
             }
@@ -1519 +1521 @@
 }
 
-void GraphicsWindowX11::adaptKey(XKeyEvent& keyevent, int& keySymbol)
+void GraphicsWindowX11::adaptKey(XKeyEvent& keyevent, int& keySymbol, int& unmodifiedKeySymbol)
 {
     unsigned char buffer_return[32];
@@ -1531 +1533 @@
         keySymbol = buffer_return[0];
     }
+
+    unmodifiedKeySymbol = XKeycodeToKeysym(keyevent.display, keyevent.keycode, 0);
 }
 
@@ -1554 +1558 @@
 
     int keySymbol = 0;
+    int unmodifiedKeySymbol = 0;
     if (state)
     {
         event.type = KeyPress;
-        adaptKey(event, keySymbol);
-        getEventQueue()->keyPress(keySymbol, time);
+        adaptKey(event, keySymbol, unmodifiedKeySymbol);
+        getEventQueue()->keyPress(keySymbol, time, unmodifiedKeySymbol);
         keyMapSetKey(_keyMap, key);
     }
@@ -1564 +1569 @@
     {
         event.type = KeyRelease;
-        adaptKey(event, keySymbol);
-        getEventQueue()->keyRelease(keySymbol, time);
+        adaptKey(event, keySymbol, unmodifiedKeySymbol);
+        getEventQueue()->keyRelease(keySymbol, time, unmodifiedKeySymbol);
         keyMapClearKey(_keyMap, key);
     }