Normalise mouse keycodes (#23975)
This commit is contained in:
parent
bc0c69570b
commit
f8596b40a4
19 changed files with 426 additions and 209 deletions
|
@ -329,7 +329,7 @@ void register_mouse(uint8_t mouse_keycode, bool pressed) {
|
|||
// should mousekeys send report, or does something else handle this?
|
||||
switch (mouse_keycode) {
|
||||
# if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
|
||||
case KC_MS_BTN1 ... KC_MS_BTN8:
|
||||
case QK_MOUSE_BUTTON_1 ... QK_MOUSE_BUTTON_8:
|
||||
// let pointing device handle the buttons
|
||||
// expand if/when it handles more of the code
|
||||
# if defined(POINTING_DEVICE_ENABLE)
|
||||
|
@ -351,8 +351,8 @@ void register_mouse(uint8_t mouse_keycode, bool pressed) {
|
|||
|
||||
#ifdef PS2_MOUSE_ENABLE
|
||||
// make sure that ps2 mouse has button report synced
|
||||
if (KC_MS_BTN1 <= mouse_keycode && mouse_keycode <= KC_MS_BTN3) {
|
||||
uint8_t tmp_button_msk = MOUSE_BTN_MASK(mouse_keycode - KC_MS_BTN1);
|
||||
if (QK_MOUSE_BUTTON_1 <= mouse_keycode && mouse_keycode <= QK_MOUSE_BUTTON_3) {
|
||||
uint8_t tmp_button_msk = MOUSE_BTN_MASK(mouse_keycode - QK_MOUSE_BUTTON_1);
|
||||
tp_buttons = pressed ? tp_buttons | tmp_button_msk : tp_buttons & ~tmp_button_msk;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -160,7 +160,7 @@ __attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
|
|||
# if defined(EXTRAKEY_ENABLE)
|
||||
tap_code_delay(KC_VOLU, 10);
|
||||
# elif defined(MOUSEKEY_ENABLE)
|
||||
tap_code_delay(KC_MS_WH_UP, 10);
|
||||
tap_code_delay(QK_MOUSE_WHEEL_UP, 10);
|
||||
# else
|
||||
tap_code_delay(KC_PGDN, 10);
|
||||
# endif
|
||||
|
@ -168,7 +168,7 @@ __attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
|
|||
# if defined(EXTRAKEY_ENABLE)
|
||||
tap_code_delay(KC_VOLD, 10);
|
||||
# elif defined(MOUSEKEY_ENABLE)
|
||||
tap_code_delay(KC_MS_WH_DOWN, 10);
|
||||
tap_code_delay(QK_MOUSE_WHEEL_DOWN, 10);
|
||||
# else
|
||||
tap_code_delay(KC_PGUP, 10);
|
||||
# endif
|
||||
|
|
|
@ -29,10 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define IS_ANY(code) (KC_A <= (code) && (code) <= 0xFF)
|
||||
|
||||
#define IS_MOUSEKEY(code) IS_MOUSE_KEYCODE(code)
|
||||
#define IS_MOUSEKEY_MOVE(code) (KC_MS_UP <= (code) && (code) <= KC_MS_RIGHT)
|
||||
#define IS_MOUSEKEY_BUTTON(code) (KC_MS_BTN1 <= (code) && (code) <= KC_MS_BTN8)
|
||||
#define IS_MOUSEKEY_WHEEL(code) (KC_MS_WH_UP <= (code) && (code) <= KC_MS_WH_RIGHT)
|
||||
#define IS_MOUSEKEY_ACCEL(code) (KC_MS_ACCEL0 <= (code) && (code) <= KC_MS_ACCEL2)
|
||||
#define IS_MOUSEKEY_MOVE(code) (QK_MOUSE_CURSOR_UP <= (code) && (code) <= QK_MOUSE_CURSOR_RIGHT)
|
||||
#define IS_MOUSEKEY_BUTTON(code) (QK_MOUSE_BUTTON_1 <= (code) && (code) <= QK_MOUSE_BUTTON_8)
|
||||
#define IS_MOUSEKEY_WHEEL(code) (QK_MOUSE_WHEEL_UP <= (code) && (code) <= QK_MOUSE_WHEEL_RIGHT)
|
||||
#define IS_MOUSEKEY_ACCEL(code) (QK_MOUSE_ACCELERATION_0 <= (code) && (code) <= QK_MOUSE_ACCELERATION_2)
|
||||
|
||||
#define MOD_BIT(code) (1 << ((code)&0x07))
|
||||
|
||||
|
|
|
@ -283,25 +283,25 @@ enum qk_keycode_defines {
|
|||
KC_ASSISTANT = 0x00C0,
|
||||
KC_MISSION_CONTROL = 0x00C1,
|
||||
KC_LAUNCHPAD = 0x00C2,
|
||||
KC_MS_UP = 0x00CD,
|
||||
KC_MS_DOWN = 0x00CE,
|
||||
KC_MS_LEFT = 0x00CF,
|
||||
KC_MS_RIGHT = 0x00D0,
|
||||
KC_MS_BTN1 = 0x00D1,
|
||||
KC_MS_BTN2 = 0x00D2,
|
||||
KC_MS_BTN3 = 0x00D3,
|
||||
KC_MS_BTN4 = 0x00D4,
|
||||
KC_MS_BTN5 = 0x00D5,
|
||||
KC_MS_BTN6 = 0x00D6,
|
||||
KC_MS_BTN7 = 0x00D7,
|
||||
KC_MS_BTN8 = 0x00D8,
|
||||
KC_MS_WH_UP = 0x00D9,
|
||||
KC_MS_WH_DOWN = 0x00DA,
|
||||
KC_MS_WH_LEFT = 0x00DB,
|
||||
KC_MS_WH_RIGHT = 0x00DC,
|
||||
KC_MS_ACCEL0 = 0x00DD,
|
||||
KC_MS_ACCEL1 = 0x00DE,
|
||||
KC_MS_ACCEL2 = 0x00DF,
|
||||
QK_MOUSE_CURSOR_UP = 0x00CD,
|
||||
QK_MOUSE_CURSOR_DOWN = 0x00CE,
|
||||
QK_MOUSE_CURSOR_LEFT = 0x00CF,
|
||||
QK_MOUSE_CURSOR_RIGHT = 0x00D0,
|
||||
QK_MOUSE_BUTTON_1 = 0x00D1,
|
||||
QK_MOUSE_BUTTON_2 = 0x00D2,
|
||||
QK_MOUSE_BUTTON_3 = 0x00D3,
|
||||
QK_MOUSE_BUTTON_4 = 0x00D4,
|
||||
QK_MOUSE_BUTTON_5 = 0x00D5,
|
||||
QK_MOUSE_BUTTON_6 = 0x00D6,
|
||||
QK_MOUSE_BUTTON_7 = 0x00D7,
|
||||
QK_MOUSE_BUTTON_8 = 0x00D8,
|
||||
QK_MOUSE_WHEEL_UP = 0x00D9,
|
||||
QK_MOUSE_WHEEL_DOWN = 0x00DA,
|
||||
QK_MOUSE_WHEEL_LEFT = 0x00DB,
|
||||
QK_MOUSE_WHEEL_RIGHT = 0x00DC,
|
||||
QK_MOUSE_ACCELERATION_0 = 0x00DD,
|
||||
QK_MOUSE_ACCELERATION_1 = 0x00DE,
|
||||
QK_MOUSE_ACCELERATION_2 = 0x00DF,
|
||||
KC_LEFT_CTRL = 0x00E0,
|
||||
KC_LEFT_SHIFT = 0x00E1,
|
||||
KC_LEFT_ALT = 0x00E2,
|
||||
|
@ -926,25 +926,25 @@ enum qk_keycode_defines {
|
|||
KC_ASST = KC_ASSISTANT,
|
||||
KC_MCTL = KC_MISSION_CONTROL,
|
||||
KC_LPAD = KC_LAUNCHPAD,
|
||||
KC_MS_U = KC_MS_UP,
|
||||
KC_MS_D = KC_MS_DOWN,
|
||||
KC_MS_L = KC_MS_LEFT,
|
||||
KC_MS_R = KC_MS_RIGHT,
|
||||
KC_BTN1 = KC_MS_BTN1,
|
||||
KC_BTN2 = KC_MS_BTN2,
|
||||
KC_BTN3 = KC_MS_BTN3,
|
||||
KC_BTN4 = KC_MS_BTN4,
|
||||
KC_BTN5 = KC_MS_BTN5,
|
||||
KC_BTN6 = KC_MS_BTN6,
|
||||
KC_BTN7 = KC_MS_BTN7,
|
||||
KC_BTN8 = KC_MS_BTN8,
|
||||
KC_WH_U = KC_MS_WH_UP,
|
||||
KC_WH_D = KC_MS_WH_DOWN,
|
||||
KC_WH_L = KC_MS_WH_LEFT,
|
||||
KC_WH_R = KC_MS_WH_RIGHT,
|
||||
KC_ACL0 = KC_MS_ACCEL0,
|
||||
KC_ACL1 = KC_MS_ACCEL1,
|
||||
KC_ACL2 = KC_MS_ACCEL2,
|
||||
MS_UP = QK_MOUSE_CURSOR_UP,
|
||||
MS_DOWN = QK_MOUSE_CURSOR_DOWN,
|
||||
MS_LEFT = QK_MOUSE_CURSOR_LEFT,
|
||||
MS_RGHT = QK_MOUSE_CURSOR_RIGHT,
|
||||
MS_BTN1 = QK_MOUSE_BUTTON_1,
|
||||
MS_BTN2 = QK_MOUSE_BUTTON_2,
|
||||
MS_BTN3 = QK_MOUSE_BUTTON_3,
|
||||
MS_BTN4 = QK_MOUSE_BUTTON_4,
|
||||
MS_BTN5 = QK_MOUSE_BUTTON_5,
|
||||
MS_BTN6 = QK_MOUSE_BUTTON_6,
|
||||
MS_BTN7 = QK_MOUSE_BUTTON_7,
|
||||
MS_BTN8 = QK_MOUSE_BUTTON_8,
|
||||
MS_WHLU = QK_MOUSE_WHEEL_UP,
|
||||
MS_WHLD = QK_MOUSE_WHEEL_DOWN,
|
||||
MS_WHLL = QK_MOUSE_WHEEL_LEFT,
|
||||
MS_WHLR = QK_MOUSE_WHEEL_RIGHT,
|
||||
MS_ACL0 = QK_MOUSE_ACCELERATION_0,
|
||||
MS_ACL1 = QK_MOUSE_ACCELERATION_1,
|
||||
MS_ACL2 = QK_MOUSE_ACCELERATION_2,
|
||||
KC_LCTL = KC_LEFT_CTRL,
|
||||
KC_LSFT = KC_LEFT_SHIFT,
|
||||
KC_LALT = KC_LEFT_ALT,
|
||||
|
@ -1457,7 +1457,7 @@ enum qk_keycode_defines {
|
|||
#define IS_BASIC_KEYCODE(code) ((code) >= KC_A && (code) <= KC_EXSEL)
|
||||
#define IS_SYSTEM_KEYCODE(code) ((code) >= KC_SYSTEM_POWER && (code) <= KC_SYSTEM_WAKE)
|
||||
#define IS_CONSUMER_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_LAUNCHPAD)
|
||||
#define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2)
|
||||
#define IS_MOUSE_KEYCODE(code) ((code) >= QK_MOUSE_CURSOR_UP && (code) <= QK_MOUSE_ACCELERATION_2)
|
||||
#define IS_MODIFIER_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI)
|
||||
#define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT)
|
||||
#define IS_MAGIC_KEYCODE(code) ((code) >= QK_MAGIC_SWAP_CONTROL_CAPS_LOCK && (code) <= QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK)
|
||||
|
@ -1482,7 +1482,7 @@ enum qk_keycode_defines {
|
|||
#define BASIC_KEYCODE_RANGE KC_A ... KC_EXSEL
|
||||
#define SYSTEM_KEYCODE_RANGE KC_SYSTEM_POWER ... KC_SYSTEM_WAKE
|
||||
#define CONSUMER_KEYCODE_RANGE KC_AUDIO_MUTE ... KC_LAUNCHPAD
|
||||
#define MOUSE_KEYCODE_RANGE KC_MS_UP ... KC_MS_ACCEL2
|
||||
#define MOUSE_KEYCODE_RANGE QK_MOUSE_CURSOR_UP ... QK_MOUSE_ACCELERATION_2
|
||||
#define MODIFIER_KEYCODE_RANGE KC_LEFT_CTRL ... KC_RIGHT_GUI
|
||||
#define SWAP_HANDS_KEYCODE_RANGE QK_SWAP_HANDS_TOGGLE ... QK_SWAP_HANDS_ONE_SHOT
|
||||
#define MAGIC_KEYCODE_RANGE QK_MAGIC_SWAP_CONTROL_CAPS_LOCK ... QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK
|
||||
|
|
|
@ -407,42 +407,42 @@ void mousekey_on(uint8_t code) {
|
|||
# ifdef MOUSEKEY_INERTIA
|
||||
|
||||
// initial keypress sets impulse and activates first frame of movement
|
||||
if ((code == KC_MS_UP) || (code == KC_MS_DOWN)) {
|
||||
mousekey_y_dir = (code == KC_MS_DOWN) ? 1 : -1;
|
||||
if ((code == QK_MOUSE_CURSOR_UP) || (code == QK_MOUSE_CURSOR_DOWN)) {
|
||||
mousekey_y_dir = (code == QK_MOUSE_CURSOR_DOWN) ? 1 : -1;
|
||||
if (mousekey_frame < 2) mouse_report.y = move_unit(1);
|
||||
} else if ((code == KC_MS_LEFT) || (code == KC_MS_RIGHT)) {
|
||||
mousekey_x_dir = (code == KC_MS_RIGHT) ? 1 : -1;
|
||||
} else if ((code == QK_MOUSE_CURSOR_LEFT) || (code == QK_MOUSE_CURSOR_RIGHT)) {
|
||||
mousekey_x_dir = (code == QK_MOUSE_CURSOR_RIGHT) ? 1 : -1;
|
||||
if (mousekey_frame < 2) mouse_report.x = move_unit(0);
|
||||
}
|
||||
|
||||
# else // no inertia
|
||||
|
||||
if (code == KC_MS_UP)
|
||||
if (code == QK_MOUSE_CURSOR_UP)
|
||||
mouse_report.y = move_unit() * -1;
|
||||
else if (code == KC_MS_DOWN)
|
||||
else if (code == QK_MOUSE_CURSOR_DOWN)
|
||||
mouse_report.y = move_unit();
|
||||
else if (code == KC_MS_LEFT)
|
||||
else if (code == QK_MOUSE_CURSOR_LEFT)
|
||||
mouse_report.x = move_unit() * -1;
|
||||
else if (code == KC_MS_RIGHT)
|
||||
else if (code == QK_MOUSE_CURSOR_RIGHT)
|
||||
mouse_report.x = move_unit();
|
||||
|
||||
# endif // inertia or not
|
||||
|
||||
else if (code == KC_MS_WH_UP)
|
||||
else if (code == QK_MOUSE_WHEEL_UP)
|
||||
mouse_report.v = wheel_unit();
|
||||
else if (code == KC_MS_WH_DOWN)
|
||||
else if (code == QK_MOUSE_WHEEL_DOWN)
|
||||
mouse_report.v = wheel_unit() * -1;
|
||||
else if (code == KC_MS_WH_LEFT)
|
||||
else if (code == QK_MOUSE_WHEEL_LEFT)
|
||||
mouse_report.h = wheel_unit() * -1;
|
||||
else if (code == KC_MS_WH_RIGHT)
|
||||
else if (code == QK_MOUSE_WHEEL_RIGHT)
|
||||
mouse_report.h = wheel_unit();
|
||||
else if (IS_MOUSEKEY_BUTTON(code))
|
||||
mouse_report.buttons |= 1 << (code - KC_MS_BTN1);
|
||||
else if (code == KC_MS_ACCEL0)
|
||||
mouse_report.buttons |= 1 << (code - QK_MOUSE_BUTTON_1);
|
||||
else if (code == QK_MOUSE_ACCELERATION_0)
|
||||
mousekey_accel |= (1 << 0);
|
||||
else if (code == KC_MS_ACCEL1)
|
||||
else if (code == QK_MOUSE_ACCELERATION_1)
|
||||
mousekey_accel |= (1 << 1);
|
||||
else if (code == KC_MS_ACCEL2)
|
||||
else if (code == QK_MOUSE_ACCELERATION_2)
|
||||
mousekey_accel |= (1 << 2);
|
||||
}
|
||||
|
||||
|
@ -450,43 +450,43 @@ void mousekey_off(uint8_t code) {
|
|||
# ifdef MOUSEKEY_INERTIA
|
||||
|
||||
// key release clears impulse unless opposite direction is held
|
||||
if ((code == KC_MS_UP) && (mousekey_y_dir < 1))
|
||||
if ((code == QK_MOUSE_CURSOR_UP) && (mousekey_y_dir < 1))
|
||||
mousekey_y_dir = 0;
|
||||
else if ((code == KC_MS_DOWN) && (mousekey_y_dir > -1))
|
||||
else if ((code == QK_MOUSE_CURSOR_DOWN) && (mousekey_y_dir > -1))
|
||||
mousekey_y_dir = 0;
|
||||
else if ((code == KC_MS_LEFT) && (mousekey_x_dir < 1))
|
||||
else if ((code == QK_MOUSE_CURSOR_LEFT) && (mousekey_x_dir < 1))
|
||||
mousekey_x_dir = 0;
|
||||
else if ((code == KC_MS_RIGHT) && (mousekey_x_dir > -1))
|
||||
else if ((code == QK_MOUSE_CURSOR_RIGHT) && (mousekey_x_dir > -1))
|
||||
mousekey_x_dir = 0;
|
||||
|
||||
# else // no inertia
|
||||
|
||||
if (code == KC_MS_UP && mouse_report.y < 0)
|
||||
if (code == QK_MOUSE_CURSOR_UP && mouse_report.y < 0)
|
||||
mouse_report.y = 0;
|
||||
else if (code == KC_MS_DOWN && mouse_report.y > 0)
|
||||
else if (code == QK_MOUSE_CURSOR_DOWN && mouse_report.y > 0)
|
||||
mouse_report.y = 0;
|
||||
else if (code == KC_MS_LEFT && mouse_report.x < 0)
|
||||
else if (code == QK_MOUSE_CURSOR_LEFT && mouse_report.x < 0)
|
||||
mouse_report.x = 0;
|
||||
else if (code == KC_MS_RIGHT && mouse_report.x > 0)
|
||||
else if (code == QK_MOUSE_CURSOR_RIGHT && mouse_report.x > 0)
|
||||
mouse_report.x = 0;
|
||||
|
||||
# endif // inertia or not
|
||||
|
||||
else if (code == KC_MS_WH_UP && mouse_report.v > 0)
|
||||
else if (code == QK_MOUSE_WHEEL_UP && mouse_report.v > 0)
|
||||
mouse_report.v = 0;
|
||||
else if (code == KC_MS_WH_DOWN && mouse_report.v < 0)
|
||||
else if (code == QK_MOUSE_WHEEL_DOWN && mouse_report.v < 0)
|
||||
mouse_report.v = 0;
|
||||
else if (code == KC_MS_WH_LEFT && mouse_report.h < 0)
|
||||
else if (code == QK_MOUSE_WHEEL_LEFT && mouse_report.h < 0)
|
||||
mouse_report.h = 0;
|
||||
else if (code == KC_MS_WH_RIGHT && mouse_report.h > 0)
|
||||
else if (code == QK_MOUSE_WHEEL_RIGHT && mouse_report.h > 0)
|
||||
mouse_report.h = 0;
|
||||
else if (IS_MOUSEKEY_BUTTON(code))
|
||||
mouse_report.buttons &= ~(1 << (code - KC_MS_BTN1));
|
||||
else if (code == KC_MS_ACCEL0)
|
||||
mouse_report.buttons &= ~(1 << (code - QK_MOUSE_BUTTON_1));
|
||||
else if (code == QK_MOUSE_ACCELERATION_0)
|
||||
mousekey_accel &= ~(1 << 0);
|
||||
else if (code == KC_MS_ACCEL1)
|
||||
else if (code == QK_MOUSE_ACCELERATION_1)
|
||||
mousekey_accel &= ~(1 << 1);
|
||||
else if (code == KC_MS_ACCEL2)
|
||||
else if (code == QK_MOUSE_ACCELERATION_2)
|
||||
mousekey_accel &= ~(1 << 2);
|
||||
if (mouse_report.x == 0 && mouse_report.y == 0) {
|
||||
mousekey_repeat = 0;
|
||||
|
@ -568,29 +568,29 @@ void mousekey_on(uint8_t code) {
|
|||
uint16_t const c_offset = c_offsets[mk_speed];
|
||||
uint16_t const w_offset = w_offsets[mk_speed];
|
||||
uint8_t const old_speed = mk_speed;
|
||||
if (code == KC_MS_UP)
|
||||
if (code == QK_MOUSE_CURSOR_UP)
|
||||
mouse_report.y = c_offset * -1;
|
||||
else if (code == KC_MS_DOWN)
|
||||
else if (code == QK_MOUSE_CURSOR_DOWN)
|
||||
mouse_report.y = c_offset;
|
||||
else if (code == KC_MS_LEFT)
|
||||
else if (code == QK_MOUSE_CURSOR_LEFT)
|
||||
mouse_report.x = c_offset * -1;
|
||||
else if (code == KC_MS_RIGHT)
|
||||
else if (code == QK_MOUSE_CURSOR_RIGHT)
|
||||
mouse_report.x = c_offset;
|
||||
else if (code == KC_MS_WH_UP)
|
||||
else if (code == QK_MOUSE_WHEEL_UP)
|
||||
mouse_report.v = w_offset;
|
||||
else if (code == KC_MS_WH_DOWN)
|
||||
else if (code == QK_MOUSE_WHEEL_DOWN)
|
||||
mouse_report.v = w_offset * -1;
|
||||
else if (code == KC_MS_WH_LEFT)
|
||||
else if (code == QK_MOUSE_WHEEL_LEFT)
|
||||
mouse_report.h = w_offset * -1;
|
||||
else if (code == KC_MS_WH_RIGHT)
|
||||
else if (code == QK_MOUSE_WHEEL_RIGHT)
|
||||
mouse_report.h = w_offset;
|
||||
else if (IS_MOUSEKEY_BUTTON(code))
|
||||
mouse_report.buttons |= 1 << (code - KC_MS_BTN1);
|
||||
else if (code == KC_MS_ACCEL0)
|
||||
mouse_report.buttons |= 1 << (code - QK_MOUSE_BUTTON_1);
|
||||
else if (code == QK_MOUSE_ACCELERATION_0)
|
||||
mk_speed = mkspd_0;
|
||||
else if (code == KC_MS_ACCEL1)
|
||||
else if (code == QK_MOUSE_ACCELERATION_1)
|
||||
mk_speed = mkspd_1;
|
||||
else if (code == KC_MS_ACCEL2)
|
||||
else if (code == QK_MOUSE_ACCELERATION_2)
|
||||
mk_speed = mkspd_2;
|
||||
if (mk_speed != old_speed) adjust_speed();
|
||||
}
|
||||
|
@ -599,30 +599,30 @@ void mousekey_off(uint8_t code) {
|
|||
# ifdef MK_MOMENTARY_ACCEL
|
||||
uint8_t const old_speed = mk_speed;
|
||||
# endif
|
||||
if (code == KC_MS_UP && mouse_report.y < 0)
|
||||
if (code == QK_MOUSE_CURSOR_UP && mouse_report.y < 0)
|
||||
mouse_report.y = 0;
|
||||
else if (code == KC_MS_DOWN && mouse_report.y > 0)
|
||||
else if (code == QK_MOUSE_CURSOR_DOWN && mouse_report.y > 0)
|
||||
mouse_report.y = 0;
|
||||
else if (code == KC_MS_LEFT && mouse_report.x < 0)
|
||||
else if (code == QK_MOUSE_CURSOR_LEFT && mouse_report.x < 0)
|
||||
mouse_report.x = 0;
|
||||
else if (code == KC_MS_RIGHT && mouse_report.x > 0)
|
||||
else if (code == QK_MOUSE_CURSOR_RIGHT && mouse_report.x > 0)
|
||||
mouse_report.x = 0;
|
||||
else if (code == KC_MS_WH_UP && mouse_report.v > 0)
|
||||
else if (code == QK_MOUSE_WHEEL_UP && mouse_report.v > 0)
|
||||
mouse_report.v = 0;
|
||||
else if (code == KC_MS_WH_DOWN && mouse_report.v < 0)
|
||||
else if (code == QK_MOUSE_WHEEL_DOWN && mouse_report.v < 0)
|
||||
mouse_report.v = 0;
|
||||
else if (code == KC_MS_WH_LEFT && mouse_report.h < 0)
|
||||
else if (code == QK_MOUSE_WHEEL_LEFT && mouse_report.h < 0)
|
||||
mouse_report.h = 0;
|
||||
else if (code == KC_MS_WH_RIGHT && mouse_report.h > 0)
|
||||
else if (code == QK_MOUSE_WHEEL_RIGHT && mouse_report.h > 0)
|
||||
mouse_report.h = 0;
|
||||
else if (IS_MOUSEKEY_BUTTON(code))
|
||||
mouse_report.buttons &= ~(1 << (code - KC_MS_BTN1));
|
||||
mouse_report.buttons &= ~(1 << (code - QK_MOUSE_BUTTON_1));
|
||||
# ifdef MK_MOMENTARY_ACCEL
|
||||
else if (code == KC_MS_ACCEL0)
|
||||
else if (code == QK_MOUSE_ACCELERATION_0)
|
||||
mk_speed = mkspd_DEFAULT;
|
||||
else if (code == KC_MS_ACCEL1)
|
||||
else if (code == QK_MOUSE_ACCELERATION_1)
|
||||
mk_speed = mkspd_DEFAULT;
|
||||
else if (code == KC_MS_ACCEL2)
|
||||
else if (code == QK_MOUSE_ACCELERATION_2)
|
||||
mk_speed = mkspd_DEFAULT;
|
||||
if (mk_speed != old_speed) adjust_speed();
|
||||
# endif
|
||||
|
|
|
@ -498,7 +498,7 @@ __attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_m
|
|||
|
||||
__attribute__((weak)) void pointing_device_keycode_handler(uint16_t keycode, bool pressed) {
|
||||
if IS_MOUSEKEY_BUTTON (keycode) {
|
||||
local_mouse_report.buttons = pointing_device_handle_buttons(local_mouse_report.buttons, pressed, keycode - KC_MS_BTN1);
|
||||
local_mouse_report.buttons = pointing_device_handle_buttons(local_mouse_report.buttons, pressed, keycode - QK_MOUSE_BUTTON_1);
|
||||
pointing_device_send();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
# define AUTO_MOUSE_TIME 650
|
||||
#endif
|
||||
#ifndef AUTO_MOUSE_DELAY
|
||||
# define AUTO_MOUSE_DELAY GET_TAPPING_TERM(KC_MS_BTN1, &(keyrecord_t){})
|
||||
# define AUTO_MOUSE_DELAY GET_TAPPING_TERM(QK_MOUSE_BUTTON_1, &(keyrecord_t){})
|
||||
#endif
|
||||
#ifndef AUTO_MOUSE_DEBOUNCE
|
||||
# define AUTO_MOUSE_DEBOUNCE 25
|
||||
|
|
|
@ -16,3 +16,42 @@
|
|||
#define RGB_VAD QK_UNDERGLOW_VALUE_DOWN
|
||||
#define RGB_SPI QK_UNDERGLOW_SPEED_UP
|
||||
#define RGB_SPD QK_UNDERGLOW_SPEED_DOWN
|
||||
|
||||
#define KC_MS_UP QK_MOUSE_CURSOR_UP
|
||||
#define KC_MS_U QK_MOUSE_CURSOR_UP
|
||||
#define KC_MS_DOWN QK_MOUSE_CURSOR_DOWN
|
||||
#define KC_MS_D QK_MOUSE_CURSOR_DOWN
|
||||
#define KC_MS_LEFT QK_MOUSE_CURSOR_LEFT
|
||||
#define KC_MS_L QK_MOUSE_CURSOR_LEFT
|
||||
#define KC_MS_RIGHT QK_MOUSE_CURSOR_RIGHT
|
||||
#define KC_MS_R QK_MOUSE_CURSOR_RIGHT
|
||||
#define KC_MS_BTN1 QK_MOUSE_BUTTON_1
|
||||
#define KC_BTN1 QK_MOUSE_BUTTON_1
|
||||
#define KC_MS_BTN2 QK_MOUSE_BUTTON_2
|
||||
#define KC_BTN2 QK_MOUSE_BUTTON_2
|
||||
#define KC_MS_BTN3 QK_MOUSE_BUTTON_3
|
||||
#define KC_BTN3 QK_MOUSE_BUTTON_3
|
||||
#define KC_MS_BTN4 QK_MOUSE_BUTTON_4
|
||||
#define KC_BTN4 QK_MOUSE_BUTTON_4
|
||||
#define KC_MS_BTN5 QK_MOUSE_BUTTON_5
|
||||
#define KC_BTN5 QK_MOUSE_BUTTON_5
|
||||
#define KC_MS_BTN6 QK_MOUSE_BUTTON_6
|
||||
#define KC_BTN6 QK_MOUSE_BUTTON_6
|
||||
#define KC_MS_BTN7 QK_MOUSE_BUTTON_7
|
||||
#define KC_BTN7 QK_MOUSE_BUTTON_7
|
||||
#define KC_MS_BTN8 QK_MOUSE_BUTTON_8
|
||||
#define KC_BTN8 QK_MOUSE_BUTTON_8
|
||||
#define KC_MS_WH_UP QK_MOUSE_WHEEL_UP
|
||||
#define KC_WH_U QK_MOUSE_WHEEL_UP
|
||||
#define KC_MS_WH_DOWN QK_MOUSE_WHEEL_DOWN
|
||||
#define KC_WH_D QK_MOUSE_WHEEL_DOWN
|
||||
#define KC_MS_WH_LEFT QK_MOUSE_WHEEL_LEFT
|
||||
#define KC_WH_L QK_MOUSE_WHEEL_LEFT
|
||||
#define KC_MS_WH_RIGHT QK_MOUSE_WHEEL_RIGHT
|
||||
#define KC_WH_R QK_MOUSE_WHEEL_RIGHT
|
||||
#define KC_MS_ACCEL0 QK_MOUSE_ACCELERATION_0
|
||||
#define KC_ACL0 QK_MOUSE_ACCELERATION_0
|
||||
#define KC_MS_ACCEL1 QK_MOUSE_ACCELERATION_1
|
||||
#define KC_ACL1 QK_MOUSE_ACCELERATION_1
|
||||
#define KC_MS_ACCEL2 QK_MOUSE_ACCELERATION_2
|
||||
#define KC_ACL2 QK_MOUSE_ACCELERATION_2
|
||||
|
|
|
@ -220,10 +220,10 @@ uint16_t get_alt_repeat_key_keycode(void) {
|
|||
{KC_BRIU, KC_BRID}, // Brightness Up / Down.
|
||||
#endif // EXTRAKEY_ENABLE
|
||||
#ifdef MOUSEKEY_ENABLE
|
||||
{KC_MS_L, KC_MS_R}, // Mouse Cursor Left / Right.
|
||||
{KC_MS_U, KC_MS_D}, // Mouse Cursor Up / Down.
|
||||
{KC_WH_L, KC_WH_R}, // Mouse Wheel Left / Right.
|
||||
{KC_WH_U, KC_WH_D}, // Mouse Wheel Up / Down.
|
||||
{MS_LEFT, MS_RGHT}, // Mouse Cursor Left / Right.
|
||||
{MS_UP, MS_DOWN}, // Mouse Cursor Up / Down.
|
||||
{MS_WHLL, MS_WHLR}, // Mouse Wheel Left / Right.
|
||||
{MS_WHLU, MS_WHLD}, // Mouse Wheel Up / Down.
|
||||
#endif // MOUSEKEY_ENABLE
|
||||
};
|
||||
// clang-format on
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue