Changeset 2755 for trunk/synergy/lib/platform/CPMScreen.cpp

Timestamp:

Jul 31, 2006, 5:21:38 AM (19 years ago)

Author:

bird

Message:

bedtime

File:

• trunk/synergy/lib/platform/CPMScreen.cpp (modified) (53 diffs)

trunk/synergy/lib/platform/CPMScreen.cpp

@@ -34 +34 @@
 #include "CPMUtil.h"
 #include <string.h>
+#include <unistd.h>
 
 //
@@ -44 +45 @@
         m_isPrimary(isPrimary),
         m_isOnScreen(m_isPrimary),
-        m_class(0),
         m_x(0), m_y(0),
         m_cx(0), m_cy(0),
@@ -53 +53 @@
         m_mark(0),
         m_markReceived(0),
-        m_fixTimer(NULL),
         m_screensaver(NULL),
         m_screensaverNotify(false),
@@ -73 +72 @@
 
         s_screen = this;
+
+        // query curren thread bits.
+        m_threadID = _gettid();
+        m_hab = WinQueryAnchorBlock(HWND_DESKTOP);
+        m_hmq = WinQueueFromID(m_hab, getpid(), _gettid());
+        if (m_hab == NULLHANDLE || m_hmq == NULLHANDLE) {
+                LOG((CLOG_CRIT "couldn't get the hab/hmq of the current thread!\n"));
+                throw XScreenOpenFailure();
+        }
+
         try {
-                if (m_isPrimary) {
+                if (m_isPrimary)
                         m_hmodHook = openHookLibrary("synrgyhk");
-                }
                 m_screensaver = new CPMScreenSaver();
                 m_keyState    = new CPMKeyState(getEventTarget());
                 updateScreenShape();
-                m_class       = createWindowClass();
-                m_window      = createWindow(m_class, "Synergy");
+                m_window      = createWindow("Synergy");
                 forceShowCursor();
                 LOG((CLOG_DEBUG "screen shape: %d,%d %dx%d %s", m_x, m_y, m_cx, m_cy, m_multimon ? "(multi-monitor)" : ""));
                 LOG((CLOG_DEBUG "window is 0x%08x", m_window));
-        }
-        catch (...) {
+        } catch (...) {
                 delete m_keyState;
                 delete m_screensaver;
                 destroyWindow(m_window);
-                destroyClass(m_class);
                 closeHookLibrary(m_hmodHook);
                 s_screen = NULL;
@@ -98 +103 @@
         // install event handlers
         EVENTQUEUE->adoptHandler(CEvent::kSystem, IEventQueue::getSystemTarget(),
-                                                        new TMethodEventJob<CPMScreen>(this,
-                                                                &CPMScreen::handleSystemEvent));
+                                                        new TMethodEventJob<CPMScreen>(this, &CPMScreen::handleSystemEvent));
 
         // install the platform event queue
@@ -115 +119 @@
         delete m_screensaver;
         destroyWindow(m_window);
-        destroyClass(m_class);
         closeHookLibrary(m_hmodHook);
         s_screen = NULL;
