Salastil/ckb-next
1
0
Fork 0
mirror of https://github.com/ckb-next/ckb-next.git synced 2026-10-10 12:27:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix buttons for Ironclaw RGB

Browse Source
This commit is contained in:
Tasos Sahanidis
2019-09-17 16:41:35 +03:00
parent 52b44c1435
commit 0b141c0cff
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/keymap.c
+23
View File
@@ -242,6 +242,11 @@ const key keymap[N_KEYS_EXTENDED] = {
{ "thumb10", -1, KEY_CORSAIR },
{ "thumb11", -1, KEY_CORSAIR },
{ "thumb12", -1, KEY_CORSAIR },
{ 0, -1, KEY_NONE },
{ 0, -1, KEY_NONE },
{ 0, -1, KEY_NONE },
{ 0, -1, KEY_NONE },
{ "profswitch", -1, KEY_CORSAIR },
// Extended mouse buttons (wheel is an axis in HW, 6-8 are recognized by the OS but not present in HW)
{ "wheelup", -1, SCAN_MOUSE | BTN_WHEELUP },
@@ -351,6 +356,8 @@ void process_input_urb(void* context, unsigned char *buffer, int urblen, ushort
// Corsair Mouse Input
else if(firstbyte == CORSAIR_IN)
corsair_mousecopy(kb->input.keys, buffer);
else if(firstbyte == 0x05 && urblen == 21) // Seems to be on the Ironclaw RGB only
corsair_extended_mousecopy(kb->input.keys, buffer);
else
ckb_err("Unknown mouse data received in input thread %02x from endpoint %02x\n", firstbyte, ep);
} else {
@@ -531,6 +538,22 @@ void corsair_mousecopy(unsigned char* kbinput, const unsigned char* urbinput){
}
}
void corsair_extended_mousecopy(unsigned char* kbinput, const unsigned char* urbinput){
// This handles the ironclaw 0x05 packets.
// So far only two possible values exist. In the future this may need to be rewritten
// in a similar fashion as corsair_mousecopy but we currently do not have enough data to do so.
if(urbinput[6] & 0b01)
SET_KEYBIT(kbinput, MOUSE_BUTTON_FIRST + 4);
else
CLEAR_KEYBIT(kbinput, MOUSE_BUTTON_FIRST + 4);
if(urbinput[6] & 0b10)
SET_KEYBIT(kbinput, MOUSE_BUTTON_FIRST + 3);
else
CLEAR_KEYBIT(kbinput, MOUSE_BUTTON_FIRST + 3);
}
void m95_mouse_translate(unsigned char* kbinput, short* xaxis, short* yaxis, int length, const unsigned char* urbinput){
if(length != 7)
return;
src/daemon/keymap.h
+3 -2
View File
@@ -34,8 +34,8 @@
// Mousepad zone count
#define N_MOUSEPAD_ZONES 15
// Mouse buttons
#define N_BUTTONS_HW 20
#define N_BUTTONS_EXTENDED 25
#define N_BUTTONS_HW 25
#define N_BUTTONS_EXTENDED 30
#define MOUSE_BUTTON_FIRST (N_KEYS_HW + N_KEY_ZONES + N_KEYS_EXTRA + N_GENERIC_ZONES)
#define MOUSE_EXTRA_FIRST (MOUSE_BUTTON_FIRST + N_BUTTONS_HW)
// Number of keys that generate input
@@ -77,6 +77,7 @@ void hid_mouse_translate(unsigned char* kbinput, short* xaxis, short* yaxis, int
// Copies input from Corsair reports
void corsair_kbcopy(unsigned char* kbinput, const unsigned char* urbinput);
void corsair_mousecopy(unsigned char* kbinput, const unsigned char* urbinput);
void corsair_extended_mousecopy(unsigned char* kbinput, const unsigned char* urbinput);
void m95_mouse_translate(unsigned char* kbinput, short* xaxis, short* yaxis, int length, const unsigned char* urbinput);
#endif // KEYMAP_H