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

Merge branch 'wheel-unbind'

Browse Source 
Closes #259
This commit is contained in:
Tasos Sahanidis
2018-10-07 16:11:20 +03:00
parent 1788b6c1fd 2c39451066
commit 5416a6843a
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/input.c
+12 -8
View File
@@ -203,16 +203,20 @@ static void inputupdate_keys(usbdevice* kb){
for(int i = rmodcount; i > 0; i--)
events[modcount + keycount + i] = events[modcount + keycount + i - 1];
events[modcount + keycount++] = new ? (scancode + 1) : -(scancode + 1);
// The volume wheel and the mouse wheel don't generate keyups, so create them automatically
#define IS_WHEEL(scan, kb) (((scan) == KEY_VOLUMEUP || (scan) == KEY_VOLUMEDOWN || (scan) == BTN_WHEELUP || (scan) == BTN_WHEELDOWN) && (!IS_K65(kb) && !IS_K63(kb)))
if(new && IS_WHEEL(map->scan, kb)){
for(int i = rmodcount; i > 0; i--)
events[modcount + keycount + i] = events[modcount + keycount + i - 1];
events[modcount + keycount++] = -(scancode + 1);
input->keys[byte] &= ~mask;
}
}
}
// The volume wheel and the mouse wheel don't generate keyups, so create them automatically
#define IS_WHEEL(scan, kb) (((scan) == KEY_VOLUMEUP || (scan) == KEY_VOLUMEDOWN || (scan) == BTN_WHEELUP || (scan) == BTN_WHEELDOWN) && (!IS_K65(kb) && !IS_K63(kb)))
if(new && IS_WHEEL(map->scan, kb)){
for(int i = rmodcount; i > 0; i--)
events[modcount + keycount + i] = events[modcount + keycount + i - 1];
if(scancode == KEY_UNBOUND)
scancode = map->scan;
events[modcount + keycount++] = -(scancode + 1);
input->keys[byte] &= ~mask;
}
// Print notifications if desired
if(kb->active){
for(int notify = 0; notify < OUTFIFO_MAX; notify++){