X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.c;h=81f6e169af33d1aeb2d9112fe3f887e64b7f388a;hb=7fd581f40bb5273e81dc08afdd55224c26c8fb9e;hp=980115e3df799de154f9645fe81c711ccf9c4a51;hpb=906bdc9fb54da36399faaa95535432fdf8531662;p=libpicofe.git diff --git a/common/input.c b/common/input.c index 980115e..81f6e16 100644 --- a/common/input.c +++ b/common/input.c @@ -2,25 +2,30 @@ #include #include +#include "common.h" #include "input.h" +#include "plat.h" #include "../linux/in_evdev.h" +#include "../gp2x/in_gp2x.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; 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; #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(); @@ -60,8 +65,9 @@ static void in_free(in_dev_t *dev) dev->binds = NULL; } -/* to be called by drivers */ -void in_register(const char *nname, int drv_id, void *drv_data) +/* 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) { int i, ret, dupe_count = 0, *binds; char name[256], *name_end, *tmp; @@ -116,6 +122,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) { @@ -131,6 +138,8 @@ update: void in_probe(void) { int i; + + in_have_async_devs = 0; for (i = 0; i < in_dev_count; i++) in_devices[i].probed = 0; @@ -146,28 +155,35 @@ void in_probe(void) memmove(&in_devices[i], &in_devices[i+1], (in_dev_count - i) * sizeof(in_devices[0])); } + + continue; } + + if (in_devices[i].probed && in_devices[i].drv_fd_hnd == -1) + in_have_async_devs = 1; } + + if (in_have_async_devs) + printf("input: async-only devices detected..\n"); } +/* 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 +#ifdef IN_GP2X + case IN_DRVID_GP2X: + result |= in_gp2x_update(dev->drv_data, dev->binds); break; #endif } @@ -177,69 +193,130 @@ int in_update(void) return result; } -static void **in_collect_drvdata(int drv_id, int *count) +static int menu_key_state = 0; + +void in_set_blocking(int is_blocking) { - static void *data[IN_MAX_DEVS]; - int i; + int i, ret; - 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; + /* 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); + } } - return data; -} + menu_key_state = 0; -static int menu_key_state = 0; + /* flush events */ + do { + ret = in_update_keycode(NULL, NULL, 0); + } while (ret >= 0); +} -void in_set_blocking(int is_blocking) +static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms) { - int i; + int i, is_down, result; + unsigned int ticks; - 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; + ticks = plat_get_ticks_ms(); + + while (1) + { + for (i = 0; i < in_dev_count; i++) { + in_dev_t *d = &in_devices[i]; + if (!d->probed) + continue; + + result = DRV(d->drv_id).update_keycode(d->drv_data, &is_down); + if (result == -1) + continue; + + if (dev_id_out) + *dev_id_out = i; + if (is_down_out) + *is_down_out = is_down; + return result; + } + + if (timeout_ms >= 0 && (int)(plat_get_ticks_ms() - ticks) > timeout_ms) + break; + + plat_sleep_ms(10); } - menu_key_state = 0; - /* flush events */ - in_update_keycode(NULL, NULL, 1); + return -1; } /* - * update with wait for a press, return keycode - * only can use 1 drv here.. + * wait for a press, always return some keycode or -1 on timeout or error */ 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 = -1, dev_id = 0, is_down, result_menu; + int fds_hnds[IN_MAX_DEVS]; + int i, ret, count = 0; + in_drv_t *drv = NULL; + unsigned int ticks; + + if (in_have_async_devs) { + result = in_update_kc_async(&dev_id, &is_down, timeout_ms); + if (result == -1) + return -1; + drv = &DRV(in_devices[dev_id].drv_id); + 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; + } - 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); + while (1) + { + ret = plat_wait_event(fds_hnds, count, timeout_ms); + if (ret < 0) + break; - for (i = id; i < in_dev_count; i++) { - if (in_devices[i].drv_data == data[id]) { - dev_id = i; + 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 -1 when some not interesting + * event happened, like sync event for evdev. */ + 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; } } -#else -#error no menu read handlers -#endif + if (result == -1) + return -1; +finish: /* 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 +331,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; @@ -266,11 +341,12 @@ int in_update_menu(int timeout_ms) int code, is_down = 0, dev_id = 0; code = in_update_keycode(&dev_id, &is_down, timeout_ms); - code = DRV(in_devices[dev_id].drv_id).menu_translate(code); + if (code >= 0) + code = DRV(in_devices[dev_id].drv_id).menu_translate(code); - if (timeout_ms != 0) + if (timeout_ms >= 0) break; - if (code == 0) + if (code < 0) continue; if (keys_old != menu_key_state) break; @@ -279,6 +355,39 @@ int in_update_menu(int timeout_ms) return menu_key_state; } +/* wait for menu input, do autorepeat */ +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; + + if (repeats) + wait = autorep_delay_ms; + + 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,12 +415,26 @@ 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, int skip_pfix) { + const char *name, *tmp; + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) return NULL; - return in_devices[dev_id].name; + if (must_be_active && !in_devices[dev_id].probed) + 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; + + return name; } /* never returns NULL */ @@ -421,6 +544,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 +669,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,11 +690,15 @@ 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; } +#ifdef IN_GP2X + in_gp2x_init(&in_drivers[IN_DRVID_GP2X]); +#endif #ifdef IN_EVDEV in_evdev_init(&in_drivers[IN_DRVID_EVDEV]); #endif @@ -589,7 +722,7 @@ int main(void) } #else while (1) { - ret = in_update_menu(); + ret = in_menu_wait_any(); printf("%08x\n", ret); } #endif