mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- enabling the mouse at startup works now

Browse Source 
- periodic mouse status update not necessary
This commit is contained in:
Volker Ruppert 2004-12-28 14:38:30 +00:00
parent e5c667a4a5
commit afb809a4f9
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bochs/gui/win32.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: win32.cc,v 1.88 2004-12-06 21:12:06 vruppert Exp $ // $Id: win32.cc,v 1.89 2004-12-28 14:38:30 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -861,11 +861,7 @@ LRESULT CALLBACK mainWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
switch (iMsg) { switch (iMsg) {
case WM_CREATE: case WM_CREATE:
bx_options.Omouse_enabled->set (mouseCaptureMode); SetStatusText(0, szMouseEnable, TRUE);
if (mouseCaptureMode)
SetStatusText(0, szMouseDisable, TRUE);
else
SetStatusText(0, szMouseEnable, TRUE);
return 0; return 0;
case WM_COMMAND: case WM_COMMAND:
@ -915,7 +911,12 @@ void SetMouseCapture()
{ {
RECT wndRect; RECT wndRect;
bx_options.Omouse_enabled->set (mouseCaptureMode); if (mouseToggleReq) {
mouseCaptureMode = mouseCaptureNew;
mouseToggleReq = FALSE;
} else {
bx_options.Omouse_enabled->set (mouseCaptureMode);
}
ShowCursor(!mouseCaptureMode); ShowCursor(!mouseCaptureMode);
ShowCursor(!mouseCaptureMode); // somehow one didn't do the trick (win98) ShowCursor(!mouseCaptureMode); // somehow one didn't do the trick (win98)
GetWindowRect(stInfo.simWnd, &wndRect); GetWindowRect(stInfo.simWnd, &wndRect);
@ -944,9 +945,7 @@ LRESULT CALLBACK simWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
case WM_TIMER: case WM_TIMER:
if (mouseToggleReq && (GetActiveWindow() == stInfo.mainWnd)) { if (mouseToggleReq && (GetActiveWindow() == stInfo.mainWnd)) {
mouseCaptureMode = mouseCaptureNew;
SetMouseCapture(); SetMouseCapture();
mouseToggleReq = FALSE;
} }
// If mouse escaped, bring it back // If mouse escaped, bring it back
if ( mouseCaptureMode) if ( mouseCaptureMode)
@ -955,8 +954,6 @@ LRESULT CALLBACK simWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
SetCursorPos(wndRect.left + stretched_x/2, wndRect.top + stretched_y/2); SetCursorPos(wndRect.left + stretched_x/2, wndRect.top + stretched_y/2);
cursorWarped(); cursorWarped();
} }
bx_options.Omouse_enabled->set (mouseCaptureMode);
return 0; return 0;
case WM_PAINT: case WM_PAINT: