Changeset 2761

Timestamp:

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

Author:

bird

Message:

Hacking and debugging.

Location:

trunk/synergy/lib/platform

Files:

• CPMEventQueueBuffer.cpp (modified) (10 diffs)
• CPMEventQueueBuffer.h (modified) (1 diff)
• CPMKeyState.cpp (modified) (16 diffs)
• CPMKeyState.h (modified) (2 diffs)
• CPMScreen.cpp (modified) (3 diffs)
• CPMUtil.cpp (modified) (2 diffs)
• CPMUtil.h (modified) (1 diff)

trunk/synergy/lib/platform/CPMEventQueueBuffer.cpp

@@ -16 +16 @@
 #include "CPMEventQueueBuffer.h"
 #include "CThread.h"
+#include "CLog.h"
 #include "IEventQueue.h"
+#include "CPMUtil.h"
+#include <unistd.h>
 
 //
@@ -31 +34 @@
 CPMEventQueueBuffer::CPMEventQueueBuffer()
 {
-        // remember the queue (/ thread / hab).  we'll be posting messages to it.
-    m_hab = WinInitialize(0);
-    m_hmq = WinCreateMsgQueue(m_hab, 0);
-    assert(m_hmq != NULLHANDLE);
+    // the anchor block. Remeber it for use when waiting, peeking, and getting events.
+    m_hab = NULLHANDLE;
+    PTIB pTib;
+    PPIB pPib;
+    DosGetInfoBlocks(&pTib, &pPib);
+    LOG((CLOG_DEBUG2 "CPMEventQueueBuffer: ultype=%lx tid=%lx", pPib->pib_ultype, pTib->tib_ptib2->tib2_ultid));
+    if (pPib->pib_ultype != 3) {
+        pPib->pib_ultype = 3;
+        m_shallTerminate = true;
+        m_hab = WinInitialize(0);
+    }
+    if (m_hab == NULLHANDLE) {
+        m_hab = CPMUtil::getHAB();
+        if (m_hab == NULLHANDLE) {
+            m_shallTerminate = true;
+            m_hab = WinInitialize(0);
+        }
+    }
+     
+    // the message queue. remember it so we can post and get messages.
+    m_hmq = CPMUtil::getHMQ(m_hab);
+    if (m_hmq == NULLHANDLE) {
+        m_shallDestroyMsgQueue = true;
+        m_hmq = WinCreateMsgQueue(m_hab, 0);
+    }
+
+    // check that we succeeded the two previous steps.
+    if (m_hab == NULLHANDLE || m_hmq == NULLHANDLE) {
+                LOG((CLOG_CRIT "couldn't get the hab(%lx)/hmq(%lx) of the current thread!", m_hab, m_hmq));
+                assert(m_hab != NULLHANDLE && m_hmq != NULLHANDLE);
+        }
+    assert(CPMUtil::getHAB() == m_hab);
 
         // create a message type for custom events
@@ -46 +77 @@
     APIRET rc = DosCreateEventSem(NULL, &m_hev, 0, FALSE);
     assert(rc == NO_ERROR);
+    LOG((CLOG_DEBUG2 "CPMEventQueueBuffer: m_userEvent=%#lx m_daemonQuit=%#lx m_hev=%#lx m_hab=%#lx m_hmq=%#lx m_shallTermiate=%d m_shallDestroyMsgQueue=%d", 
+         m_userEvent, m_daemonQuit, m_hev, m_hab, m_hmq, m_shallTerminate, m_shallDestroyMsgQueue));
 }
 
@@ -52 +85 @@
         // do nothing
     DosCloseEventSem(m_hev);
-    WinDestroyMsgQueue(m_hmq);
-    WinTerminate(m_hab);
+    if (m_shallDestroyMsgQueue) {
+        WinDestroyMsgQueue(m_hmq);
+    }
+    if (m_shallTerminate) {
+        WinTerminate(m_hab);
+    }
 }
 
@@ -62 +99 @@
     ULONG fStatus = WinQueryQueueStatus(HWND_DESKTOP);
     if (!fStatus) {
+        ULONG cPosts;
+        DosResetEventSem(m_hev, &cPosts);
+        fStatus = WinQueryQueueStatus(HWND_DESKTOP);
+    }
+    LOG((CLOG_DEBUG2 "waitForEvent: %#lx", fStatus)); 
+    if (!fStatus) {
         // convert timeout and wait.
         ULONG ulPMTimeout = timeout < 0.0
@@ -67 +110 @@
                           : (ULONG)(1000.0 * timeout);
         WinWaitEventSem(m_hev, ulPMTimeout);
+        LOG((CLOG_DEBUG2 "waitForEvent: ulPMTimeout=%ld", ulPMTimeout)); 
     }
 }
@@ -76 +120 @@
     QMSG qmsg;
     if (!WinPeekMsg(m_hab, &qmsg, NULLHANDLE, 0, 0, PM_NOREMOVE)) {
+        LOG((CLOG_DEBUG2 "getEvent: kNone"));
                 return kNone;
     }
