Skip to content

Some tweaks to device type detection algorithm #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Some tweaks to device type detection algorithm #21

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6465894
Tag absolute mouses used in many VMs as IT_MOUSE
wulf7 Apr 3, 2021
1ebb5eb
Do gamepad detection according to 'Linux Gamepad Specification' [1]
wulf7 Apr 3, 2021
49da1ec
Add support for generic joysticks handled by hgame(4) driver.
wulf7 Apr 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions udev-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ create_evdev_handler(struct udev_device *ud)
int fd = -1, input_type = IT_NONE;
size_t len;
bool opened = false;
bool has_keys, has_buttons, has_lmr;
bool has_keys, has_buttons, has_lmr, has_dpad, has_joy_axes;
bool has_rel_axes, has_abs_axes, has_mt, has_switches;
unsigned long key_bits[NLONGS(KEY_CNT)];
unsigned long rel_bits[NLONGS(REL_CNT)];
Expand Down Expand Up @@ -402,6 +402,8 @@ create_evdev_handler(struct udev_device *ud)
has_keys = bit_find(key_bits, 0, BTN_MISC);
has_buttons = bit_find(key_bits, BTN_MISC, BTN_JOYSTICK);
has_lmr = bit_find(key_bits, BTN_LEFT, BTN_MIDDLE + 1);
has_dpad = bit_find(key_bits, BTN_DPAD_UP, BTN_DPAD_RIGHT + 1);
has_joy_axes = bit_find(abs_bits, ABS_RX, ABS_HAT3Y + 1);
has_rel_axes = bit_find(rel_bits, 0, REL_CNT);
has_abs_axes = bit_find(abs_bits, 0, ABS_CNT);
has_switches = bit_find(sw_bits, 0, SW_CNT);
Expand All @@ -424,10 +426,18 @@ create_evdev_handler(struct udev_device *ud)
bit_is_set(key_bits, BTN_STYLUS2)) {
input_type = IT_TABLET;
goto detected;
} else if (bit_is_set(key_bits, BTN_SELECT) ||
bit_is_set(key_bits, BTN_START) ||
bit_is_set(key_bits, BTN_TL) ||
bit_is_set(key_bits, BTN_TR)) {
} else if (has_joy_axes ||
bit_is_set(key_bits, BTN_JOYSTICK)) {
/* Device is a joystick */
input_type = IT_JOYSTICK;
goto detected;
} else if (bit_is_set(key_bits, BTN_SOUTH) ||
has_dpad ||
bit_is_set(abs_bits, ABS_HAT0X) ||
bit_is_set(abs_bits, ABS_HAT0Y) ||
bit_is_set(key_bits, BTN_THUMBL) ||
bit_is_set(key_bits, BTN_THUMBR)) {
/* Device is a gamepad */
input_type = IT_JOYSTICK;
goto detected;
} else if (bit_is_set(abs_bits, ABS_PRESSURE) ||
Expand All @@ -442,8 +452,7 @@ create_evdev_handler(struct udev_device *ud)
} else if (!(bit_is_set(rel_bits, REL_X) &&
bit_is_set(rel_bits, REL_Y)) &&
has_lmr) {
/* some touchscreens use BTN_LEFT rather than BTN_TOUCH */
input_type = IT_TOUCHSCREEN;
input_type = IT_MOUSE;
goto detected;
}
}
Expand Down