the old-new win32 port
[libpicofe.git] / common / input.c
index 1991244..8950535 100644 (file)
@@ -2,48 +2,45 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common.h"
 #include "input.h"
+#include "plat.h"
 #include "../linux/in_evdev.h"
+#include "../gp2x/in_gp2x.h"
+#include "../win32/in_vk.h"
 
 typedef struct
 {
        int drv_id;
+       int drv_fd_hnd;
        void *drv_data;
        char *name;
-       int *binds;
+       int key_count;
+       int *binds;     /* total = key_count * bindtypes * 2 */
        int probed:1;
+       int does_combos:1;
 } in_dev_t;
 
 static in_drv_t in_drivers[IN_DRVID_COUNT];
 static in_dev_t in_devices[IN_MAX_DEVS];
 static int in_dev_count = 0;
+static int in_have_async_devs = 0;
+static int menu_key_state = 0;
+static int menu_last_used_dev = 0;
 
 #define DRV(id) in_drivers[(unsigned)(id) < IN_DRVID_COUNT ? (id) : 0]
 
-static int in_bind_count(int drv_id)
-{
-       int count = DRV(drv_id).get_bind_count();
-       if (count <= 0)
-               printf("input: failed to get bind count for drv %d\n", drv_id);
-
-       return count;
-}
 
-static int *in_alloc_binds(int drv_id)
+static int *in_alloc_binds(int drv_id, int key_count)
 {
-       int count, *binds;
-
-       count = in_bind_count(drv_id);
-       if (count <= 0)
-               return NULL;
+       int *binds;
 
-       binds = calloc(count * 2, sizeof(binds[0]));
+       binds = calloc(key_count * IN_BINDTYPE_COUNT * 2, sizeof(binds[0]));
        if (binds == NULL)
                return NULL;
 
-       DRV(drv_id).get_def_binds(binds + count);
-       memcpy(binds, binds + count, count * sizeof(binds[0]));
+       DRV(drv_id).get_def_binds(binds + key_count * IN_BINDTYPE_COUNT);
+       memcpy(binds, binds + key_count * IN_BINDTYPE_COUNT,
+               sizeof(binds[0]) * key_count * IN_BINDTYPE_COUNT);
 
        return binds;
 }
@@ -60,8 +57,10 @@ static void in_free(in_dev_t *dev)
        dev->binds = NULL;
 }
 
