From ca970cb663dc3f11f826971f9260697d049076a4 Mon Sep 17 00:00:00 2001 From: Nico Date: Thu, 24 Sep 2015 11:40:24 +0200 Subject: [PATCH] Remove duplicate RAW_KEYBOARD definition warnings --- src/ImprovedKeylayouts.h | 54 ++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/src/ImprovedKeylayouts.h b/src/ImprovedKeylayouts.h index 2ba3d45..7b89939 100644 --- a/src/ImprovedKeylayouts.h +++ b/src/ImprovedKeylayouts.h @@ -97,35 +97,6 @@ THE SOFTWARE. #define RAW_KEYBOARD_RIGHT_ALT (1 << 6) #define RAW_KEYBOARD_RIGHT_GUI (1 << 7) -#define RAW_KEYBOARD_UP_ARROW 0x52 -#define RAW_KEYBOARD_DOWN_ARROW 0x51 -#define RAW_KEYBOARD_LEFT_ARROW 0x50 -#define RAW_KEYBOARD_RIGHT_ARROW 0x4F -#define RAW_KEYBOARD_SPACEBAR 0x2C -#define RAW_KEYBOARD_BACKSPACE 0x2A -#define RAW_KEYBOARD_TAB 0x2B -#define RAW_KEYBOARD_RETURN 0x28 -#define RAW_KEYBOARD_ESC 0x29 -#define RAW_KEYBOARD_INSERT 0x49 -#define RAW_KEYBOARD_DELETE 0x4C -#define RAW_KEYBOARD_PAGE_UP 0x4B -#define RAW_KEYBOARD_PAGE_DOWN 0x4E -#define RAW_KEYBOARD_HOME 0x4A -#define RAW_KEYBOARD_END 0x4D -#define RAW_KEYBOARD_CAPS_LOCK 0x39 -#define RAW_KEYBOARD_F1 0x3A -#define RAW_KEYBOARD_F2 0x3B -#define RAW_KEYBOARD_F3 0x3C -#define RAW_KEYBOARD_F4 0x3D -#define RAW_KEYBOARD_F5 0x3E -#define RAW_KEYBOARD_F6 0x3F -#define RAW_KEYBOARD_F7 0x40 -#define RAW_KEYBOARD_F8 0x41 -#define RAW_KEYBOARD_F9 0x42 -#define RAW_KEYBOARD_F10 0x43 -#define RAW_KEYBOARD_F11 0x44 -#define RAW_KEYBOARD_F12 0x45 - #define RAW_KEYBOARD_KEY(key) ((key>='a' && key<='z') ? (0x04 + key-'a') :\ (key>='A' && key<='Z') ? (0x04 + key-'A') : (key>='1' && key<='9') ? (0x1E + key-'1') : 0x27) @@ -183,10 +154,33 @@ THE SOFTWARE. #define RAW_KEYBOARD_PERIOD ( 55 ) #define RAW_KEYBOARD_SLASH ( 56 ) +#define RAW_KEYBOARD_CAPS_LOCK 0x39 +#define RAW_KEYBOARD_F1 0x3A +#define RAW_KEYBOARD_F2 0x3B +#define RAW_KEYBOARD_F3 0x3C +#define RAW_KEYBOARD_F4 0x3D +#define RAW_KEYBOARD_F5 0x3E +#define RAW_KEYBOARD_F6 0x3F +#define RAW_KEYBOARD_F7 0x40 +#define RAW_KEYBOARD_F8 0x41 +#define RAW_KEYBOARD_F9 0x42 +#define RAW_KEYBOARD_F10 0x43 +#define RAW_KEYBOARD_F11 0x44 +#define RAW_KEYBOARD_F12 0x45 #define RAW_KEYBOARD_PRINT 0x46 -#define RAW_KEYBOARD_NUM_LOCK 0x53 #define RAW_KEYBOARD_SCROLL_LOCK 0x47 #define RAW_KEYBOARD_PAUSE 0x48 +#define RAW_KEYBOARD_INSERT 0x49 +#define RAW_KEYBOARD_HOME 0x4A +#define RAW_KEYBOARD_PAGE_UP 0x4B +#define RAW_KEYBOARD_DELETE 0x4C +#define RAW_KEYBOARD_END 0x4D +#define RAW_KEYBOARD_PAGE_DOWN 0x4E +#define RAW_KEYBOARD_RIGHT_ARROW 0x4F +#define RAW_KEYBOARD_LEFT_ARROW 0x50 +#define RAW_KEYBOARD_DOWN_ARROW 0x51 +#define RAW_KEYBOARD_UP_ARROW 0x52 +#define RAW_KEYBOARD_NUM_LOCK 0x53 #define RAW_KEYBOARD_MENU 0x65 #define SHIFT 0x80