input: rework abs handling, change API, allow custom key names

[libpicofe.git] / common / input.h

diff --git a/common/input.h b/common/input.h
index cf7a099..8fbf6e7 100644 (file)
--- a/common/input.h
+++ b/common/input.h
@@ -26,6 +26,9 @@
 #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)
@@ -36,58 +39,84 @@
 #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 0x7fc00000
+#define PEV_MASK 0x7ff80000
 
 
 enum {
        IN_DRVID_UNKNOWN = 0,
        IN_DRVID_GP2X,
        IN_DRVID_EVDEV,
+       IN_DRVID_VK,
        IN_DRVID_COUNT,
 };
 
 enum {
-       IN_INFO_BIND_COUNT = 0,
-       IN_INFO_DOES_COMBOS,
+       IN_CFG_BIND_COUNT = 0,
+       IN_CFG_DOES_COMBOS,
+       IN_CFG_BLOCKING,
+       IN_CFG_KEY_NAMES,
+       IN_CFG_ABS_DEAD_ZONE, /* dead zone for analog-digital mapping */
 };
 
+enum {
+       IN_BINDTYPE_NONE = -1,
+       IN_BINDTYPE_EMU = 0,
+       IN_BINDTYPE_PLAYER12,
+       IN_BINDTYPE_COUNT
+};
+
+#define IN_BIND_OFFS(key, btype) \
+       ((key) * IN_BINDTYPE_COUNT + (btype))
+
 typedef struct {
        const char *prefix;
        void (*probe)(void);
        void (*free)(void *drv_data);
        int  (*get_bind_count)(void);
        void (*get_def_binds)(int *binds);
-       int  (*clean_binds)(void *drv_data, int *binds);
-       void (*set_blocking)(void *data, int y);
+       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  (*update_keycode)(void *drv_data, int *is_down);
-       int  (*menu_translate)(int keycode);
+       int  (*menu_translate)(void *drv_data, int keycode);
        int  (*get_key_code)(const char *key_name);
        const char * (*get_key_name)(int keycode);
 } in_drv_t;
 
 
 /* to be called by drivers */
-void in_register(const char *nname, int drv_id, int fd_hnd, void *drv_data, int combos);
-void in_combos_find(int *binds, int last_key, int *combo_keys, int *combo_acts);
-int  in_combos_do(int keys, int *binds, int last_key, int combo_keys, int combo_acts);
+void in_register(const char *nname, int drv_id, 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);
+int  in_combos_do(int keys, const int *binds, int last_key, int combo_keys, int combo_acts);
 
 void in_init(void);
 void in_probe(void);
-int  in_update(void);
-void in_set_blocking(int is_blocking);
+int  in_update(int *result);
 int  in_update_keycode(int *dev_id, int *is_down, int timeout_ms);
 int  in_menu_wait_any(int timeout_ms);
 int  in_menu_wait(int interesting, int autorep_delay_ms);
-int  in_get_dev_info(int dev_id, int what);
 void in_config_start(void);
 int  in_config_parse_dev(const char *dev_name);
-int  in_config_bind_key(int dev_id, const char *key, int mask);
+int  in_config_bind_key(int dev_id, const char *key, int binds, int bind_type);
 void in_config_end(void);
-int  in_bind_key(int dev_id, int keycode, int mask, int force_unbind);
+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_name_to_id(const char *dev_name);
+int  in_bind_key(int dev_id, int keycode, int mask, int bind_type, int force_unbind);
+void in_unbind_all(int dev_id, int act_mask, int bind_type);
 void in_debug_dump(void);
 
 const int  *in_get_dev_binds(int dev_id);
 const int  *in_get_dev_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);
+
+#define in_set_config_int(dev_id, what, v) { \
+       int val_ = v; \
+       in_set_config(dev_id, what, &val_, sizeof(val_)); \
+}