-/* to be called by drivers */
-void in_register(const char *nname, int drv_id, void *drv_data)
+/* to be called by drivers
+ * async devices must set drv_fd_hnd to -1 */
+void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data,
+               int key_count, int combos)
 {
        int i, ret, dupe_count = 0, *binds;
        char name[256], *name_end, *tmp;
@@ -101,7 +100,7 @@ void in_register(const char *nname, int drv_id, void *drv_data)
        if (tmp == NULL)
                return;
 
-       binds = in_alloc_binds(drv_id);
+       binds = in_alloc_binds(drv_id, key_count);
        if (binds == NULL) {
                free(tmp);
                return;
@@ -109,17 +108,21 @@ void in_register(const char *nname, int drv_id, void *drv_data)
 
        in_devices[i].name = tmp;
        in_devices[i].binds = binds;
+       in_devices[i].key_count = key_count;
        if (i + 1 > in_dev_count)
                in_dev_count = i + 1;
 
        printf("input: new device #%d \"%s\"\n", i, name);
 update:
        in_devices[i].probed = 1;
+       in_devices[i].does_combos = combos;
        in_devices[i].drv_id = drv_id;
+       in_devices[i].drv_fd_hnd = drv_fd_hnd;
        in_devices[i].drv_data = drv_data;
 
        if (in_devices[i].binds != NULL) {
-               ret = DRV(drv_id).clean_binds(drv_data, in_devices[i].binds);
+               ret = DRV(drv_id).clean_binds(drv_data, in_devices[i].binds,
+                       in_devices[i].binds + key_count * IN_BINDTYPE_COUNT);
                if (ret == 0) {
                        /* no useable binds */
                        free(in_devices[i].binds);
@@ -128,9 +131,78 @@ update:
        }
 }
 
+/* key combo handling, to be called by drivers that support it.
+ * Only care about IN_BINDTYPE_EMU */
+void in_combos_find(const int *binds, int last_key, int *combo_keys, int *combo_acts)
+{
+       int act, u;
+
+       *combo_keys = *combo_acts = 0;
+       for (act = 0; act < sizeof(binds[0]) * 8; act++)
+       {
+               int keyc = 0;
+               for (u = 0; u <= last_key; u++)
+                       if (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & (1 << act))
+                               keyc++;
+
+               if (keyc > 1)
+               {
+                       // loop again and mark those keys and actions as combo
+                       for (u = 0; u <= last_key; u++)
+                       {
+                               if (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & (1 << act)) {
+                                       *combo_keys |= 1 << u;
+                                       *combo_acts |= 1 << act;
+                               }
+                       }
+               }
+       }
+}
+
+int in_combos_do(int keys, const int *binds, int last_key, int combo_keys, int combo_acts)
+{
+       int i, ret = 0;
+
+       for (i = 0; i <= last_key; i++)
+       {
+               int acts, acts_c, u;
+
+               if (!(keys & (1 << i)))
+                       continue;
+
+               acts = binds[IN_BIND_OFFS(i, IN_BINDTYPE_EMU)];
+               if (!acts)
+                       continue;
+
+               if (!(combo_keys & (1 << i))) {
+                       ret |= acts;
+                       continue;
+               }
+
+               acts_c = acts & combo_acts;
+               u = last_key;
+               if (acts_c) {
+                       // let's try to find the other one
+                       for (u = i + 1; u <= last_key; u++)
+                               if ( (keys & (1 << u)) && (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & acts_c) ) {
+                                       ret |= acts_c & binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)];
+                                       keys &= ~((1 << i) | (1 << u));
+                                       break;
+                               }
+               }
+               // add non-combo actions if combo ones were not found
+               if (u >= last_key)
+                       ret |= acts & ~combo_acts;
+       }
+
+       return ret;
+}
+
 void in_probe(void)
 {
        int i;
+
+       in_have_async_devs = 0;
        for (i = 0; i < in_dev_count; i++)
                in_devices[i].probed = 0;
 
@@ -146,92 +218,170 @@ void in_probe(void)
                                memmove(&in_devices[i], &in_devices[i+1],
                                        (in_dev_count - i) * sizeof(in_devices[0]));
                        }
+
+                       continue;
                }
+
+               if (in_devices[i].probed && in_devices[i].drv_fd_hnd == -1)
+                       in_have_async_devs = 1;
        }
+
+       if (in_have_async_devs)
+               printf("input: async-only devices detected..\n");
 }
 
-int in_update(void)
+/* async update */
+int in_update(int *result)
 {
-       int i, result = 0;
+       int i, ret = 0;
 
        for (i = 0; i < in_dev_count; i++) {
                in_dev_t *dev = &in_devices[i];
                if (dev->probed && dev->binds != NULL) {
+                       // FIXME: this is stupid, make it indirect
                        switch (dev->drv_id) {
 #ifdef IN_EVDEV
                        case IN_DRVID_EVDEV:
-                               result |= in_evdev_update(dev->drv_data, dev->binds);
+                               ret |= in_evdev_update(dev->drv_data, dev->binds, result);
                                break;
 #endif
+#ifdef IN_GP2X
+                       case IN_DRVID_GP2X:
+                               ret |= in_gp2x_update(dev->drv_data, dev->binds, result);
+                               break;
+#endif
+                       case IN_DRVID_VK:
+                               ret |= in_vk_update(dev->drv_data, dev->binds, result);
+                               break;
                        }
                }
        }
 
-       return result;
+       return ret;
 }
 
