Fix PS2_MOUSE_INVERT_BUTTONS (#20646)

This commit is contained in:
Daniel Kao 2023-07-07 04:34:44 -07:00 committed by GitHub
parent 30de598650
commit e43080788e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -191,13 +191,12 @@ static inline void ps2_mouse_convert_report_to_hid(report_mouse_t *mouse_report)
#ifdef PS2_MOUSE_INVERT_BUTTONS #ifdef PS2_MOUSE_INVERT_BUTTONS
// swap left & right buttons // swap left & right buttons
uint8_t needs_left = mouse_report->buttons & PS2_MOUSE_BTN_RIGHT; bool needs_left = mouse_report->buttons & (1 << PS2_MOUSE_BTN_RIGHT);
uint8_t needs_right = mouse_report->buttons & PS2_MOUSE_BTN_LEFT; bool needs_right = mouse_report->buttons & (1 << PS2_MOUSE_BTN_LEFT);
mouse_report->buttons = (mouse_report->buttons & ~(PS2_MOUSE_BTN_MASK)) | (needs_left ? PS2_MOUSE_BTN_LEFT : 0) | (needs_right ? PS2_MOUSE_BTN_RIGHT : 0); mouse_report->buttons = (mouse_report->buttons & ~((1 << PS2_MOUSE_BTN_LEFT) | (1 << PS2_MOUSE_BTN_RIGHT))) | (needs_left << PS2_MOUSE_BTN_LEFT) | (needs_right << PS2_MOUSE_BTN_RIGHT);
#else #endif
// remove sign and overflow flags // remove sign and overflow flags
mouse_report->buttons &= PS2_MOUSE_BTN_MASK; mouse_report->buttons &= PS2_MOUSE_BTN_MASK;
#endif
#ifdef PS2_MOUSE_INVERT_X #ifdef PS2_MOUSE_INVERT_X
mouse_report->x = -mouse_report->x; mouse_report->x = -mouse_report->x;