Merge "minui: add support for virtual keys" into froyo
This commit is contained in:
Koushik Dutta
Gerrit Code Review
commit
9397e322c3
256
minui/events.c
256
minui/events.c
@ -19,16 +19,141 @@
|
||||
#include <fcntl.h>
|
||||
#include <dirent.h>
|
||||
#include <sys/poll.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include <linux/input.h>
|
||||
|
||||
#include "../common.h"
|
||||
|
||||
#include "minui.h"
|
||||
|
||||
#define MAX_DEVICES 16
|
||||
|
||||
enum {
|
||||
DOWN_NOT,
|
||||
DOWN_SENT,
|
||||
DOWN_RELEASED,
|
||||
};
|
||||
|
||||
struct virtualkey {
|
||||
int scancode;
|
||||
int centerx, centery;
|
||||
int width, height;
|
||||
};
|
||||
|
||||
struct position {
|
||||
int x, y;
|
||||
int synced;
|
||||
struct input_absinfo xi, yi;
|
||||
};
|
||||
|
||||
struct ev {
|
||||
struct pollfd *fd;
|
||||
|
||||
struct virtualkey *vks;
|
||||
int vk_count;
|
||||
|
||||
struct position p, mt_p;
|
||||
int down;
|
||||
};
|
||||
|
||||
static struct pollfd ev_fds[MAX_DEVICES];
|
||||
static struct ev evs[MAX_DEVICES];
|
||||
static unsigned ev_count = 0;
|
||||
|
||||
static inline int ABS(int x) {
|
||||
return x<0?-x:x;
|
||||
}
|
||||
|
||||
/* Returns empty tokens */
|
||||
static char *vk_strtok_r(char *str, const char *delim, char **save_str)
|
||||
{
|
||||
if(!str) {
|
||||
if(!*save_str) return NULL;
|
||||
str = (*save_str) + 1;
|
||||
}
|
||||
*save_str = strpbrk(str, delim);
|
||||
if(*save_str) **save_str = '\0';
|
||||
return str;
|
||||
}
|
||||
|
||||
static int vk_init(struct ev *e)
|
||||
{
|
||||
char vk_path[PATH_MAX] = "/sys/board_properties/virtualkeys.";
|
||||
char vks[2048], *ts;
|
||||
ssize_t len;
|
||||
int vk_fd;
|
||||
int i;
|
||||
|
||||
e->vk_count = 0;
|
||||
|
||||
len = strlen(vk_path);
|
||||
len = ioctl(e->fd->fd, EVIOCGNAME(sizeof(vk_path) - len), vk_path + len);
|
||||
if (len <= 0)
|
||||
return -1;
|
||||
|
||||
vk_fd = open(vk_path, O_RDONLY);
|
||||
if (vk_fd < 0)
|
||||
return -1;
|
||||
|
||||
len = read(vk_fd, vks, sizeof(vks)-1);
|
||||
close(vk_fd);
|
||||
if (len <= 0)
|
||||
return -1;
|
||||
|
||||
vks[len] = '\0';
|
||||
|
||||
/* Parse a line like:
|
||||
keytype:keycode:centerx:centery:width:height:keytype2:keycode2:centerx2:...
|
||||
*/
|
||||
for (ts = vks, e->vk_count = 1; *ts; ++ts) {
|
||||
if (*ts == ':')
|
||||
++e->vk_count;
|
||||
}
|
||||
|
||||
if (e->vk_count % 6) {
|
||||
LOGW("minui: %s is %d %% 6\n", vk_path, e->vk_count % 6);
|
||||
}
|
||||
e->vk_count /= 6;
|
||||
if (e->vk_count <= 0)
|
||||
return -1;
|
||||
|
||||
e->down = DOWN_NOT;
|
||||
|
||||
ioctl(e->fd->fd, EVIOCGABS(ABS_X), &e->p.xi);
|
||||
ioctl(e->fd->fd, EVIOCGABS(ABS_Y), &e->p.yi);
|
||||
e->p.synced = 0;
|
||||
|
||||
ioctl(e->fd->fd, EVIOCGABS(ABS_MT_POSITION_X), &e->mt_p.xi);
|
||||
ioctl(e->fd->fd, EVIOCGABS(ABS_MT_POSITION_Y), &e->mt_p.yi);
|
||||
e->mt_p.synced = 0;
|
||||
|
||||
e->vks = malloc(sizeof(*e->vks) * e->vk_count);
|
||||
|
||||
for (i = 0; i < e->vk_count; ++i) {
|
||||
char *token[6];
|
||||
int j;
|
||||
|
||||
for (j = 0; j < 6; ++j) {
|
||||
token[j] = vk_strtok_r((i||j)?NULL:vks, ":", &ts);
|
||||
}
|
||||
|
||||
if (strcmp(token[0], "0x01") != 0) {
|
||||
/* Java does string compare, so we do too. */
|
||||
LOGW("minui: %s: ignoring unknown virtual key type %s\n", vk_path, token[0]);
|
||||
continue;
|
||||
}
|
||||
|
||||
e->vks[i].scancode = strtol(token[1], NULL, 0);
|
||||
e->vks[i].centerx = strtol(token[2], NULL, 0);
|
||||
e->vks[i].centery = strtol(token[3], NULL, 0);
|
||||
e->vks[i].width = strtol(token[4], NULL, 0);
|
||||
e->vks[i].height = strtol(token[5], NULL, 0);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ev_init(void)
|
||||
{
|
||||
DIR *dir;
|
||||
@ -45,6 +170,11 @@ int ev_init(void)
|
||||
|
||||
ev_fds[ev_count].fd = fd;
|
||||
ev_fds[ev_count].events = POLLIN;
|
||||
evs[ev_count].fd = &ev_fds[ev_count];
|
||||
|
||||
/* Load virtualkeys if there are any */
|
||||
vk_init(&evs[ev_count]);
|
||||
|
||||
ev_count++;
|
||||
if(ev_count == MAX_DEVICES) break;
|
||||
}
|
||||
@ -55,11 +185,128 @@ int ev_init(void)
|
||||
|
||||
void ev_exit(void)
|
||||
{
|
||||
while (ev_count > 0) {
|
||||
close(ev_fds[--ev_count].fd);
|
||||
while (ev_count-- > 0) {
|
||||
if (evs[ev_count].vk_count) {
|
||||
free(evs[ev_count].vks);
|
||||
evs[ev_count].vk_count = 0;
|
||||
}
|
||||
close(ev_fds[ev_count].fd);
|
||||
}
|
||||
}
|
||||
|
||||
static int vk_inside_display(__s32 value, struct input_absinfo *info, int screen_size)
|
||||
{
|
||||
int screen_pos;
|
||||
|
||||
if (info->minimum == info->maximum)
|
||||
return 0;
|
||||
|
||||
screen_pos = (value - info->minimum) * (screen_size - 1) / (info->maximum - info->minimum);
|
||||
return (screen_pos >= 0 && screen_pos < screen_size);
|
||||
}
|
||||
|
||||
static int vk_tp_to_screen(struct position *p, int *x, int *y)
|
||||
{
|
||||
if (p->xi.minimum == p->xi.maximum || p->yi.minimum == p->yi.maximum)
|
||||
return 0;
|
||||
|
||||
*x = (p->x - p->xi.minimum) * (gr_fb_width() - 1) / (p->xi.maximum - p->xi.minimum);
|
||||
*y = (p->y - p->yi.minimum) * (gr_fb_height() - 1) / (p->yi.maximum - p->yi.minimum);
|
||||
|
||||
if (*x >= 0 && *x < gr_fb_width() &&
|
||||
*y >= 0 && *y < gr_fb_height()) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Translate a virtual key in to a real key event, if needed */
|
||||
/* Returns non-zero when the event should be consumed */
|
||||
static int vk_modify(struct ev *e, struct input_event *ev)
|
||||
{
|
||||
int i;
|
||||
int x, y;
|
||||
|
||||
if (ev->type == EV_KEY) {
|
||||
if (ev->code == BTN_TOUCH && !ev->value)
|
||||
e->down = DOWN_RELEASED;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ev->type == EV_ABS) {
|
||||
switch (ev->code) {
|
||||
case ABS_X:
|
||||
e->p.synced = 1;
|
||||
e->p.x = ev->value;
|
||||
return !vk_inside_display(e->p.x, &e->p.xi, gr_fb_width());
|
||||
case ABS_Y:
|
||||
e->p.synced = 1;
|
||||
e->p.y = ev->value;
|
||||
return !vk_inside_display(e->p.y, &e->p.yi, gr_fb_height());
|
||||
case ABS_MT_POSITION_X:
|
||||
if (e->mt_p.synced & 2) return 1;
|
||||
e->mt_p.synced = 1;
|
||||
e->mt_p.x = ev->value;
|
||||
return !vk_inside_display(e->mt_p.x, &e->mt_p.xi, gr_fb_width());
|
||||
case ABS_MT_POSITION_Y:
|
||||
if (e->mt_p.synced & 2) return 1;
|
||||
e->mt_p.synced = 1;
|
||||
e->mt_p.y = ev->value;
|
||||
return !vk_inside_display(e->mt_p.y, &e->mt_p.yi, gr_fb_height());
|
||||
case ABS_MT_TOUCH_MAJOR:
|
||||
if (e->mt_p.synced & 2) return 1;
|
||||
if (!ev->value) e->down = DOWN_RELEASED;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ev->type != EV_SYN)
|
||||
return 0;
|
||||
|
||||
if (ev->code == SYN_MT_REPORT) {
|
||||
/* Ignore the rest of the points */
|
||||
e->mt_p.synced |= 2;
|
||||
return 0;
|
||||
}
|
||||
if (ev->code != SYN_REPORT)
|
||||
return 0;
|
||||
|
||||
if (e->down == DOWN_RELEASED) {
|
||||
e->down = DOWN_NOT;
|
||||
/* TODO: Send emulated key release? */
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!(e->p.synced && vk_tp_to_screen(&e->p, &x, &y)) &&
|
||||
!((e->mt_p.synced & 1) && vk_tp_to_screen(&e->mt_p, &x, &y))) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
e->p.synced = e->mt_p.synced = 0;
|
||||
|
||||
if (e->down)
|
||||
return 1;
|
||||
|
||||
for (i = 0; i < e->vk_count; ++i) {
|
||||
int xd = ABS(e->vks[i].centerx - x);
|
||||
int yd = ABS(e->vks[i].centery - y);
|
||||
if (xd < e->vks[i].width/2 && yd < e->vks[i].height/2) {
|
||||
/* Fake a key event */
|
||||
e->down = DOWN_SENT;
|
||||
|
||||
ev->type = EV_KEY;
|
||||
ev->code = e->vks[i].scancode;
|
||||
ev->value = 1;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ev_get(struct input_event *ev, unsigned dont_wait)
|
||||
{
|
||||
int r;
|
||||
@ -72,7 +319,10 @@ int ev_get(struct input_event *ev, unsigned dont_wait)
|
||||
for(n = 0; n < ev_count; n++) {
|
||||
if(ev_fds[n].revents & POLLIN) {
|
||||
r = read(ev_fds[n].fd, ev, sizeof(*ev));
|
||||
if(r == sizeof(*ev)) return 0;
|
||||
if(r == sizeof(*ev)) {
|
||||
if (!vk_modify(&evs[n], ev))
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user