TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

input: fixes for older Android API levels (thanks to pmp-p)

Browse Source
This commit is contained in:
rdb 2018-02-04 10:58:36 +01:00
parent fb32b96456
commit 9e6d0d91ad
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
panda/src/device/evdevInputDevice.cxx
View File

@ -23,6 +23,15 @@
#include <fcntl.h> #include <fcntl.h>
#include <linux/input.h> #include <linux/input.h>
// Android introduces these in API level 21.
#ifndef BTN_TRIGGER_HAPPY
#define BTN_TRIGGER_HAPPY 0x2c0
#define BTN_TRIGGER_HAPPY1 0x2c0
#define BTN_TRIGGER_HAPPY2 0x2c1
#define BTN_TRIGGER_HAPPY3 0x2c2
#define BTN_TRIGGER_HAPPY4 0x2c3
#endif
#define test_bit(bit, array) ((array)[(bit)>>3] & (1<<((bit)&7))) #define test_bit(bit, array) ((array)[(bit)>>3] & (1<<((bit)&7)))
enum QuirkBits { enum QuirkBits {
@ -220,7 +229,7 @@ init_device() {
LightMutexHolder holder(_lock); LightMutexHolder holder(_lock);
uint8_t evtypes[(EV_CNT + 7) >> 3]; uint8_t evtypes[(EV_MAX + 8) >> 3];
memset(evtypes, 0, sizeof(evtypes)); memset(evtypes, 0, sizeof(evtypes));
char name[128]; char name[128];
if (ioctl(_fd, EVIOCGNAME(sizeof(name)), name) < 0 || if (ioctl(_fd, EVIOCGNAME(sizeof(name)), name) < 0 ||
@ -248,7 +257,7 @@ init_device() {
bool has_keys = false; bool has_keys = false;
bool has_axes = false; bool has_axes = false;
uint8_t keys[(KEY_CNT + 7) >> 3]; uint8_t keys[(KEY_MAX + 8) >> 3];
if (test_bit(EV_KEY, evtypes)) { if (test_bit(EV_KEY, evtypes)) {
// Check which buttons are on the device. // Check which buttons are on the device.
memset(keys, 0, sizeof(keys)); memset(keys, 0, sizeof(keys));
@ -261,7 +270,7 @@ init_device() {
} }
int num_bits = 0; int num_bits = 0;
uint8_t axes[(ABS_CNT + 7) >> 3]; uint8_t axes[(ABS_MAX + 8) >> 3];
if (test_bit(EV_ABS, evtypes)) { if (test_bit(EV_ABS, evtypes)) {
// Check which axes are on the device. // Check which axes are on the device.
memset(axes, 0, sizeof(axes)); memset(axes, 0, sizeof(axes));
@ -355,11 +364,11 @@ init_device() {
if (has_keys) { if (has_keys) {
// Also check whether the buttons are currently pressed. // Also check whether the buttons are currently pressed.
uint8_t states[(KEY_CNT + 7) >> 3]; uint8_t states[(KEY_MAX + 8) >> 3];
memset(states, 0, sizeof(states)); memset(states, 0, sizeof(states));
ioctl(_fd, EVIOCGKEY(sizeof(states)), states); ioctl(_fd, EVIOCGKEY(sizeof(states)), states);
for (int i = 0; i < KEY_CNT; ++i) { for (int i = 0; i <= KEY_MAX; ++i) {
if (test_bit(i, keys)) { if (test_bit(i, keys)) {
ButtonState button; ButtonState button;
button.handle = map_button(i, _device_class); button.handle = map_button(i, _device_class);
@ -546,7 +555,7 @@ init_device() {
} }
if (test_bit(EV_FF, evtypes)) { if (test_bit(EV_FF, evtypes)) {
uint8_t effects[(FF_CNT + 7) >> 3]; uint8_t effects[(FF_MAX + 8) >> 3];
memset(effects, 0, sizeof(effects)); memset(effects, 0, sizeof(effects));
ioctl(_fd, EVIOCGBIT(EV_FF, sizeof(effects)), effects); ioctl(_fd, EVIOCGBIT(EV_FF, sizeof(effects)), effects);

5
panda/src/device/linuxInputDeviceManager.cxx
View File

@ -32,7 +32,12 @@
LinuxInputDeviceManager:: LinuxInputDeviceManager::
LinuxInputDeviceManager() { LinuxInputDeviceManager() {
// Use inotify to watch /dev/input for hotplugging of devices. // Use inotify to watch /dev/input for hotplugging of devices.
#if !defined(__ANDROID_API__) || __ANDROID_API__ >= 21
_inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC); _inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
#else
_inotify_fd = inotify_init();
fcntl(_inotify_fd, O_NONBLOCK | O_CLOEXEC);
#endif
if (_inotify_fd < 0) { if (_inotify_fd < 0) {
device_cat.error() device_cat.error()