X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.c;h=7a0a23f8431d84b93e897bb710a2e08b94d3ed2c;hb=94a1d22e978309e92e355234be7c22ac885b7046;hp=8474f3605ef57de44c3519293ffadb553711afb7;hpb=049a6b3e80151f6a5af726e25478ed15e111dfcc;p=libpicofe.git diff --git a/common/input.c b/common/input.c index 8474f36..7a0a23f 100644 --- a/common/input.c +++ b/common/input.c @@ -2,10 +2,19 @@ #include #include -#include "common.h" #include "input.h" +#include "plat.h" +#include "lprintf.h" + +#ifdef IN_EVDEV #include "../linux/in_evdev.h" +#endif +#ifdef IN_GP2X #include "../gp2x/in_gp2x.h" +#endif +#ifdef IN_VK +#include "../win32/in_vk.h" +#endif typedef struct { @@ -13,41 +22,34 @@ typedef struct int drv_fd_hnd; void *drv_data; char *name; - int *binds; - int probed:1; + int key_count; + int *binds; /* total = key_count * bindtypes * 2 */ + const char * const *key_names; + unsigned int probed:1; + unsigned int does_combos:1; } in_dev_t; static in_drv_t in_drivers[IN_DRVID_COUNT]; static in_dev_t in_devices[IN_MAX_DEVS]; static int in_dev_count = 0; static int in_have_async_devs = 0; +static int menu_key_state = 0; +static int menu_last_used_dev = 0; #define DRV(id) in_drivers[(unsigned)(id) < IN_DRVID_COUNT ? (id) : 0] -static int in_bind_count(int drv_id) -{ - int count = DRV(drv_id).get_bind_count(); - if (count <= 0) - printf("input: failed to get bind count for drv %d\n", drv_id); - - return count; -} - -static int *in_alloc_binds(int drv_id) +static int *in_alloc_binds(int drv_id, int key_count) { - int count, *binds; - - count = in_bind_count(drv_id); - if (count <= 0) - return NULL; + int *binds; - binds = calloc(count * 2, sizeof(binds[0])); + binds = calloc(key_count * IN_BINDTYPE_COUNT * 2, sizeof(binds[0])); if (binds == NULL) return NULL; - DRV(drv_id).get_def_binds(binds + count); - memcpy(binds, binds + count, count * sizeof(binds[0])); + DRV(drv_id).get_def_binds(binds + key_count * IN_BINDTYPE_COUNT); + memcpy(binds, binds + key_count * IN_BINDTYPE_COUNT, + sizeof(binds[0]) * key_count * IN_BINDTYPE_COUNT); return binds; } @@ -66,7 +68,8 @@ static void in_free(in_dev_t *dev) /* to be called by drivers * async devices must set drv_fd_hnd to -1 */ -void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data) +void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data, + int key_count, const char * const *key_names, int combos) { int i, ret, dupe_count = 0, *binds; char name[256], *name_end, *tmp; @@ -96,7 +99,7 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data) for (i = 0; i < IN_MAX_DEVS; i++) if (!in_devices[i].probed) break; if (i >= IN_MAX_DEVS) { - printf("input: too many devices, can't add %s\n", name); + lprintf("input: too many devices, can't add %s\n", name); return; } in_free(&in_devices[i]); @@ -106,7 +109,7 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data) if (tmp == NULL) return; - binds = in_alloc_binds(drv_id); + binds = in_alloc_binds(drv_id, key_count); if (binds == NULL) { free(tmp); return; @@ -114,18 +117,22 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data) in_devices[i].name = tmp; in_devices[i].binds = binds; + in_devices[i].key_count = key_count; if (i + 1 > in_dev_count) in_dev_count = i + 1; - printf("input: new device #%d \"%s\"\n", i, name); + lprintf("input: new device #%d \"%s\"\n", i, name); update: in_devices[i].probed = 1; + in_devices[i].does_combos = combos; in_devices[i].drv_id = drv_id; in_devices[i].drv_fd_hnd = drv_fd_hnd; + in_devices[i].key_names = key_names; in_devices[i].drv_data = drv_data; if (in_devices[i].binds != NULL) { - ret = DRV(drv_id).clean_binds(drv_data, in_devices[i].binds); + ret = DRV(drv_id).clean_binds(drv_data, in_devices[i].binds, + in_devices[i].binds + key_count * IN_BINDTYPE_COUNT); if (ret == 0) { /* no useable binds */ free(in_devices[i].binds); @@ -134,6 +141,73 @@ update: } } +/* key combo handling, to be called by drivers that support it. + * Only care about IN_BINDTYPE_EMU */ +void in_combos_find(const int *binds, int last_key, int *combo_keys, int *combo_acts) +{ + int act, u; + + *combo_keys = *combo_acts = 0; + for (act = 0; act < sizeof(binds[0]) * 8; act++) + { + int keyc = 0; + for (u = 0; u <= last_key; u++) + if (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & (1 << act)) + keyc++; + + if (keyc > 1) + { + // loop again and mark those keys and actions as combo + for (u = 0; u <= last_key; u++) + { + if (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & (1 << act)) { + *combo_keys |= 1 << u; + *combo_acts |= 1 << act; + } + } + } + } +} + +int in_combos_do(int keys, const int *binds, int last_key, int combo_keys, int combo_acts) +{ + int i, ret = 0; + + for (i = 0; i <= last_key; i++) + { + int acts, acts_c, u; + + if (!(keys & (1 << i))) + continue; + + acts = binds[IN_BIND_OFFS(i, IN_BINDTYPE_EMU)]; + if (!acts) + continue; + + if (!(combo_keys & (1 << i))) { + ret |= acts; + continue; + } + + acts_c = acts & combo_acts; + u = last_key; + if (acts_c) { + // let's try to find the other one + for (u = i + 1; u <= last_key; u++) + if ( (keys & (1 << u)) && (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & acts_c) ) { + ret |= acts_c & binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)]; + keys &= ~((1 << i) | (1 << u)); + break; + } + } + // add non-combo actions if combo ones were not found + if (u >= last_key) + ret |= acts & ~combo_acts; + } + + return ret; +} + void in_probe(void) { int i; @@ -163,68 +237,49 @@ void in_probe(void) } if (in_have_async_devs) - printf("input: async-only devices detected..\n"); + lprintf("input: async-only devices detected..\n"); + + in_debug_dump(); } /* async update */ -int in_update(void) +int in_update(int *result) { - int i, result = 0; + int i, ret = 0; for (i = 0; i < in_dev_count; i++) { in_dev_t *dev = &in_devices[i]; if (dev->probed && dev->binds != NULL) { + // FIXME: this is stupid, make it indirect switch (dev->drv_id) { #ifdef IN_EVDEV case IN_DRVID_EVDEV: - result |= in_evdev_update(dev->drv_data, dev->binds); + ret |= in_evdev_update(dev->drv_data, dev->binds, result); break; #endif #ifdef IN_GP2X case IN_DRVID_GP2X: - result |= in_gp2x_update(dev->drv_data, dev->binds); + ret |= in_gp2x_update(dev->drv_data, dev->binds, result); + break; +#endif +#ifdef IN_VK + case IN_DRVID_VK: + ret |= in_vk_update(dev->drv_data, dev->binds, result); break; #endif } } } - return result; -} - -static int menu_key_state = 0; - -void in_set_blocking(int is_blocking) -{ - int i, ret; - - /* have_async_devs means we will have to do all reads async anyway.. */ - if (!in_have_async_devs) { - for (i = 0; i < in_dev_count; i++) { - if (in_devices[i].probed) - DRV(in_devices[i].drv_id).set_blocking(in_devices[i].drv_data, is_blocking); - } - } - - menu_key_state = 0; - - /* flush events */ - do { - ret = in_update_keycode(NULL, NULL, 0); - } while (ret >= 0); + return ret; } -/* TODO: move.. */ -#include -#include -#include - static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms) { - struct timeval start, now; int i, is_down, result; + unsigned int ticks; - gettimeofday(&start, NULL); + ticks = plat_get_ticks_ms(); while (1) { @@ -244,14 +299,10 @@ static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms) return result; } - if (timeout_ms >= 0) { - gettimeofday(&now, NULL); - if ((now.tv_sec - start.tv_sec) * 1000 + - (now.tv_usec - start.tv_usec) / 1000 > timeout_ms) - break; - } + if (timeout_ms >= 0 && (int)(plat_get_ticks_ms() - ticks) > timeout_ms) + break; - usleep(10000); + plat_sleep_ms(10); } return -1; @@ -262,10 +313,11 @@ static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms) */ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) { - int result = 0, dev_id = 0, is_down, result_menu; + int result = -1, dev_id = 0, is_down, result_menu; int fds_hnds[IN_MAX_DEVS]; int i, ret, count = 0; - in_drv_t *drv; + in_drv_t *drv = NULL; + unsigned int ticks; if (in_have_async_devs) { result = in_update_kc_async(&dev_id, &is_down, timeout_ms); @@ -275,6 +327,8 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) goto finish; } + ticks = plat_get_ticks_ms(); + for (i = 0; i < in_dev_count; i++) { if (in_devices[i].probed) fds_hnds[count++] = in_devices[i].drv_fd_hnd; @@ -282,65 +336,43 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) if (count == 0) { /* don't deadlock, fail */ - printf("input: failed to find devices to read\n"); + lprintf("input: failed to find devices to read\n"); exit(1); } -again: - /* TODO: move this block to platform/linux */ + while (1) { - struct timeval tv, *timeout = NULL; - int fdmax = -1; - fd_set fdset; - - if (timeout_ms >= 0) { - tv.tv_sec = timeout_ms / 1000; - tv.tv_usec = (timeout_ms % 1000) * 1000; - timeout = &tv; - } - - FD_ZERO(&fdset); - for (i = 0; i < count; i++) { - if (fds_hnds[i] > fdmax) fdmax = fds_hnds[i]; - FD_SET(fds_hnds[i], &fdset); - } + ret = plat_wait_event(fds_hnds, count, timeout_ms); + if (ret < 0) + break; - ret = select(fdmax + 1, &fdset, NULL, NULL, timeout); - if (ret == -1) - { - perror("input: select failed"); - sleep(1); - return -1; + for (i = 0; i < in_dev_count; i++) { + if (in_devices[i].drv_fd_hnd == ret) { + dev_id = i; + break; + } } - if (ret == 0) - return -1; /* timeout */ - - for (i = 0; i < count; i++) - if (FD_ISSET(fds_hnds[i], &fdset)) - ret = fds_hnds[i]; - } - - for (i = 0; i < in_dev_count; i++) { - if (in_devices[i].drv_fd_hnd == ret) { - dev_id = i; + drv = &DRV(in_devices[dev_id].drv_id); + result = drv->update_keycode(in_devices[dev_id].drv_data, &is_down); + if (result >= 0) break; + + if (timeout_ms >= 0) { + unsigned int ticks2 = plat_get_ticks_ms(); + timeout_ms -= ticks2 - ticks; + ticks = ticks2; + if (timeout_ms <= 0) + break; } } - drv = &DRV(in_devices[dev_id].drv_id); - result = drv->update_keycode(in_devices[dev_id].drv_data, &is_down); - - /* update_keycode() might return -1 when some not interesting - * event happened, like sync event for evdev. - * XXX: timeout restarts.. */ - if (result == -1) - goto again; - + if (result < 0) + return -1; finish: /* keep track of menu key state, to allow mixing * in_update_keycode() and in_menu_wait_any() calls */ - result_menu = drv->menu_translate(result); + result_menu = drv->menu_translate(in_devices[dev_id].drv_data, result); if (result_menu != 0) { if (is_down) menu_key_state |= result_menu; @@ -365,15 +397,13 @@ int in_menu_wait_any(int timeout_ms) int code, is_down = 0, dev_id = 0; code = in_update_keycode(&dev_id, &is_down, timeout_ms); - if (code >= 0) - code = DRV(in_devices[dev_id].drv_id).menu_translate(code); - - if (timeout_ms >= 0) - break; if (code < 0) - continue; - if (keys_old != menu_key_state) break; + + if (keys_old != menu_key_state) { + menu_last_used_dev = dev_id; + break; + } } return menu_key_state; @@ -384,7 +414,7 @@ int in_menu_wait(int interesting, int autorep_delay_ms) { static int inp_prev = 0; static int repeats = 0; - int ret, release = 0, wait = 666; + int ret, release = 0, wait = 450; if (repeats) wait = autorep_delay_ms; @@ -422,21 +452,87 @@ const int *in_get_dev_binds(int dev_id) const int *in_get_dev_def_binds(int dev_id) { - int count; - if (dev_id < 0 || dev_id >= IN_MAX_DEVS) return NULL; - count = in_bind_count(in_devices[dev_id].drv_id); - return in_devices[dev_id].binds + count; + return in_devices[dev_id].binds + in_devices[dev_id].key_count * IN_BINDTYPE_COUNT; +} + +int in_get_config(int dev_id, int what, void *val) +{ + int *ival = val; + in_dev_t *dev; + + if (dev_id < 0 || dev_id >= IN_MAX_DEVS || val == NULL) + return -1; + + dev = &in_devices[dev_id]; + switch (what) { + case IN_CFG_BIND_COUNT: + *ival = dev->key_count; + break; + case IN_CFG_DOES_COMBOS: + *ival = dev->does_combos; + break; + case IN_CFG_BLOCKING: + case IN_CFG_KEY_NAMES: + return -1; /* not implemented */ + default: + return DRV(dev->drv_id).get_config(dev->drv_data, what, ival); + } + + return 0; +} + +static int in_set_blocking(int is_blocking) +{ + int i, ret; + + /* have_async_devs means we will have to do all reads async anyway.. */ + if (!in_have_async_devs) { + for (i = 0; i < in_dev_count; i++) { + if (in_devices[i].probed) + DRV(in_devices[i].drv_id).set_config(in_devices[i].drv_data, + IN_CFG_BLOCKING, is_blocking); + } + } + + menu_key_state = 0; + + /* flush events */ + do { + ret = in_update_keycode(NULL, NULL, 0); + } while (ret >= 0); + + return 0; } -int in_get_dev_bind_count(int dev_id) +int in_set_config(int dev_id, int what, const void *val, int size) { + const int *ival = val; + in_dev_t *dev; + + if (what == IN_CFG_BLOCKING) + return in_set_blocking(*ival); + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + return -1; + + dev = &in_devices[dev_id]; + if (what == IN_CFG_KEY_NAMES) { + const char * const *names = val; + int count = size / sizeof(names[0]); + + if (count < dev->key_count) { + lprintf("input: set_key_names: not enough keys\n"); + return -1; + } + + dev->key_names = names; return 0; + } - return in_bind_count(in_devices[dev_id].drv_id); + return DRV(dev->drv_id).set_config(dev->drv_data, what, *ival); } const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix) @@ -450,6 +546,10 @@ const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix) return NULL; name = in_devices[dev_id].name; + if (name == NULL || !skip_pfix) + return name; + + /* skip prefix */ tmp = strchr(name, ':'); if (tmp != NULL) name = tmp + 1; @@ -457,16 +557,45 @@ const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix) return name; } +int in_name_to_id(const char *dev_name) +{ + int i; + + for (i = 0; i < in_dev_count; i++) + if (strcmp(dev_name, in_devices[i].name) == 0) + break; + + if (i >= in_dev_count) { + lprintf("input: in_name_to_id: no such device: %s\n", dev_name); + return -1; + } + + return i; +} + /* never returns NULL */ const char *in_get_key_name(int dev_id, int keycode) { + const char *name = NULL; static char xname[16]; - const char *name; + in_dev_t *dev; + + if (dev_id < 0) /* want last used dev? */ + dev_id = menu_last_used_dev; if (dev_id < 0 || dev_id >= IN_MAX_DEVS) return "Unkn0"; - name = DRV(in_devices[dev_id].drv_id).get_key_name(keycode); + dev = &in_devices[dev_id]; + if (keycode < 0) /* want name for menu key? */ + keycode = DRV(dev->drv_id).menu_translate(dev->drv_data, keycode); + + if (dev->key_names != NULL && 0 <= keycode && keycode < dev->key_count) + name = dev->key_names[keycode]; + if (name != NULL) + return name; + + name = DRV(dev->drv_id).get_key_name(keycode); if (name != NULL) return name; @@ -479,33 +608,57 @@ const char *in_get_key_name(int dev_id, int keycode) return xname; } -int in_bind_key(int dev_id, int keycode, int mask, int force_unbind) +int in_get_key_code(int dev_id, const char *key_name) { - int ret, count; in_dev_t *dev; + int i; + + if (dev_id < 0) /* want last used dev? */ + dev_id = menu_last_used_dev; if (dev_id < 0 || dev_id >= IN_MAX_DEVS) return -1; + + dev = &in_devices[dev_id]; + if (dev->key_names == NULL) + return -1; + + for (i = 0; i < dev->key_count; i++) + if (dev->key_names[i] && strcasecmp(dev->key_names[i], key_name) == 0) + return i; + + return -1; +} + +int in_bind_key(int dev_id, int keycode, int mask, int bind_type, int force_unbind) +{ + int ret, count; + in_dev_t *dev; + + if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT) + return -1; + dev = &in_devices[dev_id]; + count = dev->key_count; if (dev->binds == NULL) { if (force_unbind) return 0; - dev->binds = in_alloc_binds(dev->drv_id); + dev->binds = in_alloc_binds(dev->drv_id, count); if (dev->binds == NULL) return -1; } - count = in_bind_count(dev->drv_id); if (keycode < 0 || keycode >= count) return -1; if (force_unbind) - dev->binds[keycode] &= ~mask; + dev->binds[IN_BIND_OFFS(keycode, bind_type)] &= ~mask; else - dev->binds[keycode] ^= mask; + dev->binds[IN_BIND_OFFS(keycode, bind_type)] ^= mask; - ret = DRV(dev->drv_id).clean_binds(dev->drv_data, dev->binds); + ret = DRV(dev->drv_id).clean_binds(dev->drv_data, dev->binds, + dev->binds + count * IN_BINDTYPE_COUNT); if (ret == 0) { free(dev->binds); dev->binds = NULL; @@ -514,6 +667,24 @@ int in_bind_key(int dev_id, int keycode, int mask, int force_unbind) return 0; } +void in_unbind_all(int dev_id, int act_mask, int bind_type) +{ + int i, count; + in_dev_t *dev; + + if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT) + return; + + dev = &in_devices[dev_id]; + count = dev->key_count; + + if (dev->binds == NULL) + return; + + for (i = 0; i < count; i++) + dev->binds[IN_BIND_OFFS(i, bind_type)] &= ~act_mask; +} + /* returns device id, or -1 on error */ int in_config_parse_dev(const char *name) { @@ -528,7 +699,7 @@ int in_config_parse_dev(const char *name) } if (drv_id < 0) { - printf("input: missing driver for %s\n", name); + lprintf("input: missing driver for %s\n", name); return -1; } @@ -546,7 +717,7 @@ int in_config_parse_dev(const char *name) for (i = 0; i < IN_MAX_DEVS; i++) if (in_devices[i].name == NULL) break; if (i >= IN_MAX_DEVS) { - printf("input: too many devices, can't add %s\n", name); + lprintf("input: too many devices, can't add %s\n", name); return -1; } } @@ -557,9 +728,11 @@ int in_config_parse_dev(const char *name) if (in_devices[i].name == NULL) return -1; + in_devices[i].key_count = DRV(drv_id).get_bind_count(); + in_devices[i].drv_id = drv_id; + if (i + 1 > in_dev_count) in_dev_count = i + 1; - in_devices[i].drv_id = drv_id; return i; } @@ -581,26 +754,24 @@ void in_config_start(void) if (binds == NULL) continue; - count = in_bind_count(in_devices[i].drv_id); - def_binds = binds + count; + count = in_devices[i].key_count; + def_binds = binds + count * IN_BINDTYPE_COUNT; - for (n = 0; n < count; n++) + for (n = 0; n < count * IN_BINDTYPE_COUNT; n++) if (binds[n] == def_binds[n]) binds[n] = -1; } } -int in_config_bind_key(int dev_id, const char *key, int binds) +int in_config_bind_key(int dev_id, const char *key, int acts, int bind_type) { - int count, kc; in_dev_t *dev; + int i, offs, kc; - if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT) return -1; dev = &in_devices[dev_id]; - count = in_bind_count(dev->drv_id); - /* maybe a raw code? */ if (key[0] == '\\' && key[1] == 'x') { char *p = NULL; @@ -611,28 +782,46 @@ int in_config_bind_key(int dev_id, const char *key, int binds) else { /* device specific key name */ if (dev->binds == NULL) { - dev->binds = in_alloc_binds(dev->drv_id); + dev->binds = in_alloc_binds(dev->drv_id, dev->key_count); if (dev->binds == NULL) return -1; in_config_start(); } - kc = DRV(dev->drv_id).get_key_code(key); + kc = -1; + if (dev->key_names != NULL) { + for (i = 0; i < dev->key_count; i++) { + const char *k = dev->key_names[i]; + if (k != NULL && strcasecmp(k, key) == 0) { + kc = i; + break; + } + } + } + + if (kc < 0) + kc = DRV(dev->drv_id).get_key_code(key); if (kc < 0 && strlen(key) == 1) { /* assume scancode */ kc = key[0]; } } - if (kc < 0 || kc >= count) { - printf("input: bad key: %s\n", key); + if (kc < 0 || kc >= dev->key_count) { + lprintf("input: bad key: %s\n", key); return -1; } - if (dev->binds[kc] == -1) - dev->binds[kc] = 0; - dev->binds[kc] |= binds; + if (bind_type == IN_BINDTYPE_NONE) { + for (i = 0; i < IN_BINDTYPE_COUNT; i++) + dev->binds[IN_BIND_OFFS(kc, i)] = 0; + return 0; + } + offs = IN_BIND_OFFS(kc, bind_type); + if (dev->binds[offs] == -1) + dev->binds[offs] = 0; + dev->binds[offs] |= acts; return 0; } @@ -641,24 +830,33 @@ void in_config_end(void) int i; for (i = 0; i < IN_MAX_DEVS; i++) { - int n, ret, count, *binds, *def_binds; + int n, t, ret, count, *binds, *def_binds; in_dev_t *dev = &in_devices[i]; if (dev->binds == NULL) continue; - count = in_bind_count(dev->drv_id); + count = dev->key_count; binds = dev->binds; - def_binds = binds + count; - - for (n = 0; n < count; n++) - if (binds[n] == -1) - binds[n] = def_binds[n]; + def_binds = binds + count * IN_BINDTYPE_COUNT; + + for (n = 0; n < count; n++) { + int is_default = 1; + for (t = 0; t < IN_BINDTYPE_COUNT; t++) + if (binds[IN_BIND_OFFS(n, t)] == -1) + binds[IN_BIND_OFFS(n, t)] = 0; + else + is_default = 0; + + if (is_default) + for (t = 0; t < IN_BINDTYPE_COUNT; t++) + binds[IN_BIND_OFFS(n, t)] = def_binds[IN_BIND_OFFS(n, t)]; + } if (dev->drv_data == NULL) continue; - ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds); + ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds, def_binds); if (ret == 0) { /* no useable binds */ free(dev->binds); @@ -671,12 +869,12 @@ void in_debug_dump(void) { int i; - printf("# drv probed binds name\n"); + lprintf("# drv probed binds name\n"); for (i = 0; i < IN_MAX_DEVS; i++) { in_dev_t *d = &in_devices[i]; if (!d->probed && d->name == NULL && d->binds == NULL) continue; - printf("%d %3d %6c %5c %s\n", i, d->drv_id, d->probed ? 'y' : 'n', + lprintf("%d %3d %6c %5c %s\n", i, d->drv_id, d->probed ? 'y' : 'n', d->binds ? 'y' : 'n', d->name); } } @@ -687,11 +885,12 @@ static void in_def_probe(void) {} static void in_def_free(void *drv_data) {} static int in_def_get_bind_count(void) { return 0; } static void in_def_get_def_binds(int *binds) {} -static int in_def_clean_binds(void *drv_data, int *binds) { return 0; } -static void in_def_set_blocking(void *data, int y) {} +static int in_def_clean_binds(void *drv_data, int *b, int *db) { return 0; } +static int in_def_get_config(void *drv_data, int what, int *val) { return -1; } +static int in_def_set_config(void *drv_data, int what, int val) { return -1; } static int in_def_update_keycode(void *drv_data, int *is_down) { return 0; } -static int in_def_menu_translate(int keycode) { return keycode; } -static int in_def_get_key_code(const char *key_name) { return 0; } +static int in_def_menu_translate(void *drv_data, int keycode) { return keycode; } +static int in_def_get_key_code(const char *key_name) { return -1; } static const char *in_def_get_key_name(int keycode) { return NULL; } void in_init(void) @@ -709,7 +908,8 @@ void in_init(void) in_drivers[i].get_bind_count = in_def_get_bind_count; in_drivers[i].get_def_binds = in_def_get_def_binds; in_drivers[i].clean_binds = in_def_clean_binds; - in_drivers[i].set_blocking = in_def_set_blocking; + in_drivers[i].get_config = in_def_get_config; + in_drivers[i].set_config = in_def_set_config; in_drivers[i].update_keycode = in_def_update_keycode; in_drivers[i].menu_translate = in_def_menu_translate; in_drivers[i].get_key_code = in_def_get_key_code; @@ -722,6 +922,9 @@ void in_init(void) #ifdef IN_EVDEV in_evdev_init(&in_drivers[IN_DRVID_EVDEV]); #endif +#ifdef IN_VK + in_vk_init(&in_drivers[IN_DRVID_VK]); +#endif } #if 0 @@ -738,12 +941,12 @@ int main(void) while (1) { int dev = 0, down; ret = in_update_keycode(&dev, &down); - printf("#%i: %i %i (%s)\n", dev, down, ret, in_get_key_name(dev, ret)); + lprintf("#%i: %i %i (%s)\n", dev, down, ret, in_get_key_name(dev, ret)); } #else while (1) { ret = in_menu_wait_any(); - printf("%08x\n", ret); + lprintf("%08x\n", ret); } #endif