X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.c;h=163311ba5f81020838d67ee7d5b5122fa949260a;hb=7f022a8d573295d721fd6a517c8f1fe04480a8f0;hp=980115e3df799de154f9645fe81c711ccf9c4a51;hpb=906bdc9fb54da36399faaa95535432fdf8531662;p=libpicofe.git diff --git a/common/input.c b/common/input.c index 980115e..163311b 100644 --- a/common/input.c +++ b/common/input.c @@ -2,16 +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; char *name; int *binds; - int prev_result; int probed:1; } in_dev_t; @@ -61,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; @@ -116,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) { @@ -150,24 +152,18 @@ void in_probe(void) } } +/* async update */ int in_update(void) { int i, result = 0; for (i = 0; i < in_dev_count; i++) { in_dev_t *dev = &in_devices[i]; - int ret; if (dev->probed && dev->binds != NULL) { switch (dev->drv_id) { #ifdef IN_EVDEV case IN_DRVID_EVDEV: - ret = in_evdev_update(dev->drv_data, dev->binds); - if (ret == -1) /* no change */ - result |= dev->prev_result; - else { - dev->prev_result = ret; - result |= ret; - } + result |= in_evdev_update(dev->drv_data, dev->binds); break; #endif } @@ -177,19 +173,6 @@ 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) @@ -199,47 +182,91 @@ void in_set_blocking(int is_blocking) 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); - in_devices[i].prev_result = 0; } menu_key_state = 0; /* flush events */ - in_update_keycode(NULL, NULL, 1); + 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_out, int *is_down_out, int timeout_ms) { - int result = 0, dev_id, is_down, result_menu; -#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, timeout_ms); +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); + } + + 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 = id; i < in_dev_count; i++) { - if (in_devices[i].drv_data == data[id]) { + 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; break; } } -#else -#error no menu read handlers -#endif + + 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_update_menu() calls */ - result_menu = DRV(in_devices[dev_id].drv_id).menu_translate(result); + * 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; @@ -254,10 +281,8 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) return result; } -/* - * same as above, only return bitfield of BTN_* - */ -int in_update_menu(int timeout_ms) +/* same as above, only return bitfield of PBTN_* */ +int in_menu_wait_any(int timeout_ms) { int keys_old = menu_key_state; @@ -268,7 +293,7 @@ int in_update_menu(int timeout_ms) code = in_update_keycode(&dev_id, &is_down, timeout_ms); code = DRV(in_devices[dev_id].drv_id).menu_translate(code); - if (timeout_ms != 0) + if (timeout_ms >= 0) break; if (code == 0) continue; @@ -279,6 +304,39 @@ int in_update_menu(int timeout_ms) 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) { if (dev_id < 0 || dev_id >= IN_MAX_DEVS) @@ -306,11 +364,13 @@ 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; } @@ -421,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; @@ -541,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; } @@ -561,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; @@ -589,7 +656,7 @@ int main(void) } #else while (1) { - ret = in_update_menu(); + ret = in_menu_wait_any(); printf("%08x\n", ret); } #endif