-static void **in_collect_drvdata(int drv_id, int *count)
+void in_set_blocking(int is_blocking)
 {
-       static void *data[IN_MAX_DEVS];
-       int i;
+       int i, ret;
 
-       for (*count = i = 0; i < in_dev_count; i++) {
-               if (in_devices[i].drv_id == drv_id && in_devices[i].probed)
-                       data[(*count)++] = in_devices[i].drv_data;
+       /* have_async_devs means we will have to do all reads async anyway.. */
+       if (!in_have_async_devs) {
+               for (i = 0; i < in_dev_count; i++) {
+                       if (in_devices[i].probed)
+                               DRV(in_devices[i].drv_id).set_blocking(in_devices[i].drv_data, is_blocking);
+               }
        }
 
-       return data;
-}
+       menu_key_state = 0;
 
-static int menu_key_state = 0;
+       /* flush events */
+       do {
+               ret = in_update_keycode(NULL, NULL, 0);
+       } while (ret >= 0);
+}
 
-void in_set_blocking(int is_blocking)
+static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms)
 {
-       int i;
+       int i, is_down, result;
+       unsigned int ticks;
 
-       for (i = 0; i < in_dev_count; i++) {
-               if (in_devices[i].probed)
-                       DRV(in_devices[i].drv_id).set_blocking(in_devices[i].drv_data, is_blocking);
+       ticks = plat_get_ticks_ms();
+
+       while (1)
+       {
+               for (i = 0; i < in_dev_count; i++) {
+                       in_dev_t *d = &in_devices[i];
+                       if (!d->probed)
+                               continue;
+
+                       result = DRV(d->drv_id).update_keycode(d->drv_data, &is_down);
+                       if (result == -1)
+                               continue;
+
+                       if (dev_id_out)
+                               *dev_id_out = i;
+                       if (is_down_out)
+                               *is_down_out = is_down;
+                       return result;
+               }
+
+               if (timeout_ms >= 0 && (int)(plat_get_ticks_ms() - ticks) > timeout_ms)
+                       break;
+
+               plat_sleep_ms(10);
        }
 
-       menu_key_state = 0;
-       /* flush events */
-       in_update_keycode(NULL, NULL, 0);
+       return -1;
 }
 
 /* 
- * update with wait for a press, return keycode
- * only can use 1 drv here..
+ * wait for a press, always return some keycode or -1 on timeout or error
  */
 int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms)
 {
-       int result = 0, dev_id = 0, is_down, result_menu;
-#ifdef IN_EVDEV
-       void **data;
-       int i, id = 0, count = 0;
+       int result = -1, dev_id = 0, is_down, result_menu;
+       int fds_hnds[IN_MAX_DEVS];
+       int i, ret, count = 0;
+       in_drv_t *drv = NULL;
+       unsigned int ticks;
+
+       if (in_have_async_devs) {
+               result = in_update_kc_async(&dev_id, &is_down, timeout_ms);
+               if (result == -1)
+                       return -1;
+               drv = &DRV(in_devices[dev_id].drv_id);
+               goto finish;
+       }
+
+       ticks = plat_get_ticks_ms();
+
+       for (i = 0; i < in_dev_count; i++) {
+               if (in_devices[i].probed)
+                       fds_hnds[count++] = in_devices[i].drv_fd_hnd;
+       }
 
-       data = in_collect_drvdata(IN_DRVID_EVDEV, &count);
        if (count == 0) {
                /* don't deadlock, fail */
                printf("input: failed to find devices to read\n");
                exit(1);
        }
 
-       result = in_evdev_update_keycode(data, count, &id, &is_down, timeout_ms);
+       while (1)
+       {
+               ret = plat_wait_event(fds_hnds, count, timeout_ms);
+               if (ret < 0)
+                       break;
+
+               for (i = 0; i < in_dev_count; i++) {
+                       if (in_devices[i].drv_fd_hnd == ret) {
+                               dev_id = i;
+                               break;
+                       }
+               }
 
-       for (i = id; i < in_dev_count; i++) {
-               if (in_devices[i].drv_data == data[id]) {
-                       dev_id = i;
+               drv = &DRV(in_devices[dev_id].drv_id);
+               result = drv->update_keycode(in_devices[dev_id].drv_data, &is_down);
+
+               /* update_keycode() might return -1 when some not interesting
+                * event happened, like sync event for evdev. */
+               if (result >= 0)
                        break;
+
+               if (timeout_ms >= 0) {
+                       unsigned int ticks2 = plat_get_ticks_ms();
+                       timeout_ms -= ticks2 - ticks;
+                       ticks = ticks2;
+                       if (timeout_ms <= 0)
+                               break;
                }
        }
-#else
-#error no menu read handlers
-#endif
 
+       if (result == -1)
+               return -1;
+finish:
        /* keep track of menu key state, to allow mixing
         * in_update_keycode() and in_menu_wait_any() calls */
-       result_menu = DRV(in_devices[dev_id].drv_id).menu_translate(result);
+       result_menu = drv->menu_translate(result);
        if (result_menu != 0) {
                if (is_down)
                        menu_key_state |=  result_menu;
@@ -256,12 +406,14 @@ int in_menu_wait_any(int timeout_ms)
                int code, is_down = 0, dev_id = 0;
 
                code = in_update_keycode(&dev_id, &is_down, timeout_ms);
-               code = DRV(in_devices[dev_id].drv_id).menu_translate(code);
+               if (code >= 0)
+                       code = DRV(in_devices[dev_id].drv_id).menu_translate(code);
 
                if (timeout_ms >= 0)
                        break;
-               if (code == 0)
+               if (code < 0)
                        continue;
+               menu_last_used_dev = dev_id;
                if (keys_old != menu_key_state)
                        break;
        }
@@ -270,14 +422,14 @@ int in_menu_wait_any(int timeout_ms)
 }
 
 /* wait for menu input, do autorepeat */
-int in_menu_wait(int interesting)
+int in_menu_wait(int interesting, int autorep_delay_ms)
 {
        static int inp_prev = 0;
        static int repeats = 0;
-       int ret, release = 0, wait = 666;
+       int ret, release = 0, wait = 450;
 
        if (repeats)
-               wait = 33;
+               wait = autorep_delay_ms;
 
        ret = in_menu_wait_any(wait);
        if (ret == inp_prev)
@@ -312,31 +464,47 @@ const int *in_get_dev_binds(int dev_id)
 
 const int *in_get_dev_def_binds(int dev_id)
 {
-       int count;
-
        if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
                return NULL;
 
-       count = in_bind_count(in_devices[dev_id].drv_id);
-       return in_devices[dev_id].binds + count;
+       return in_devices[dev_id].binds + in_devices[dev_id].key_count * IN_BINDTYPE_COUNT;
 }
 
-int in_get_dev_bind_count(int dev_id)
+int in_get_dev_info(int dev_id, int what)
 {
        if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
                return 0;
 
-       return in_bind_count(in_devices[dev_id].drv_id);
+       switch (what) {
+       case IN_INFO_BIND_COUNT:
+               return in_devices[dev_id].key_count;
+       case IN_INFO_DOES_COMBOS:
+               return in_devices[dev_id].does_combos;
+       }
+
+       return 0;
 }
 
-const char *in_get_dev_name(int dev_id, int must_be_active)
+const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix)
 {
+       const char *name, *tmp;
+
        if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
                return NULL;
 
        if (must_be_active && !in_devices[dev_id].probed)
                return NULL;
-       return in_devices[dev_id].name;
+
+       name = in_devices[dev_id].name;
+       if (name == NULL || !skip_pfix)
+               return name;
+
+       /* skip prefix */
+       tmp = strchr(name, ':');
+       if (tmp != NULL)
+               name = tmp + 1;
+
+       return name;
 }
 
 /* never returns NULL */
@@ -345,9 +513,15 @@ const char *in_get_key_name(int dev_id, int keycode)
        static char xname[16];
        const char *name;
 
+       if (dev_id < 0)         /* want last used dev? */
+               dev_id = menu_last_used_dev;
+
        if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
                return "Unkn0";
 
+       if (keycode < 0)        /* want name for menu key? */
+               keycode = DRV(in_devices[dev_id].drv_id).menu_translate(keycode);
+
        name = DRV(in_devices[dev_id].drv_id).get_key_name(keycode);
        if (name != NULL)
                return name;
@@ -361,33 +535,35 @@ const char *in_get_key_name(int dev_id, int keycode)
        return xname;
 }
 
-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)
 {
        int ret, count;
        in_dev_t *dev;
 
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
+       if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
                return -1;
+
        dev = &in_devices[dev_id];
+       count = dev->key_count;
 
        if (dev->binds == NULL) {
                if (force_unbind)
                        return 0;
-               dev->binds = in_alloc_binds(dev->drv_id);
+               dev->binds = in_alloc_binds(dev->drv_id, count);
                if (dev->binds == NULL)
                        return -1;
        }
 
-       count = in_bind_count(dev->drv_id);
        if (keycode < 0 || keycode >= count)
                return -1;
        
        if (force_unbind)
-               dev->binds[keycode] &= ~mask;
+               dev->binds[IN_BIND_OFFS(keycode, bind_type)] &= ~mask;
        else
-               dev->binds[keycode] ^=  mask;
+               dev->binds[IN_BIND_OFFS(keycode, bind_type)] ^=  mask;
        
-       ret = DRV(dev->drv_id).clean_binds(dev->drv_data, dev->binds);
+       ret = DRV(dev->drv_id).clean_binds(dev->drv_data, dev->binds,
+                               dev->binds + count * IN_BINDTYPE_COUNT);
        if (ret == 0) {
                free(dev->binds);
                dev->binds = NULL;
@@ -396,6 +572,24 @@ int in_bind_key(int dev_id, int keycode, int mask, int force_unbind)
        return 0;
 }
 
+void in_unbind_all(int dev_id, int act_mask, int bind_type)
+{
+       int i, count;
+       in_dev_t *dev;
+
+       if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
+               return;
+
+       dev = &in_devices[dev_id];
+       count = dev->key_count;
+
+       if (dev->binds == NULL)
+               return;
+
+       for (i = 0; i < count; i++)
+               dev->binds[IN_BIND_OFFS(i, bind_type)] &= ~act_mask;
+}
+
 /* returns device id, or -1 on error */
 int in_config_parse_dev(const char *name)
 {
@@ -439,9 +633,11 @@ int in_config_parse_dev(const char *name)
        if (in_devices[i].name == NULL)
                return -1;
 
+       in_devices[i].key_count = DRV(drv_id).get_bind_count();
+       in_devices[i].drv_id = drv_id;
+
        if (i + 1 > in_dev_count)
                in_dev_count = i + 1;
-       in_devices[i].drv_id = drv_id;
 
        return i;
 }
@@ -463,26 +659,24 @@ void in_config_start(void)
                if (binds == NULL)
                        continue;
 
-               count = in_bind_count(in_devices[i].drv_id);
-               def_binds = binds + count;
+               count = in_devices[i].key_count;
+               def_binds = binds + count * IN_BINDTYPE_COUNT;
 
-               for (n = 0; n < count; n++)
+               for (n = 0; n < count * IN_BINDTYPE_COUNT; n++)
                        if (binds[n] == def_binds[n])
                                binds[n] = -1;
        }
 }
 
