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 'alpha0.2.2.le1-daemononly' of https://github.com/frickler24/ckb into testing

Browse Source
This commit is contained in:
ccMSC
2015-12-14 21:18:27 -07:00
parent c3474d2ec3 eb56cc1e78
commit f7d897f836
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ckb-daemon/device_vtable.c
+1
View File
@@ -49,6 +49,7 @@ const devcmd vtable_keyboard = {
.bind = cmd_bind,
.unbind = cmd_unbind,
.rebind = cmd_rebind,
.macro = cmd_macro,
.dpi = cmd_macro_none,
.dpisel = cmd_none,
src/ckb-daemon/input.c
+1 -1
View File
@@ -313,7 +313,7 @@ static void _cmd_macro(usbmode* mode, const char* keys, const char* assignment){
bind->macros = realloc(bind->macros, (bind->macrocap += 16) * sizeof(keymacro));
}
void cmd_macro(usbdevice* kb, usbmode* mode, const char* keys, const char* assignment){
void cmd_macro(usbdevice* kb, usbmode* mode, const int notifynumber, const char* keys, const char* assignment){
pthread_mutex_lock(imutex(kb));
_cmd_macro(mode, keys, assignment);
pthread_mutex_unlock(imutex(kb));
src/ckb-daemon/input.h
+1 -1
View File
@@ -27,7 +27,7 @@ void cmd_unbind(usbdevice* kb, usbmode* mode, int dummy, int keyindex, const cha
// Resets a key binding
void cmd_rebind(usbdevice* kb, usbmode* mode, int dummy, int keyindex, const char* ignored);
// Creates or updates a macro. Pass null strings to clear all macros
void cmd_macro(usbdevice* kb, usbmode* mode, const char* keys, const char* assignment);
void cmd_macro(usbdevice* kb, usbmode* mode, const int notifynumber, const char* keys, const char* assignment);
#ifdef OS_LINUX
// Is a key a modifier?