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

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

Browse Source 
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"
This commit is contained in:
Robert Osfield 2011-01-27 16:23:48 +00:00
parent 67e1d14991
commit 67ae23f2cf
9 changed files with 216 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
examples/osgkeyboard/osgkeyboard.cpp
View File

@ -42,14 +42,13 @@ public:
osg::Group* getScene() { return _scene.get(); } osg::Group* getScene() { return _scene.get(); }
void keyChange(int key,int value); void keyChange(int key, int virtualKey, int value);
protected: protected:
~KeyboardModel() {} ~KeyboardModel() {}
osg::Switch* addKey(osg::Vec3& pos, int key,const std::string& text,float width, float height); 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(); void createKeyboard();
@ -61,12 +60,12 @@ protected:
}; };
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; 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 // 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()) if (itr!=_keyModelMap.end())
{ {
itr->second->setSingleChildOn(value); itr->second->setSingleChildOn(value);
@ -147,12 +146,6 @@ osg::Switch* KeyboardModel::addKey(osg::Vec3& pos, int key,const std::string& te
} }
osg::Switch* KeyboardModel::addKey(int key,osg::Switch* sw)
{
_keyModelMap[key] = sw;
return sw;
}
void KeyboardModel::createKeyboard() void KeyboardModel::createKeyboard()
{ {
_scene = new osg::Group; _scene = new osg::Group;
@ -175,70 +168,70 @@ void KeyboardModel::createKeyboard()
pos.z() += 1.0f; pos.z() += 1.0f;
addKey(pos,osgGA::GUIEventAdapter::KEY_Shift_L,"Shift",2.0f,0.5f); addKey(pos,osgGA::GUIEventAdapter::KEY_Shift_L,"Shift",2.0f,0.5f);
addKey(pos,'\\',"\\",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_Backslash,"\\",1.0f,1.0f);
addKey('Z',addKey(pos,'z',"Z",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Z,"Z",1.0f,1.0f);
addKey('X',addKey(pos,'x',"X",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_X,"X",1.0f,1.0f);
addKey('C',addKey(pos,'c',"C",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_C,"C",1.0f,1.0f);
addKey('V',addKey(pos,'v',"V",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_V,"V",1.0f,1.0f);
addKey('B',addKey(pos,'b',"B",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_B,"B",1.0f,1.0f);
addKey('N',addKey(pos,'n',"N",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_N,"N",1.0f,1.0f);
addKey('M',addKey(pos,'m',"M",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_M,"M",1.0f,1.0f);
addKey('<',addKey(pos,',',",",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Comma,",",1.0f,1.0f);
addKey('>',addKey(pos,'.',".",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Period,".",1.0f,1.0f);
addKey('?',addKey(pos,'/',"/",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); addKey(pos,osgGA::GUIEventAdapter::KEY_Shift_R,"Shift",2.0f,0.5f);
pos.x() = 0.0f; pos.x() = 0.0f;
pos.z() += 1.0f; pos.z() += 1.0f;
addKey(pos,osgGA::GUIEventAdapter::KEY_Caps_Lock,"Caps",2.0f,0.5f); addKey(pos,osgGA::GUIEventAdapter::KEY_Caps_Lock,"Caps",2.0f,0.5f);
addKey('A',addKey(pos,'a',"A",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_A,"A",1.0f,1.0f);
addKey('S',addKey(pos,'s',"S",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_S,"S",1.0f,1.0f);
addKey('D',addKey(pos,'d',"D",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_D,"D",1.0f,1.0f);
addKey('F',addKey(pos,'f',"F",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_F,"F",1.0f,1.0f);
addKey('G',addKey(pos,'g',"G",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_G,"G",1.0f,1.0f);
addKey('H',addKey(pos,'h',"H",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_H,"H",1.0f,1.0f);
addKey('J',addKey(pos,'j',"J",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_J,"J",1.0f,1.0f);
addKey('K',addKey(pos,'k',"K",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_K,"K",1.0f,1.0f);
addKey('L',addKey(pos,'l',"L",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_L,"L",1.0f,1.0f);
addKey(':',addKey(pos,';',";",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Semicolon,";",1.0f,1.0f);
addKey('@',addKey(pos,'\'',"'",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Quote,"'",1.0f,1.0f);
addKey('~',addKey(pos,'#',"#",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); addKey(pos,osgGA::GUIEventAdapter::KEY_Return,"Return",4.0f,0.5f);
pos.x() = 0.0f; pos.x() = 0.0f;
pos.z() += 1.0f; pos.z() += 1.0f;
addKey(pos,osgGA::GUIEventAdapter::KEY_Tab,"Tab",2.0f,0.5f); addKey(pos,osgGA::GUIEventAdapter::KEY_Tab,"Tab",2.0f,0.5f);
addKey('Q',addKey(pos,'q',"Q",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Q,"Q",1.0f,1.0f);
addKey('W',addKey(pos,'w',"W",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_W,"W",1.0f,1.0f);
addKey('E',addKey(pos,'e',"E",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_E,"E",1.0f,1.0f);
addKey('R',addKey(pos,'r',"R",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_R,"R",1.0f,1.0f);
addKey('T',addKey(pos,'t',"T",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_T,"T",1.0f,1.0f);
addKey('Y',addKey(pos,'y',"Y",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Y,"Y",1.0f,1.0f);
addKey('U',addKey(pos,'u',"U",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_U,"U",1.0f,1.0f);
addKey('I',addKey(pos,'i',"I",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_I,"I",1.0f,1.0f);
addKey('O',addKey(pos,'o',"O",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_O,"O",1.0f,1.0f);
addKey('P',addKey(pos,'p',"P",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_P,"P",1.0f,1.0f);
addKey('{',addKey(pos,'[',"[",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Leftbracket,"[",1.0f,1.0f);
addKey('}',addKey(pos,']',"]",1.0f,1.0f)); addKey(pos,osgGA::GUIEventAdapter::KEY_Rightbracket,"]",1.0f,1.0f);
pos.x() = 0.0f; pos.x() = 0.0f;
pos.z() += 1.0f; pos.z() += 1.0f;
addKey(pos,'`',"`",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_Backquote,"`",1.0f,1.0f);
addKey(pos,'1',"1",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_1,"1",1.0f,1.0f);
addKey(pos,'2',"2",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_2,"2",1.0f,1.0f);
addKey(pos,'3',"3",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_3,"3",1.0f,1.0f);
addKey(pos,'4',"4",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_4,"4",1.0f,1.0f);
addKey(pos,'5',"5",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_5,"5",1.0f,1.0f);
addKey(pos,'6',"6",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_6,"6",1.0f,1.0f);
addKey(pos,'7',"7",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_7,"7",1.0f,1.0f);
addKey(pos,'8',"8",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_8,"8",1.0f,1.0f);
addKey(pos,'9',"9",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_9,"9",1.0f,1.0f);
addKey(pos,'0',"0",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_0,"0",1.0f,1.0f);
addKey(pos,'-',"-",1.0f,1.0f); addKey(pos,osgGA::GUIEventAdapter::KEY_Minus,"-",1.0f,1.0f);
addKey(pos,'=',"=",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); addKey(pos,osgGA::GUIEventAdapter::KEY_BackSpace,"Backspace",3.0f,0.5f);
pos.x() = 0.0f; pos.x() = 0.0f;
@ -405,12 +398,12 @@ public:
{ {
case(osgGA::GUIEventAdapter::KEYDOWN): case(osgGA::GUIEventAdapter::KEYDOWN):
{ {
_keyboardModel->keyChange(ea.getKey(),1); _keyboardModel->keyChange(ea.getKey(), ea.getUnmodifiedKey(),1);
return true; return true;
} }
case(osgGA::GUIEventAdapter::KEYUP): case(osgGA::GUIEventAdapter::KEYUP):
{ {
_keyboardModel->keyChange(ea.getKey(),0); _keyboardModel->keyChange(ea.getKey(), ea.getUnmodifiedKey(),0);
return true; return true;
} }

8
include/osgGA/EventQueue
View File

@ -146,17 +146,17 @@ class OSGGA_EXPORT EventQueue : public osg::Referenced
/** Method for adapting keyboard press events. Note, special keys such as Ctrl/Function keys should be adapted to GUIEventAdapter::KeySymbol mappings.*/ /** 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.*/ /** 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.*/ /** 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.*/ /** 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); GUIEventAdapter* touchBegan(unsigned int id, GUIEventAdapter::TouchPhase phase, float x, float y, double time);
GUIEventAdapter* touchBegan(unsigned int id, GUIEventAdapter::TouchPhase phase, float x, float y) { GUIEventAdapter* touchBegan(unsigned int id, GUIEventAdapter::TouchPhase phase, float x, float y) {

72
include/osgGA/GUIEventAdapter
View File

@ -59,6 +59,71 @@ public:
{ {
KEY_Space = 0x20, 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_BackSpace = 0xFF08, /* back space, back char */
KEY_Tab = 0xFF09, KEY_Tab = 0xFF09,
KEY_Linefeed = 0xFF0A, /* Linefeed, LF */ KEY_Linefeed = 0xFF0A, /* Linefeed, LF */
@ -374,6 +439,12 @@ public:
/** get key pressed, return -1 if inappropriate for this GUIEventAdapter. */ /** get key pressed, return -1 if inappropriate for this GUIEventAdapter. */
virtual int getKey() const { return _key; } 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.*/ /** set button pressed/released.*/
void setButton(int button) { _button = button; } void setButton(int button) { _button = button; }
@ -519,6 +590,7 @@ public:
int _windowWidth; int _windowWidth;
int _windowHeight; int _windowHeight;
int _key; int _key;
int _unmodifiedKey;
int _button; int _button;
float _Xmin,_Xmax; float _Xmin,_Xmax;
float _Ymin,_Ymax; float _Ymin,_Ymax;

4
include/osgViewer/api/Win32/GraphicsWindowWin32
View File

@ -135,7 +135,7 @@ class OSGVIEWER_EXPORT GraphicsWindowWin32 : public osgViewer::GraphicsWindow, p
bool setPixelFormat(); 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); void transformMouseXY(float& x, float& y);
@ -178,7 +178,7 @@ class OSGVIEWER_EXPORT GraphicsWindowWin32 : public osgViewer::GraphicsWindow, p
std::map<MouseCursor,HCURSOR> _mouseCursorMap; std::map<MouseCursor,HCURSOR> _mouseCursorMap;
std::map<int, bool> _keyMap; std::map<std::pair<int, int>, bool> _keyMap;
bool _applyWorkaroundForMultimonitorMultithreadNVidiaWin32Issues; bool _applyWorkaroundForMultimonitorMultithreadNVidiaWin32Issues;
}; };

2
include/osgViewer/api/X11/GraphicsWindowX11
View File

@ -163,7 +163,7 @@ class OSGVIEWER_EXPORT GraphicsWindowX11 : public osgViewer::GraphicsWindow, pub
void transformMouseXY(float& x, float& y); 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 forceKey(int key, double time, bool state);
void rescanModifierMapping(); void rescanModifierMapping();
void getModifierMap(char* keymap) const; void getModifierMap(char* keymap) const;

6
src/osgGA/EventQueue.cpp
View File

@ -274,7 +274,7 @@ void EventQueue::mouseButtonRelease(float x, float y, unsigned int button, doubl
addEvent(event); addEvent(event);
} }
void EventQueue::keyPress(int key, double time) void EventQueue::keyPress(int key, double time, int unmodifiedKey)
{ {
switch(key) switch(key)
{ {
@ -312,12 +312,13 @@ void EventQueue::keyPress(int key, double time)
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState); GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::KEYDOWN); event->setEventType(GUIEventAdapter::KEYDOWN);
event->setKey(key); event->setKey(key);
event->setUnmodifiedKey(unmodifiedKey);
event->setTime(time); event->setTime(time);
addEvent(event); addEvent(event);
} }
void EventQueue::keyRelease(int key, double time) void EventQueue::keyRelease(int key, double time, int unmodifiedKey)
{ {
switch(key) switch(key)
{ {
@ -339,6 +340,7 @@ void EventQueue::keyRelease(int key, double time)
GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState); GUIEventAdapter* event = new GUIEventAdapter(*_accumulateEventState);
event->setEventType(GUIEventAdapter::KEYUP); event->setEventType(GUIEventAdapter::KEYUP);
event->setKey(key); event->setKey(key);
event->setUnmodifiedKey(unmodifiedKey);
event->setTime(time); event->setTime(time);
addEvent(event); addEvent(event);

2
src/osgGA/GUIEventAdapter.cpp
View File

@ -31,6 +31,7 @@ GUIEventAdapter::GUIEventAdapter():
_windowWidth(1280), _windowWidth(1280),
_windowHeight(1024), _windowHeight(1024),
_key(0), _key(0),
_unmodifiedKey(0),
_button(0), _button(0),
_Xmin(-1.0), _Xmin(-1.0),
_Xmax(1.0), _Xmax(1.0),
@ -57,6 +58,7 @@ GUIEventAdapter::GUIEventAdapter(const GUIEventAdapter& rhs,const osg::CopyOp& c
_windowWidth(rhs._windowWidth), _windowWidth(rhs._windowWidth),
_windowHeight(rhs._windowHeight), _windowHeight(rhs._windowHeight),
_key(rhs._key), _key(rhs._key),
_unmodifiedKey(rhs._unmodifiedKey),
_button(rhs._button), _button(rhs._button),
_Xmin(rhs._Xmin), _Xmin(rhs._Xmin),
_Xmax(rhs._Xmax), _Xmax(rhs._Xmax),

121
src/osgViewer/GraphicsWindowWin32.cpp
View File

@ -401,62 +401,62 @@ class Win32KeyboardMap
_keymap[VK_F10 ] = osgGA::GUIEventAdapter::KEY_F10; _keymap[VK_F10 ] = osgGA::GUIEventAdapter::KEY_F10;
_keymap[VK_F11 ] = osgGA::GUIEventAdapter::KEY_F11; _keymap[VK_F11 ] = osgGA::GUIEventAdapter::KEY_F11;
_keymap[VK_F12 ] = osgGA::GUIEventAdapter::KEY_F12; _keymap[VK_F12 ] = osgGA::GUIEventAdapter::KEY_F12;
_keymap[0xc0 ] = '`'; _keymap[0xc0 ] = osgGA::GUIEventAdapter::KEY_Backquote;
_keymap['0' ] = '0'; _keymap['0' ] = osgGA::GUIEventAdapter::KEY_0;
_keymap['1' ] = '1'; _keymap['1' ] = osgGA::GUIEventAdapter::KEY_1;
_keymap['2' ] = '2'; _keymap['2' ] = osgGA::GUIEventAdapter::KEY_2;
_keymap['3' ] = '3'; _keymap['3' ] = osgGA::GUIEventAdapter::KEY_3;
_keymap['4' ] = '4'; _keymap['4' ] = osgGA::GUIEventAdapter::KEY_4;
_keymap['5' ] = '5'; _keymap['5' ] = osgGA::GUIEventAdapter::KEY_5;
_keymap['6' ] = '6'; _keymap['6' ] = osgGA::GUIEventAdapter::KEY_6;
_keymap['7' ] = '7'; _keymap['7' ] = osgGA::GUIEventAdapter::KEY_7;
_keymap['8' ] = '8'; _keymap['8' ] = osgGA::GUIEventAdapter::KEY_8;
_keymap['9' ] = '9'; _keymap['9' ] = osgGA::GUIEventAdapter::KEY_9;
_keymap[0xbd ] = '-'; _keymap[0xbd ] = osgGA::GUIEventAdapter::KEY_Minus;
_keymap[0xbb ] = '='; _keymap[0xbb ] = osgGA::GUIEventAdapter::KEY_Equals;
_keymap[VK_BACK ] = osgGA::GUIEventAdapter::KEY_BackSpace; _keymap[VK_BACK ] = osgGA::GUIEventAdapter::KEY_BackSpace;
_keymap[VK_TAB ] = osgGA::GUIEventAdapter::KEY_Tab; _keymap[VK_TAB ] = osgGA::GUIEventAdapter::KEY_Tab;
_keymap['A' ] = 'A'; _keymap['A' ] = osgGA::GUIEventAdapter::KEY_A;
_keymap['B' ] = 'B'; _keymap['B' ] = osgGA::GUIEventAdapter::KEY_B;
_keymap['C' ] = 'C'; _keymap['C' ] = osgGA::GUIEventAdapter::KEY_C;
_keymap['D' ] = 'D'; _keymap['D' ] = osgGA::GUIEventAdapter::KEY_D;
_keymap['E' ] = 'E'; _keymap['E' ] = osgGA::GUIEventAdapter::KEY_E;
_keymap['F' ] = 'F'; _keymap['F' ] = osgGA::GUIEventAdapter::KEY_F;
_keymap['G' ] = 'G'; _keymap['G' ] = osgGA::GUIEventAdapter::KEY_G;
_keymap['H' ] = 'H'; _keymap['H' ] = osgGA::GUIEventAdapter::KEY_H;
_keymap['I' ] = 'I'; _keymap['I' ] = osgGA::GUIEventAdapter::KEY_I;
_keymap['J' ] = 'J'; _keymap['J' ] = osgGA::GUIEventAdapter::KEY_J;
_keymap['K' ] = 'K'; _keymap['K' ] = osgGA::GUIEventAdapter::KEY_K;
_keymap['L' ] = 'L'; _keymap['L' ] = osgGA::GUIEventAdapter::KEY_L;
_keymap['M' ] = 'M'; _keymap['M' ] = osgGA::GUIEventAdapter::KEY_M;
_keymap['N' ] = 'N'; _keymap['N' ] = osgGA::GUIEventAdapter::KEY_N;
_keymap['O' ] = 'O'; _keymap['O' ] = osgGA::GUIEventAdapter::KEY_O;
_keymap['P' ] = 'P'; _keymap['P' ] = osgGA::GUIEventAdapter::KEY_P;
_keymap['Q' ] = 'Q'; _keymap['Q' ] = osgGA::GUIEventAdapter::KEY_Q;
_keymap['R' ] = 'R'; _keymap['R' ] = osgGA::GUIEventAdapter::KEY_R;
_keymap['S' ] = 'S'; _keymap['S' ] = osgGA::GUIEventAdapter::KEY_S;
_keymap['T' ] = 'T'; _keymap['T' ] = osgGA::GUIEventAdapter::KEY_T;
_keymap['U' ] = 'U'; _keymap['U' ] = osgGA::GUIEventAdapter::KEY_U;
_keymap['V' ] = 'V'; _keymap['V' ] = osgGA::GUIEventAdapter::KEY_V;
_keymap['W' ] = 'W'; _keymap['W' ] = osgGA::GUIEventAdapter::KEY_W;
_keymap['X' ] = 'X'; _keymap['X' ] = osgGA::GUIEventAdapter::KEY_X;
_keymap['Y' ] = 'Y'; _keymap['Y' ] = osgGA::GUIEventAdapter::KEY_Y;
_keymap['Z' ] = 'Z'; _keymap['Z' ] = osgGA::GUIEventAdapter::KEY_Z;
_keymap[0xdb ] = '['; _keymap[0xdb ] = osgGA::GUIEventAdapter::KEY_Leftbracket;
_keymap[0xdd ] = ']'; _keymap[0xdd ] = osgGA::GUIEventAdapter::KEY_Rightbracket;
_keymap[0xdc ] = '\\'; _keymap[0xdc ] = osgGA::GUIEventAdapter::KEY_Backslash;
_keymap[VK_CAPITAL ] = osgGA::GUIEventAdapter::KEY_Caps_Lock; _keymap[VK_CAPITAL ] = osgGA::GUIEventAdapter::KEY_Caps_Lock;
_keymap[0xba ] = ';'; _keymap[0xba ] = osgGA::GUIEventAdapter::KEY_Semicolon;
_keymap[0xde ] = '\''; _keymap[0xde ] = osgGA::GUIEventAdapter::KEY_Quote;
_keymap[VK_RETURN ] = osgGA::GUIEventAdapter::KEY_Return; _keymap[VK_RETURN ] = osgGA::GUIEventAdapter::KEY_Return;
_keymap[VK_LSHIFT ] = osgGA::GUIEventAdapter::KEY_Shift_L; _keymap[VK_LSHIFT ] = osgGA::GUIEventAdapter::KEY_Shift_L;
_keymap[0xbc ] = ','; _keymap[0xbc ] = osgGA::GUIEventAdapter::KEY_Comma;
_keymap[0xbe ] = '.'; _keymap[0xbe ] = osgGA::GUIEventAdapter::KEY_Period;
_keymap[0xbf ] = '/'; _keymap[0xbf ] = osgGA::GUIEventAdapter::KEY_Slash;
_keymap[VK_RSHIFT ] = osgGA::GUIEventAdapter::KEY_Shift_R; _keymap[VK_RSHIFT ] = osgGA::GUIEventAdapter::KEY_Shift_R;
_keymap[VK_LCONTROL ] = osgGA::GUIEventAdapter::KEY_Control_L; _keymap[VK_LCONTROL ] = osgGA::GUIEventAdapter::KEY_Control_L;
_keymap[VK_LWIN ] = osgGA::GUIEventAdapter::KEY_Super_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_LMENU ] = osgGA::GUIEventAdapter::KEY_Alt_L;
_keymap[VK_RMENU ] = osgGA::GUIEventAdapter::KEY_Alt_R; _keymap[VK_RMENU ] = osgGA::GUIEventAdapter::KEY_Alt_R;
_keymap[VK_RWIN ] = osgGA::GUIEventAdapter::KEY_Super_R; _keymap[VK_RWIN ] = osgGA::GUIEventAdapter::KEY_Super_R;
@ -2237,7 +2237,7 @@ void GraphicsWindowWin32::setSyncToVBlank( bool on )
#endif #endif
} }
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; modifierMask = 0;
@ -2303,7 +2303,10 @@ void GraphicsWindowWin32::adaptKey( WPARAM wParam, LPARAM lParam, int& keySymbol
{ {
keySymbol = osgGA::GUIEventAdapter::KEY_KP_Enter; keySymbol = osgGA::GUIEventAdapter::KEY_KP_Enter;
} }
else if ((keySymbol & 0xff00)==0)
unmodifiedKeySymbol = keySymbol;
if ((keySymbol & 0xff00)==0)
{ {
char asciiKey[2]; char asciiKey[2];
int numChars = ::ToAscii(wParam, (lParam>>16)&0xff, keyState, reinterpret_cast<WORD*>(asciiKey), 0); int numChars = ::ToAscii(wParam, (lParam>>16)&0xff, keyState, reinterpret_cast<WORD*>(asciiKey), 0);
@ -2479,11 +2482,12 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
{ {
int keySymbol = 0; int keySymbol = 0;
int unmodifiedKeySymbol = 0;
unsigned int modifierMask = 0; unsigned int modifierMask = 0;
adaptKey(wParam, lParam, keySymbol, modifierMask); adaptKey(wParam, lParam, keySymbol, modifierMask, unmodifiedKeySymbol);
_keyMap[keySymbol] = true; _keyMap[std::make_pair(keySymbol,unmodifiedKeySymbol)] = true;
//getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask); //getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
getEventQueue()->keyPress(keySymbol, eventTime); getEventQueue()->keyPress(keySymbol, eventTime, unmodifiedKeySymbol);
} }
break; break;
@ -2494,11 +2498,12 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
{ {
int keySymbol = 0; int keySymbol = 0;
int unmodifiedKeySymbol = 0;
unsigned int modifierMask = 0; unsigned int modifierMask = 0;
adaptKey(wParam, lParam, keySymbol, modifierMask); adaptKey(wParam, lParam, keySymbol, modifierMask, unmodifiedKeySymbol);
_keyMap[keySymbol] = false; _keyMap[std::make_pair(keySymbol, unmodifiedKeySymbol)] = false;
//getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask); //getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
getEventQueue()->keyRelease(keySymbol, eventTime); getEventQueue()->keyRelease(keySymbol, eventTime, unmodifiedKeySymbol);
} }
break; break;
@ -2538,12 +2543,12 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
/////////////////// ///////////////////
// Release all keys that were pressed when the window lost focus. // 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) key != _keyMap.end(); ++key)
{ {
if (key->second) if (key->second)
{ {
getEventQueue()->keyRelease(key->first); getEventQueue()->keyRelease(key->first.first, key->first.second);
key->second = false; key->second = false;
} }
} }

23
src/osgViewer/GraphicsWindowX11.cpp
View File

@ -1414,9 +1414,10 @@ void GraphicsWindowX11::checkEvents()
_modifierState = ev.xkey.state; _modifierState = ev.xkey.state;
keyMapSetKey(_keyMap, ev.xkey.keycode); keyMapSetKey(_keyMap, ev.xkey.keycode);
int keySymbol = 0; int keySymbol = 0;
adaptKey(ev.xkey, keySymbol); int unmodifiedKeySymbol = 0;
adaptKey(ev.xkey, keySymbol, unmodifiedKeySymbol);
getEventQueue()->keyPress(keySymbol, eventTime); getEventQueue()->keyPress(keySymbol, eventTime, unmodifiedKeySymbol);
break; break;
} }
@ -1445,9 +1446,10 @@ void GraphicsWindowX11::checkEvents()
_modifierState = ev.xkey.state; _modifierState = ev.xkey.state;
keyMapClearKey(_keyMap, ev.xkey.keycode); keyMapClearKey(_keyMap, ev.xkey.keycode);
int keySymbol = 0; 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; break;
} }
@ -1518,7 +1520,7 @@ void GraphicsWindowX11::transformMouseXY(float& x, float& y)
} }
} }
void GraphicsWindowX11::adaptKey(XKeyEvent& keyevent, int& keySymbol) void GraphicsWindowX11::adaptKey(XKeyEvent& keyevent, int& keySymbol, int& unmodifiedKeySymbol)
{ {
unsigned char buffer_return[32]; unsigned char buffer_return[32];
int bytes_buffer = 32; int bytes_buffer = 32;
@ -1530,6 +1532,8 @@ void GraphicsWindowX11::adaptKey(XKeyEvent& keyevent, int& keySymbol)
{ {
keySymbol = buffer_return[0]; keySymbol = buffer_return[0];
} }
unmodifiedKeySymbol = XKeycodeToKeysym(keyevent.display, keyevent.keycode, 0);
} }
// Function to inject artificial key presses/releases. // Function to inject artificial key presses/releases.
@ -1553,18 +1557,19 @@ void GraphicsWindowX11::forceKey(int key, double time, bool state)
event.same_screen = True; event.same_screen = True;
int keySymbol = 0; int keySymbol = 0;
int unmodifiedKeySymbol = 0;
if (state) if (state)
{ {
event.type = KeyPress; event.type = KeyPress;
adaptKey(event, keySymbol); adaptKey(event, keySymbol, unmodifiedKeySymbol);
getEventQueue()->keyPress(keySymbol, time); getEventQueue()->keyPress(keySymbol, time, unmodifiedKeySymbol);
keyMapSetKey(_keyMap, key); keyMapSetKey(_keyMap, key);
} }
else else
{ {
event.type = KeyRelease; event.type = KeyRelease;
adaptKey(event, keySymbol); adaptKey(event, keySymbol, unmodifiedKeySymbol);
getEventQueue()->keyRelease(keySymbol, time); getEventQueue()->keyRelease(keySymbol, time, unmodifiedKeySymbol);
keyMapClearKey(_keyMap, key); keyMapClearKey(_keyMap, key);
} }
} }