Changeset 2761 for trunk/synergy/lib/platform/CPMKeyState.cpp

Timestamp:

Aug 13, 2006, 1:41:05 AM (19 years ago)

Author:

bird

Message:

Hacking and debugging.

File:

• trunk/synergy/lib/platform/CPMKeyState.cpp (modified) (16 diffs)

trunk/synergy/lib/platform/CPMKeyState.cpp

@@ -181 +181 @@
         // extract character, virtual key, and if we didn't use AltGr
         char c       = (char)((charAndVirtKey & 0xff00u) >> 8);
-        UINT vkCode  = (charAndVirtKey & 0xffu);
+        ULONG vkCode = (charAndVirtKey & 0xffu);
         bool noAltGr = ((charAndVirtKey & 0xff0000u) != 0);
 
@@ -240 +240 @@
 
 void
-CPMKeyState::onKey(KeyButton button, bool down, KeyModifierMask newState)
-{
-        // handle win32 brokenness and forward to superclass
-        fixKeys();
-        CKeyState::onKey(button, down, newState);
-        fixKeys();
-}
-
-void
 CPMKeyState::sendKeyEvent(void* target,
                                                         bool press, bool isAutoRepeat,
@@ -316 +307 @@
 CPMKeyState::pollActiveGroup() const
 {
-        // determine the thread that'll receive this event
-        HWND  targetWindow = GetForegroundWindow();
-        ULONG targetThread = GetWindowThreadProcessId(targetWindow, NULL);
-
-        // get keyboard layout for the thread
+#if 0
         HKL hkl            = GetKeyboardLayout(targetThread);
 
@@ -331 +318 @@
 
         return i->second;
+#else
+    return 0;
+#endif 
 }
 
@@ -337 +327 @@
 {
         BYTE keyState[256];
-        GetKeyboardState(keyState);
-        for (KeyButton i = 1; i < 256; ++i) {
-                if ((keyState[i] & 0x80) != 0) {
-                        pressedKeys.insert(i);
-                }
-        }
+    if (WinSetKeyboardStateTable(HWND_DESKTOP, keyState, FALSE)) {
+        for (KeyButton i = 1; i < 256; ++i) {
+                if ((keyState[i] & 0x80) != 0) {
+                        pressedKeys.insert(i);
+                }
+        }
+    }
 }
 
@@ -348 +339 @@
 CPMKeyState::getKeyMap(CKeyMap& keyMap)
 {
+#if 0
         // update keyboard groups
         if (getGroups(m_groups)) {
@@ -374 +366 @@
                 // map buttons (scancodes) to virtual keys
                 for (KeyButton i = 1; i < 256; ++i) {
-                        UINT vk = MapVirtualKey(i, 1);
+                        ULONG vk = MapVirtualKey(i, 1);
                         if (vk == 0) {
                                 // unmapped
@@ -453 +445 @@
                 // either a numpad key and we use the button as is or it's an
                 // extended button.
-                for (UINT i = 1; i < 255; ++i) {
+                for (ULONG i = 1; i < 255; ++i) {
                         // skip virtual keys we don't want
                         switch (i) {
@@ -551 +543 @@
                                         // shift, caps lock, and AltGr.
                                         struct Modifier {
-                                                UINT                    m_vk1;
-                                                UINT                    m_vk2;
+                                                ULONG                   m_vk1;
+                                                ULONG                   m_vk2;
                                                 BYTE                    m_state;
                                                 KeyModifierMask m_mask;
@@ -650 +642 @@
         // restore keyboard layout
         ActivateKeyboardLayout(activeLayout, 0);
+#endif
 }
 
@@ -668 +661 @@
 
                 // get the virtual key for the button
-                UINT vk = keystroke.m_data.m_button.m_client;
-
-                // special handling of VK_SNAPSHOT
-                if (vk == VK_SNAPSHOT) {
-                        if ((getActiveModifiers() & KeyModifierAlt) != 0) {
-                                // snapshot active window
-                                button = 1;
-                        }
-                        else {
-                                // snapshot full screen
-                                button = 0;
-                        }
-                }
-
-                // synthesize event
+                ULONG vk = keystroke.m_data.m_button.m_client;
+
+        // synthesize event
+#if 0///fixme!
                 m_desks->fakeKeyEvent(button, vk,
                                                                 keystroke.m_data.m_button.m_press,
                                                                 keystroke.m_data.m_button.m_repeat);
+#endif 
                 break;
         }
 
         case Keystroke::kGroup:
+#if 0
                 // we don't restore the group.  we'd like to but we can't be
                 // sure the restoring group change will be processed after the
@@ -704 +688 @@
                         }
                 }
+#endif 
                 break;
         }
@@ -719 +704 @@
 }
 
-void
-CPMKeyState::fixKeys()
-{
-        // fake key releases for the windows keys if we think they're
-        // down but they're really up.  we have to do this because if the
-        // user presses and releases a windows key without pressing any
-        // other key while it's down then the system will eat the key
-        // release.  if we don't detect that and synthesize the release
-        // then the client won't take the usual windows key release action
-        // (which on windows is to show the start menu).
-        //
-        // only check on the windows 95 family since the NT family reports
-        // the key releases as usual.
-        if (!m_is95Family) {
-                return;
-        }
-
-        KeyButton leftButton  = virtualKeyToButton(VK_LWIN);
-        KeyButton rightButton = virtualKeyToButton(VK_RWIN);
-        bool leftDown         = isKeyDown(leftButton);
-        bool rightDown        = isKeyDown(rightButton);
-        bool fix              = (leftDown || rightDown);
-        if (fix) {
-                // check if either button is not really down
-                bool leftAsyncDown  = ((GetAsyncKeyState(VK_LWIN) & 0x8000) != 0);
-                bool rightAsyncDown = ((GetAsyncKeyState(VK_RWIN) & 0x8000) != 0);
-
-                if (leftAsyncDown != leftDown || rightAsyncDown != rightDown) {
-                        KeyModifierMask state = getActiveModifiers();
-                        if (!leftAsyncDown && !rightAsyncDown) {
-                                // no win keys are down so remove super modifier
-                                state &= ~KeyModifierSuper;
-                        }
-
-                        // report up events
-                        if (leftDown  && !leftAsyncDown) {
-                                LOG((CLOG_DEBUG1 "event: fake key release left windows key (0x%03x)", leftButton));
-                                CKeyState::onKey(leftButton, false, state);
-                                CKeyState::sendKeyEvent(m_eventTarget, false, false, kKeySuper_L, state, 1, leftButton);
-                        }
-                        if (rightDown && !rightAsyncDown) {
-                                LOG((CLOG_DEBUG1 "event: fake key release right windows key (0x%03x)", rightButton));
-                                CKeyState::onKey(rightButton, false, state);
-                                CKeyState::sendKeyEvent(m_eventTarget, false, false, kKeySuper_R, state, 1, rightButton);
-                        }
-                }
-        }
-
-        if (fix && m_fixTimer == NULL) {
-                // schedule check
-                m_fixTimer = EVENTQUEUE->newTimer(0.1, NULL);
-                EVENTQUEUE->adoptHandler(CEvent::kTimer, m_fixTimer,
-                                                        new TMethodEventJob<CPMKeyState>(
-                                                                this, &CPMKeyState::handleFixKeys));
-        }
-        else if (!fix && m_fixTimer != NULL) {
-                // remove scheduled check
-                EVENTQUEUE->removeHandler(CEvent::kTimer, m_fixTimer);
-                EVENTQUEUE->deleteTimer(m_fixTimer);
-                m_fixTimer = NULL;
-        }
-}
-
-void
-CPMKeyState::handleFixKeys(const CEvent&, void*)
-{
-        fixKeys();
-}
-
 KeyID
-CPMKeyState::getKeyID(UINT virtualKey, KeyButton button)
+CPMKeyState::getKeyID(ULONG virtualKey, KeyButton button)
 {
         if ((button & 0x100u) != 0) {
@@ -799 +715 @@
 KeyID
 CPMKeyState::getIDForKey(CKeyMap::KeyItem& item,
-                                KeyButton button, UINT virtualKey,
-                                PBYTE keyState, HKL hkl) const
-{
+                                KeyButton button, ULONG virtualKey,
+                                PBYTE keyState) const
+{
+#if 0
         int n;
         KeyID id;
-        if (m_is95Family) {
-                // XXX -- how do we get characters not in Latin-1?
-                WORD ascii;
-                n  = ToAsciiEx(virtualKey, button, keyState, &ascii, 0, hkl);
-                id = static_cast<KeyID>(ascii & 0xffu);
-        }
-        else {
-                WCHAR unicode[2];
-                n  = m_ToUnicodeEx(virtualKey, button, keyState,
-                                                                unicode, sizeof(unicode) / sizeof(unicode[0]),
-                                                                0, hkl);
-                id = static_cast<KeyID>(unicode[0]);
-        }
+    WORD ascii;
+    n  = ToAsciiEx(virtualKey, button, keyState, &ascii, 0, hkl);
+    id = static_cast<KeyID>(ascii & 0xffu);
         switch (n) {
         case -1:
@@ -833 +740 @@
                 return getIDForKey(item, button, virtualKey, keyState, hkl);
         }
+#else
+    //fixme!
+    return 0;
+#endif
 }
 
@@ -840 +751 @@
         keyMap.addKeyEntry(item);
         if (item.m_group == 0) {
-                m_keyToVKMap[item.m_id] = static_cast<UINT>(item.m_client);
+                m_keyToVKMap[item.m_id] = static_cast<ULONG>(item.m_client);
         }
 }