mirror of
https://github.com/debauchee/barrier.git
synced 2025-08-06 10:09:28 +02:00
Changes from mercurial repository.
This commit is contained in:
parent
44bb32f476
commit
98c68897d8
135 changed files with 2686 additions and 26965 deletions
|
@ -1102,7 +1102,9 @@ CMSWindowsKeyState::getKeyMap(CKeyMap& keyMap)
|
|||
KeyButton button = static_cast<KeyButton>(i & 0xffu);
|
||||
for (size_t j = 0; j < s_numCombinations; ++j) {
|
||||
for (size_t k = 0; k < s_numModifiers; ++k) {
|
||||
if ((j & (1 << k)) != 0) {
|
||||
//if ((j & (1 << k)) != 0) {
|
||||
// http://msdn.microsoft.com/en-us/library/ke55d167.aspx
|
||||
if ((j & (1i64 << k)) != 0) {
|
||||
keys[modifiers[k].m_vk1] = modifiers[k].m_state;
|
||||
keys[modifiers[k].m_vk2] = modifiers[k].m_state;
|
||||
}
|
||||
|
@ -1125,7 +1127,9 @@ CMSWindowsKeyState::getKeyMap(CKeyMap& keyMap)
|
|||
item.m_sensitive = 0;
|
||||
for (size_t k = 0; k < s_numModifiers; ++k) {
|
||||
for (size_t j = 0; j < s_numCombinations; ++j) {
|
||||
if (id[j] != id[j ^ (1u << k)]) {
|
||||
//if (id[j] != id[j ^ (1u << k)]) {
|
||||
// http://msdn.microsoft.com/en-us/library/ke55d167.aspx
|
||||
if (id[j] != id[j ^ (1ui64 << k)]) {
|
||||
item.m_sensitive |= modifiers[k].m_mask;
|
||||
break;
|
||||
}
|
||||
|
@ -1139,7 +1143,7 @@ CMSWindowsKeyState::getKeyMap(CKeyMap& keyMap)
|
|||
item.m_id = id[j];
|
||||
item.m_required = 0;
|
||||
for (size_t k = 0; k < s_numModifiers; ++k) {
|
||||
if ((j & (1 << k)) != 0) {
|
||||
if ((j & (1i64 << k)) != 0) {
|
||||
item.m_required |= modifiers[k].m_mask;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue