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

Timestamp:

Aug 20, 2006, 9:50:11 AM (19 years ago)

Author:

bird

Message:

fixed a couple of clipboard issues. seems to work now.

File:

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

trunk/synergy/lib/platform/CPMScreen.cpp

@@ -547 +547 @@
     qmsg.ptl.y = 0;
     qmsg.reserved = 0;
-LOG((CLOG_DEBUG "fakeMessage: msg=%#lx mp1=%#lx mp2=%#lx...", msg, mp1, mp2));
+    LOG((CLOG_DEBUG "fakeMessage: msg=%#lx mp1=%#lx mp2=%#lx...", msg, mp1, mp2));
     const char *pszError = m_fakeMsg(m_hab, &qmsg);
     if (pszError) {
         LOG((CLOG_CRIT "fakeMessage: msg=%#lx mp1=%#lx mp2=%#lx failed: %s", msg, mp1, mp2, pszError));
     }
-else LOG((CLOG_DEBUG "fakeMessage: done"));
 }
 
@@ -624 +623 @@
     POINTL ptl;
     if (WinQueryPointerPos(HWND_DESKTOP, &ptl)) {
-        LOG((CLOG_DEBUG "fakeMouseRelativeMove: %d,%d (%d,%d +/- %d,%d)", ptl.x + dx, ptl.y - dy, ptl.y, ptl.x, dx, dy));
+        LOG((CLOG_DEBUG1 "fakeMouseRelativeMove: %d,%d (%d,%d +/- %d,%d)", ptl.x + dx, ptl.y - dy, ptl.y, ptl.x, dx, dy));
         fakeMouseMove(ptl.x + dx, ptl.y - dy - m_cy);
         return;
@@ -762 +761 @@
         throw XScreenOpenFailure();
     }
-    LOG((CLOG_DEBUG1 "openHookLibrary: hmod=%#lx '%s'", hmod, name));
+    LOG((CLOG_DEBUG2 "openHookLibrary: hmod=%#lx '%s'", hmod, name));
     return hmod;
 }
@@ -769 +768 @@
 CPMScreen::closeHookLibrary(HMODULE hmod) const
 {
-    LOG((CLOG_DEBUG1 "closeHookLibrary: hmod=%#lx\n", hmod));
+    LOG((CLOG_DEBUG2 "closeHookLibrary: hmod=%#lx\n", hmod));
     if (hmod != NULL) {
         m_cleanup(m_hab);
@@ -911 +910 @@
 {
     switch (msg) {
-    case WM_DRAWCLIPBOARD:
+
+        //
+        // Just freak out and close the clipboard if we get any of these.
+        //
+    case WM_RENDERFMT:
+    case WM_RENDERALLFMTS:
+    case WM_PAINTCLIPBOARD:
+    case WM_SIZECLIPBOARD:
+    case WM_HSCROLLCLIPBOARD:
+    case WM_VSCROLLCLIPBOARD:
+        LOG((CLOG_DEBUG "msg=%#x -> closing clipboard.\n", msg));
+        WinCloseClipbrd(m_hab);
+        break;
+
+        //
+        // The content has changed.
+        //
+    //case WM_DESTROYCLIPBOARD:
+        case WM_DRAWCLIPBOARD:
         //// first pass on the message
         //if (m_nextClipboardWindow != NULL) {