X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.c;h=8262e21c26f5b436d76ea11e8e9d87a3afcc26e6;hb=fce20e73e7094060b29f1668b8f0032f75eb152e;hp=48e3c0af49f470ddf858c2fc8d017fb4a13efe31;hpb=595491c49949ad41ffe2c343f1484ae913b6de5f;p=libpicofe.git diff --git a/common/input.c b/common/input.c index 48e3c0a..8262e21 100644 --- a/common/input.c +++ b/common/input.c @@ -2,6 +2,7 @@ #include #include +#include "common.h" #include "input.h" #include "../linux/in_evdev.h" @@ -9,25 +10,20 @@ typedef struct { int drv_id; void *drv_data; - int *binds; char *name; + int *binds; int probed:1; - int ignore:1; } in_dev_t; -#define IN_MAX_DEVS 10 - +static in_drv_t in_drivers[IN_DRVID_COUNT]; static in_dev_t in_devices[IN_MAX_DEVS]; static int in_dev_count = 0; +#define DRV(id) in_drivers[(unsigned)(id) < IN_DRVID_COUNT ? (id) : 0] + static int in_bind_count(int drv_id) { - int count = 0; - switch (drv_id) { - case IN_DRVID_EVDEV: - count = in_evdev_bind_count(); - break; - } + int count = DRV(drv_id).get_bind_count(); if (count <= 0) printf("input: failed to get bind count for drv %d\n", drv_id); @@ -36,27 +32,26 @@ static int in_bind_count(int drv_id) static int *in_alloc_binds(int drv_id) { - int count, *ret; + int count, *binds; count = in_bind_count(drv_id); - if (count <= 0) { - printf("input: failed to get bind count for drv %d\n", drv_id); + if (count <= 0) return NULL; - } - ret = malloc(count * sizeof(*ret)); - return ret; + binds = calloc(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])); + + return binds; } static void in_free(in_dev_t *dev) { - if (dev->probed) { - switch (dev->drv_id) { - case IN_DRVID_EVDEV: - in_evdev_free(dev->drv_data); - break; - } - } + if (dev->probed) + DRV(dev->drv_id).free(dev->drv_data); dev->probed = 0; dev->drv_data = NULL; free(dev->name); @@ -68,7 +63,7 @@ static void in_free(in_dev_t *dev) /* to be called by drivers */ void in_register(const char *nname, int drv_id, void *drv_data) { - int i, dupe_count = 0, *binds; + int i, ret, dupe_count = 0, *binds; char name[256], *name_end, *tmp; strncpy(name, nname, sizeof(name)); @@ -122,6 +117,15 @@ update: in_devices[i].probed = 1; in_devices[i].drv_id = drv_id; 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); + if (ret == 0) { + /* no useable binds */ + free(in_devices[i].binds); + in_devices[i].binds = NULL; + } + } } void in_probe(void) @@ -130,7 +134,8 @@ void in_probe(void) for (i = 0; i < in_dev_count; i++) in_devices[i].probed = 0; - in_evdev_probe(); + for (i = 1; i < IN_DRVID_COUNT; i++) + in_drivers[i].probe(); /* get rid of devs without binds and probes */ for (i = 0; i < in_dev_count; i++) { @@ -145,28 +150,19 @@ void in_probe(void) } } -void in_clear_binds(const char *devname) -{ -/* int count; - - count = in_bind_count(drv_id); - if (count <= 0) { - printf("input: failed to get bind count for drv %d\n", dev->drv_id); - return NULL; - } -*/ -} - int in_update(void) { int i, result = 0; for (i = 0; i < in_dev_count; i++) { - if (in_devices[i].probed && in_devices[i].binds != NULL) { - switch (in_devices[i].drv_id) { + in_dev_t *dev = &in_devices[i]; + if (dev->probed && dev->binds != NULL) { + switch (dev->drv_id) { +#ifdef IN_EVDEV case IN_DRVID_EVDEV: - result |= in_evdev_update(in_devices[i].drv_data, in_devices[i].binds); + result |= in_evdev_update(dev->drv_data, dev->binds); break; +#endif } } } @@ -187,28 +183,29 @@ static void **in_collect_drvdata(int drv_id, int *count) return data; } +static int menu_key_state = 0; + void in_set_blocking(int is_blocking) { int i; for (i = 0; i < in_dev_count; i++) { - if (in_devices[i].probed) { - switch (in_devices[i].drv_id) { - case IN_DRVID_EVDEV: - in_evdev_set_blocking(in_devices[i].drv_data, is_blocking); - break; - } - } + 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 */ + in_update_keycode(NULL, NULL, 0); } /* * update with wait for a press, return keycode * only can use 1 drv here.. */ -int in_update_keycode(int *dev_id, int *is_down) +int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) { - int result = 0; + int result = 0, dev_id = 0, is_down, result_menu; #ifdef IN_EVDEV void **data; int i, id = 0, count = 0; @@ -220,70 +217,392 @@ int in_update_keycode(int *dev_id, int *is_down) exit(1); } - result = in_evdev_update_keycode(data, count, &id, is_down); + result = in_evdev_update_keycode(data, count, &id, &is_down, timeout_ms); - if (dev_id != NULL) { - for (i = id; i < in_dev_count; i++) { - if (in_devices[i].drv_data == data[id]) { - *dev_id = i; - break; - } + for (i = id; i < in_dev_count; i++) { + if (in_devices[i].drv_data == data[id]) { + dev_id = i; + break; } } #else #error no menu read handlers #endif + /* keep track of menu key state, to allow mixing + * in_update_keycode() and in_menu_wait_any() calls */ + result_menu = DRV(in_devices[dev_id].drv_id).menu_translate(result); + if (result_menu != 0) { + if (is_down) + menu_key_state |= result_menu; + else + menu_key_state &= ~result_menu; + } + + if (dev_id_out != NULL) + *dev_id_out = dev_id; + if (is_down_out != NULL) + *is_down_out = is_down; return result; } -/* - * same as above, only return bitfield of BTN_* - */ -int in_update_menu(void) +/* same as above, only return bitfield of PBTN_* */ +int in_menu_wait_any(int timeout_ms) { - static int keys_active = 0; - int keys_old = keys_active; + int keys_old = menu_key_state; while (1) { - int code, is_down = 0; - code = in_update_keycode(NULL, &is_down); -#ifdef IN_EVDEV - code = in_evdev_menu_translate(code); -#endif - if (code == 0) continue; + int code, is_down = 0, dev_id = 0; - if (is_down) - keys_active |= code; - else - keys_active &= ~code; + code = in_update_keycode(&dev_id, &is_down, timeout_ms); + code = DRV(in_devices[dev_id].drv_id).menu_translate(code); - if (keys_old != keys_active) + if (timeout_ms >= 0) break; + if (code == 0) + continue; + if (keys_old != menu_key_state) + break; + } + + return menu_key_state; +} + +/* wait for menu input, do autorepeat */ +int in_menu_wait(int interesting) +{ + static int inp_prev = 0; + static int repeats = 0, wait = 20; + int ret = 0, release = 0, i; + + if (repeats == 2) wait = 3; + else if (repeats == 4) wait = 2; + else if (repeats == 6) wait = 1; + + for (i = 0; i < wait; i++) { + ret = in_menu_wait_any(30); + if (ret != inp_prev) break; + if (i == 0) repeats++; } - return keys_active; + while (!(ret & interesting)) { + ret = in_menu_wait_any(-1); + release = 1; + } + + if (release || ret != inp_prev) { + repeats = 0; + wait = 20; + } + if (wait > 6 && (ret & (PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT))) + wait = 6; + inp_prev = ret; + + // we don't need diagonals in menus + if ((ret & PBTN_UP) && (ret & PBTN_LEFT)) ret &= ~PBTN_LEFT; + if ((ret & PBTN_UP) && (ret & PBTN_RIGHT)) ret &= ~PBTN_RIGHT; + if ((ret & PBTN_DOWN) && (ret & PBTN_LEFT)) ret &= ~PBTN_LEFT; + if ((ret & PBTN_DOWN) && (ret & PBTN_RIGHT)) ret &= ~PBTN_RIGHT; + + return ret; +} + +const int *in_get_dev_binds(int dev_id) +{ + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + return NULL; + + return in_devices[dev_id].binds; +} + +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; +} + +int in_get_dev_bind_count(int dev_id) +{ + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + return 0; + + return in_bind_count(in_devices[dev_id].drv_id); } +const char *in_get_dev_name(int dev_id, int must_be_active) +{ + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + return NULL; + + if (must_be_active && !in_devices[dev_id].probed) + return NULL; + return in_devices[dev_id].name; +} + +/* never returns NULL */ const char *in_get_key_name(int dev_id, int keycode) { + static char xname[16]; + const char *name; + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) return "Unkn0"; - switch (in_devices[dev_id].drv_id) { - case IN_DRVID_EVDEV: - return in_evdev_get_key_name(keycode); + + name = DRV(in_devices[dev_id].drv_id).get_key_name(keycode); + if (name != NULL) + return name; + + /* assume scancode */ + if ((keycode >= '0' && keycode <= '9') || (keycode >= 'a' && keycode <= 'z') + || (keycode >= 'A' && keycode <= 'Z')) + sprintf(xname, "%c", keycode); + else + sprintf(xname, "\\x%02X", keycode); + return xname; +} + +int in_bind_key(int dev_id, int keycode, int mask, int force_unbind) +{ + int ret, count; + in_dev_t *dev; + + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + return -1; + dev = &in_devices[dev_id]; + + if (dev->binds == NULL) { + if (force_unbind) + return 0; + dev->binds = in_alloc_binds(dev->drv_id); + 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; + else + dev->binds[keycode] ^= mask; + + ret = DRV(dev->drv_id).clean_binds(dev->drv_data, dev->binds); + if (ret == 0) { + free(dev->binds); + dev->binds = NULL; } - return "Unkn1"; + return 0; +} + +/* returns device id, or -1 on error */ +int in_config_parse_dev(const char *name) +{ + int drv_id = -1, i; + + for (i = 0; i < IN_DRVID_COUNT; i++) { + int len = strlen(in_drivers[i].prefix); + if (strncmp(name, in_drivers[i].prefix, len) == 0) { + drv_id = i; + break; + } + } + + if (drv_id < 0) { + printf("input: missing driver for %s\n", name); + return -1; + } + + for (i = 0; i < in_dev_count; i++) + { + if (in_devices[i].name == NULL) + continue; + if (strcmp(in_devices[i].name, name) == 0) + return i; + } + + if (i >= IN_MAX_DEVS) + { + /* try to find unused device */ + 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); + return -1; + } + } + + memset(&in_devices[i], 0, sizeof(in_devices[i])); + + in_devices[i].name = strdup(name); + if (in_devices[i].name == NULL) + return -1; + + if (i + 1 > in_dev_count) + in_dev_count = i + 1; + in_devices[i].drv_id = drv_id; + + return i; +} + +void in_config_start(void) +{ + int i; + + /* mark all default binds, so they get overwritten by func below */ + for (i = 0; i < IN_MAX_DEVS; i++) { + int n, count, *binds, *def_binds; + + binds = in_devices[i].binds; + if (binds == NULL) + continue; + + count = in_bind_count(in_devices[i].drv_id); + def_binds = binds + count; + + for (n = 0; n < 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 count, kc; + in_dev_t *dev; + + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + 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; + kc = (int)strtoul(key + 2, &p, 16); + if (p == NULL || *p != 0) + kc = -1; + } + else { + /* device specific key name */ + if (dev->binds == NULL) { + dev->binds = in_alloc_binds(dev->drv_id); + if (dev->binds == NULL) + return -1; + in_config_start(); + } + + 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); + return -1; + } + + if (dev->binds[kc] == -1) + dev->binds[kc] = 0; + dev->binds[kc] |= binds; + + return 0; +} + +void in_config_end(void) +{ + int i; + + for (i = 0; i < IN_MAX_DEVS; i++) { + int n, ret, count, *binds, *def_binds; + in_dev_t *dev = &in_devices[i]; + + if (dev->binds == NULL) + continue; + + count = in_bind_count(dev->drv_id); + binds = dev->binds; + def_binds = binds + count; + + for (n = 0; n < count; n++) + if (binds[n] == -1) + binds[n] = def_binds[n]; + + if (dev->drv_data == NULL) + continue; + + ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds); + if (ret == 0) { + /* no useable binds */ + free(dev->binds); + dev->binds = NULL; + } + } +} + +void in_debug_dump(void) +{ + int i; + + printf("# 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', + d->binds ? 'y' : 'n', d->name); + } } +/* handlers for unknown/not_preset drivers */ + +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_menu_translate(int keycode) { return keycode; } +static int in_def_get_key_code(const char *key_name) { return 0; } +static const char *in_def_get_key_name(int keycode) { return NULL; } + void in_init(void) { + int i; + + memset(in_drivers, 0, sizeof(in_drivers)); memset(in_devices, 0, sizeof(in_devices)); in_dev_count = 0; + + for (i = 0; i < IN_DRVID_COUNT; i++) { + in_drivers[i].prefix = "none:"; + in_drivers[i].probe = in_def_probe; + in_drivers[i].free = in_def_free; + 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].menu_translate = in_def_menu_translate; + in_drivers[i].get_key_code = in_def_get_key_code; + in_drivers[i].get_key_name = in_def_get_key_name; + } + +#ifdef IN_EVDEV + in_evdev_init(&in_drivers[IN_DRVID_EVDEV]); +#endif } +#if 0 int main(void) { int ret; @@ -301,11 +620,11 @@ int main(void) } #else while (1) { - ret = in_update_menu(); + ret = in_menu_wait_any(); printf("%08x\n", ret); } #endif return 0; } - +#endif