X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fcommon%2Finput.h;h=e87e6ea5103a260e3b7695dc8a3457f8629e566a;hp=524366f2e7b18336859a8739bb4796c3eac48b19;hb=0e2e3f498456d1175916ecd69d0a9e80e701e760;hpb=1b0c513996d57548fc5df8726e21a68e5ace4f99

diff --git a/frontend/common/input.h b/frontend/common/input.h
index 524366f2..e87e6ea5 100644
--- a/frontend/common/input.h
+++ b/frontend/common/input.h
@@ -20,6 +20,8 @@
 
 #define PBTN_MENU  (1 << 10)
 
+#define PBTN_CHAR  (1 << 11)	/* character (text input) */
+
 // TODO: move to pico
 #if 0
 
@@ -61,6 +63,7 @@ enum {
 	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 {
@@ -79,7 +82,6 @@ typedef struct {
 	void (*free)(void *drv_data);
 	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);
 	int  (*get_config)(void *drv_data, int what, int *val);
 	int  (*set_config)(void *drv_data, int what, int val);
@@ -87,9 +89,11 @@ typedef struct {
 	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)(void *drv_data, 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 {
@@ -99,7 +103,7 @@ struct in_default_bind {
 };
 
 /* to be called by drivers */
-int  in_register_driver(const in_drv_t *drv);
+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);
@@ -109,9 +113,9 @@ 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_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_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 binds, int bind_type);
 int  in_get_config(int dev_id, int what, void *val);