Changeset 2765

Timestamp:

Aug 14, 2006, 6:55:06 AM (19 years ago)

Author:

bird

Message:

hacking on keyboard stuff.

Location:

trunk/synergy/lib/platform

Files:

• CMSWindowsKeyState.h (modified) (2 diffs)
• CPMKeyState.cpp (modified) (36 diffs)
• CPMKeyState.h (modified) (3 diffs)
• CPMScreen.cpp (modified) (1 diff)
• CPMUtil.cpp (modified) (3 diffs)
• CPMUtil.h (modified) (3 diffs)

trunk/synergy/lib/platform/CMSWindowsKeyState.h

@@ -2 +2 @@
  * synergy -- mouse and keyboard sharing utility
  * Copyright (C) 2003 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -186 +186 @@
         CEventQueueTimer*       m_fixTimer;
 
+#if 0
         // the groups (keyboard layouts)
         GroupList                       m_groups;
         GroupMap                        m_groupMap;
+#endif
 
         // the last button that we generated a key down event for.  this

trunk/synergy/lib/platform/CPMKeyState.cpp

@@ -19 +19 @@
 #include "CLog.h"
 #include "CStringUtil.h"
+#include "CPMUtil.h"
 #include "IEventQueue.h"
 #include "TMethodEventJob.h"
@@ -111 +112 @@
 };
 
-CPMKeyState::CPMKeyState(void* eventTarget) :
+CPMKeyState::CPMKeyState(void* eventTarget, FakeMsgFunc fakeMsg) :
         m_eventTarget(eventTarget),
+        m_fakeMsg(fakeMsg),
+    m_lastButton(0),
         m_fixTimer(NULL),
         m_lastDown(kKeyNone),
@@ -119 +122 @@
         m_originalSavedModifiers(0)
 {
-
+    LOG((CLOG_DEBUG "CPMKeyState:"));
 }
 
 CPMKeyState::~CPMKeyState()
 {
+    LOG((CLOG_DEBUG "~CPMKeyState:"));
         disable();
 }
