RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 06:14:58 +00:00
Code Issues Activity Actions

WindowServer: Read from /dev/input/mice for mouse packets

Browse source 
Instead of trying to acquire from an individual mouse device, let's read
from /dev/input/mice, where all mouse packets are blended together from
all mouse devices that are attached to the machine.
This commit is contained in:
Liav A 2023-10-06 22:01:49 +03:00 • committed by Andrew Kaster
parent 97166a5570
commit ca2be5c51b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ namespace WindowServer {
EventLoop::EventLoop()
{
m_keyboard_fd = open("/dev/input/keyboard/0", O_RDONLY | O_NONBLOCK | O_CLOEXEC);
m_mouse_fd = open("/dev/input/mouse/0", O_RDONLY | O_NONBLOCK | O_CLOEXEC);
m_mice_fd = open("/dev/input/mice", O_RDONLY | O_NONBLOCK | O_CLOEXEC);
m_window_server = MUST(IPC::MultiServer<ConnectionFromClient>::try_create("/tmp/portal/window"));
m_wm_server = MUST(IPC::MultiServer<WMConnectionFromClient>::try_create("/tmp/portal/wm"));
@ -33,11 +33,11 @@ EventLoop::EventLoop()
dbgln("Couldn't open /dev/input/keyboard/0");
}
if (m_mouse_fd >= 0) {
m_mouse_notifier = Core::Notifier::construct(m_mouse_fd, Core::Notifier::Type::Read);
if (m_mice_fd >= 0) {
m_mouse_notifier = Core::Notifier::construct(m_mice_fd, Core::Notifier::Type::Read);
m_mouse_notifier->on_activation = [this] { drain_mouse(); };
} else {
dbgln("Couldn't open /dev/input/mouse/0");
dbgln("Couldn't open /dev/input/mice");
}
}
@ -48,7 +48,7 @@ void EventLoop::drain_mouse()
state.buttons = screen_input.mouse_button_state();
MousePacket packets[32];
ssize_t nread = read(m_mouse_fd, &packets, sizeof(packets));
ssize_t nread = read(m_mice_fd, &packets, sizeof(packets));
if (nread < 0) {
perror("EventLoop::drain_mouse read");
return;

2
Userland/Services/WindowServer/EventLoop.h
View file

@ -31,7 +31,7 @@ private:
Core::EventLoop m_event_loop;
int m_keyboard_fd { -1 };
RefPtr<Core::Notifier> m_keyboard_notifier;
int m_mouse_fd { -1 };
int m_mice_fd { -1 };
RefPtr<Core::Notifier> m_mouse_notifier;
OwnPtr<IPC::MultiServer<ConnectionFromClient>> m_window_server;
OwnPtr<IPC::MultiServer<WMConnectionFromClient>> m_wm_server;