@@ -124 +127 @@
 {
         assert(m_isOnScreen == m_isPrimary);
-
-        // we need to poll some things to fix them
-        m_fixTimer = EVENTQUEUE->newTimer(1.0, NULL);
-        EVENTQUEUE->adoptHandler(CEvent::kTimer, m_fixTimer,
-                                                         new TMethodEventJob<CPMScreen>(this, &CPMScreen::handleFixes));
 
         // install our clipboard snooper
@@ -135 +133 @@
     WinSetClipbrdViewer(hab, m_window);
 
-/// @todo start here!
-        // track the active desk and (re)install the hooks
-        m_desks->enable();
-
         if (m_isPrimary) {
                 // set jump zones
@@ -151 +145 @@
 CPMScreen::disable()
 {
-        // stop tracking the active desk
-        m_desks->disable();
-
         if (m_isPrimary) {
                 // disable hooks
@@ -166 +157 @@
         m_nextClipboardWindow = NULL;
 
-        // uninstall fix timer
-        if (m_fixTimer != NULL) {
-                EVENTQUEUE->removeHandler(CEvent::kTimer, m_fixTimer);
-                EVENTQUEUE->deleteTimer(m_fixTimer);
-                m_fixTimer = NULL;
-        }
-
         m_isOnScreen = m_isPrimary;
         forceShowCursor();
@@ -180 +164 @@
 CPMScreen::enter()
 {
-        m_desks->enter();
+        // show the pointer (?), hide the synergy window and restore focus.
+        WinShowPointer(HWND_DESKTOP, TRUE);
+        WinSetWindowPos(m_window, HWND_BOTTOM, 0, 0, 0, 0, SWP_HIDE);
+        //?? WinSetFocus(
+        //?? WinEnableWindow
+
         if (m_isPrimary) {
                 // watch jump zones
@@ -197 +186 @@
 CPMScreen::leave()
 {
+        /// @todo save focus window.
+
         if (m_isPrimary) {
                 // warp to center
@@ -252 +243 @@
 {
         m_screensaverNotify = notify;
-        if (!m_screensaverNotify) {
+        if (!m_screensaverNotify)
                 m_screensaver->disable();
-        }
 }
 
@@ -260 +250 @@
 CPMScreen::closeScreensaver()
 {
-        if (!m_screensaverNotify) {
+        if (!m_screensaverNotify)
                 m_screensaver->enable();
-        }
 }
 
@@ -268 +257 @@
 CPMScreen::screensaver(bool activate)
 {
-    if (activate) {
+    if (activate)
         m_screensaver->activate();
-    }
-    else {
+    else
         m_screensaver->deactivate();
-    }
 }
 
@@ -321 +308 @@
 CPMScreen::getShape(SInt32& x, SInt32& y, SInt32& cx, SInt32& cy) const
 {
-        assert(m_class != 0);
-
         x = m_x;
         y = m_y;
@@ -356 +341 @@
         // remove all input events before and including warp
         QMSG qmsg;
-        while (WinPeekMsg(m_hab, &qmsg, NULLHANDLE, SYNERGY_MSG_INPUT_FIRST, SYNERGY_MSG_INPUT_LAST, PM_REMOVE)) {
+        while (WinPeekMsg(m_hab, &qmsg, NULLHANDLE, SYNERGY_PM_MSG_INPUT_FIRST, SYNERGY_PM_MSG_INPUT_LAST, PM_REMOVE)) {
                 // do nothing
         }
@@ -483 +468 @@
                 m_keyState->useSavedModifiers(true);
         }
-        m_desks->fakeInputBegin();
+        //m_desks->fakeInputBegin();
 }
 
@@ -491 +476 @@
         assert(m_isPrimary);
 
-        m_desks->fakeInputEnd();
+        //m_desks->fakeInputEnd();
         if (!m_isOnScreen) {
                 m_keyState->useSavedModifiers(false);
@@ -535 +520 @@
 CPMScreen::fakeMouseButton(ButtonID id, bool press) const
 {
-        m_desks->fakeMouseButton(id, press);
+        //m_desks->fakeMouseButton(id, press);
 }
 
@@ -541 +526 @@
 CPMScreen::fakeMouseMove(SInt32 x, SInt32 y) const
 {
-        m_desks->fakeMouseMove(x, y);
+        //m_desks->fakeMouseMove(x, y);
 }
 
@@ -547 +532 @@
 CPMScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const
 {
-        m_desks->fakeMouseRelativeMove(dx, dy);
+        //m_desks->fakeMouseRelativeMove(dx, dy);
 }
 
@@ -553 +538 @@
 CPMScreen::fakeMouseWheel(SInt32 xDelta, SInt32 yDelta) const
 {
-        m_desks->fakeMouseWheel(xDelta, yDelta);
+        //m_desks->fakeMouseWheel(xDelta, yDelta);
 }
 
@@ -559 +544 @@
 CPMScreen::updateKeys()
 {
-        m_desks->updateKeys();
+        //m_desks->updateKeys();
 }
 
@@ -592 +577 @@
 }
 
-HINSTANCE
+HMODULE
 CPMScreen::openHookLibrary(const char* name)
 {
         // load the hook library
-        HINSTANCE hookLibrary = LoadLibrary(name);
-        if (hookLibrary == NULL) {
-                LOG((CLOG_ERR "Failed to load hook library;  %s.dll is missing", name));
+        HMODULE hmod;
+        APIRET rc = DosLoadModule(NULL, 0, (PCSZ)name, &hmod);
+        if (rc != NO_ERROR) {
+                LOG((CLOG_ERR "Failed to load hook library (%s), rc=%d ", name, rc));
                 throw XScreenOpenFailure();
         }
 
         // look up functions
-        m_setSides  = (SetSidesFunc)GetProcAddress(hookLibrary, "setSides");
-        m_setZone   = (SetZoneFunc)GetProcAddress(hookLibrary, "setZone");
-        m_setMode   = (SetModeFunc)GetProcAddress(hookLibrary, "setMode");
-        m_init      = (InitFunc)GetProcAddress(hookLibrary, "init");
-        m_cleanup   = (CleanupFunc)GetProcAddress(hookLibrary, "cleanup");
-        if (m_setSides             == NULL ||
-                m_setZone              == NULL ||
-                m_setMode              == NULL ||
-                m_init                 == NULL ||
-                m_cleanup              == NULL) {
-                LOG((CLOG_ERR "Invalid hook library;  use a newer %s.dll", name));
+        if (    (rc = DosQueryProcAddr(hmod, 0, (PCSZ)"_setSides",      (PPFN)&m_setSides)) != NO_ERROR
+                ||      (rc = DosQueryProcAddr(hmod, 0, (PCSZ)"_setZone",       (PPFN)&m_setZone )) != NO_ERROR
+                ||      (rc = DosQueryProcAddr(hmod, 0, (PCSZ)"_setMode",       (PPFN)&m_setMode )) != NO_ERROR
+                ||      (rc = DosQueryProcAddr(hmod, 0, (PCSZ)"_init",          (PPFN)&m_init    )) != NO_ERROR
+                ||      (rc = DosQueryProcAddr(hmod, 0, (PCSZ)"_cleanup",       (PPFN)&m_cleanup )) != NO_ERROR) {
+                LOG((CLOG_ERR "Invalid hook library;  use a newer %s.dll (rc=%d)", name, rc));
+                DosFreeModule(hmod);
                 throw XScreenOpenFailure();
         }
 
         // initialize hook library
-        if (m_init(GetCurrentThreadId()) == 0) {
-                LOG((CLOG_ERR "Cannot initialize hook library;  is synergy already running?"));
+        if (m_init(m_hmq, _gettid(), getpid()) == 0) {
+                LOG((CLOG_ERR "Cannot initialize hook library; is synergy already running?"));
+                DosFreeModule(hmod);
                 throw XScreenOpenFailure();
         }
-
-        return hookLibrary;
-}
-
-void
-CPMScreen::closeHookLibrary(HINSTANCE hookLibrary) const
-{
-        if (hookLibrary != NULL) {
-                m_cleanup();
-                FreeLibrary(hookLibrary);
-        }
-}
-
-ATOM
-CPMScreen::createWindowClass() const
-{
-        WNDCLASSEX classInfo;
-        classInfo.cbSize        = sizeof(classInfo);
-        classInfo.style         = CS_DBLCLKS | CS_NOCLOSE;
-        classInfo.lpfnWndProc   = &CPMScreen::wndProc;
-        classInfo.cbClsExtra    = 0;
-        classInfo.cbWndExtra    = 0;
-        classInfo.hInstance     = s_instance;
-        classInfo.hIcon         = NULL;
-        classInfo.hCursor       = NULL;
-        classInfo.hbrBackground = NULL;
-        classInfo.lpszMenuName  = NULL;
-        classInfo.lpszClassName = "Synergy";
-        classInfo.hIconSm       = NULL;
-        return RegisterClassEx(&classInfo);
-}
-
-void
-CPMScreen::destroyClass(ATOM windowClass) const
-{
-        if (windowClass != 0) {
-                UnregisterClass(reinterpret_cast<LPCTSTR>(windowClass), s_instance);
+        return hmod;
+}
+
+void
+CPMScreen::closeHookLibrary(HMODULE hmod) const
+{
+        if (hmod != NULL) {
+                m_cleanup(m_hab);
+                DosFreeModule(hmod);
         }
 }
 
 HWND
-CPMScreen::createWindow(ATOM windowClass, const char* name) const
-{
-        HWND window = CreateWindowEx(WS_EX_TOPMOST |
-                                                                        WS_EX_TRANSPARENT |
-                                                                        WS_EX_TOOLWINDOW,
-                                                                reinterpret_cast<LPCTSTR>(windowClass),
-                                                                name,
-                                                                WS_POPUP,
+CPMScreen::createWindow(const char* name)
+{
+        WinRegisterClass(m_hab, (PCSZ)"Synergy", CPMScreen::wndProc, CS_MOVENOTIFY, sizeof(uintptr_t));
+        HWND hwnd = WinCreateWindow(HWND_DESKTOP,
+                                                                (PCSZ)"Synergy",
+                                                                NULL,
+                                                                0, //WS_?,
                                                                 0, 0, 1, 1,
-                                                                NULL, NULL,
-                                                                s_instance,
+                                                                HWND_DESKTOP,
+                                                                NULLHANDLE,
+                                                                0,
+                                                                this,
                                                                 NULL);
-        if (window == NULL) {
-                LOG((CLOG_ERR "failed to create window: %d", GetLastError()));
+        if (hwnd == NULLHANDLE) {
+                LOG((CLOG_ERR "failed to create window: %ld", WinGetLastError(m_hab)));
                 throw XScreenOpenFailure();
         }
-        return window;
+        return hwnd;
 }
 
@@ -686 +642 @@
 {
         if (hwnd != NULL) {
-                DestroyWindow(hwnd);
+                WinDestroyWindow(hwnd);
         }
 }
@@ -708 +664 @@
 CPMScreen::handleSystemEvent(const CEvent& event, void*)
 {
-        MSG* msg = reinterpret_cast<MSG*>(event.getData());
-        assert(msg != NULL);
-
-        if (CArchMiscWindows::processDialog(msg)) {
+        PQMSG pqmsg = (PQMSG)event.getData();
+        assert(pqmsg != NULL);
+        if (onPreDispatch(pqmsg->hwnd, pqmsg->msg, pqmsg->mp1, pqmsg->mp2))
                 return;
-        }
-        if (onPreDispatch(msg->hwnd, msg->message, msg->wParam, msg->lParam)) {
-                return;
-        }
-        TranslateMessage(msg);
-        DispatchMessage(msg);
+        WinDispatchMsg(CPMUtil::getHAB(), pqmsg);
 }
 
@@ -724 +674 @@
 CPMScreen::updateButtons()
 {
-        int numButtons               = GetSystemMetrics(SM_CMOUSEBUTTONS);
         m_buttons[kButtonNone]       = false;
-        m_buttons[kButtonLeft]       = (GetKeyState(VK_LBUTTON)  < 0);
-        m_buttons[kButtonRight]      = (GetKeyState(VK_RBUTTON)  < 0);
-        m_buttons[kButtonMiddle]     = (GetKeyState(VK_MBUTTON)  < 0);
-        m_buttons[kButtonExtra0 + 0] = (numButtons >= 4) &&
-                                                                   (GetKeyState(VK_XBUTTON1) < 0);
-        m_buttons[kButtonExtra0 + 1] = (numButtons >= 5) &&
-                                                                   (GetKeyState(VK_XBUTTON2) < 0);
+        m_buttons[kButtonLeft]       = (WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) & 0x8000) != 0;
+        m_buttons[kButtonRight]      = (WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) & 0x8000) != 0;
+        m_buttons[kButtonMiddle]     = (WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) & 0x8000) != 0;
+        m_buttons[kButtonExtra0 + 0] = false;
+        m_buttons[kButtonExtra0 + 1] = false;
 }
 
@@ -742 +689 @@
 
 bool
-CPMScreen::onPreDispatch(HWND hwnd,
-                                UINT message, WPARAM wParam, LPARAM lParam)
+CPMScreen::onPreDispatch(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
         // handle event
-        switch (message) {
-        case SYNERGY_MSG_SCREEN_SAVER:
-                return onScreensaver(wParam != 0);
-
-        case SYNERGY_MSG_DEBUG:
-                LOG((CLOG_DEBUG1 "hook: 0x%08x 0x%08x", wParam, lParam));
+        switch (msg) {
+        case SYNERGY_PM_MSG_DEBUG:
+                LOG((CLOG_DEBUG1 "hook: 0x%08x 0x%08x", mp1, mp2));
                 return true;
         }
 
         if (m_isPrimary) {
-                return onPreDispatchPrimary(hwnd, message, wParam, lParam);
+                return onPreDispatchPrimary(hwnd, msg, mp1, mp2);
         }
 
@@ -763 +706 @@
 
 bool
-CPMScreen::onPreDispatchPrimary(HWND,
-                                UINT message, WPARAM wParam, LPARAM lParam)
+CPMScreen::onPreDispatchPrimary(HWND, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
         // handle event
-        switch (message) {
-        case SYNERGY_MSG_MARK:
-                return onMark(static_cast<UInt32>(wParam));
-
-        case SYNERGY_MSG_KEY:
-                return onKey(wParam, lParam);
-
-        case SYNERGY_MSG_MOUSE_BUTTON:
-                return onMouseButton(wParam, lParam);
-
-        case SYNERGY_MSG_MOUSE_MOVE:
-                return onMouseMove(static_cast<SInt32>(wParam),
-                                                        static_cast<SInt32>(lParam));
-
-        case SYNERGY_MSG_MOUSE_WHEEL:
-                // XXX -- support x-axis scrolling
-                return onMouseWheel(0, static_cast<SInt32>(wParam));
-
-        case SYNERGY_MSG_PRE_WARP:
+        switch (msg) {
+        case SYNERGY_PM_MSG_MARK:
+                return onMark((uintptr_t)mp1);
+
+        case SYNERGY_PM_MSG_KEY:
+                return onKey(SHORT1FROMMP(mp1), CHAR3FROMMP(mp1), CHAR4FROMMP(mp1), SHORT1FROMMP(mp2), SHORT2FROMMP(mp2));
+
+        case SYNERGY_PM_MSG_MOUSE_BUTTON:
+                return onMouseButton(SHORT1FROMMP(mp1), (SHORT)SHORT1FROMMP(mp2), m_cy - (SHORT)SHORT2FROMMP(mp2));
+
+        case SYNERGY_PM_MSG_MOUSE_MOVE:
+                return onMouseMove(SHORT1FROMMP(mp1), (SHORT)SHORT1FROMMP(mp2), m_cy - (SHORT)SHORT2FROMMP(mp2));
+
+        case SYNERGY_PM_MSG_PRE_WARP:
                 {
-                        // save position to compute delta of next motion
-                        m_xCursor = static_cast<SInt32>(wParam);
-                        m_yCursor = static_cast<SInt32>(lParam);
-
-                        // we warped the mouse.  discard events until we find the
-                        // matching post warp event.  see warpCursorNoFlush() for
-                        // where the events are sent.  we discard the matching
+                        // Save position to compute delta of next motion
+                        m_xCursor = (SInt32)mp1;
+                        m_yCursor = (SInt32)mp2;
+
+                        // We warped the mouse. Discard events until we find the
+                        // matching post warp event. See warpCursorNoFlush() for
+                        // where the events are sent. We discard the matching
                         // post warp event and can be sure we've skipped the warp
                         // event.
-                        MSG msg;
-                        do {
-                                GetMessage(&msg, NULL, SYNERGY_MSG_MOUSE_MOVE,
-                                                                                SYNERGY_MSG_POST_WARP);
-                        } while (msg.message != SYNERGY_MSG_POST_WARP);
+                        QMSG qmsg;
+                        while (   WinGetMsg(m_hab, &qmsg, NULLHANDLE, SYNERGY_PM_MSG_MOUSE_MOVE, SYNERGY_PM_MSG_POST_WARP)
+                                   && qmsg.msg != SYNERGY_PM_MSG_POST_WARP)
+                                /* nothing */;
                 }
                 return true;
 
-        case SYNERGY_MSG_POST_WARP:
+        case SYNERGY_PM_MSG_POST_WARP:
                 LOG((CLOG_WARN "unmatched post warp"));
                 return true;
-
-        case WM_HOTKEY:
-                // we discard these messages.  we'll catch the hot key in the
-                // regular key event handling, where we can detect both key
-                // press and release.  we only register the hot key so no other
-                // app will act on the key combination.
-                break;
         }
 
@@ -820 +749 @@
 
 bool
-CPMScreen::onEvent(HWND, UINT msg,
-                                WPARAM wParam, LPARAM lParam, LRESULT* result)
+CPMScreen::onEvent(HWND, ULONG msg, MPARAM mp1, MPARAM mp2, MRESULT *result)
 {
         switch (msg) {
-        case WM_QUERYENDSESSION:
-                if (m_is95Family) {
-                        *result = TRUE;
-                        return true;
-                }
-                break;
-
-        case WM_ENDSESSION:
-                if (m_is95Family) {
-                        if (wParam == TRUE && lParam == 0) {
-                                EVENTQUEUE->addEvent(CEvent(CEvent::kQuit));
-                        }
-                        return true;
-                }
-                break;
-
         case WM_DRAWCLIPBOARD:
-                // first pass on the message
-                if (m_nextClipboardWindow != NULL) {
-                        SendMessage(m_nextClipboardWindow, msg, wParam, lParam);
-                }
+                //// first pass on the message
+                //if (m_nextClipboardWindow != NULL) {
+                //      WinSendMessage(m_nextClipboardWindow, msg, mp1, mp2);
+                //}
 
                 // now handle the message
                 return onClipboardChange();
-
-        case WM_CHANGECBCHAIN:
-                if (m_nextClipboardWindow == (HWND)wParam) {
-                        m_nextClipboardWindow = (HWND)lParam;
-                        LOG((CLOG_DEBUG "clipboard chain: new next: 0x%08x", m_nextClipboardWindow));
-                }
-                else if (m_nextClipboardWindow != NULL) {
-                        SendMessage(m_nextClipboardWindow, msg, wParam, lParam);
-                }
-                return true;
-
-        case WM_DISPLAYCHANGE:
-                return onDisplayChange();
-
-        case WM_POWERBROADCAST:
-                switch (wParam) {
-                case PBT_APMRESUMEAUTOMATIC:
-                case PBT_APMRESUMECRITICAL:
-                case PBT_APMRESUMESUSPEND:
-                        EVENTQUEUE->addEvent(CEvent(IScreen::getResumeEvent(),
-                                                        getEventTarget(), NULL,
-                                                        CEvent::kDeliverImmediately));
-                        break;
-
-                case PBT_APMSUSPEND:
-                        EVENTQUEUE->addEvent(CEvent(IScreen::getSuspendEvent(),
-                                                        getEventTarget(), NULL,
-                                                        CEvent::kDeliverImmediately));
-                        break;
-                }
-                *result = TRUE;
-                return true;
         }
 
@@ -893 +773 @@
 
 bool
-CPMScreen::onKey(WPARAM wParam, LPARAM lParam)
-{
-        static const KeyModifierMask s_ctrlAlt =
-                KeyModifierControl | KeyModifierAlt;
-
-        LOG((CLOG_DEBUG1 "event: Key char=%d, vk=0x%02x, nagr=%d, lParam=0x%08x", (wParam & 0xff00u) >> 8, wParam & 0xffu, (wParam & 0x10000u) ? 1 : 0, lParam));
+CPMScreen::onKey(USHORT fsFlags, UCHAR ucRepeat, UCHAR ucScanCode, USHORT usch, USHORT usvk)
+{
+#if 0
+        static const KeyModifierMask s_ctrlAlt = KeyModifierControl | KeyModifierAlt;
+
+        LOG((CLOG_DEBUG1 "event: Key char=%d, vk=0x%02x, nagr=%d, mp2=0x%08x", (mp1 & 0xff00u) >> 8, mp1 & 0xffu, (mp1 & 0x10000u) ? 1 : 0, mp2));
 
         // get event info
-        KeyButton button         = (KeyButton)((lParam & 0x01ff0000) >> 16);
-        bool down                = ((lParam & 0x80000000u) == 0x00000000u);
+        KeyButton button         = (KeyButton)((mp2 & 0x01ff0000) >> 16);
+        bool down                = ((mp2 & 0x80000000u) == 0x00000000u);
         bool wasDown             = isKeyDown(button);
         KeyModifierMask oldState = pollActiveModifiers();
 
         // check for autorepeat
-        if (m_keyState->testAutoRepeat(down, (lParam & 0x40000000u) == 1, button)) {
-                lParam |= 0x40000000u;
+        if (m_keyState->testAutoRepeat(down, (mp2 & 0x40000000u) == 1, button)) {
+                mp2 |= 0x40000000u;
         }
 
@@ -916 +796 @@
         // alternatively, we could just throw these events out.
         if (button == 0) {
-                button = m_keyState->virtualKeyToButton(wParam & 0xffu);
+                button = m_keyState->virtualKeyToButton(mp1 & 0xffu);
                 if (button == 0) {
                         return true;
@@ -950 +830 @@
         if (oldState != state) {
                 // modifier key was pressed/released
-                if (onHotKey(0, lParam)) {
+                if (onHotKey(0, mp2)) {
                         return true;
                 }
@@ -956 +836 @@
         else {
                 // non-modifier was pressed/released
-                if (onHotKey(wParam, lParam)) {
+                if (onHotKey(mp1, mp2)) {
                         return true;
                 }
@@ -965 +845 @@
                 // check for ctrl+alt+del.  we do not want to pass that to the
                 // client.  the user can use ctrl+alt+pause to emulate it.
-                UINT virtKey = (wParam & 0xffu);
+                UINT virtKey = (mp1 & 0xffu);
                 if (virtKey == VK_DELETE && (state & s_ctrlAlt) == s_ctrlAlt) {
                         LOG((CLOG_DEBUG "discard ctrl+alt+del"));
@@ -975 +855 @@
                         (state & s_ctrlAlt) == s_ctrlAlt) {
                         LOG((CLOG_DEBUG "emulate ctrl+alt+del"));
-                        // switch wParam and lParam to be as if VK_DELETE was
+                        // switch mp1 and mp2 to be as if VK_DELETE was
                         // pressed or released.  when mapping the key we require that
-                        // we not use AltGr (the 0x10000 flag in wParam) and we not
-                        // use the keypad delete key (the 0x01000000 flag in lParam).
-                        wParam  = VK_DELETE | 0x00010000u;
-                        lParam &= 0xfe000000;
-                        lParam |= m_keyState->virtualKeyToButton(wParam & 0xffu) << 16;
-                        lParam |= 0x01000001;
+                        // we not use AltGr (the 0x10000 flag in mp1) and we not
+                        // use the keypad delete key (the 0x01000000 flag in mp2).
+                        mp1  = VK_DELETE | 0x00010000u;
+                        mp2 &= 0xfe000000;
+                        mp2 |= m_keyState->virtualKeyToButton(mp1 & 0xffu) << 16;
+                        mp2 |= 0x01000001;
                 }
 
                 // process key
                 KeyModifierMask mask;
-                KeyID key = m_keyState->mapKeyFromEvent(wParam, lParam, &mask);
-                button    = static_cast<KeyButton>((lParam & 0x01ff0000u) >> 16);
+                KeyID key = m_keyState->mapKeyFromEvent((ULONG)mp1, (ULONG)mp2, &mask);
+                button    = static_cast<KeyButton>((mp2 & 0x01ff0000u) >> 16);
                 if (key != kKeyNone) {
                         // fix key up.  if the key isn't down according to
@@ -1023 +903 @@
                         // do it
                         m_keyState->sendKeyEvent(getEventTarget(),
-                                                        ((lParam & 0x80000000u) == 0),
-                                                        ((lParam & 0x40000000u) != 0),
-                                                        key, mask, (SInt32)(lParam & 0xffff), button);
+                                                        ((mp2 & 0x80000000u) == 0),
+                                                        ((mp2 & 0x40000000u) != 0),
+                                                        key, mask, (SInt32)(mp2 & 0xffff), button);
                 }
                 else {
@@ -1031 +911 @@
                 }
         }
-
+#endif
         return true;
 }
 
 bool
-CPMScreen::onHotKey(WPARAM wParam, LPARAM lParam)
-{
+CPMScreen::onHotKey(MPARAM mp1, MPARAM mp2)
+{
+#if 0
         // get the key info
         KeyModifierMask state = getActiveModifiers();
-        UINT virtKey   = (wParam & 0xffu);
+        UINT virtKey   = (mp1 & 0xffu);
         UINT modifiers = 0;
         if ((state & KeyModifierShift) != 0) {
@@ -1064 +945 @@
         // find what kind of event
         CEvent::Type type;
-        if ((lParam & 0x80000000u) == 0u) {
-                if ((lParam & 0x40000000u) != 0u) {
+        if ((mp2 & 0x80000000u) == 0u) {
+                if ((mp2 & 0x40000000u) != 0u) {
                         // ignore key repeats but it counts as a hot key
                         return true;
@@ -1079 +960 @@
                                                         CHotKeyInfo::alloc(i->second)));
 
+#endif
         return true;
 }
 
 bool
-CPMScreen::onMouseButton(WPARAM wParam, LPARAM lParam)
+CPMScreen::onMouseButton(ULONG msg, SInt32 ax, SInt32 ay)
 {
         // get which button
-        bool pressed    = mapPressFromEvent((ULONG)wParam, lParam);
-        ButtonID button = mapButtonFromEvent((ULONG)wParam, lParam);
+        bool pressed    = mapPressFromEvent(msg);
+        ButtonID button = mapButtonFromEvent(msg);
 
         // keep our shadow key state up to date
@@ -1122 +1004 @@
 
 bool
-CPMScreen::onMouseMove(SInt32 mx, SInt32 my)
+CPMScreen::onMouseMove(ULONG msg, SInt32 ax, SInt32 ay)
 {
         // compute motion delta (relative to the last known
         // mouse position)
-        SInt32 x = mx - m_xCursor;
-        SInt32 y = my - m_yCursor;
+        SInt32 x = ax - m_xCursor;
+        SInt32 y = ay - m_yCursor;
 
         // ignore if the mouse didn't move or if message posted prior
@@ -1136 +1018 @@
 
         // save position to compute delta of next motion
-        m_xCursor = mx;
-        m_yCursor = my;
+        m_xCursor = ax;
+        m_yCursor = ay;
 
         if (m_isOnScreen) {
                 // motion on primary screen
-                sendEvent(getMotionOnPrimaryEvent(),
-                                                        CMotionInfo::alloc(m_xCursor, m_yCursor));
+                sendEvent(getMotionOnPrimaryEvent(), CMotionInfo::alloc(m_xCursor, m_yCursor));
         }
         else {
@@ -1171 +1052 @@
 
 bool
-CPMScreen::onMouseWheel(SInt32 xDelta, SInt32 yDelta)
-{
-        // ignore message if posted prior to last mark change
-        if (!ignore()) {
-                LOG((CLOG_DEBUG1 "event: button wheel delta=%+d,%+d", xDelta, yDelta));
-                sendEvent(getWheelEvent(), CWheelInfo::alloc(xDelta, yDelta));
-        }
-        return true;
-}
-
-bool
-CPMScreen::onScreensaver(bool activated)
-{
-        // ignore this message if there are any other screen saver
-        // messages already in the queue.  this is important because
-        // our checkStarted() function has a deliberate delay, so it
-        // can't respond to events at full CPU speed and will fall
-        // behind if a lot of screen saver events are generated.
-        // that can easily happen because windows will continually
-        // send SC_SCREENSAVE until the screen saver starts, even if
-        // the screen saver is disabled!
-        MSG msg;
-        if (PeekMessage(&msg, NULL, SYNERGY_MSG_SCREEN_SAVER,
-                                                SYNERGY_MSG_SCREEN_SAVER, PM_NOREMOVE)) {
-                return true;
-        }
-
-        if (activated) {
-                if (!m_screensaverActive &&
-                        m_screensaver->checkStarted(SYNERGY_MSG_SCREEN_SAVER, FALSE, 0)) {
-                        m_screensaverActive = true;
-                        sendEvent(getScreensaverActivatedEvent());
-
-                        // enable display power down
-                        CArchMiscWindows::removeBusyState(CArchMiscWindows::kDISPLAY);
-                }
-        }
-        else {
-                if (m_screensaverActive) {
-                        m_screensaverActive = false;
-                        sendEvent(getScreensaverDeactivatedEvent());
-
-                        // disable display power down
-                        CArchMiscWindows::addBusyState(CArchMiscWindows::kDISPLAY);
-                }
-        }
-
-        return true;
-}
-
-bool
-CPMScreen::onDisplayChange()
-{
-        // screen resolution may have changed.  save old shape.
-        SInt32 xOld = m_x, yOld = m_y, wOld = m_cx, hOld = m_cy;
-
-        // update shape
-        updateScreenShape();
-
-        // do nothing if resolution hasn't changed
-        if (xOld != m_x || yOld != m_y || wOld != m_cx || hOld != m_cy) {
-                if (m_isPrimary) {
-                        // warp mouse to center if off screen
-                        if (!m_isOnScreen) {
-                                warpCursor(m_xCenter, m_yCenter);
-                        }
-
-                        // tell hook about resize if on screen
-                        else {
-                                m_setZone(m_x, m_y, m_cx, m_cy, getJumpZoneSize());
-                        }
-                }
-
-                // send new screen info
-                sendEvent(getShapeChangedEvent());
-
-                LOG((CLOG_DEBUG "screen shape: %d,%d %dx%d %s", m_x, m_y, m_cx, m_cy, m_multimon ? "(multi-monitor)" : ""));
-        }
-
-        return true;
-}
-
-bool
 CPMScreen::onClipboardChange()
 {
@@ -1278 +1076 @@
 {
         // send an event that we can recognize before the mouse warp
-    WinPostQueueMsg(m_hmq, SYNERGY_MSG_PRE_WARP, (MPARAM)x, (MPARAM)y);
+    WinPostQueueMsg(m_hmq, SYNERGY_PM_MSG_PRE_WARP, (MPARAM)x, (MPARAM)y);
 
         // warp mouse.  hopefully this inserts a mouse motion event
@@ -1303 +1101 @@
 
         // send an event that we can recognize after the mouse warp
-    WinPostQueueMsg(m_hmq, SYNERGY_MSG_POST_WARP, 0, 0);
+    WinPostQueueMsg(m_hmq, SYNERGY_PM_MSG_POST_WARP, 0, 0);
 }
 
@@ -1313 +1111 @@
 
         // mark point in message queue where the mark was changed
-    WinPostQueueMsg(m_hmq, SYNERGY_MSG_MARK, (MPARAM)m_mark, 0);
+    WinPostQueueMsg(m_hmq, SYNERGY_PM_MSG_MARK, (MPARAM)m_mark, 0);
 }
 
@@ -1339 +1137 @@
 }
 
-void
-CPMScreen::handleFixes(const CEvent&, void*)
-{
-        // update keys if keyboard layouts have changed
-        if (m_keyState->didGroupsChange()) {
-                updateKeys();
-        }
-}
-
 ButtonID
-CPMScreen::mapButtonFromEvent(ULONG msg, MPARAM button) const
+CPMScreen::mapButtonFromEvent(ULONG msg) const
 {
     /** @todo query which is left and which is right. */
@@ -1377 +1166 @@
 
 bool
-CPMScreen::mapPressFromEvent(ULONG msg, LPARAM) const
+CPMScreen::mapPressFromEvent(ULONG msg) const
 {
         switch (msg) {
@@ -1411 +1200 @@
         }
 
-        // update layouts if necessary
-        if (m_keyState->didGroupsChange()) {
-                CPlatformScreen::updateKeyMap();
-        }
-
         // now update the keyboard state
         CPlatformScreen::updateKeyState();
@@ -1454 +1238 @@
 }
 
-HRESULT EXPENTRY
-CPMScreen::wndProc(HWND hwnd, UINT msg, MPARAM mp1, MPARAM mp2)
+MRESULT EXPENTRY
+CPMScreen::wndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
         assert(s_screen != NULL);
 
-        HRESULT mr = 0;
-        if (!s_screen->onEvent(hwnd, msg, mp1, mp2, &result)) {
+        MRESULT mr = 0;
+        if (!s_screen->onEvent(hwnd, msg, mp1, mp2, &mr)) {
                 mr = WinDefWindowProc(hwnd, msg, mp1, mp2);
         }
@@ -1472 +1256 @@
 //
 
-CPMScreen::CHotKeyItem::CHotKeyItem(UINT keycode, UINT mask) :
+CPMScreen::CHotKeyItem::CHotKeyItem(ULONG keycode, ULONG mask) :
         m_keycode(keycode),
         m_mask(mask)
@@ -1479 +1263 @@
 }
 
-UINT
+ULONG
 CPMScreen::CHotKeyItem::getVirtualKey() const
 {