Changeset 8291

Timestamp:

05/08/08 18:45:59

Author:

robert

Message:

From Melchior Franz, "In KDE I switch desktops with Super-Tab, and occasionally I
get an excess Tab key report when switching back to an OSG
application (usually FlightGear? :-). Although KDE has consumed
the Tab, it's sometimes still in the XKeymapEvent's key_vector,
and followed by a Tab KeyRelease? event.

Avoid this artifact by
- asking for a "fresh" keymap (via XQueryKeymap()), rather than

using the unreliable(?) XKeymapEvent's key_vector, and by
- flushing all key events on focus-in (to avoid the KeyRelease?)

After Super-press, Tab-press, Super-release, Tab-release (note
the wrong release order!) I still get an extra Tab event. But
this is not surprising and not exactly wrong either. Also it's
hard to avoid, as we can't see what happened to the keyboard
before we regained focus.

Files changed:

src/osgViewer/GraphicsWindowX11.cpp
include/osgViewer/api/X11/GraphicsWindowX11"

Files:

• OpenSceneGraph/trunk/include/osgViewer/api/X11/GraphicsWindowX11 (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.cpp (modified) (6 diffs)

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

@@ -170 +170 @@
-        int getModifierMask() const;
-        void syncLocks();
+        void flushKeyEvents();
-        
-        bool            _valid;

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowX11.cpp

@@ -994 +994 @@
-            case FocusIn :
-                osg::notify(osg::INFO)<<"FocusIn event received"<<std::endl;
+                flushKeyEvents();
-                break;
-
@@ -1039 +1040 @@
-                syncLocks();
-
+                char keyMap[32];
+                XQueryKeymap(_eventDisplay, keyMap);
+
-                // release normal (non-modifier) keys
-                for (unsigned int key = 8; key < 256; key++)
@@ -1044 +1048 @@
-                    bool isModifier = keyMapGetKey(modMap, key);
-                    if (isModifier) continue;
-ev.xkeymap.key_vector
+keyMap
-                    if (!isPressed) forceKey(key, eventTime, false);
-                }
@@ -1053 +1057 @@
-                    bool isModifier = keyMapGetKey(modMap, key);
-                    if (!isModifier) continue;
-ev.xkeymap.key_vector
+keyMap
-                    forceKey(key, eventTime, isPressed);
-                }
@@ -1062 +1066 @@
-                    bool isModifier = keyMapGetKey(modMap, key);
-                    if (isModifier) continue;
-ev.xkeymap.key_vector
+keyMap
-                    if (isPressed) forceKey(key, eventTime, true);
-                }
@@ -1386 +1390 @@
-}
-
+void GraphicsWindowX11::flushKeyEvents()
+{
+    XEvent e;
+    while (XCheckMaskEvent(_eventDisplay, KeyPressMask|KeyReleaseMask, &e))
+        continue;
+}
+
-// Returns char[32] keymap with bits for every modifier key set.
-void GraphicsWindowX11::getModifierMap(char* keymap) const