X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=common%2Finput.c;h=163311ba5f81020838d67ee7d5b5122fa949260a;hb=7f022a8d573295d721fd6a517c8f1fe04480a8f0;hp=2fd38d8b644d3af70c9410e77913ac57b73ceb65;hpb=da767bd51b7532b822a28d5a2878a6cd80110675;p=libpicofe.git diff --git a/common/input.c b/common/input.c index 2fd38d8..163311b 100644 --- a/common/input.c +++ b/common/input.c @@ -2,15 +2,17 @@ #include #include +#include "common.h" #include "input.h" #include "../linux/in_evdev.h" typedef struct { int drv_id; + int drv_fd_hnd; void *drv_data; - int *binds; char *name; + int *binds; int probed:1; } in_dev_t; @@ -60,7 +62,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) +void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data) { int i, ret, dupe_count = 0, *binds; char name[256], *name_end, *tmp; @@ -115,6 +117,7 @@ void in_register(const char *nname, int drv_id, void *drv_data) update: in_devices[i].probed = 1; in_devices[i].drv_id = drv_id; + in_devices[i].drv_fd_hnd = drv_fd_hnd; in_devices[i].drv_data = drv_data; if (in_devices[i].binds != NULL) { @@ -149,16 +152,18 @@ void in_probe(void) } } +/* async update */ 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 } @@ -168,18 +173,7 @@ int in_update(void) return result; } -static void **in_collect_drvdata(int drv_id, int *count) -{ - static void *data[IN_MAX_DEVS]; - int i; - - for (*count = i = 0; i < in_dev_count; i++) { - if (in_devices[i].drv_id == drv_id && in_devices[i].probed) - data[(*count)++] = in_devices[i].drv_data; - } - - return data; -} +static int menu_key_state = 0; void in_set_blocking(int is_blocking) { @@ -189,68 +183,158 @@ void in_set_blocking(int is_blocking) 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); } +/* TODO: move.. */ +#include + /* - * update with wait for a press, return keycode - * only can use 1 drv here.. + * update with wait for a press, always return some keycode */ -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; -#ifdef IN_EVDEV - void **data; - int i, id = 0, count = 0; + int result = 0, dev_id = 0, is_down, result_menu; + int fds_hnds[IN_MAX_DEVS]; + int i, ret, count = 0; + in_drv_t *drv; + + for (i = 0; i < in_dev_count; i++) { + if (in_devices[i].probed) + fds_hnds[count++] = in_devices[i].drv_fd_hnd; + } - data = in_collect_drvdata(IN_DRVID_EVDEV, &count); if (count == 0) { /* don't deadlock, fail */ printf("input: failed to find devices to read\n"); exit(1); } - result = in_evdev_update_keycode(data, count, &id, is_down); +again: + /* TODO: move this block to platform/linux */ + { + 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); + } - if (dev_id != NULL) { - for (i = id; i < in_dev_count; i++) { - if (in_devices[i].drv_data == data[id]) { - *dev_id = i; - break; - } + ret = select(fdmax + 1, &fdset, NULL, NULL, timeout); + if (ret == -1) + { + perror("input: select failed"); + sleep(1); + return 0; } + + if (ret == 0) + return 0; /* timeout */ + + for (i = 0; i < count; i++) + if (FD_ISSET(fds_hnds[i], &fdset)) + ret = fds_hnds[i]; } -#else -#error no menu read handlers -#endif + for (i = 0; i < in_dev_count; i++) { + if (in_devices[i].drv_fd_hnd == ret) { + dev_id = i; + 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 0 when some not interesting + * event happened, like sync event for evdev. + * XXX: timeout restarts.. */ + if (result == 0) + goto again; + + /* keep track of menu key state, to allow mixing + * in_update_keycode() and in_menu_wait_any() calls */ + result_menu = drv->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, dev_id = 0; - code = in_update_keycode(&dev_id, &is_down); - code = DRV(in_devices[dev_id].drv_id).menu_translate(code); - if (code == 0) continue; - 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 keys_active; + 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; + int ret, release = 0, wait = 666; + + if (repeats) + wait = 33; + + ret = in_menu_wait_any(wait); + if (ret == inp_prev) + repeats++; + + while (!(ret & interesting)) { + ret = in_menu_wait_any(-1); + release = 1; + } + + if (release || ret != inp_prev) + repeats = 0; + + 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) @@ -280,20 +364,71 @@ int in_get_dev_bind_count(int dev_id) return in_bind_count(in_devices[dev_id].drv_id); } -const char *in_get_dev_name(int dev_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"; - return DRV(in_devices[dev_id].drv_id).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 0; } /* returns device id, or -1 on error */ @@ -346,6 +481,11 @@ int in_config_parse_dev(const char *name) return i; } +/* + * To reduce size of game specific configs, default binds are not saved. + * So we mark default binds in in_config_start(), override them in in_config_bind_key(), + * and restore whatever default binds are left in in_config_end(). + */ void in_config_start(void) { int i; @@ -354,11 +494,11 @@ void in_config_start(void) for (i = 0; i < IN_MAX_DEVS; i++) { int n, count, *binds, *def_binds; - if (in_devices[i].binds == NULL) + binds = in_devices[i].binds; + if (binds == NULL) continue; count = in_bind_count(in_devices[i].drv_id); - binds = in_devices[i].binds; def_binds = binds + count; for (n = 0; n < count; n++) @@ -369,27 +509,46 @@ void in_config_start(void) int in_config_bind_key(int dev_id, const char *key, int binds) { - int kc; + int count, kc; + in_dev_t *dev; if (dev_id < 0 || dev_id >= IN_MAX_DEVS) return -1; + dev = &in_devices[dev_id]; - if (in_devices[dev_id].binds == NULL) { - in_devices[dev_id].binds = in_alloc_binds(in_devices[dev_id].drv_id); - if (in_devices[dev_id].binds == NULL) - return -1; - in_config_start(); + 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]; + } } - kc = DRV(in_devices[dev_id].drv_id).get_key_code(key); - if (kc < 0) { + if (kc < 0 || kc >= count) { printf("input: bad key: %s\n", key); return -1; } - if (in_devices[dev_id].binds[kc] == -1) - in_devices[dev_id].binds[kc] = 0; - in_devices[dev_id].binds[kc] |= binds; + if (dev->binds[kc] == -1) + dev->binds[kc] = 0; + dev->binds[kc] |= binds; return 0; } @@ -400,26 +559,27 @@ void in_config_end(void) for (i = 0; i < IN_MAX_DEVS; i++) { int n, ret, count, *binds, *def_binds; + in_dev_t *dev = &in_devices[i]; - if (in_devices[i].binds == NULL) + if (dev->binds == NULL) continue; - count = in_bind_count(in_devices[i].drv_id); - binds = in_devices[i].binds; + 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 (in_devices[i].drv_data == NULL) + if (dev->drv_data == NULL) continue; - ret = DRV(in_devices[i].drv_id).clean_binds(in_devices[i].drv_data, binds); + ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds); if (ret == 0) { /* no useable binds */ - free(binds); - in_devices[i].binds = NULL; + free(dev->binds); + dev->binds = NULL; } } } @@ -446,6 +606,7 @@ 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_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 const char *in_def_get_key_name(int keycode) { return NULL; } @@ -466,6 +627,7 @@ void in_init(void) 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].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; in_drivers[i].get_key_name = in_def_get_key_name; @@ -494,7 +656,7 @@ int main(void) } #else while (1) { - ret = in_update_menu(); + ret = in_menu_wait_any(); printf("%08x\n", ret); } #endif