demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[linuxinput] Handle all kinds of buttons (#10730)

Browse Source 
Previously only the basic keyboard buttons where handled.
Now all buttons known to Linux, or rather libevdev are reported.

Reported-in: https://community.openhab.org/t/linuxinput-binding-and-mouse-capture/122612
Reported-in: https://github.com/t-8ch/binding-linuxinput/issues/5

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
This commit is contained in:
Thomas Weißschuh 2021-05-23 21:03:14 +02:00 committed by GitHub
parent 66a540289d
commit e2fa4ba49e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/evdev4j/EvdevDevice.java
View File

@ -189,7 +189,7 @@ public class EvdevDevice implements Closeable {
public Collection<Key> enumerateKeys() { public Collection<Key> enumerateKeys() {
int minKey = 0; int minKey = 0;
int maxKey = 255 - 1; int maxKey = lib.event_type_get_max(EvdevLibrary.Type.KEY.intValue());
List<Key> result = new ArrayList<>(); List<Key> result = new ArrayList<>();
for (int i = minKey; i <= maxKey; i++) { for (int i = minKey; i <= maxKey; i++) {
if (has(EvdevLibrary.Type.KEY, i)) { if (has(EvdevLibrary.Type.KEY, i)) {
@ -215,6 +215,11 @@ public class EvdevDevice implements Closeable {
public String getName() { public String getName() {
return lib.event_code_get_name(EvdevLibrary.Type.KEY.intValue(), code); return lib.event_code_get_name(EvdevLibrary.Type.KEY.intValue(), code);
} }
@Override
public String toString() {
return String.valueOf(code);
}
} }
public static class InputEvent { public static class InputEvent {

2
bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/evdev4j/jnr/EvdevLibrary.java
View File

@ -98,6 +98,8 @@ public interface EvdevLibrary {
int enable_event_type(@In Handle handle, int type); int enable_event_type(@In Handle handle, int type);
int event_type_get_max(int type);
int disable_event_type(@In Handle handle, int type); int disable_event_type(@In Handle handle, int type);
boolean has_event_code(@In Handle handle, int type, int code); boolean has_event_code(@In Handle handle, int type, int code);