OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Fix no cursor on window frame and title bar.

Browse Source 
Remove mouse capture and handle visibility via WM_SETCURSOR messages
instead of window activation events. See
aed7e97d0d
for original implementation
This commit is contained in:
Adam Johnson
2012-10-03 20:07:54 -04:00
parent a760e3dc35
commit 87b441e890
5 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -59,6 +59,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfCrashHandler/plCrashCli.h" #include "pfCrashHandler/plCrashCli.h"
#include "plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "plNetClient/plNetLinkingMgr.h" #include "plNetClient/plNetLinkingMgr.h"
#include "plInputCore/plInputDevice.h"
#include "plInputCore/plInputManager.h" #include "plInputCore/plInputManager.h"
#include "plUnifiedTime/plUnifiedTime.h" #include "plUnifiedTime/plUnifiedTime.h"
#include "plPipeline.h" #include "plPipeline.h"
@ -457,6 +458,26 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
} }
break; break;
case WM_SETCURSOR:
{
static bool winCursor = true;
bool enterWnd = LOWORD(lParam) == HTCLIENT;
if (enterWnd && winCursor)
{
winCursor = !winCursor;
ShowCursor(winCursor != 0);
plMouseDevice::ShowCursor();
}
else if (!enterWnd && !winCursor)
{
winCursor = !winCursor;
ShowCursor(winCursor != 0);
plMouseDevice::HideCursor();
}
return TRUE;
}
break;
case WM_ACTIVATE: case WM_ACTIVATE:
{ {
bool active = (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE); bool active = (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE);

24
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
View File

@ -750,27 +750,3 @@ bool plMouseDevice::MsgReceive(plMessage* msg)
} }
return false; return false;
} }
void plMouseDevice::HandleWindowActivate(bool bActive, HWND hWnd)
{
if ( bActive )
{
RECT rect;
::GetClientRect(hWnd,&rect);
// rect.right /= plInputManager::GetInstance()->GetMouseScale();
// rect.bottom /= plInputManager::GetInstance()->GetMouseScale();
::MapWindowPoints( hWnd, NULL, (POINT *)&rect, 2 );
::ShowCursor( FALSE );
SetCapture(hWnd);
}
else
{
ReleaseCapture();
::ShowCursor( TRUE );
}
}

1
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
View File

@ -160,7 +160,6 @@ public:
~plMouseDevice(); ~plMouseDevice();
const char* GetInputName() { return "mouse"; } const char* GetInputName() { return "mouse"; }
void HandleWindowActivate(bool bActive, hsWindowHndl hWnd);
bool HasControlFlag(int f) const { return fControlFlags.IsBitSet(f); } bool HasControlFlag(int f) const { return fControlFlags.IsBitSet(f); }
void SetControlFlag(int f) void SetControlFlag(int f)

4
Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
View File

@ -584,8 +584,6 @@ void plDInputMgr::AddDevice(IDirectInputDevice8* device)
void plDInputMgr::ConfigureDevice() void plDInputMgr::ConfigureDevice()
{ {
::ShowCursor( TRUE ); ::ShowCursor( TRUE );
ReleaseCapture();
DICOLORSET dics; DICOLORSET dics;
ZeroMemory(&dics, sizeof(DICOLORSET)); ZeroMemory(&dics, sizeof(DICOLORSET));
@ -607,8 +605,6 @@ void plDInputMgr::ConfigureDevice()
fDI->fSticks[i]->fDevice->SetActionMap( fDI->fActionFormat, NULL, DIDSAM_FORCESAVE ); fDI->fSticks[i]->fDevice->SetActionMap( fDI->fActionFormat, NULL, DIDSAM_FORCESAVE );
::ShowCursor( FALSE ); ::ShowCursor( FALSE );
SetCapture(fhWnd);
} }
bool plDInputMgr::MsgReceive(plMessage* msg) bool plDInputMgr::MsgReceive(plMessage* msg)

3
Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
View File

@ -2247,7 +2247,6 @@ bool plDXPipeline::IResetDevice()
{ {
IClearShadowSlaves(); IClearShadowSlaves();
ReleaseCapture();
Sleep(100); Sleep(100);
HRESULT coopLev = fD3DDevice->TestCooperativeLevel(); HRESULT coopLev = fD3DDevice->TestCooperativeLevel();
if( coopLev == D3DERR_DEVICELOST ) if( coopLev == D3DERR_DEVICELOST )
@ -2295,8 +2294,6 @@ bool plDXPipeline::IResetDevice()
/// all device-specific stuff needs to be recreated /// all device-specific stuff needs to be recreated
plDeviceRecreateMsg* clean = new plDeviceRecreateMsg(); plDeviceRecreateMsg* clean = new plDeviceRecreateMsg();
plgDispatch::MsgSend(clean); plgDispatch::MsgSend(clean);
SetCapture(fSettings.fHWnd);
} }
fDevWasLost = true; fDevWasLost = true;
fDeviceLost = false; fDeviceLost = false;