X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=common%2Finput.h;h=14eb303fd1cdac938792f44f1476f3124b0b0b04;hb=82abf46f3db8ade517881c03327bdbc0de848eb2;hp=4b8784c573e2c0867ff0baf4db14a13967f5b145;hpb=906bdc9fb54da36399faaa95535432fdf8531662;p=libpicofe.git

diff --git a/common/input.h b/common/input.h
index 4b8784c..14eb303 100644
--- a/common/input.h
+++ b/common/input.h
@@ -1,9 +1,31 @@
 #define IN_MAX_DEVS 10
 
+/* unified menu keys */
+#define PBTN_UP    (1 <<  0)
+#define PBTN_DOWN  (1 <<  1)
+#define PBTN_LEFT  (1 <<  2)
+#define PBTN_RIGHT (1 <<  3)
+
+#define PBTN_MOK   (1 <<  4)
+#define PBTN_MBACK (1 <<  5)
+#define PBTN_MA2   (1 <<  6)	/* menu action 2 */
+#define PBTN_MA3   (1 <<  7)
+
+#define PBTN_L     (1 <<  8)
+#define PBTN_R     (1 <<  9)
+
+#define PBTN_MENU  (1 << 10)
+
 enum {
 	IN_DRVID_UNKNOWN = 0,
+	IN_DRVID_GP2X,
 	IN_DRVID_EVDEV,
-	IN_DRVID_COUNT
+	IN_DRVID_COUNT,
+};
+
+enum {
+	IN_INFO_BIND_COUNT = 0,
+	IN_INFO_DOES_COMBOS,
 };
 
 typedef struct {
@@ -14,6 +36,7 @@ typedef struct {
 	void (*get_def_binds)(int *binds);
 	int  (*clean_binds)(void *drv_data, int *binds);
 	void (*set_blocking)(void *data, int y);
+	int  (*update_keycode)(void *drv_data, int *is_down);
 	int  (*menu_translate)(int keycode);
 	int  (*get_key_code)(const char *key_name);
 	const char * (*get_key_name)(int keycode);
@@ -21,15 +44,18 @@ typedef struct {
 
 
 /* to be called by drivers */
-void in_register(const char *nname, int drv_id, void *drv_data);
+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_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_update_menu(int timeout_ms);
-int  in_get_dev_bind_count(int dev_id);
+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);
@@ -39,5 +65,5 @@ 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);
+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);