From 78b3739a4edc15ecc2f44273697a2c25704d7f65 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 3 Jun 2017 23:41:43 -0700 Subject: [PATCH] partially satisfying the cpplint complaints --- src/Kaleidoscope-MouseKeys.cpp | 3 ++- src/MouseKeyDefs.h | 8 ++++---- src/MouseWrapper.cpp | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Kaleidoscope-MouseKeys.cpp b/src/Kaleidoscope-MouseKeys.cpp index 2f4f6926..7a6017b6 100644 --- a/src/Kaleidoscope-MouseKeys.cpp +++ b/src/Kaleidoscope-MouseKeys.cpp @@ -90,8 +90,9 @@ Key MouseKeys_::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyS if (key_is_pressed(keyState)) { if (mappedKey.keyCode & KEY_MOUSE_WHEEL) { scrollWheel(mappedKey.keyCode); - } else + } else { mouseMoveIntent |= mappedKey.keyCode; + } } } else if (key_toggled_on(keyState)) { if (mappedKey.keyCode & KEY_MOUSE_WARP && mappedKey.flags & IS_MOUSE_KEY) { diff --git a/src/MouseKeyDefs.h b/src/MouseKeyDefs.h index 4b998dc0..83ca84d3 100644 --- a/src/MouseKeyDefs.h +++ b/src/MouseKeyDefs.h @@ -1,11 +1,11 @@ #pragma once -#define IS_MOUSE_KEY B00010000 +#define IS_MOUSE_KEY B00010000 // Synthetic, not internal -#define KEY_MOUSE_BTN_L 0x01 // Synthetic key -#define KEY_MOUSE_BTN_M 0x02 // Synthetic key -#define KEY_MOUSE_BTN_R 0x03 // Synthetic key +#define KEY_MOUSE_BTN_L 0x01 // Synthetic key +#define KEY_MOUSE_BTN_M 0x02 // Synthetic key +#define KEY_MOUSE_BTN_R 0x03 // Synthetic key #define KEY_MOUSE_UP B0000001 diff --git a/src/MouseWrapper.cpp b/src/MouseWrapper.cpp index b6495cc7..2e09a600 100644 --- a/src/MouseWrapper.cpp +++ b/src/MouseWrapper.cpp @@ -20,7 +20,6 @@ MouseWrapper_::MouseWrapper_(void) { void MouseWrapper_::press_button(uint8_t button) { Mouse.press(button); end_warping(); - } void MouseWrapper_::release_button(uint8_t button) {