X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fcommon%2Finput.c;h=0b1984bd5349a947127c164db03c74ae4d15c067;hp=5250535500026d669f0f892686fa69ec7a411c89;hb=1b0c513996d57548fc5df8726e21a68e5ace4f99;hpb=43bca6fbee5f6b26ee02e8850bf7dace8d63336b diff --git a/frontend/common/input.c b/frontend/common/input.c index 52505355..0b1984bd 100644 --- a/frontend/common/input.c +++ b/frontend/common/input.c @@ -1,5 +1,5 @@ /* - * (C) Gražvydas "notaz" Ignotas, 2008-2010 + * (C) Gražvydas "notaz" Ignotas, 2008-2011 * * This work is licensed under the terms of any of these licenses * (at your option): @@ -16,13 +16,12 @@ #include "plat.h" #include "lprintf.h" -#ifdef IN_EVDEV -#include "../linux/in_evdev.h" -#endif #ifdef IN_GP2X +#error needs update: in_gp2x_init in_gp2x_update #include "../gp2x/in_gp2x.h" #endif #ifdef IN_VK +#error needs update: in_vk_init in_vk_update #include "../win32/in_vk.h" #endif @@ -39,14 +38,16 @@ typedef struct unsigned int does_combos:1; } in_dev_t; -static in_drv_t in_drivers[IN_DRVID_COUNT]; +static in_drv_t *in_drivers; static in_dev_t in_devices[IN_MAX_DEVS]; -static int in_dev_count = 0; +static int in_driver_count = 0; +static int in_dev_count = 0; /* probed + bind devices */ static int in_have_async_devs = 0; +static int in_probe_dev_id; 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] +#define DRV(id) in_drivers[id] static int *in_alloc_binds(int drv_id, int key_count) @@ -64,12 +65,17 @@ static int *in_alloc_binds(int drv_id, int key_count) return binds; } -static void in_free(in_dev_t *dev) +static void in_unprobe(in_dev_t *dev) { if (dev->probed) DRV(dev->drv_id).free(dev->drv_data); dev->probed = 0; dev->drv_data = NULL; +} + +static void in_free(in_dev_t *dev) +{ + in_unprobe(dev); free(dev->name); dev->name = NULL; free(dev->binds); @@ -78,7 +84,7 @@ 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_fd_hnd, void *drv_data, int key_count, const char * const *key_names, int combos) { int i, ret, dupe_count = 0, *binds; @@ -119,7 +125,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, key_count); + binds = in_alloc_binds(in_probe_dev_id, key_count); if (binds == NULL) { free(tmp); return; @@ -135,13 +141,13 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data, update: in_devices[i].probed = 1; in_devices[i].does_combos = combos; - in_devices[i].drv_id = drv_id; + in_devices[i].drv_id = in_probe_dev_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(in_probe_dev_id).clean_binds(drv_data, in_devices[i].binds, in_devices[i].binds + key_count * IN_BINDTYPE_COUNT); if (ret == 0) { /* no useable binds */ @@ -223,11 +229,16 @@ void in_probe(void) int i; in_have_async_devs = 0; + menu_key_state = 0; + menu_last_used_dev = 0; + for (i = 0; i < in_dev_count; i++) - in_devices[i].probed = 0; + in_unprobe(&in_devices[i]); - for (i = 1; i < IN_DRVID_COUNT; i++) + for (i = 0; i < in_driver_count; i++) { + in_probe_dev_id = i; in_drivers[i].probe(); + } /* get rid of devs without binds and probes */ for (i = 0; i < in_dev_count; i++) { @@ -259,31 +270,31 @@ int in_update(int *result) 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: - ret |= in_evdev_update(dev->drv_data, dev->binds, result); - break; -#endif -#ifdef IN_GP2X - case IN_DRVID_GP2X: - 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 - } - } + if (dev->probed && dev->binds != NULL) + ret |= DRV(dev->drv_id).update(dev->drv_data, dev->binds, result); } return ret; } +static in_dev_t *get_dev(int dev_id) +{ + if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + return NULL; + + return &in_devices[dev_id]; +} + +int in_update_analog(int dev_id, int axis_id, int *result) +{ + in_dev_t *dev = get_dev(dev_id); + + if (dev == NULL || !dev->probed) + return -1; + + return DRV(dev->drv_id).update_analog(dev->drv_data, axis_id, result); +} + static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms) { int i, is_down, result; @@ -368,6 +379,12 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms) if (result >= 0) break; + if (result == -2) { + lprintf("input: \"%s\" errored out, removing.\n", in_devices[dev_id].name); + in_unprobe(&in_devices[dev_id]); + break; + } + if (timeout_ms >= 0) { unsigned int ticks2 = plat_get_ticks_ms(); timeout_ms -= ticks2 - ticks; @@ -454,18 +471,18 @@ int in_menu_wait(int interesting, int autorep_delay_ms) const int *in_get_dev_binds(int dev_id) { - if (dev_id < 0 || dev_id >= IN_MAX_DEVS) - return NULL; + in_dev_t *dev = get_dev(dev_id); - return in_devices[dev_id].binds; + return dev ? dev->binds : NULL; } const int *in_get_dev_def_binds(int dev_id) { - if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + in_dev_t *dev = get_dev(dev_id); + if (dev == NULL) return NULL; - return in_devices[dev_id].binds + in_devices[dev_id].key_count * IN_BINDTYPE_COUNT; + return dev->binds + dev->key_count * IN_BINDTYPE_COUNT; } int in_get_config(int dev_id, int what, void *val) @@ -473,10 +490,10 @@ 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) + dev = get_dev(dev_id); + if (dev == NULL || val == NULL) return -1; - dev = &in_devices[dev_id]; switch (what) { case IN_CFG_BIND_COUNT: *ival = dev->key_count; @@ -525,10 +542,10 @@ int in_set_config(int dev_id, int what, const void *val, int size) if (what == IN_CFG_BLOCKING) return in_set_blocking(*ival); - if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + dev = get_dev(dev_id); + if (dev == NULL) return -1; - dev = &in_devices[dev_id]; if (what == IN_CFG_KEY_NAMES) { const char * const *names = val; int count = size / sizeof(names[0]); @@ -542,20 +559,25 @@ int in_set_config(int dev_id, int what, const void *val, int size) return 0; } - return DRV(dev->drv_id).set_config(dev->drv_data, what, *ival); + if (dev->probed) + return DRV(dev->drv_id).set_config(dev->drv_data, what, *ival); + + return -1; } const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix) { const char *name, *tmp; + in_dev_t *dev; - if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + dev = get_dev(dev_id); + if (dev == NULL) return NULL; - if (must_be_active && !in_devices[dev_id].probed) + if (must_be_active && !dev->probed) return NULL; - name = in_devices[dev_id].name; + name = dev->name; if (name == NULL || !skip_pfix) return name; @@ -588,24 +610,27 @@ const char *in_get_key_name(int dev_id, int keycode) { const char *name = NULL; static char xname[16]; + in_drv_t *drv; 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) + dev = get_dev(dev_id); + if (dev == NULL) return "Unkn0"; - dev = &in_devices[dev_id]; + drv = &DRV(dev->drv_id); if (keycode < 0) /* want name for menu key? */ - keycode = DRV(dev->drv_id).menu_translate(dev->drv_data, keycode); + keycode = drv->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 (drv->get_key_name != NULL) + name = drv->get_key_name(keycode); if (name != NULL) return name; @@ -626,10 +651,10 @@ int in_get_key_code(int dev_id, const char *key_name) if (dev_id < 0) /* want last used dev? */ dev_id = menu_last_used_dev; - if (dev_id < 0 || dev_id >= IN_MAX_DEVS) + dev = get_dev(dev_id); + if (dev == NULL) return -1; - dev = &in_devices[dev_id]; if (dev->key_names == NULL) return -1; @@ -645,10 +670,10 @@ int in_bind_key(int dev_id, int keycode, int mask, int bind_type, int force_unbi int ret, count; in_dev_t *dev; - if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT) + dev = get_dev(dev_id); + if (dev == NULL || bind_type >= IN_BINDTYPE_COUNT) return -1; - dev = &in_devices[dev_id]; count = dev->key_count; if (dev->binds == NULL) { @@ -717,7 +742,7 @@ int in_config_parse_dev(const char *name) { int drv_id = -1, i; - for (i = 0; i < IN_DRVID_COUNT; i++) { + for (i = 0; i < in_driver_count; i++) { int len = strlen(in_drivers[i].prefix); if (strncmp(name, in_drivers[i].prefix, len) == 0) { drv_id = i; @@ -755,7 +780,7 @@ 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].key_names = DRV(drv_id).get_key_names(&in_devices[i].key_count); in_devices[i].drv_id = drv_id; if (i + 1 > in_dev_count) @@ -764,40 +789,14 @@ 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; - - /* 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_devices[i].key_count; - def_binds = binds + count * IN_BINDTYPE_COUNT; - - 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 acts, int bind_type) { in_dev_t *dev; int i, offs, kc; - if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT) + dev = get_dev(dev_id); + if (dev == NULL || bind_type >= IN_BINDTYPE_COUNT) return -1; - dev = &in_devices[dev_id]; /* maybe a raw code? */ if (key[0] == '\\' && key[1] == 'x') { @@ -812,7 +811,6 @@ int in_config_bind_key(int dev_id, const char *key, int acts, int bind_type) dev->binds = in_alloc_binds(dev->drv_id, dev->key_count); if (dev->binds == NULL) return -1; - in_config_start(); } kc = -1; @@ -852,37 +850,21 @@ int in_config_bind_key(int dev_id, const char *key, int acts, int bind_type) return 0; } -void in_config_end(void) +void in_clean_binds(void) { int i; for (i = 0; i < IN_MAX_DEVS; i++) { - int n, t, ret, count, *binds, *def_binds; + int ret, count, *binds, *def_binds; in_dev_t *dev = &in_devices[i]; - if (dev->binds == NULL) + if (dev->binds == NULL || dev->drv_data == NULL) continue; count = dev->key_count; binds = dev->binds; 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, def_binds); if (ret == 0) { /* no useable binds */ @@ -906,52 +888,58 @@ void in_debug_dump(void) } } -/* handlers for unknown/not_preset drivers */ +/* stubs for drivers that choose not to implement something */ -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 *b, int *db) { return 0; } +static int in_def_clean_binds(void *drv_data, int *b, int *db) { return 1; } 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_analog(void *drv_data, int axis_id, int *result) { return -1; } static int in_def_update_keycode(void *drv_data, int *is_down) { return 0; } -static int in_def_menu_translate(void *drv_data, int keycode) { return keycode; } +static int in_def_menu_translate(void *drv_data, int keycode) { return 0; } 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) -{ - int i; +#define CHECK_ADD_STUB(d, f) \ + if (d.f == NULL) d.f = in_def_##f - memset(in_drivers, 0, sizeof(in_drivers)); - memset(in_devices, 0, sizeof(in_devices)); - in_dev_count = 0; +/* to be called by drivers */ +int in_register_driver(const in_drv_t *drv) +{ + int count_new = in_driver_count + 1; + in_drv_t *new_drivers; - 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].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; - in_drivers[i].get_key_name = in_def_get_key_name; + new_drivers = realloc(in_drivers, count_new * sizeof(in_drivers[0])); + if (new_drivers == NULL) { + lprintf("input: in_register_driver OOM\n"); + return -1; } -#ifdef IN_GP2X - in_gp2x_init(&in_drivers[IN_DRVID_GP2X]); -#endif -#ifdef IN_EVDEV - in_evdev_init(&in_drivers[IN_DRVID_EVDEV]); -#endif -#ifdef IN_VK - in_vk_init(&in_drivers[IN_DRVID_VK]); -#endif + memcpy(&new_drivers[in_driver_count], drv, sizeof(new_drivers[0])); + + CHECK_ADD_STUB(new_drivers[in_driver_count], free); + CHECK_ADD_STUB(new_drivers[in_driver_count], get_def_binds); + CHECK_ADD_STUB(new_drivers[in_driver_count], clean_binds); + CHECK_ADD_STUB(new_drivers[in_driver_count], get_config); + CHECK_ADD_STUB(new_drivers[in_driver_count], set_config); + CHECK_ADD_STUB(new_drivers[in_driver_count], update_analog); + CHECK_ADD_STUB(new_drivers[in_driver_count], update_keycode); + CHECK_ADD_STUB(new_drivers[in_driver_count], menu_translate); + CHECK_ADD_STUB(new_drivers[in_driver_count], get_key_code); + CHECK_ADD_STUB(new_drivers[in_driver_count], get_key_name); + in_drivers = new_drivers; + in_driver_count = count_new; + + return 0; +} + +void in_init(void) +{ + in_drivers = NULL; + memset(in_devices, 0, sizeof(in_devices)); + in_driver_count = 0; + in_dev_count = 0; } #if 0