RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

WindowServer: Prevent sending duplicate MousePackets when clicking

Browse source 
If a mouse button was clicked, `EventLoop::drain_mouse()` would always
send the last MousePacket state to the screen input - even if that
state is equivalent to the last state sent as part of the button logic.

By remembering if the state was already sent, we prevent sending that
state a second time saving some resources in the process.
This commit is contained in:
Jelle Raaijmakers 2021-10-24 17:51:29 +02:00 • committed by Andreas Kling
parent 38b09ba133
commit 40a0a995af
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Services/WindowServer/EventLoop.cpp
View file

@ -86,6 +86,8 @@ void EventLoop::drain_mouse()
size_t npackets = nread / sizeof(MousePacket); size_t npackets = nread / sizeof(MousePacket);
if (!npackets) if (!npackets)
return; return;
bool state_is_sent = false;
for (size_t i = 0; i < npackets; ++i) { for (size_t i = 0; i < npackets; ++i) {
auto& packet = packets[i]; auto& packet = packets[i];
dbgln_if(WSMESSAGELOOP_DEBUG, "EventLoop: Mouse X {}, Y {}, Z {}, relative={}", packet.x, packet.y, packet.z, packet.is_relative); dbgln_if(WSMESSAGELOOP_DEBUG, "EventLoop: Mouse X {}, Y {}, Z {}, relative={}", packet.x, packet.y, packet.z, packet.is_relative);
@ -99,11 +101,13 @@ void EventLoop::drain_mouse()
state.y = packet.y; state.y = packet.y;
} }
state.z += packet.z; state.z += packet.z;
state_is_sent = false;
if (packet.buttons != state.buttons) { if (packet.buttons != state.buttons) {
state.buttons = packet.buttons; state.buttons = packet.buttons;
dbgln_if(WSMESSAGELOOP_DEBUG, "EventLoop: Mouse Button Event"); dbgln_if(WSMESSAGELOOP_DEBUG, "EventLoop: Mouse Button Event");
screen_input.on_receive_mouse_data(state); screen_input.on_receive_mouse_data(state);
state_is_sent = true;
if (state.is_relative) { if (state.is_relative) {
state.x = 0; state.x = 0;
state.y = 0; state.y = 0;
@ -111,6 +115,8 @@ void EventLoop::drain_mouse()
} }
} }
} }
if (state_is_sent)
return;
if (state.is_relative && (state.x || state.y || state.z)) if (state.is_relative && (state.x || state.y || state.z))
screen_input.on_receive_mouse_data(state); screen_input.on_receive_mouse_data(state);
if (!state.is_relative) if (!state.is_relative)