tweaking pandora frontend

[libpicofe.git] / linux / in_evdev.c

diff --git a/linux/in_evdev.c b/linux/in_evdev.c
index 74f81c7..8a00296 100644 (file)
--- a/linux/in_evdev.c
+++ b/linux/in_evdev.c
@@ -14,6 +14,7 @@
 
 typedef struct {
        int fd;
+       int *kbits;
        int abs_lzone;
        int abs_rzone;
        int abs_tzone;
@@ -32,6 +33,9 @@ typedef struct {
 #define KEYBITS_BIT_SET(x) (keybits[(x)/sizeof(keybits[0])/8] |= \
        (1 << ((x) & (sizeof(keybits[0])*8-1))))
 
+#define KEYBITS_BIT_CLEAR(x) (keybits[(x)/sizeof(keybits[0])/8] &= \
+       ~(1 << ((x) & (sizeof(keybits[0])*8-1))))
+
 static const char * const in_evdev_prefix = "evdev:";
 static const char * const in_evdev_keys[KEY_CNT] = {
        [0 ... KEY_MAX] = NULL,
@@ -122,11 +126,17 @@ static const char * const in_evdev_keys[KEY_CNT] = {
 
 static void in_evdev_probe(void)
 {
+       long keybits[KEY_CNT / sizeof(long) / 8];
+       long absbits[(ABS_MAX+1) / sizeof(long) / 8];
        int i;
 
+       // the kernel might support and return less keys then we know about,
+       // so make sure the buffers are clear.
+       memset(keybits, 0, sizeof(keybits));
+       memset(absbits, 0, sizeof(absbits));
+
        for (i = 0;; i++)
        {
-               int keybits[KEY_CNT / sizeof(int)], absbits[(ABS_MAX+1)/sizeof(int)];
                int support = 0, count = 0;
                in_evdev_t *dev;
                int u, ret, fd;
@@ -158,7 +168,8 @@ static void in_evdev_probe(void)
 
                /* check for interesting keys */
                for (u = 0; u < KEY_CNT; u++) {
-                       if (KEYBITS_BIT(u) && u != KEY_POWER && u != KEY_SLEEP)
+                       if (KEYBITS_BIT(u) && u != KEY_POWER &&
+                                       u != KEY_SLEEP && u != BTN_TOUCH)
                                count++;
                }
 
@@ -169,6 +180,16 @@ static void in_evdev_probe(void)
                if (dev == NULL)
                        goto skip;
 
+               ret = ioctl(fd, EVIOCGKEY(sizeof(keybits)), keybits);
+               if (ret == -1) {
+                       printf("Warning: EVIOCGKEY not supported, will have to track state\n");
+                       dev->kbits = calloc(KEY_CNT, sizeof(int));
+                       if (dev->kbits == NULL) {
+                               free(dev);
+                               goto skip;
+                       }
+               }
+
                /* check for abs too */
                if (support & (1 << EV_ABS)) {
                        struct input_absinfo ainfo;
@@ -235,23 +256,36 @@ int in_evdev_update(void *drv_data, const int *binds, int *result)
 {
        struct input_event ev[16];
        struct input_absinfo ainfo;
-       int keybits[KEY_CNT / sizeof(int)];
+       int keybits_[KEY_CNT / sizeof(int)];
+       int *keybits = keybits_;
        in_evdev_t *dev = drv_data;
        int rd, ret, u;
 
-       while (1) {
-               rd = read(dev->fd, ev, sizeof(ev));
-               if (rd < (int)sizeof(ev[0])) {
-                       if (errno != EAGAIN)
-                               perror("in_evdev: read failed");
-                       break;
+       if (dev->kbits == NULL) {
+               ret = ioctl(dev->fd, EVIOCGKEY(sizeof(keybits_)), keybits_);
+               if (ret == -1) {
+                       perror("in_evdev: ioctl failed");
+                       return -1;
                }
        }
-
-       ret = ioctl(dev->fd, EVIOCGKEY(sizeof(keybits)), keybits);
-       if (ret == -1) {
-               perror("in_evdev: ioctl failed");
-               return -1;
+       else {
+               keybits = dev->kbits;
+               while (1) {
+                       rd = read(dev->fd, ev, sizeof(ev));
+                       if (rd < (int)sizeof(ev[0])) {
+                               if (errno != EAGAIN)
+                                       perror("in_evdev: read failed");
+                               break;
+                       }
+                       for (u = 0; u < rd / sizeof(ev[0]); u++) {
+                               if (ev[u].type != EV_KEY)
+                                       continue;
+                               else if (ev[u].value == 1)
+                                       KEYBITS_BIT_SET(ev[u].code);
+                               else if (ev[u].value == 0)
+                                       KEYBITS_BIT_CLEAR(ev[u].code);
+                       }
+               }
        }
 
        for (u = 0; u < KEY_CNT; u++) {
@@ -289,6 +323,16 @@ static void in_evdev_set_blocking(void *drv_data, int y)
                perror("in_evdev: F_GETFL fcntl failed");
                return;
        }
+
+       if (flags & O_NONBLOCK) {
+               /* flush the event queue */
+               struct input_event ev;
+               do {
+                       ret = read(dev->fd, &ev, sizeof(ev));
+               }
+               while (ret == sizeof(ev));
+       }
+
        if (y)
                flags &= ~O_NONBLOCK;
        else
@@ -367,16 +411,20 @@ static const struct {
        { KEY_LEFT,     PBTN_LEFT },
        { KEY_RIGHT,    PBTN_RIGHT },
        { KEY_ENTER,    PBTN_MOK },
-       { BTN_A,        PBTN_MOK },
+       { KEY_END,      PBTN_MOK },
        { BTN_TRIGGER,  PBTN_MOK },
        { KEY_ESC,      PBTN_MBACK },
-       { BTN_B,        PBTN_MBACK },
+       { KEY_PAGEDOWN, PBTN_MBACK },
        { BTN_THUMB,    PBTN_MBACK },
        { KEY_A,        PBTN_MA2 },
+       { KEY_HOME,     PBTN_MA2 },
        { KEY_S,        PBTN_MA3 },
+       { KEY_PAGEUP,   PBTN_MA3 },
        { KEY_BACKSLASH,  PBTN_MENU },
-       { KEY_MENU,       PBTN_MENU },
+       { KEY_LEFTCTRL,   PBTN_MENU },
+       { KEY_RIGHTSHIFT, PBTN_L },
        { KEY_LEFTBRACE,  PBTN_L },
+       { KEY_RIGHTCTRL,  PBTN_R },
        { KEY_RIGHTBRACE, PBTN_R },
 };
 
@@ -439,15 +487,16 @@ static const struct {
        { KEY_LEFT,     IN_BINDTYPE_PLAYER12, 2 },
        { KEY_RIGHT,    IN_BINDTYPE_PLAYER12, 3 },
        { KEY_S,        IN_BINDTYPE_PLAYER12, 4 },      /* B */
-       { BTN_B,        IN_BINDTYPE_PLAYER12, 4 },
+       { KEY_PAGEDOWN, IN_BINDTYPE_PLAYER12, 4 },
        { KEY_D,        IN_BINDTYPE_PLAYER12, 5 },      /* C */
-       { BTN_A,        IN_BINDTYPE_PLAYER12, 5 },
+       { KEY_END,      IN_BINDTYPE_PLAYER12, 5 },
        { KEY_A,        IN_BINDTYPE_PLAYER12, 6 },      /* A */
-       { BTN_Y,        IN_BINDTYPE_PLAYER12, 6 },
+       { KEY_HOME,     IN_BINDTYPE_PLAYER12, 6 },
        { KEY_ENTER,    IN_BINDTYPE_PLAYER12, 7 },
-       { BTN_START,    IN_BINDTYPE_PLAYER12, 7 },
-       { BTN_TL,       IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
-       { BTN_TR,       IN_BINDTYPE_EMU, PEVB_STATE_SAVE },
+       { KEY_LEFTALT,  IN_BINDTYPE_PLAYER12, 7 },
+       { KEY_RIGHTSHIFT,IN_BINDTYPE_EMU, PEVB_STATE_SAVE },
+       { KEY_RIGHTCTRL, IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
+       { KEY_LEFTCTRL,  IN_BINDTYPE_EMU, PEVB_MENU },
 };
 
 #define DEF_BIND_COUNT (sizeof(in_evdev_def_binds) / sizeof(in_evdev_def_binds[0]))