From 9a245498a6482563601cec629d884d5d68c640dd Mon Sep 17 00:00:00 2001 From: crs Date: Tue, 7 Jan 2003 21:12:51 +0000 Subject: [PATCH] Attempts to improve forcing synergy window to foreground. These changes don't seem to improve the situation but don't seem to hurt either. --- lib/platform/CMSWindowsPrimaryScreen.cpp | 43 +++++++++++++++++++++--- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/lib/platform/CMSWindowsPrimaryScreen.cpp b/lib/platform/CMSWindowsPrimaryScreen.cpp index 56143f30..a955f882 100644 --- a/lib/platform/CMSWindowsPrimaryScreen.cpp +++ b/lib/platform/CMSWindowsPrimaryScreen.cpp @@ -540,17 +540,52 @@ CMSWindowsPrimaryScreen::showWindow() m_lastForegroundWindow = GetForegroundWindow(); m_lastActiveThread = GetWindowThreadProcessId( m_lastForegroundWindow, NULL); + DWORD myThread = GetCurrentThreadId(); if (m_lastActiveThread != 0) { - DWORD myThread = GetCurrentThreadId(); - if (AttachThreadInput(myThread, m_lastActiveThread, TRUE)) { - m_lastActiveWindow = GetActiveWindow(); - AttachThreadInput(myThread, m_lastActiveThread, FALSE); + if (myThread != m_lastActiveThread) { + if (AttachThreadInput(myThread, m_lastActiveThread, TRUE)) { + m_lastActiveWindow = GetActiveWindow(); + AttachThreadInput(myThread, m_lastActiveThread, FALSE); + } } } // show our window ShowWindow(m_window, SW_SHOW); + // force our window to the foreground. this is necessary to + // capture input but is complicated by microsoft's misguided + // attempt to prevent applications from changing the + // foreground window. (the user should be in control of that + // under normal circumstances but there are exceptions; the + // good folks at microsoft, after abusing the previously + // available ability to switch foreground tasks in many of + // their apps, changed the behavior to prevent it. maybe + // it was easier than fixing the applications.) + // + // anyway, simply calling SetForegroundWindow() doesn't work + // unless there is no foreground window or we already are the + // foreground window. so we AttachThreadInput() to the + // foreground process then call SetForegroundWindow(); that + // makes Windows think the foreground process changed the + // foreground window which is allowed since the foreground + // is "voluntarily" yielding control. then we unattach the + // thread input and go about our business. + // + // unfortunately, this still doesn't work for console windows + // on the windows 95 family. if a console is the foreground + // app on the server when the user leaves the server screen + // then the keyboard will not be captured by synergy. + if (m_lastActiveThread != myThread) { + if (m_lastActiveThread != 0) { + AttachThreadInput(myThread, m_lastActiveThread, TRUE); + } + SetForegroundWindow(m_window); + if (m_lastActiveThread != 0) { + AttachThreadInput(myThread, m_lastActiveThread, FALSE); + } + } + // get keyboard input and capture mouse SetActiveWindow(m_window); SetFocus(m_window);