Fixed getting locked to screen after ctrl+alt+del. Also fixed

cursor not being hidden on win32 server when on client screens
(which happened when using low-level hooks).
This commit is contained in:
crs
2003-05-17 20:58:27 +00:00
parent 07ed8ebd1c
commit dc6652a21a
9 changed files with 111 additions and 21 deletions

View File

@@ -319,7 +319,8 @@ CMSWindowsPrimaryScreen::CMSWindowsPrimaryScreen(
m_threadID(0),
m_mark(0),
m_markReceived(0),
m_lowLevel(false)
m_lowLevel(false),
m_cursorThread(0)
{
assert(m_receiver != NULL);
@@ -787,6 +788,13 @@ CMSWindowsPrimaryScreen::preDestroyWindow(HWND)
m_uninstall();
}
void
CMSWindowsPrimaryScreen::onAccessibleDesktop()
{
// get the current keyboard state
updateKeys();
}
void
CMSWindowsPrimaryScreen::onPreMainLoop()
{
@@ -833,6 +841,18 @@ CMSWindowsPrimaryScreen::onPostClose()
void
CMSWindowsPrimaryScreen::onPreEnter()
{
// show cursor if we hid it
if (m_cursorThread != 0) {
if (m_threadID != m_cursorThread) {
AttachThreadInput(m_threadID, m_cursorThread, TRUE);
}
ShowCursor(TRUE);
if (m_threadID != m_cursorThread) {
AttachThreadInput(m_threadID, m_cursorThread, FALSE);
}
m_cursorThread = 0;
}
// enable ctrl+alt+del, alt+tab, etc
if (m_is95Family) {
DWORD dummy = 0;
@@ -869,6 +889,19 @@ CMSWindowsPrimaryScreen::onPostLeave(bool success)
DWORD dummy = 0;
SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &dummy, 0);
}
// hide the cursor if using low level hooks
if (m_lowLevel) {
HWND hwnd = GetForegroundWindow();
m_cursorThread = GetWindowThreadProcessId(hwnd, NULL);
if (m_threadID != m_cursorThread) {
AttachThreadInput(m_threadID, m_cursorThread, TRUE);
}
ShowCursor(FALSE);
if (m_threadID != m_cursorThread) {
AttachThreadInput(m_threadID, m_cursorThread, FALSE);
}
}
}
}
@@ -876,10 +909,13 @@ void
CMSWindowsPrimaryScreen::createWindow()
{
// open the desktop and the window
HWND window = m_screen->openDesktop();
if (window == NULL) {
m_window = m_screen->openDesktop();
if (m_window == NULL) {
throw XScreenOpenFailure();
}
// we don't ever want our window to activate
EnableWindow(m_window, FALSE);
}
void
@@ -892,14 +928,25 @@ CMSWindowsPrimaryScreen::destroyWindow()
bool
CMSWindowsPrimaryScreen::showWindow()
{
// do nothing. we don't need to show a window to capture input.
// we don't need a window to capture input but we need a window
// to hide the cursor when using low-level hooks. do not try to
// take the activation; we want the currently active window to
// stay active.
if (m_lowLevel) {
SetWindowPos(m_window, HWND_TOPMOST, m_xCenter, m_yCenter, 1, 1,
SWP_NOACTIVATE);
ShowWindow(m_window, SW_SHOWNA);
}
return true;
}
void
CMSWindowsPrimaryScreen::hideWindow()
{
// do nothing. we don't need to show a window to capture input.
// hide our window
if (m_lowLevel) {
ShowWindow(m_window, SW_HIDE);
}
}
void