Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mousekey doesn't work with trackpoint #18474

Merged
merged 8 commits into from
Nov 13, 2022
+3 −4
Merged

fix: mousekey doesn't work with trackpoint #18474

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
07c00f7
fix: mousekey doesn't work with trackpoint
klesh Sep 25, 2022
788d250
Update quantum/mousekey.c
klesh Sep 25, 2022
57c3e57
Update quantum/mousekey.c
klesh Sep 25, 2022
50b9b95
Formatting
klesh Sep 25, 2022
b5c9175
Reuse `has_mouse_report_changed` in `should_mousekey_report_send`
klesh Sep 26, 2022
500f39a
`should_mousekey_report_send` handles buttons differently
klesh Sep 26, 2022
172b37e
fix: btn events should be handled in ps2_mouse
klesh Oct 6, 2022
e45754e
Merge remote-tracking branch 'upstream/master' into kw-18277-mousekey…
klesh Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions drivers/ps2/ps2_mouse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,30 +80,29 @@ void ps2_mouse_task(void) {
uint8_t rcv;
rcv = ps2_host_send(PS2_MOUSE_READ_DATA);
if (rcv == PS2_ACK) {
mouse_report.buttons = ps2_host_recv_response() | tp_buttons;
mouse_report.buttons = ps2_host_recv_response();
mouse_report.x = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER;
mouse_report.y = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER;
# ifdef PS2_MOUSE_ENABLE_SCROLLING
mouse_report.v = -(ps2_host_recv_response() & PS2_MOUSE_SCROLL_MASK) * PS2_MOUSE_V_MULTIPLIER;
# endif
} else {
if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n");
return;
}
#else
if (pbuf_has_data()) {
mouse_report.buttons = ps2_host_recv_response() | tp_buttons;
mouse_report.buttons = ps2_host_recv_response();
mouse_report.x = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER;
mouse_report.y = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER;
# ifdef PS2_MOUSE_ENABLE_SCROLLING
mouse_report.v = -(ps2_host_recv_response() & PS2_MOUSE_SCROLL_MASK) * PS2_MOUSE_V_MULTIPLIER;
# endif
} else {
if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n");
return;
}
#endif

mouse_report.buttons |= tp_buttons;
/* if mouse moves or buttons state changes */
if (mouse_report.x || mouse_report.y || mouse_report.v || ((mouse_report.buttons ^ buttons_prev) & PS2_MOUSE_BTN_MASK)) {
#ifdef PS2_MOUSE_DEBUG_RAW
Expand Down