@@ -130 +134 @@
 CPMKeyState::disable()
 {
+    LOG((CLOG_DEBUG "disable:"));
         if (m_fixTimer != NULL) {
                 EVENTQUEUE->removeHandler(CEvent::kTimer, m_fixTimer);
@@ -141 +146 @@
 CPMKeyState::virtualKeyToButton(ULONG virtualKey) const
 {
+    LOG((CLOG_DEBUG "virtualKeyToButton:"));
         return m_virtualKeyToButton[virtualKey & 0xffu];
 }
@@ -147 +153 @@
 CPMKeyState::testAutoRepeat(bool press, bool isRepeat, KeyButton button)
 {
+    LOG((CLOG_DEBUG "testAutoRepeat:"));
         if (!isRepeat)
                 isRepeat = press && button == m_lastDown && button != kKeyNone;
@@ -156 +163 @@
 CPMKeyState::saveModifiers()
 {
+    LOG((CLOG_DEBUG "saveModifiers:"));
         m_savedModifiers         = getActiveModifiers();
         m_originalSavedModifiers = m_savedModifiers;
@@ -163 +171 @@
 CPMKeyState::useSavedModifiers(bool enable)
 {
+    LOG((CLOG_DEBUG "useSavedModifiers:"));
         if (enable != m_useSavedModifiers) {
                 m_useSavedModifiers = enable;
@@ -176 +185 @@
 CPMKeyState::mapKeyFromEvent(USHORT fsFlags, UCHAR ucRepeat, UCHAR ucScanCode, USHORT usch, USHORT usvk, KeyModifierMask* maskOut) const
 {
+    LOG((CLOG_DEBUG "mapKeyFromEvent:"));
 #if 0 /** @todo */
         static const KeyModifierMask s_controlAlt = KeyModifierControl | KeyModifierAlt;
@@ -231 +241 @@
 CPMKeyState::mapKeyToVirtualKey(KeyID key) const
 {
+    LOG((CLOG_DEBUG "mapKeyToVirtualKey:"));
         if (key == kKeyNone)
                 return 0;
@@ -245 +256 @@
                                                         SInt32 count, KeyButton button)
 {
+    LOG((CLOG_DEBUG "sendKeyEvent:"));
         if (press || isAutoRepeat) {
                 // send key
@@ -266 +278 @@
 CPMKeyState::fakeKeyDown(KeyID id, KeyModifierMask mask, KeyButton button)
 {
+    LOG((CLOG_DEBUG "fakeKeyDown: id=%#x mask=%#x button=%#x", id, mask, button));
         CKeyState::fakeKeyDown(id, mask, button);
 }
@@ -272 +285 @@
 CPMKeyState::fakeKeyRepeat(KeyID id, KeyModifierMask mask, SInt32 count, KeyButton button)
 {
+    LOG((CLOG_DEBUG "fakeKeyRepeat: id=%#x mask=%#x count=%d button=%#x", id, mask, count, button));
         CKeyState::fakeKeyRepeat(id, mask, count, button);
 }
@@ -278 +292 @@
 CPMKeyState::fakeCtrlAltDel()
 {
+    LOG((CLOG_DEBUG "fakeCtrlAltDel:"));
     fakeKeyDown(kKeyDelete, KeyModifierControl | KeyModifierAlt, virtualKeyToButton(VK_DELETE));
 }
@@ -284 +299 @@
 CPMKeyState::pollActiveModifiers() const
 {
+    LOG((CLOG_DEBUG "pollActiveModifiers:"));
         KeyModifierMask state = 0;
 
@@ -307 +323 @@
 CPMKeyState::pollActiveGroup() const
 {
+    LOG((CLOG_DEBUG "pollActiveGroup:"));
 #if 0
         HKL hkl            = GetKeyboardLayout(targetThread);
@@ -320 +337 @@
 #else
     return 0;
-#endif 
+#endif
 }
 
@@ -326 +343 @@
 CPMKeyState::pollPressedKeys(KeyButtonSet& pressedKeys) const
 {
+    LOG((CLOG_DEBUG "pollPressedKeys:"));
         BYTE keyState[256];
     if (WinSetKeyboardStateTable(HWND_DESKTOP, keyState, FALSE)) {
@@ -339 +357 @@
 CPMKeyState::getKeyMap(CKeyMap& keyMap)
 {
+    LOG((CLOG_DEBUG "getKeyMap:"));
 #if 0
         // update keyboard groups
@@ -349 +368 @@
         }
         HKL activeLayout = GetKeyboardLayout(0);
+#endif
 
         // clear table
@@ -355 +375 @@
 
         CKeyMap::KeyItem item;
-        SInt32 numGroups = (SInt32)m_groups.size();
-        for (SInt32 g = 0; g < numGroups; ++g) {
+//      SInt32 numGroups = (SInt32)m_groups.size();
+//      for (SInt32 g = 0; g < numGroups; ++g) {
+        for (SInt32 g = 0; g < 1; ++g) {
                 item.m_group = g;
-                ActivateKeyboardLayout(m_groups[g], 0);
+//              ActivateKeyboardLayout(m_groups[g], 0);
 
                 // clear tables
                 memset(m_buttonToVK, 0, sizeof(m_buttonToVK));
-                memset(m_buttonToNumpadVK, 0, sizeof(m_buttonToNumpadVK));
 
                 // map buttons (scancodes) to virtual keys
                 for (KeyButton i = 1; i < 256; ++i) {
-                        ULONG vk = MapVirtualKey(i, 1);
-                        if (vk == 0) {
-                                // unmapped
-                                continue;
-                        }
-
-                        // deal with certain virtual keys specially
-                        switch (vk) {
-                        case VK_SHIFT:
-                                if (MapVirtualKey(VK_RSHIFT, 0) == i) {
-                                        vk = VK_RSHIFT;
-                                }
-                                else {
-                                        vk = VK_LSHIFT;
-                                }
-                                break;
-
-                        case VK_CONTROL:
-                                vk = VK_LCONTROL;
-                                break;
-
-                        case VK_MENU:
-                                vk = VK_LMENU;
-                                break;
-
-                        case VK_NUMLOCK:
-                                vk = VK_PAUSE;
-                                break;
-
-                        case VK_NUMPAD0:
-                        case VK_NUMPAD1:
-                        case VK_NUMPAD2:
-                        case VK_NUMPAD3:
-                        case VK_NUMPAD4:
-                        case VK_NUMPAD5:
-                        case VK_NUMPAD6:
-                        case VK_NUMPAD7:
-                        case VK_NUMPAD8:
-                        case VK_NUMPAD9:
-                        case VK_DECIMAL:
-                                // numpad keys are saved in their own table
-                                m_buttonToNumpadVK[i] = vk;
-                                continue;
-
-                        case VK_LWIN:
-                        case VK_RWIN:
-                                // add extended key only for these on 95 family
-                                if (m_is95Family) {
-                                        m_buttonToVK[i | 0x100u] = vk;
-                                        continue;
-                                }
-                                break;
-
-                        case VK_RETURN:
-                        case VK_PRIOR:
-                        case VK_NEXT:
-                        case VK_END:
-                        case VK_HOME:
-                        case VK_LEFT:
-                        case VK_UP:
-                        case VK_RIGHT:
-                        case VK_DOWN:
-                        case VK_INSERT:
-                        case VK_DELETE:
-                                // also add extended key for these
-                                m_buttonToVK[i | 0x100u] = vk;
-                                break;
-                        }
-
-                        if (m_buttonToVK[i] == 0) {
-                                m_buttonToVK[i] = vk;
+            USHORT usVirtualKey = i;
+            USHORT fShiftState = 0;
+                        WinTranslateChar2(0, &usVirtualKey, NULL, TC_SCANCODETOVIRTUALKEY, &fShiftState);
+                        if (    usVirtualKey != 0
+                &&  m_buttonToVK[i] == 0) {
+                m_buttonToVK[i] = usVirtualKey;
                         }
                 }
@@ -448 +403 @@
                         // skip virtual keys we don't want
                         switch (i) {
-                        case VK_LBUTTON:
-                        case VK_RBUTTON:
-                        case VK_MBUTTON:
-                        case VK_XBUTTON1:
-                        case VK_XBUTTON2:
+                        case VK_BUTTON1:
+                        case VK_BUTTON2:
+                        case VK_BUTTON3:
                         case VK_SHIFT:
-                        case VK_CONTROL:
+                        case VK_CTRL:
                         case VK_MENU:
                                 continue;
@@ -460 +413 @@
 
                         // get the button
-                        KeyButton button = static_cast<KeyButton>(MapVirtualKey(i, 0));
-                        if (button == 0) {
-                                continue;
-                        }
-
-                        // deal with certain virtual keys specially
-                        switch (i) {
-                        case VK_NUMPAD0:
-                        case VK_NUMPAD1:
-                        case VK_NUMPAD2:
-                        case VK_NUMPAD3:
-                        case VK_NUMPAD4:
-                        case VK_NUMPAD5:
-                        case VK_NUMPAD6:
-                        case VK_NUMPAD7:
-                        case VK_NUMPAD8:
-                        case VK_NUMPAD9:
-                        case VK_DECIMAL:
-                                m_buttonToNumpadVK[button] = i;
-                                break;
-
-                        default:
-                                // add extended key if virtual keys don't match
-                                if (m_buttonToVK[button] != i) {
-                                        m_buttonToVK[button | 0x100u] = i;
-                                }
-                                break;
-                        }
-                }
-
-                // add alt+printscreen
-                if (m_buttonToVK[0x54u] == 0) {
-                        m_buttonToVK[0x54u] = VK_SNAPSHOT;
-                }
+            USHORT usButton = i;
+            USHORT fShiftState = 0;
+            WinTranslateChar2(0, &usButton, NULL, TC_VIRTUALKEYTOSCANCODE, &fShiftState);
+
+            // add extended key if virtual keys don't match
+                        if (    usButton != 0
+                &&  m_buttonToVK[usButton] != i) {
+                m_buttonToVK[usButton | 0x100u] = i;
+                        }
+                }
+
+/// @todo?
+//              // add alt+printscreen
+//              if (m_buttonToVK[0x54u] == 0) {
+//                      m_buttonToVK[0x54u] = VK_SNAPSHOT;
+//              }
 
                 // set virtual key to button table
-                if (GetKeyboardLayout(0) == m_groups[g]) {
+//              if (GetKeyboardLayout(0) == m_groups[g]) {
                         for (KeyButton i = 0; i < 512; ++i) {
                                 if (m_buttonToVK[i] != 0) {
@@ -503 +438 @@
                                         }
                                 }
-                                if (m_buttonToNumpadVK[i] != 0) {
-                                        if (m_virtualKeyToButton[m_buttonToNumpadVK[i]] == 0) {
-                                                m_virtualKeyToButton[m_buttonToNumpadVK[i]] = i;
-                                        }
-                                }
-                        }
-                }
-
-                // add numpad keys
-                for (KeyButton i = 0; i < 512; ++i) {
-                        if (m_buttonToNumpadVK[i] != 0) {
-                                item.m_id        = getKeyID(m_buttonToNumpadVK[i], i);
-                                item.m_button    = i;
-                                item.m_required  = KeyModifierNumLock;
-                                item.m_sensitive = KeyModifierNumLock | KeyModifierShift;
-                                item.m_generates = 0;
-                                item.m_client    = m_buttonToNumpadVK[i];
-                                addKeyEntry(keyMap, item);
-                        }
-                }
-
-                // add other keys
+                        }
+//              }
+
+                // add the keys to the map.
                 BYTE keys[256];
                 memset(keys, 0, sizeof(keys));
                 for (KeyButton i = 0; i < 512; ++i) {
-                        if (m_buttonToVK[i] != 0) {
+            USHORT usChar = i;
+            USHORT fCharShiftState = 0;
+            USHORT fCharKCFlags = WinTranslateChar2(0, &usChar, NULL, TC_SCANCODETOVIRTUALKEY, &fCharShiftState);
+                        if (    usChar
+                ||  m_buttonToVK[i]) {
                                 // initialize item
                                 item.m_id        = getKeyID(m_buttonToVK[i], i);
@@ -534 +455 @@
                                 item.m_required  = 0;
                                 item.m_sensitive = 0;
-                                item.m_client    = m_buttonToVK[i];
+                                item.m_client    = (m_buttonToVK[i] & 0xff) //  0-7 : virtual key.
+                                 | (i << 8)                 //  8-15: scancode
+                                 | (usChar & 0x3fff)        // 16-29: PM char
+                                 | (0 << 30)                //    30: KC_DEADKEY ??
+                                 | (0 << 31);               //    31: KC_COMPOSITE ??
 
                                 // get flags for modifier keys
@@ -540 +465 @@
 
                                 if (item.m_id == 0) {
+#if 0
                                         // translate virtual key to a character with and without
                                         // shift, caps lock, and AltGr.
@@ -551 +477 @@
                                                 { VK_SHIFT,   VK_SHIFT,   0x80u, KeyModifierShift    },
                                                 { VK_CAPITAL, VK_CAPITAL, 0x01u, KeyModifierCapsLock },
-                                                { VK_CONTROL, VK_MENU,    0x80u, KeyModifierControl |
-                                                                                                                 KeyModifierAlt      }
+                                                { VK_CONTROL, VK_MENU,    0x80u, KeyModifierControl | KeyModifierAlt }
                                         };
-                                        static const size_t s_numModifiers =
-                                                sizeof(modifiers) / sizeof(modifiers[0]);
+                                        static const size_t s_numModifiers = sizeof(modifiers) / sizeof(modifiers[0]);
                                         static const size_t s_numCombinations = 1 << s_numModifiers;
                                         KeyID id[s_numCombinations];
@@ -572 +496 @@
                                                         }
                                                 }
-                                                id[j] = getIDForKey(item, button,
-                                                                                m_buttonToVK[i], keys, m_groups[g]);
+                                                id[j] = getIDForKey(item, button, m_buttonToVK[i], keys, m_groups[g]);
                                                 if (id[j] != 0) {
                                                         anyFound = true;
@@ -607 +530 @@
                                                 }
                                         }
-                                }
-                                else {
-                                        // found in table
+#endif
+                                } else {
+                                        // found in table - adjust modifiers and add it.
                                         switch (m_buttonToVK[i]) {
-                                        case VK_TAB:
-                                                // add kKeyLeftTab, too
-                                                item.m_id         = kKeyLeftTab;
+                                        case VK_BACKTAB:
                                                 item.m_required  |= KeyModifierShift;
                                                 item.m_sensitive |= KeyModifierShift;
-                                                addKeyEntry(keyMap, item);
-                                                item.m_id         = kKeyTab;
-                                                item.m_required  &= ~KeyModifierShift;
-                                                break;
-
-                                        case VK_CANCEL:
-                                                item.m_required  |= KeyModifierControl;
-                                                item.m_sensitive |= KeyModifierControl;
-                                                break;
-
-                                        case VK_SNAPSHOT:
-                                                item.m_sensitive |= KeyModifierAlt;
-                                                if ((i & 0x100u) == 0) {
-                                                        // non-extended snapshot key requires alt
-                                                        item.m_required |= KeyModifierAlt;
-                                                }
                                                 break;
                                         }
@@ -637 +542 @@
                                 }
                         }
-                }
-        }
-
+                } // for buttons 0 thru 511
+        }
+
+#if 0
         // restore keyboard layout
         ActivateKeyboardLayout(activeLayout, 0);
@@ -648 +554 @@
 CPMKeyState::fakeKey(const Keystroke& keystroke)
 {
+    LOG((CLOG_DEBUG "fakeKey:"));
         switch (keystroke.m_type) {
         case Keystroke::kButton: {
-                LOG((CLOG_DEBUG1 "  %03x (%08x) %s%s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client, 
+                LOG((CLOG_DEBUG1 "  %03x (%08x) %s%s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client,
              keystroke.m_data.m_button.m_press ? "down" : "up", keystroke.m_data.m_button.m_repeat ? " repeate" : ""));
                 KeyButton button = keystroke.m_data.m_button.m_button;
 
-                // windows doesn't send key ups for key repeats
+                // OS/2 doesn't send key ups for key repeats
                 if (keystroke.m_data.m_button.m_repeat &&
                         !keystroke.m_data.m_button.m_press) {
-                        LOG((CLOG_DEBUG1 "  discard key repeat release"));
+                        LOG((CLOG_DEBUG "  discard key repeat release"));
                         break;
                 }
 
-                // get the virtual key for the button
-                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 
+                // unpack the m_client packet.
+                USHORT virtualKey = 0;//keystroke.m_data.m_button.m_client & 0xff;
+        UCHAR  scanCode = (keystroke.m_data.m_button.m_client >> 8) & 0xff;
+        USHORT pmChar = 0;//(keystroke.m_data.m_button.m_client >> 16) & 0xff;
+        bool   fKC_DEADKEY = (keystroke.m_data.m_button.m_client >> 30) & 1;
+        bool   fKC_COMPOSITE = (keystroke.m_data.m_button.m_client >> 31) & 1;
+
+        // synthesize message
+        HAB hab = CPMUtil::getHAB();/// @todo fix this
+        QMSG qmsg;
+        qmsg.hwnd = NULLHANDLE;
+        qmsg.msg = WM_CHAR;
+        qmsg.ptl.x = 0;
+        qmsg.ptl.y = 0;
+        qmsg.time = WinGetCurrentTime(hab);
+        qmsg.reserved = 0;
+
+        // mp2
+        if (!keystroke.m_data.m_button.m_press) {
+            pmChar |= 0x0e00; /// @todo figure out what's going on here...
+        }
+        qmsg.mp2 = MPFROM2SHORT(pmChar, virtualKey);
+
+        // mp1
+        USHORT fFlags = 0;
+        if (!keystroke.m_data.m_button.m_press) {
+            fFlags |= KC_KEYUP;
+            /// @todo KC_LONEKEY and KC_TOGGLE, or will PM take care of that?
+        }
+        /// @todo check that PM does KC_CTRL, KC_ALT and KC_SHIFT.
+        /// @todo check that PM does KC_INVALIDCOMP
+        if (fKC_DEADKEY)    fFlags |= KC_DEADKEY;
+        if (fKC_COMPOSITE)  fFlags |= KC_COMPOSITE;
+//        if (virtualKey)     fFlags |= KC_VIRTUALKEY;
+//        if (keystroke.m_data.m_button.m_press && pmChar)
+//                            fFlags |= KC_CHAR;
+        if (scanCode)       fFlags |= KC_SCANCODE;
+        if (!keystroke.m_data.m_button.m_press && m_lastButton == scanCode)
+                            fFlags |= KC_LONEKEY;
+        // PM does: KC_TOGGLE, KC_CTRL, KC_ALT, KC_SHIFT. more?
+        qmsg.mp1 = MPFROMSH2CH(fFlags, 1, scanCode); /** @todo translate the scan code back to its untranslated form. */
+
+        // finaly inject it.
+        const char *pszError = m_fakeMsg(hab, &qmsg);
+        if (pszError) {
+                        LOG((CLOG_ERR " fakeMsg failed to inject msg=%#lx mp1=%#lx mp2=%#lx: %s", qmsg.msg, qmsg.mp1, qmsg.mp2, pszError));
+        }
+
+        // remember the previous key for KC_LONEKEY.
+        if (keystroke.m_data.m_button.m_press && !keystroke.m_data.m_button.m_repeat)
+            m_lastButton = scanCode;
                 break;
         }
@@ -689 +638 @@
                         }
                 }
-#endif 
+#endif
                 break;
         }
@@ -697 +646 @@
 CPMKeyState::getActiveModifiersRValue()
 {
+    LOG((CLOG_DEBUG "getActiveModifiersRValue:"));
         if (m_useSavedModifiers) {
                 return m_savedModifiers;
         }
-        else {
-                return CKeyState::getActiveModifiersRValue();
-        }
+    return CKeyState::getActiveModifiersRValue();
 }
 
@@ -708 +656 @@
 CPMKeyState::getKeyID(ULONG virtualKey, KeyButton button)
 {
-        if ((button & 0x100u) != 0) {
-                virtualKey += 0x100u;
-        }
-        return s_virtualKey[virtualKey];
+    LOG((CLOG_DEBUG "getKeyID:"));
+//      if ((button & 0x100u) != 0) {
+//              virtualKey += 0x100u;
+//      }
+//      return s_virtualKey[virtualKey];
+        return  virtualKey < sizeof(s_virtualKey) / sizeof(s_virtualKey[0])
+        ?  s_virtualKey[virtualKey]
+        : kKeyNone;
 }
 
@@ -719 +671 @@
                                 PBYTE keyState) const
 {
+    LOG((CLOG_DEBUG "getIDForKey:"));
 #if 0
         int n;
@@ -750 +703 @@
 CPMKeyState::addKeyEntry(CKeyMap& keyMap, CKeyMap::KeyItem& item)
 {
+    LOG((CLOG_DEBUG "addKeyEntry:"));
         keyMap.addKeyEntry(item);
         if (item.m_group == 0) {
-                m_keyToVKMap[item.m_id] = static_cast<ULONG>(item.m_client);
-        }
+                m_keyToVKMap[item.m_id] = item.m_client;
+    }
 }
 

trunk/synergy/lib/platform/CPMKeyState.h

@@ -19 +19 @@
 #include "CKeyState.h"
 #include "CString.h"
+#include "CPMSynergyHook.h"
 #include "stdvector.h"
 #define INCL_ERRORS
@@ -34 +35 @@
 class CPMKeyState : public CKeyState {
 public:
-        CPMKeyState(void* eventTarget);
+        CPMKeyState(void* eventTarget, FakeMsgFunc fakeMsg);
         virtual ~CPMKeyState();
 
@@ -153 +154 @@
 
 private:
-        typedef std::map<KeyID, ULONG> KeyToVKMap;
-
+        typedef std::map<KeyID, UInt32> KeyToVKMap;
         void*                           m_eventTarget;
         ULONG                           m_buttonToVK[512];
-        ULONG                           m_buttonToNumpadVK[512];
         KeyButton                       m_virtualKeyToButton[256];
         KeyToVKMap                      m_keyToVKMap;
+
+    // function which can inject fake WM_CHAR messages.
+    FakeMsgFunc                 m_fakeMsg;
+
+    // the last button pressed.
+    KeyButton           m_lastButton;
 
         // the timer used to check for fixing key state

trunk/synergy/lib/platform/CPMScreen.cpp

@@ -96 +96 @@
                 m_hmodHook = openHookLibrary("synrgyhk");
                 m_screensaver = new CPMScreenSaver();
-                m_keyState    = new CPMKeyState(getEventTarget());
+                m_keyState    = new CPMKeyState(getEventTarget(), m_fakeMsg);
                 updateScreenShape();
                 m_window      = createWindow("Synergy");

trunk/synergy/lib/platform/CPMUtil.cpp

@@ -3 +3 @@
  * Copyright (C) 2004 Chris Schoeneman
  * Copyright (C) 2006 Knut St. Osmundsen
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -67 +67 @@
                 return result;
         }
-#endif 
+#endif
 }
 
@@ -83 +83 @@
 }
 
+
+/** dynamic resolver */
+USHORT APIENTRY WinTranslateChar2(USHORT  usCodePage,
+                                  PUSHORT pusCharInOut,
+                                  PULONG  pulDeadKeyInfo,
+                                  WINTCOP enmOperation,
+                                  PUSHORT pfShiftState)
+{
+    static USHORT (* APIENTRY pfnWinTranslateChar2)(USHORT, PUSHORT, PULONG, WINTCOP, PUSHORT) = NULL;
+    if (!pfnWinTranslateChar2) {
+        /* resolve it */
+        HMODULE hmod;
+        if (    DosLoadModule(NULL, 0, (PCSZ)"PMWIN", &hmod) != NO_ERROR
+            ||  DosQueryProcAddr(hmod, 1070, NULL, (PPFN)&pfnWinTranslateChar2) != NO_ERROR) {
+            asm("int3");
+            *pusCharInOut = 0;
+            return 0;
+        }
+        DosFreeModule(hmod);
+    }
+    return pfnWinTranslateChar2(usCodePage, pusCharInOut, pulDeadKeyInfo, enmOperation, pfShiftState);
+}
+

trunk/synergy/lib/platform/CPMUtil.h

@@ -3 +3 @@
  * Copyright (C) 2004 Chris Schoeneman
  * Copyright (C) 2006 Knut St. Osmundsen
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -37 +37 @@
         */
         static CString          getErrorString(HMODULE hmod, ULONG error, ULONG id);
-    
+
     static HAB          getHAB(void);
     static HMQ          getHMQ(HAB hab = NULLHANDLE);
@@ -43 +43 @@
 };
 
+
+/** The WinTranlateChar2 operation. */
+typedef enum WINTCOP
+{
+    TC_CHARTOSCANCODE = 0,
+    TC_SCANCODETOCHAR,
+    TC_VIRTUALKEYTOSCANCODE,
+    TC_SCANCODETOVIRTUALKEY,
+    TC_SCANTOOEMSCAN,
+    TC_OEMSCANTOSCAN,
+    TC_SIZE_HACK = 0x7fff
+} WINTCOP;
+
+/** @name WinTranslateChar2 shift state.
+ * This state goes with scancode input/output.
+ * @{ */
+#define TCF_LSHIFT          0x1
+#define TCF_RSHIFT          0x2
+#define TCF_SHIFT           (TCF_LSHIFT | TCF_RSHIFT)
+#define TCF_LCONTROL        0x4
+#define TCF_RCONTROL        0x8
+#define TCF_CONTROL         (TCF_LCONTROL | TCF_RCONTROL)
+#define TCF_ALT             0x10
+#define TCF_ALTGR           0x20
+#define TCF_CAPSLOCK        0x40
+#define TCF_NUMLOCK         0x80
+#define TCF_MAX_BITS        8       /**< bits 0-7 are real shift states */
+#define TCF_OEMSCANCODE     0x100
+#define TCF_EXTENDEDKEY     0x200
+/** @} */
+
+/**
+ * Char to/from keyboard code translator.
+ *
+ * @returns A combination of some of the KC_* values.
+ * @param   usCodePage          The code page. Anything goes, apparently ignored.
+ * @param   pusCharInOut        Where to get the char/code to be translated and to
+ *                              put the output upon return.
+ * @param   pulDeadKeyInfo      Previous, dead key.
+ * @param   enmOperation        The kind of translation.
+ * @param   pfShiftState        Where to read/store the shift state. Used when
+ *                              translating from/to scancodes.
+ * @remark  PMWIN.1070
+ */
+extern "C"
+USHORT APIENTRY WinTranslateChar2(USHORT  usCodePage,
+                                  PUSHORT pusCharInOut,
+                                  PULONG  pulDeadKeyInfo,
+                                  WINTCOP enmOperation,
+                                  PUSHORT pfShiftState);
+
 #endif
+