X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=libpicofe.git;a=blobdiff_plain;f=input.h;h=360b65bb4e090a3cae1d0590ae08a18f3b538dae;hp=44ab06bfa513416ae883b4cc422c7b4701131839;hb=HEAD;hpb=c19e28f62660cdaed26698234cff9c084517b34c diff --git a/input.h b/input.h index 44ab06b..5ac73c9 100644 --- a/input.h +++ b/input.h @@ -1,6 +1,8 @@ #ifndef INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc #define INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc 1 +#include + #define IN_MAX_DEVS 10 #define IN_ABS_RANGE 1024 /* abs must be centered at 0, move upto +- this */ @@ -21,6 +23,7 @@ #define PBTN_MENU (1 << 10) #define PBTN_CHAR (1 << 11) /* character (text input) */ +#define PBTN_RDRAW (1 << 12) /* redraw event */ // TODO: move to pico #if 0 @@ -35,9 +38,6 @@ #define PEVB_SSLOT_NEXT 24 #define PEVB_MENU 23 #define PEVB_FF 22 -#define PEVB_PICO_PNEXT 21 -#define PEVB_PICO_PPREV 20 -#define PEVB_PICO_SWINP 19 #define PEV_VOL_DOWN (1 << PEVB_VOL_DOWN) #define PEV_VOL_UP (1 << PEVB_VOL_UP) @@ -48,15 +48,12 @@ #define PEV_SSLOT_NEXT (1 << PEVB_SSLOT_NEXT) #define PEV_MENU (1 << PEVB_MENU) #define PEV_FF (1 << PEVB_FF) -#define PEV_PICO_PNEXT (1 << PEVB_PICO_PNEXT) -#define PEV_PICO_PPREV (1 << PEVB_PICO_PPREV) -#define PEV_PICO_SWINP (1 << PEVB_PICO_SWINP) #define PEV_MASK 0x7ff80000 #endif -enum { +enum in_cfg_opt { IN_CFG_BIND_COUNT = 0, IN_CFG_DOES_COMBOS, IN_CFG_BLOCKING, @@ -64,15 +61,20 @@ enum { IN_CFG_ABS_DEAD_ZONE, /* dead zone for analog-digital mapping */ IN_CFG_ABS_AXIS_COUNT, /* number of abs axes (ro) */ IN_CFG_DEFAULT_DEV, + IN_CFG_ANALOG_MAP_ULDR, }; enum { IN_BINDTYPE_NONE = -1, IN_BINDTYPE_EMU = 0, IN_BINDTYPE_PLAYER12, - IN_BINDTYPE_COUNT + IN_BINDTYPE_PLAYER34, + IN_BINDTYPE_KEYBOARD, + IN_BINDTYPE_COUNT, }; +#define IN_BIND_LAST 350 // See SDLK_LAST + #define IN_BIND_OFFS(key, btype) \ ((key) * IN_BINDTYPE_COUNT + (btype)) @@ -83,12 +85,14 @@ struct InputDriver { void (*probe)(const in_drv_t *drv); void (*free)(void *drv_data); const char * const * - (*get_key_names)(int *count); + (*get_key_names)(const in_drv_t *drv, int *count); int (*clean_binds)(void *drv_data, int *binds, int *def_finds); - int (*get_config)(void *drv_data, int what, int *val); - int (*set_config)(void *drv_data, int what, int val); + int (*get_config)(void *drv_data, enum in_cfg_opt what, int *val); + int (*set_config)(void *drv_data, enum in_cfg_opt what, int val); int (*update)(void *drv_data, const int *binds, int *result); + int (*update_kbd)(void *drv_data, const int *binds, int *result); int (*update_analog)(void *drv_data, int axis_id, int *result); + int (*update_pointer)(void *drv_data, int axis_id, int *result); /* return -1 on no event, -2 on error */ int (*update_keycode)(void *drv_data, int *is_down); int (*menu_translate)(void *drv_data, int keycode, char *charcode); @@ -96,6 +100,7 @@ struct InputDriver { const char * (*get_key_name)(int keycode); const struct in_default_bind *defbinds; + const struct in_default_bind *kbd_binds; const void *pdata; }; @@ -116,11 +121,15 @@ struct in_pdata { size_t kmap_size; const struct menu_keymap *joy_map; size_t jmap_size; + const char * const *key_names; + const struct in_default_bind *kbd_map; }; /* to be called by drivers */ -int in_register_driver(const in_drv_t *drv, - const struct in_default_bind *defbinds, const void *pdata); +int in_register_driver(const in_drv_t *drv, + const struct in_default_bind *defbinds, + const struct in_default_bind *kbd_map, + const void *pdata); void in_register(const char *nname, int drv_fd_hnd, void *drv_data, int key_count, const char * const *key_names, int combos); void in_combos_find(const int *binds, int last_key, int *combo_keys, int *combo_acts); @@ -130,22 +139,28 @@ void in_init(void); void in_probe(void); int in_update(int *result); int in_update_analog(int dev_id, int axis_id, int *value); +int in_update_pointer(int dev_id, int id, int *result); int in_update_keycode(int *dev_id, int *is_down, char *charcode, int timeout_ms); +int in_update_kbd(int *result); int in_menu_wait_any(char *charcode, int timeout_ms); int in_menu_wait(int interesting, char *charcode, int autorep_delay_ms); int in_config_parse_dev(const char *dev_name); int in_config_bind_key(int dev_id, const char *key, int binds, int bind_type); -int in_get_config(int dev_id, int what, void *val); -int in_set_config(int dev_id, int what, const void *val, int size); +int in_config_bind_kbd_key(int dev_id, const char *key, int kbd_key); +int in_get_config(int dev_id, enum in_cfg_opt what, void *val); +int in_set_config(int dev_id, enum in_cfg_opt what, const void *val, size_t size); int in_get_key_code(int dev_id, const char *key_name); int in_name_to_id(const char *dev_name); int in_bind_key(int dev_id, int keycode, int mask, int bind_type, int force_unbind); +int in_bind_kbd_key(int dev_id, int keycode, int kbd_key); void in_unbind_all(int dev_id, int act_mask, int bind_type); void in_clean_binds(void); void in_debug_dump(void); const int *in_get_dev_binds(int dev_id); +const int *in_get_dev_kbd_binds(int dev_id); const int *in_get_dev_def_binds(int dev_id); +const int *in_get_dev_kbd_def_binds(int dev_id); const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix); const char *in_get_key_name(int dev_id, int keycode);