PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ev_iterate_available_keys to minui."

Browse Source
This commit is contained in:
Elliott Hughes
2015-04-10 16:58:48 +00:00
committed by Gerrit Code Review
parent f471861e83 0713819fd2
commit 18eaa0cfe7
3 changed files with 125 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minui/Android.mk
+7 -2
View File
@@ -1,14 +1,19 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := graphics.c graphics_adf.c graphics_fbdev.c events.c resources.c LOCAL_SRC_FILES := \
events.cpp \
graphics.c \
graphics_adf.c \
graphics_fbdev.c \
resources.c \
LOCAL_WHOLE_STATIC_LIBRARIES += libadf LOCAL_WHOLE_STATIC_LIBRARIES += libadf
LOCAL_STATIC_LIBRARIES += libpng LOCAL_STATIC_LIBRARIES += libpng
LOCAL_MODULE := libminui LOCAL_MODULE := libminui
LOCAL_CFLAGS := -std=gnu11 LOCAL_CLANG := true
# This used to compare against values in double-quotes (which are just # This used to compare against values in double-quotes (which are just
# ordinary characters in this context). Strip double-quotes from the # ordinary characters in this context). Strip double-quotes from the
minui/events.c → minui/events.cpp
+97 -79
View File
@@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
#include <dirent.h>
#include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <unistd.h>
#include <linux/input.h> #include <linux/input.h>
@@ -32,16 +32,13 @@
#define BITS_PER_LONG (sizeof(unsigned long) * 8) #define BITS_PER_LONG (sizeof(unsigned long) * 8)
#define BITS_TO_LONGS(x) (((x) + BITS_PER_LONG - 1) / BITS_PER_LONG) #define BITS_TO_LONGS(x) (((x) + BITS_PER_LONG - 1) / BITS_PER_LONG)
#define test_bit(bit, array) \
((array)[(bit)/BITS_PER_LONG] & (1 << ((bit) % BITS_PER_LONG)))
struct fd_info { struct fd_info {
int fd; int fd;
ev_callback cb; ev_callback cb;
void *data; void* data;
}; };
static int epollfd; static int g_epoll_fd;
static struct epoll_event polledevents[MAX_DEVICES + MAX_MISC_FDS]; static struct epoll_event polledevents[MAX_DEVICES + MAX_MISC_FDS];
static int npolledevents; static int npolledevents;
@@ -51,44 +48,45 @@ static unsigned ev_count = 0;
static unsigned ev_dev_count = 0; static unsigned ev_dev_count = 0;
static unsigned ev_misc_count = 0; static unsigned ev_misc_count = 0;
int ev_init(ev_callback input_cb, void *data) static bool test_bit(size_t bit, unsigned long* array) {
{ return (array[bit/BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG))) != 0;
DIR *dir; }
struct dirent *de;
int fd; int ev_init(ev_callback input_cb, void* data) {
struct epoll_event ev;
bool epollctlfail = false; bool epollctlfail = false;
epollfd = epoll_create(MAX_DEVICES + MAX_MISC_FDS); g_epoll_fd = epoll_create(MAX_DEVICES + MAX_MISC_FDS);
if (epollfd == -1) if (g_epoll_fd == -1) {
return -1; return -1;
}
dir = opendir("/dev/input"); DIR* dir = opendir("/dev/input");
if(dir != 0) { if (dir != NULL) {
while((de = readdir(dir))) { struct dirent* de;
while ((de = readdir(dir))) {
unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)];
// fprintf(stderr,"/dev/input/%s\n", de->d_name); // fprintf(stderr,"/dev/input/%s\n", de->d_name);
if(strncmp(de->d_name,"event",5)) continue; if (strncmp(de->d_name, "event", 5)) continue;
fd = openat(dirfd(dir), de->d_name, O_RDONLY); int fd = openat(dirfd(dir), de->d_name, O_RDONLY);
if(fd < 0) continue; if (fd == -1) continue;
/* read the evbits of the input device */ // Read the evbits of the input device.
if (ioctl(fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) < 0) { if (ioctl(fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) {
close(fd); close(fd);
continue; continue;
} }
/* TODO: add ability to specify event masks. For now, just assume // We assume that only EV_KEY, EV_REL, and EV_SW event types are ever needed.
* that only EV_KEY, EV_REL & EV_SW event types are ever needed. */
if (!test_bit(EV_KEY, ev_bits) && !test_bit(EV_REL, ev_bits) && !test_bit(EV_SW, ev_bits)) { if (!test_bit(EV_KEY, ev_bits) && !test_bit(EV_REL, ev_bits) && !test_bit(EV_SW, ev_bits)) {
close(fd); close(fd);
continue; continue;
} }
struct epoll_event ev;
ev.events = EPOLLIN | EPOLLWAKEUP; ev.events = EPOLLIN | EPOLLWAKEUP;
ev.data.ptr = (void *)&ev_fdinfo[ev_count]; ev.data.ptr = &ev_fdinfo[ev_count];
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev)) { if (epoll_ctl(g_epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) {
close(fd); close(fd);
epollctlfail = true; epollctlfail = true;
continue; continue;
@@ -99,30 +97,34 @@ int ev_init(ev_callback input_cb, void *data)
ev_fdinfo[ev_count].data = data; ev_fdinfo[ev_count].data = data;
ev_count++; ev_count++;
ev_dev_count++; ev_dev_count++;
if(ev_dev_count == MAX_DEVICES) break; if (ev_dev_count == MAX_DEVICES) break;
} }
closedir(dir);
} }
if (epollctlfail && !ev_count) { if (epollctlfail && !ev_count) {
close(epollfd); close(g_epoll_fd);
epollfd = -1; g_epoll_fd = -1;
return -1; return -1;
} }
return 0; return 0;
} }
int ev_add_fd(int fd, ev_callback cb, void *data) int ev_get_epollfd(void) {
{ return g_epoll_fd;
struct epoll_event ev; }
int ret;
if (ev_misc_count == MAX_MISC_FDS || cb == NULL) int ev_add_fd(int fd, ev_callback cb, void* data) {
if (ev_misc_count == MAX_MISC_FDS || cb == NULL) {
return -1; return -1;
}
struct epoll_event ev;
ev.events = EPOLLIN | EPOLLWAKEUP; ev.events = EPOLLIN | EPOLLWAKEUP;
ev.data.ptr = (void *)&ev_fdinfo[ev_count]; ev.data.ptr = (void *)&ev_fdinfo[ev_count];
ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev); int ret = epoll_ctl(g_epoll_fd, EPOLL_CTL_ADD, fd, &ev);
if (!ret) { if (!ret) {
ev_fdinfo[ev_count].fd = fd; ev_fdinfo[ev_count].fd = fd;
ev_fdinfo[ev_count].cb = cb; ev_fdinfo[ev_count].cb = cb;
@@ -134,80 +136,96 @@ int ev_add_fd(int fd, ev_callback cb, void *data)
return ret; return ret;
} }
int ev_get_epollfd(void) void ev_exit(void) {
{
return epollfd;
}
void ev_exit(void)
{
while (ev_count > 0) { while (ev_count > 0) {
close(ev_fdinfo[--ev_count].fd); close(ev_fdinfo[--ev_count].fd);
} }
ev_misc_count = 0; ev_misc_count = 0;
ev_dev_count = 0; ev_dev_count = 0;
close(epollfd); close(g_epoll_fd);
} }
int ev_wait(int timeout) int ev_wait(int timeout) {
{ npolledevents = epoll_wait(g_epoll_fd, polledevents, ev_count, timeout);
npolledevents = epoll_wait(epollfd, polledevents, ev_count, timeout); if (npolledevents <= 0) {
if (npolledevents <= 0)
return -1; return -1;
}
return 0; return 0;
} }
void ev_dispatch(void) void ev_dispatch(void) {
{ for (int n = 0; n < npolledevents; n++) {
int n; fd_info* fdi = reinterpret_cast<fd_info*>(polledevents[n].data.ptr);
int ret;
for (n = 0; n < npolledevents; n++) {
struct fd_info *fdi = polledevents[n].data.ptr;
ev_callback cb = fdi->cb; ev_callback cb = fdi->cb;
if (cb) if (cb) {
cb(fdi->fd, polledevents[n].events, fdi->data); cb(fdi->fd, polledevents[n].events, fdi->data);
}
} }
} }
int ev_get_input(int fd, uint32_t epevents, struct input_event *ev) int ev_get_input(int fd, uint32_t epevents, struct input_event* ev) {
{
int r;
if (epevents & EPOLLIN) { if (epevents & EPOLLIN) {
r = read(fd, ev, sizeof(*ev)); ssize_t r = read(fd, ev, sizeof(*ev));
if (r == sizeof(*ev)) if (r == sizeof(*ev)) {
return 0; return 0;
}
} }
return -1; return -1;
} }
int ev_sync_key_state(ev_set_key_callback set_key_cb, void *data) int ev_sync_key_state(ev_set_key_callback set_key_cb, void* data) {
{
unsigned long key_bits[BITS_TO_LONGS(KEY_MAX)];
unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)];
unsigned i; unsigned long key_bits[BITS_TO_LONGS(KEY_MAX)];
int ret;
for (i = 0; i < ev_dev_count; i++) { for (size_t i = 0; i < ev_dev_count; ++i) {
int code;
memset(key_bits, 0, sizeof(key_bits));
memset(ev_bits, 0, sizeof(ev_bits)); memset(ev_bits, 0, sizeof(ev_bits));
memset(key_bits, 0, sizeof(key_bits));
ret = ioctl(ev_fdinfo[i].fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits); if (ioctl(ev_fdinfo[i].fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) {
if (ret < 0 || !test_bit(EV_KEY, ev_bits))
continue; continue;
}
ret = ioctl(ev_fdinfo[i].fd, EVIOCGKEY(sizeof(key_bits)), key_bits); if (!test_bit(EV_KEY, ev_bits)) {
if (ret < 0)
continue; continue;
}
if (ioctl(ev_fdinfo[i].fd, EVIOCGKEY(sizeof(key_bits)), key_bits) == -1) {
continue;
}
for (code = 0; code <= KEY_MAX; code++) { for (int code = 0; code <= KEY_MAX; code++) {
if (test_bit(code, key_bits)) if (test_bit(code, key_bits)) {
set_key_cb(code, 1, data); set_key_cb(code, 1, data);
}
} }
} }
return 0; return 0;
} }
void ev_iterate_available_keys(ev_key_callback cb, void* data) {
unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)];
unsigned long key_bits[BITS_TO_LONGS(KEY_MAX)];
for (size_t i = 0; i < ev_dev_count; ++i) {
memset(ev_bits, 0, sizeof(ev_bits));
memset(key_bits, 0, sizeof(key_bits));
// Does this device even have keys?
if (ioctl(ev_fdinfo[i].fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits) == -1) {
continue;
}
if (!test_bit(EV_KEY, ev_bits)) {
continue;
}
int rc = ioctl(ev_fdinfo[i].fd, EVIOCGBIT(EV_KEY, KEY_MAX), key_bits);
if (rc == -1) {
continue;
}
for (int key_code = 0; key_code <= KEY_MAX; ++key_code) {
if (test_bit(key_code, key_bits)) {
cb(key_code, data);
}
}
}
}
minui/minui.h
+21 -12
View File
@@ -25,6 +25,10 @@
extern "C" { extern "C" {
#endif #endif
//
// Graphics.
//
typedef struct { typedef struct {
int width; int width;
int height; int height;
@@ -56,30 +60,35 @@ void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy);
unsigned int gr_get_width(gr_surface surface); unsigned int gr_get_width(gr_surface surface);
unsigned int gr_get_height(gr_surface surface); unsigned int gr_get_height(gr_surface surface);
// input event structure, include <linux/input.h> for the definition. //
// see http://www.mjmwired.net/kernel/Documentation/input/ for info. // Input events.
//
struct input_event; struct input_event;
typedef int (*ev_callback)(int fd, uint32_t epevents, void *data); typedef int (*ev_callback)(int fd, uint32_t epevents, void* data);
typedef int (*ev_set_key_callback)(int code, int value, void *data); typedef int (*ev_set_key_callback)(int code, int value, void* data);
typedef void (*ev_key_callback)(int code, void* data);
int ev_init(ev_callback input_cb, void *data); int ev_init(ev_callback input_cb, void* data);
void ev_exit(void); void ev_exit(void);
int ev_add_fd(int fd, ev_callback cb, void *data); int ev_add_fd(int fd, ev_callback cb, void* data);
int ev_sync_key_state(ev_set_key_callback set_key_cb, void *data); int ev_sync_key_state(ev_set_key_callback set_key_cb, void* data);
void ev_iterate_available_keys(ev_key_callback cb, void* data);
/* timeout has the same semantics as for poll // 'timeout' has the same semantics as poll(2).
* 0 : don't block // 0 : don't block
* < 0 : block forever // < 0 : block forever
* > 0 : block for 'timeout' milliseconds // > 0 : block for 'timeout' milliseconds
*/
int ev_wait(int timeout); int ev_wait(int timeout);
int ev_get_input(int fd, uint32_t epevents, struct input_event *ev); int ev_get_input(int fd, uint32_t epevents, struct input_event *ev);
void ev_dispatch(void); void ev_dispatch(void);
int ev_get_epollfd(void); int ev_get_epollfd(void);
//
// Resources // Resources
//
// res_create_*_surface() functions return 0 if no error, else // res_create_*_surface() functions return 0 if no error, else
// negative. // negative.