@@ -88 +133 @@
     if (m_event.msg == m_userEvent) {
                 dataID = (UInt32)(uintptr_t)m_event.mp1;
+        LOG((CLOG_DEBUG2 "getEvent: dataID=%#x", dataID));
                 return kUser;
         }
 
     event = CEvent(CEvent::kSystem, IEventQueue::getSystemTarget(), &m_event);
+    LOG((CLOG_DEBUG2 "getEvent: kSystem"));
     return kSystem;
 }
@@ -98 +145 @@
 CPMEventQueueBuffer::addEvent(UInt32 dataID)
 {
-    return WinPostQueueMsg(m_hmq, m_userEvent, (MPARAM)dataID, 0) != FALSE;
+    LOG((CLOG_DEBUG2 "addEvent: dataID=%#x", dataID));
+    BOOL fRc = WinPostQueueMsg(m_hmq, m_userEvent, (MPARAM)dataID, 0) != FALSE;
+    if (fRc) {
+        DosPostEventSem(m_hev);
+    } else {
+        LOG((CLOG_CRIT "addEvent: dataID=%#x fRc=%d lasterr=%d", dataID, WinGetLastError(CPMUtil::getHAB()))); 
+    }
+    return fRc;
 }
 
@@ -105 +159 @@
 {
     ULONG fStatus = WinQueryQueueStatus(HWND_DESKTOP);
-        return fStatus != 0;
+    LOG((CLOG_DEBUG2 "isEmpty: %#lx", fStatus)); 
+        return fStatus == 0;
 }
 

trunk/synergy/lib/platform/CPMEventQueueBuffer.h

@@ -39 +39 @@
 
 private:
+    bool                m_shallTerminate;
         HAB                                 m_hab;
+    bool                m_shallDestroyMsgQueue;
         HMQ                                 m_hmq;
     HEV                 m_hev;

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);
         }
 }

trunk/synergy/lib/platform/CPMKeyState.h

@@ -128 +128 @@
 
         // CKeyState overrides
-        virtual void            onKey(KeyButton button, bool down,
-                                                        KeyModifierMask newState);
         virtual void            sendKeyEvent(void* target,
                                                         bool press, bool isAutoRepeat,
@@ -143 +141 @@
 
 private:
-        void                            fixKeys();
-        void                            handleFixKeys(const CEvent&, void*);
-
         KeyID                           getIDForKey(CKeyMap::KeyItem& item,
                                                         KeyButton button, ULONG virtualKey,

trunk/synergy/lib/platform/CPMScreen.cpp

@@ -70 +70 @@
 {
         assert(s_screen == NULL);
-
         s_screen = this;
+    
+    // create the event queue buffer first so we know there is a message queue.
+    CPMEventQueueBuffer *eventQueue = new CPMEventQueueBuffer();
 
         // query curren thread bits.
         m_threadID = _gettid();
         m_hab = WinQueryAnchorBlock(HWND_DESKTOP);
+    //if (m_hab == NULLHANDLE) {
+        //    m_hab = WinInitialize(0);
+    //}
         m_hmq = WinQueueFromID(m_hab, getpid(), _gettid());
+    //if (m_hab != NULLHANDLE && m_hmq == NULLHANDLE) {
+    //    m_hmq = WinCreateMsgQueue(m_hab, 0);
+    //}
         if (m_hab == NULLHANDLE || m_hmq == NULLHANDLE) {
-                LOG((CLOG_CRIT "couldn't get the hab/hmq of the current thread!\n"));
+                LOG((CLOG_CRIT "couldn't get the hab(%ld)/hmq(%ld) of the current thread! %d\n", m_hab, m_hmq));
+        delete eventQueue;
+                s_screen = NULL;
                 throw XScreenOpenFailure();
         }
@@ -97 +107 @@
                 destroyWindow(m_window);
                 closeHookLibrary(m_hmodHook);
+        delete eventQueue;
                 s_screen = NULL;
                 throw;
@@ -626 +637 @@
                                                                 0, //WS_?,
                                                                 0, 0, 1, 1,
-                                                                HWND_DESKTOP,
                                                                 NULLHANDLE,
+                                                                HWND_TOP,
                                                                 0,
                                                                 this,
                                                                 NULL);
         if (hwnd == NULLHANDLE) {
-                LOG((CLOG_ERR "failed to create window: %ld", WinGetLastError(m_hab)));
+                LOG((CLOG_ERR "failed to create window: %lx", WinGetLastError(m_hab)));
                 throw XScreenOpenFailure();
         }

trunk/synergy/lib/platform/CPMUtil.cpp

@@ -17 +17 @@
 #include "CStringUtil.h"
 #include <stdio.h>
+#include <process.h>
 
 //
@@ -74 +75 @@
 }
 
+HMQ CPMUtil::getHMQ(HAB hab /* = NULLHANDLE */)
+{
+    if (hab == NULLHANDLE) {
+        hab = getHAB();
+    }
+    return WinQueueFromID(hab, getpid(), _gettid());
+}
+

trunk/synergy/lib/platform/CPMUtil.h

@@ -39 +39 @@
     
     static HAB          getHAB(void);
+    static HMQ          getHMQ(HAB hab = NULLHANDLE);
 
 };