backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-05 03:17:51 +08:00
Code Issues Projects Releases Wiki Activity

merge 1.4 r887:888 into trunk

Browse Source
This commit is contained in:
Nick Bolton
2011-01-23 19:48:38 +00:00
parent 76c47c2346
commit cc520f08d8
10 changed files with 360 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/platform/COSXKeyState.h
View File

@@ -24,6 +24,12 @@
#include "stdset.h"
#include "stdvector.h"
#if defined(MAC_OS_X_VERSION_10_5)
typedef TISInputSourceRef KeyLayout;
#else
typedef KeyboardLayoutRef KeyLayout;
#endif
//! OS X key state
/*!
A key state for OS X.
@@ -99,7 +105,7 @@ protected:
private:
class CKeyResource;
typedef std::vector<TISInputSourceRef> GroupList;
typedef std::vector<KeyLayout> GroupList;
// Add hard coded special keys to a CKeyMap.
void getKeyMapForSpecialKeys(
@@ -197,7 +203,7 @@ private:
KeyButtonOffset = 1
};
typedef std::map<TISInputSourceRef, SInt32> GroupMap;
typedef std::map<KeyLayout, SInt32> GroupMap;
typedef std::map<UInt32, KeyID> CVirtualKeyMap;
CVirtualKeyMap m_virtualKeyMap;