unified menu wip and some reorganization for it

[libpicofe.git] / common / input.h

diff --git a/common/input.h b/common/input.h
index 4b8784c..85723f1 100644 (file)
--- a/common/input.h
+++ b/common/input.h
@@ -2,6 +2,7 @@
 
 enum {
        IN_DRVID_UNKNOWN = 0,
+       IN_DRVID_GP2X,
        IN_DRVID_EVDEV,
        IN_DRVID_COUNT
 };
@@ -14,6 +15,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,14 +23,15 @@ 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);
 
 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_menu_wait_any(int timeout_ms);
+int  in_menu_wait(int interesting);
 int  in_get_dev_bind_count(int dev_id);
 void in_config_start(void);
 int  in_config_parse_dev(const char *dev_name);
@@ -39,5 +42,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);
 const char *in_get_key_name(int dev_id, int keycode);