X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.h;h=e87e6ea5103a260e3b7695dc8a3457f8629e566a;hb=9934732a09e9249757fb683e5d323d64e54ed543;hp=9bc28c90aac3c253895bef564e245fae06da2704;hpb=93c18cb44bf9794c7c9bc93411c68880723320d1;p=libpicofe.git

diff --git a/common/input.h b/common/input.h
index 9bc28c9..e87e6ea 100644
--- a/common/input.h
+++ b/common/input.h
@@ -1,4 +1,8 @@
+#ifndef INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc
+#define INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc 1
+
 #define IN_MAX_DEVS 10
+#define IN_ABS_RANGE 1024	/* abs must be centered at 0, move upto +- this */
 
 /* unified menu keys */
 #define PBTN_UP    (1 <<  0)
@@ -16,6 +20,11 @@
 
 #define PBTN_MENU  (1 << 10)
 
+#define PBTN_CHAR  (1 << 11)	/* character (text input) */
+
+// TODO: move to pico
+#if 0
+
 /* ui events */
 #define PEVB_VOL_DOWN   30
 #define PEVB_VOL_UP     29
@@ -45,55 +54,87 @@
 
 #define PEV_MASK 0x7ff80000
 
+#endif
 
 enum {
-	IN_DRVID_UNKNOWN = 0,
-	IN_DRVID_GP2X,
-	IN_DRVID_EVDEV,
-	IN_DRVID_COUNT,
+	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 */
+	IN_CFG_ABS_AXIS_COUNT,	/* number of abs axes (ro) */
+	IN_CFG_DEFAULT_DEV,
 };
 
 enum {
-	IN_INFO_BIND_COUNT = 0,
-	IN_INFO_DOES_COMBOS,
+	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);
+	const char * const *
+	     (*get_key_names)(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  (*update)(void *drv_data, const int *binds, int *result);
+	int  (*update_analog)(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)(int keycode);
+	int  (*menu_translate)(void *drv_data, int keycode, char *charcode);
 	int  (*get_key_code)(const char *key_name);
 	const char * (*get_key_name)(int keycode);
+
+	const struct in_default_bind *defbinds;
 } in_drv_t;
 
+struct in_default_bind {
+	unsigned short code;
+	unsigned char btype;    /* IN_BINDTYPE_* */
+	unsigned char bit;
+};
 
 /* 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);
+int  in_register_driver(const in_drv_t *drv, const struct in_default_bind *defbinds);
+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);
+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_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_update(int *result);
+int  in_update_analog(int dev_id, int axis_id, int *value);
+int  in_update_keycode(int *dev_id, int *is_down, char *charcode, int timeout_ms);
+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 mask);
-void in_config_end(void);
-int  in_bind_key(int dev_id, int keycode, int mask, int force_unbind);
+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_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);
+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_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_)); \
+}
+
+#endif /* INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc */