X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.h;h=e82ecaae9df2ac52022f34954d514fb612a9fa5c;hb=8754b84cdbcac9d319330a7623eb5021da3011f4;hp=06b3de595c4cfc73dd4fbffc9d54d3eaaf294f2c;hpb=8ced8d2b38431e23be1b26457110febbe10d14c7;p=libpicofe.git

diff --git a/common/input.h b/common/input.h
index 06b3de5..e82ecaa 100644
--- a/common/input.h
+++ b/common/input.h
@@ -1,3 +1,6 @@
+#ifndef INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc
+#define INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc 1
+
 #define IN_MAX_DEVS 10
 
 /* unified menu keys */
@@ -16,6 +19,9 @@
 
 #define PBTN_MENU  (1 << 10)
 
+// TODO: move to pico
+#if 0
+
 /* ui events */
 #define PEVB_VOL_DOWN   30
 #define PEVB_VOL_UP     29
@@ -45,18 +51,14 @@
 
 #define PEV_MASK 0x7ff80000
 
+#endif
 
 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 {
@@ -73,40 +75,58 @@ typedef struct {
 	const char *prefix;
 	void (*probe)(void);
 	void (*free)(void *drv_data);
-	int  (*get_bind_count)(void);
+	const char * const *
+	     (*get_key_names)(int *count);
 	void (*get_def_binds)(int *binds);
 	int  (*clean_binds)(void *drv_data, int *binds, int *def_finds);
-	void (*set_blocking)(void *data, int y);
+	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);
+	/* 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);
 	int  (*get_key_code)(const char *key_name);
 	const char * (*get_key_name)(int keycode);
 } 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 drv_fd_hnd, void *drv_data,
-		int key_count, int combos);
+int  in_register_driver(const in_drv_t *drv);
+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(int *result);
-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_config_parse_dev(const char *dev_name);
 int  in_config_bind_key(int dev_id, const char *key, int binds, int bind_type);
-void in_config_end(void);
+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 */