backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Making the mouse fully unusable when sleeping

Browse source
This commit is contained in:
acth2 2026-03-07 02:24:14 +01:00
parent 5a4608df10
commit ed62889822
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Minecraft.Client/Windows64/KeyboardMouseInput.cpp
View file

@ -160,6 +160,9 @@ void KeyboardMouseInput::OnKeyUp(int vkCode)
void KeyboardMouseInput::OnMouseButtonDown(int button) void KeyboardMouseInput::OnMouseButtonDown(int button)
{ {
if (!m_mouseActive)
return;
if (button >= 0 && button < MAX_MOUSE_BUTTONS) if (button >= 0 && button < MAX_MOUSE_BUTTONS)
{ {
if (!m_mouseButtonDown[button]) if (!m_mouseButtonDown[button])
@ -170,6 +173,10 @@ void KeyboardMouseInput::OnMouseButtonDown(int button)
void KeyboardMouseInput::OnMouseButtonUp(int button) void KeyboardMouseInput::OnMouseButtonUp(int button)
{ {
if (!m_mouseActive)
return;
if (button >= 0 && button < MAX_MOUSE_BUTTONS) if (button >= 0 && button < MAX_MOUSE_BUTTONS)
{ {
if (m_mouseButtonDown[button]) if (m_mouseButtonDown[button])
@ -180,12 +187,18 @@ void KeyboardMouseInput::OnMouseButtonUp(int button)
void KeyboardMouseInput::OnMouseMove(int x, int y) void KeyboardMouseInput::OnMouseMove(int x, int y)
{ {
if (!m_mouseActive)
return;
m_mouseX = x; m_mouseX = x;
m_mouseY = y; m_mouseY = y;
} }
void KeyboardMouseInput::OnMouseWheel(int delta) void KeyboardMouseInput::OnMouseWheel(int delta)
{ {
if (!m_mouseActive)
return;
// Normalize from raw Windows delta (multiples of WHEEL_DELTA=120) to discrete notch counts // Normalize from raw Windows delta (multiples of WHEEL_DELTA=120) to discrete notch counts
m_mouseWheelAccum += delta / WHEEL_DELTA; m_mouseWheelAccum += delta / WHEEL_DELTA;
} }
@ -263,6 +276,9 @@ bool KeyboardMouseInput::IsMouseButtonReleased(int button) const
void KeyboardMouseInput::ConsumeMouseDelta(float &dx, float &dy) void KeyboardMouseInput::ConsumeMouseDelta(float &dx, float &dy)
{ {
if (!m_mouseActive)
return;
dx = static_cast<float>(m_mouseDeltaAccumX); dx = static_cast<float>(m_mouseDeltaAccumX);
dy = static_cast<float>(m_mouseDeltaAccumY); dy = static_cast<float>(m_mouseDeltaAccumY);
m_mouseDeltaAccumX = 0; m_mouseDeltaAccumX = 0;

2
Minecraft.World/Player.cpp
View file

@ -1934,6 +1934,8 @@ void Player::stopSleepInBed(bool forcefulWakeUp, bool updateLevelList, bool save
m_isSleeping = false; m_isSleeping = false;
#ifdef _WINDOWS64 #ifdef _WINDOWS64
g_KBMInput.SetActiveMouse(true); g_KBMInput.SetActiveMouse(true);
g_KBMInput.OnMouseButtonUp(KeyboardMouseInput::MOUSE_LEFT);
g_KBMInput.OnMouseButtonUp(KeyboardMouseInput::MOUSE_RIGHT);
#endif #endif
if (!level->isClientSide && updateLevelList) if (!level->isClientSide && updateLevelList)