summaryrefslogtreecommitdiff
path: root/quantum/mousekey.c
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2024-07-03 18:35:54 +1000
committerGitHub <noreply@github.com>2024-07-03 18:35:54 +1000
commitf8596b40a4bb15a1881138baa8b8787277e2e622 (patch)
tree551e145c341b2a7e9f8ee9f2573f4f1e8ebbfbe9 /quantum/mousekey.c
parentbc0c69570b8a8b1d9a754a280053e49a825b24d7 (diff)
Normalise mouse keycodes (#23975)
Diffstat (limited to 'quantum/mousekey.c')
-rw-r--r--quantum/mousekey.c112
1 files changed, 56 insertions, 56 deletions
diff --git a/quantum/mousekey.c b/quantum/mousekey.c
index 3910811752..8683cfdffa 100644
--- a/quantum/mousekey.c
+++ b/quantum/mousekey.c
@@ -407,42 +407,42 @@ void mousekey_on(uint8_t code) {
407# ifdef MOUSEKEY_INERTIA 407# ifdef MOUSEKEY_INERTIA
408 408
409 // initial keypress sets impulse and activates first frame of movement 409 // initial keypress sets impulse and activates first frame of movement
410 if ((code == KC_MS_UP) || (code == KC_MS_DOWN)) { 410 if ((code == QK_MOUSE_CURSOR_UP) || (code == QK_MOUSE_CURSOR_DOWN)) {
411 mousekey_y_dir = (code == KC_MS_DOWN) ? 1 : -1; 411 mousekey_y_dir = (code == QK_MOUSE_CURSOR_DOWN) ? 1 : -1;
412 if (mousekey_frame < 2) mouse_report.y = move_unit(1); 412 if (mousekey_frame < 2) mouse_report.y = move_unit(1);
413 } else if ((code == KC_MS_LEFT) || (code == KC_MS_RIGHT)) { 413 } else if ((code == QK_MOUSE_CURSOR_LEFT) || (code == QK_MOUSE_CURSOR_RIGHT)) {
414 mousekey_x_dir = (code == KC_MS_RIGHT) ? 1 : -1; 414 mousekey_x_dir = (code == QK_MOUSE_CURSOR_RIGHT) ? 1 : -1;
415 if (mousekey_frame < 2) mouse_report.x = move_unit(0); 415 if (mousekey_frame < 2) mouse_report.x = move_unit(0);
416 } 416 }
417 417
418# else // no inertia 418# else // no inertia
419 419
420 if (code == KC_MS_UP) 420 if (code == QK_MOUSE_CURSOR_UP)
421 mouse_report.y = move_unit() * -1; 421 mouse_report.y = move_unit() * -1;
422 else if (code == KC_MS_DOWN) 422 else if (code == QK_MOUSE_CURSOR_DOWN)
423 mouse_report.y = move_unit(); 423 mouse_report.y = move_unit();
424 else if (code == KC_MS_LEFT) 424 else if (code == QK_MOUSE_CURSOR_LEFT)
425 mouse_report.x = move_unit() * -1; 425 mouse_report.x = move_unit() * -1;
426 else if (code == KC_MS_RIGHT) 426 else if (code == QK_MOUSE_CURSOR_RIGHT)
427 mouse_report.x = move_unit(); 427 mouse_report.x = move_unit();
428 428
429# endif // inertia or not 429# endif // inertia or not
430 430
431 else if (code == KC_MS_WH_UP) 431 else if (code == QK_MOUSE_WHEEL_UP)
432 mouse_report.v = wheel_unit(); 432 mouse_report.v = wheel_unit();
433 else if (code == KC_MS_WH_DOWN) 433 else if (code == QK_MOUSE_WHEEL_DOWN)
434 mouse_report.v = wheel_unit() * -1; 434 mouse_report.v = wheel_unit() * -1;
435 else if (code == KC_MS_WH_LEFT) 435 else if (code == QK_MOUSE_WHEEL_LEFT)
436 mouse_report.h = wheel_unit() * -1; 436 mouse_report.h = wheel_unit() * -1;
437 else if (code == KC_MS_WH_RIGHT) 437 else if (code == QK_MOUSE_WHEEL_RIGHT)
438 mouse_report.h = wheel_unit(); 438 mouse_report.h = wheel_unit();
439 else if (IS_MOUSEKEY_BUTTON(code)) 439 else if (IS_MOUSEKEY_BUTTON(code))
440 mouse_report.buttons |= 1 << (code - KC_MS_BTN1); 440 mouse_report.buttons |= 1 << (code - QK_MOUSE_BUTTON_1);
441 else if (code == KC_MS_ACCEL0) 441 else if (code == QK_MOUSE_ACCELERATION_0)
442 mousekey_accel |= (1 << 0); 442 mousekey_accel |= (1 << 0);
443 else if (code == KC_MS_ACCEL1) 443 else if (code == QK_MOUSE_ACCELERATION_1)
444 mousekey_accel |= (1 << 1); 444 mousekey_accel |= (1 << 1);
445 else if (code == KC_MS_ACCEL2) 445 else if (code == QK_MOUSE_ACCELERATION_2)
446 mousekey_accel |= (1 << 2); 446 mousekey_accel |= (1 << 2);
447} 447}
448 448
@@ -450,43 +450,43 @@ void mousekey_off(uint8_t code) {
450# ifdef MOUSEKEY_INERTIA 450# ifdef MOUSEKEY_INERTIA
451 451
452 // key release clears impulse unless opposite direction is held 452 // key release clears impulse unless opposite direction is held
453 if ((code == KC_MS_UP) && (mousekey_y_dir < 1)) 453 if ((code == QK_MOUSE_CURSOR_UP) && (mousekey_y_dir < 1))
454 mousekey_y_dir = 0; 454 mousekey_y_dir = 0;
455 else if ((code == KC_MS_DOWN) && (mousekey_y_dir > -1)) 455 else if ((code == QK_MOUSE_CURSOR_DOWN) && (mousekey_y_dir > -1))
456 mousekey_y_dir = 0; 456 mousekey_y_dir = 0;
457 else if ((code == KC_MS_LEFT) && (mousekey_x_dir < 1)) 457 else if ((code == QK_MOUSE_CURSOR_LEFT) && (mousekey_x_dir < 1))
458 mousekey_x_dir = 0; 458 mousekey_x_dir = 0;
459 else if ((code == KC_MS_RIGHT) && (mousekey_x_dir > -1)) 459 else if ((code == QK_MOUSE_CURSOR_RIGHT) && (mousekey_x_dir > -1))
460 mousekey_x_dir = 0; 460 mousekey_x_dir = 0;
461 461
462# else // no inertia 462# else // no inertia
463 463
464 if (code == KC_MS_UP && mouse_report.y < 0) 464 if (code == QK_MOUSE_CURSOR_UP && mouse_report.y < 0)
465 mouse_report.y = 0; 465 mouse_report.y = 0;
466 else if (code == KC_MS_DOWN && mouse_report.y > 0) 466 else if (code == QK_MOUSE_CURSOR_DOWN && mouse_report.y > 0)
467 mouse_report.y = 0; 467 mouse_report.y = 0;
468 else if (code == KC_MS_LEFT && mouse_report.x < 0) 468 else if (code == QK_MOUSE_CURSOR_LEFT && mouse_report.x < 0)
469 mouse_report.x = 0; 469 mouse_report.x = 0;
470 else if (code == KC_MS_RIGHT && mouse_report.x > 0) 470 else if (code == QK_MOUSE_CURSOR_RIGHT && mouse_report.x > 0)
471 mouse_report.x = 0; 471 mouse_report.x = 0;
472 472
473# endif // inertia or not 473# endif // inertia or not
474 474
475 else if (code == KC_MS_WH_UP && mouse_report.v > 0) 475 else if (code == QK_MOUSE_WHEEL_UP && mouse_report.v > 0)
476 mouse_report.v = 0; 476 mouse_report.v = 0;
477 else if (code == KC_MS_WH_DOWN && mouse_report.v < 0) 477 else if (code == QK_MOUSE_WHEEL_DOWN && mouse_report.v < 0)
478 mouse_report.v = 0; 478 mouse_report.v = 0;
479 else if (code == KC_MS_WH_LEFT && mouse_report.h < 0) 479 else if (code == QK_MOUSE_WHEEL_LEFT && mouse_report.h < 0)
480 mouse_report.h = 0; 480 mouse_report.h = 0;
481 else if (code == KC_MS_WH_RIGHT && mouse_report.h > 0) 481 else if (code == QK_MOUSE_WHEEL_RIGHT && mouse_report.h > 0)
482 mouse_report.h = 0; 482 mouse_report.h = 0;
483 else if (IS_MOUSEKEY_BUTTON(code)) 483 else if (IS_MOUSEKEY_BUTTON(code))
484 mouse_report.buttons &= ~(1 << (code - KC_MS_BTN1)); 484 mouse_report.buttons &= ~(1 << (code - QK_MOUSE_BUTTON_1));
485 else if (code == KC_MS_ACCEL0) 485 else if (code == QK_MOUSE_ACCELERATION_0)
486 mousekey_accel &= ~(1 << 0); 486 mousekey_accel &= ~(1 << 0);
487 else if (code == KC_MS_ACCEL1) 487 else if (code == QK_MOUSE_ACCELERATION_1)
488 mousekey_accel &= ~(1 << 1); 488 mousekey_accel &= ~(1 << 1);
489 else if (code == KC_MS_ACCEL2) 489 else if (code == QK_MOUSE_ACCELERATION_2)
490 mousekey_accel &= ~(1 << 2); 490 mousekey_accel &= ~(1 << 2);
491 if (mouse_report.x == 0 && mouse_report.y == 0) { 491 if (mouse_report.x == 0 && mouse_report.y == 0) {
492 mousekey_repeat = 0; 492 mousekey_repeat = 0;
@@ -568,29 +568,29 @@ void mousekey_on(uint8_t code) {
568 uint16_t const c_offset = c_offsets[mk_speed]; 568 uint16_t const c_offset = c_offsets[mk_speed];
569 uint16_t const w_offset = w_offsets[mk_speed]; 569 uint16_t const w_offset = w_offsets[mk_speed];
570 uint8_t const old_speed = mk_speed; 570 uint8_t const old_speed = mk_speed;
571 if (code == KC_MS_UP) 571 if (code == QK_MOUSE_CURSOR_UP)
572 mouse_report.y = c_offset * -1; 572 mouse_report.y = c_offset * -1;
573 else if (code == KC_MS_DOWN) 573 else if (code == QK_MOUSE_CURSOR_DOWN)
574 mouse_report.y = c_offset; 574 mouse_report.y = c_offset;
575 else if (code == KC_MS_LEFT) 575 else if (code == QK_MOUSE_CURSOR_LEFT)
576 mouse_report.x = c_offset * -1; 576 mouse_report.x = c_offset * -1;
577 else if (code == KC_MS_RIGHT) 577 else if (code == QK_MOUSE_CURSOR_RIGHT)
578 mouse_report.x = c_offset; 578 mouse_report.x = c_offset;
579 else if (code == KC_MS_WH_UP) 579 else if (code == QK_MOUSE_WHEEL_UP)
580 mouse_report.v = w_offset; 580 mouse_report.v = w_offset;
581 else if (code == KC_MS_WH_DOWN) 581 else if (code == QK_MOUSE_WHEEL_DOWN)
582 mouse_report.v = w_offset * -1; 582 mouse_report.v = w_offset * -1;
583 else if (code == KC_MS_WH_LEFT) 583 else if (code == QK_MOUSE_WHEEL_LEFT)
584 mouse_report.h = w_offset * -1; 584 mouse_report.h = w_offset * -1;
585 else if (code == KC_MS_WH_RIGHT) 585 else if (code == QK_MOUSE_WHEEL_RIGHT)
586 mouse_report.h = w_offset; 586 mouse_report.h = w_offset;
587 else if (IS_MOUSEKEY_BUTTON(code)) 587 else if (IS_MOUSEKEY_BUTTON(code))
588 mouse_report.buttons |= 1 << (code - KC_MS_BTN1); 588 mouse_report.buttons |= 1 << (code - QK_MOUSE_BUTTON_1);
589 else if (code == KC_MS_ACCEL0) 589 else if (code == QK_MOUSE_ACCELERATION_0)
590 mk_speed = mkspd_0; 590 mk_speed = mkspd_0;
591 else if (code == KC_MS_ACCEL1) 591 else if (code == QK_MOUSE_ACCELERATION_1)
592 mk_speed = mkspd_1; 592 mk_speed = mkspd_1;
593 else if (code == KC_MS_ACCEL2) 593 else if (code == QK_MOUSE_ACCELERATION_2)
594 mk_speed = mkspd_2; 594 mk_speed = mkspd_2;
595 if (mk_speed != old_speed) adjust_speed(); 595 if (mk_speed != old_speed) adjust_speed();
596} 596}
@@ -599,30 +599,30 @@ void mousekey_off(uint8_t code) {
599# ifdef MK_MOMENTARY_ACCEL 599# ifdef MK_MOMENTARY_ACCEL
600 uint8_t const old_speed = mk_speed; 600 uint8_t const old_speed = mk_speed;
601# endif 601# endif
602 if (code == KC_MS_UP && mouse_report.y < 0) 602 if (code == QK_MOUSE_CURSOR_UP && mouse_report.y < 0)
603 mouse_report.y = 0; 603 mouse_report.y = 0;
604 else if (code == KC_MS_DOWN && mouse_report.y > 0) 604 else if (code == QK_MOUSE_CURSOR_DOWN && mouse_report.y > 0)
605 mouse_report.y = 0; 605 mouse_report.y = 0;
606 else if (code == KC_MS_LEFT && mouse_report.x < 0) 606 else if (code == QK_MOUSE_CURSOR_LEFT && mouse_report.x < 0)
607 mouse_report.x = 0; 607 mouse_report.x = 0;
608 else if (code == KC_MS_RIGHT && mouse_report.x > 0) 608 else if (code == QK_MOUSE_CURSOR_RIGHT && mouse_report.x > 0)
609 mouse_report.x = 0; 609 mouse_report.x = 0;
610 else if (code == KC_MS_WH_UP && mouse_report.v > 0) 610 else if (code == QK_MOUSE_WHEEL_UP && mouse_report.v > 0)
611 mouse_report.v = 0; 611 mouse_report.v = 0;
612 else if (code == KC_MS_WH_DOWN && mouse_report.v < 0) 612 else if (code == QK_MOUSE_WHEEL_DOWN && mouse_report.v < 0)
613 mouse_report.v = 0; 613 mouse_report.v = 0;
614 else if (code == KC_MS_WH_LEFT && mouse_report.h < 0) 614 else if (code == QK_MOUSE_WHEEL_LEFT && mouse_report.h < 0)
615 mouse_report.h = 0; 615 mouse_report.h = 0;
616 else if (code == KC_MS_WH_RIGHT && mouse_report.h > 0) 616 else if (code == QK_MOUSE_WHEEL_RIGHT && mouse_report.h > 0)
617 mouse_report.h = 0; 617 mouse_report.h = 0;
618 else if (IS_MOUSEKEY_BUTTON(code)) 618 else if (IS_MOUSEKEY_BUTTON(code))
619 mouse_report.buttons &= ~(1 << (code - KC_MS_BTN1)); 619 mouse_report.buttons &= ~(1 << (code - QK_MOUSE_BUTTON_1));
620# ifdef MK_MOMENTARY_ACCEL 620# ifdef MK_MOMENTARY_ACCEL
621 else if (code == KC_MS_ACCEL0) 621 else if (code == QK_MOUSE_ACCELERATION_0)
622 mk_speed = mkspd_DEFAULT; 622 mk_speed = mkspd_DEFAULT;
623 else if (code == KC_MS_ACCEL1) 623 else if (code == QK_MOUSE_ACCELERATION_1)
624 mk_speed = mkspd_DEFAULT; 624 mk_speed = mkspd_DEFAULT;
625 else if (code == KC_MS_ACCEL2) 625 else if (code == QK_MOUSE_ACCELERATION_2)
626 mk_speed = mkspd_DEFAULT; 626 mk_speed = mkspd_DEFAULT;
627 if (mk_speed != old_speed) adjust_speed(); 627 if (mk_speed != old_speed) adjust_speed();
628# endif 628# endif
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 07:21:01 +0000