X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.h;h=92f54146832e4e58a6b26ecaa7fad2b5a4ee8d5d;hb=762ab456021d48de4b2601ac8721061e6cca809e;hp=cf7a09910d46d5c75f4ae442f939f9de5505eef6;hpb=388947f33d88ce3de0d9cb3e873244fbb5162a59;p=libpicofe.git

diff --git a/common/input.h b/common/input.h
index cf7a099..92f5414 100644
--- 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,8 +39,11 @@
 #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 {
@@ -52,13 +58,23 @@ enum {
 	IN_INFO_DOES_COMBOS,
 };
 
+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);
+	int  (*clean_binds)(void *drv_data, int *binds, int *def_finds);
 	void (*set_blocking)(void *data, int y);
 	int  (*update_keycode)(void *drv_data, int *is_down);
 	int  (*menu_translate)(int keycode);
@@ -68,13 +84,14 @@ typedef struct {
 
 
 /* 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, 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);
+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);
@@ -82,9 +99,10 @@ 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_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);