-int in_config_bind_key(int dev_id, const char *key, int binds)
+int in_config_bind_key(int dev_id, const char *key, int acts, int bind_type)
 {
-       int count, kc;
        in_dev_t *dev;
+       int i, offs, kc;
 
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
+       if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
                return -1;
        dev = &in_devices[dev_id];
 
-       count = in_bind_count(dev->drv_id);
-
        /* maybe a raw code? */
        if (key[0] == '\\' && key[1] == 'x') {
                char *p = NULL;
@@ -493,7 +687,7 @@ int in_config_bind_key(int dev_id, const char *key, int binds)
        else {
                /* device specific key name */
                if (dev->binds == NULL) {
-                       dev->binds = in_alloc_binds(dev->drv_id);
+                       dev->binds = in_alloc_binds(dev->drv_id, dev->key_count);
                        if (dev->binds == NULL)
                                return -1;
                        in_config_start();
@@ -506,15 +700,21 @@ int in_config_bind_key(int dev_id, const char *key, int binds)
                }
        }
 
-       if (kc < 0 || kc >= count) {
+       if (kc < 0 || kc >= dev->key_count) {
                printf("input: bad key: %s\n", key);
                return -1;
        }
 
-       if (dev->binds[kc] == -1)
-               dev->binds[kc] = 0;
-       dev->binds[kc] |= binds;
+       if (bind_type == IN_BINDTYPE_NONE) {
+               for (i = 0; i < IN_BINDTYPE_COUNT; i++)
+                       dev->binds[IN_BIND_OFFS(kc, i)] = 0;
+               return 0;
+       }
 
+       offs = IN_BIND_OFFS(kc, bind_type);
+       if (dev->binds[offs] == -1)
+               dev->binds[offs] = 0;
+       dev->binds[offs] |= acts;
        return 0;
 }
 
@@ -523,24 +723,33 @@ void in_config_end(void)
        int i;
 
        for (i = 0; i < IN_MAX_DEVS; i++) {
-               int n, ret, count, *binds, *def_binds;
+               int n, t, ret, count, *binds, *def_binds;
                in_dev_t *dev = &in_devices[i];
 
                if (dev->binds == NULL)
                        continue;
 
-               count = in_bind_count(dev->drv_id);
+               count = dev->key_count;
                binds = dev->binds;
-               def_binds = binds + count;
-
-               for (n = 0; n < count; n++)
-                       if (binds[n] == -1)
-                               binds[n] = def_binds[n];
+               def_binds = binds + count * IN_BINDTYPE_COUNT;
+
+               for (n = 0; n < count; n++) {
+                       int is_default = 1;
+                       for (t = 0; t < IN_BINDTYPE_COUNT; t++)
+                               if (binds[IN_BIND_OFFS(n, t)] == -1)
+                                       binds[IN_BIND_OFFS(n, t)] = 0;
+                               else
+                                       is_default = 0;
+
+                       if (is_default)
+                               for (t = 0; t < IN_BINDTYPE_COUNT; t++)
+                                       binds[IN_BIND_OFFS(n, t)] = def_binds[IN_BIND_OFFS(n, t)];
+               }
 
                if (dev->drv_data == NULL)
                        continue;
 
-               ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds);
+               ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds, def_binds);
                if (ret == 0) {
                        /* no useable binds */
                        free(dev->binds);
@@ -569,8 +778,9 @@ static void in_def_probe(void) {}
 static void in_def_free(void *drv_data) {}
 static int  in_def_get_bind_count(void) { return 0; }
 static void in_def_get_def_binds(int *binds) {}
-static int  in_def_clean_binds(void *drv_data, int *binds) { return 0; }
+static int  in_def_clean_binds(void *drv_data, int *b, int *db) { return 0; }
 static void in_def_set_blocking(void *data, int y) {}
+static int  in_def_update_keycode(void *drv_data, int *is_down) { return 0; }
 static int  in_def_menu_translate(int keycode) { return keycode; }
 static int  in_def_get_key_code(const char *key_name) { return 0; }
 static const char *in_def_get_key_name(int keycode) { return NULL; }
@@ -591,14 +801,19 @@ void in_init(void)
                in_drivers[i].get_def_binds = in_def_get_def_binds;
                in_drivers[i].clean_binds = in_def_clean_binds;
                in_drivers[i].set_blocking = in_def_set_blocking;
+               in_drivers[i].update_keycode = in_def_update_keycode;
                in_drivers[i].menu_translate = in_def_menu_translate;
                in_drivers[i].get_key_code = in_def_get_key_code;
                in_drivers[i].get_key_name = in_def_get_key_name;
        }
 
+#ifdef IN_GP2X
+       in_gp2x_init(&in_drivers[IN_DRVID_GP2X]);
+#endif
 #ifdef IN_EVDEV
        in_evdev_init(&in_drivers[IN_DRVID_EVDEV]);
 #endif
+       in_vk_init(&in_drivers[IN_DRVID_VK]);
 }
 
 #if 0