Changeset 12125 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.cpp

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"

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.cpp (modified) (6 diffs)

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);
     }