evdev 1.8.0__tar.gz → 1.9.0__tar.gz

{evdev-1.8.0 → evdev-1.9.0}/MANIFEST.in

@@ -1,5 +1,5 @@
 # The _ecodes extension module source file needs to be generated against the
 # evdev headers of the running kernel. Refer to the 'build_ecodes' distutils
 # command in setup.py.
-exclude evdev/ecodes.c
-include evdev/ecodes.py
+exclude src/evdev/ecodes.c
+include src/evdev/ecodes.py

{evdev-1.8.0/evdev.egg-info → evdev-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: evdev
-Version: 1.8.0
+Version: 1.9.0
 Summary: Bindings to the Linux input handling subsystem
 Author-email: Georgi Valkov <georgi.t.valkov@gmail.com>
 Maintainer-email: Tobi <proxima@sezanzeb.de>

{evdev-1.8.0 → evdev-1.9.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "evdev"
-version = "1.8.0"
+version = "1.9.0"
 description = "Bindings to the Linux input handling subsystem"
 keywords = ["evdev", "input", "uinput"]
 readme = "README.md"
@@ -29,9 +29,6 @@ classifiers = [
 [project.urls]
 "Homepage" = "https://github.com/gvalkov/python-evdev"
 
-[tool.setuptools]
-packages = ["evdev"]
-
 [tool.ruff]
 line-length = 120
 
@@ -39,7 +36,7 @@ line-length = 120
 ignore = ["E265", "E241", "F403", "F401", "E401", "E731"]
 
 [tool.bumpversion]
-current_version = "1.8.0"
+current_version = "1.9.0"
 commit = true
 tag = true
 allow_dirty = true

{evdev-1.8.0 → evdev-1.9.0}/setup.py

@@ -2,6 +2,7 @@ import os
 import sys
 import shutil
 import textwrap
+import platform
 from pathlib import Path
 from subprocess import run
 
@@ -10,7 +11,7 @@ from setuptools.command import build_ext as _build_ext
 
 
 curdir = Path(__file__).resolve().parent
-ecodes_c_path = curdir / "evdev/ecodes.c"
+ecodes_c_path = curdir / "src/evdev/ecodes.c"
 
 
 def create_ecodes(headers=None):
@@ -25,7 +26,11 @@ def create_ecodes(headers=None):
             include_paths.update(c_inc_path.split(":"))
 
         include_paths.add("/usr/include")
-        files = ["linux/input.h", "linux/input-event-codes.h", "linux/uinput.h"]
+        if platform.system().lower() == "freebsd":
+            files = ["dev/evdev/input.h", "dev/evdev/input-event-codes.h", "dev/evdev/uinput.h"]
+        else:
+            files = ["linux/input.h", "linux/input-event-codes.h", "linux/uinput.h"]
+
         headers = [os.path.join(path, file) for path in include_paths for file in files]
 
     headers = [header for header in headers if os.path.isfile(header)]
@@ -60,7 +65,7 @@ def create_ecodes(headers=None):
 
     print("writing %s (using %s)" % (ecodes_c_path, " ".join(headers)))
     with ecodes_c_path.open("w") as fh:
-        cmd = [sys.executable, "evdev/genecodes_c.py", "--ecodes", *headers]
+        cmd = [sys.executable, "src/evdev/genecodes_c.py", "--ecodes", *headers]
         run(cmd, check=True, stdout=fh)
 
 
@@ -93,12 +98,12 @@ class build_ext(_build_ext.build_ext):
         ecodes_py = Path(self.build_lib) / "evdev/ecodes.py"
         print(f"writing {ecodes_py}")
         with ecodes_py.open("w") as fh:
-            cmd = [sys.executable, "-B", "evdev/genecodes_py.py"]
+            cmd = [sys.executable, "-B", "src/evdev/genecodes_py.py"]
             res = run(cmd, env={"PYTHONPATH": self.build_lib}, stdout=fh)
 
         if res.returncode != 0:
             print(f"failed to generate static {ecodes_py} - will use ecodes_runtime.py")
-            shutil.copy("evdev/ecodes_runtime.py", ecodes_py)
+            shutil.copy("src/evdev/ecodes_runtime.py", ecodes_py)
 
     def run(self):
         for cmd_name in self.get_sub_commands():
@@ -112,9 +117,9 @@ class build_ext(_build_ext.build_ext):
 cflags = ["-std=c99", "-Wno-error=declaration-after-statement"]
 setup(
     ext_modules=[
-        Extension("evdev._input", sources=["evdev/input.c"], extra_compile_args=cflags),
-        Extension("evdev._uinput", sources=["evdev/uinput.c"], extra_compile_args=cflags),
-        Extension("evdev._ecodes", sources=["evdev/ecodes.c"], extra_compile_args=cflags),
+        Extension("evdev._input", sources=["src/evdev/input.c"], extra_compile_args=cflags),
+        Extension("evdev._uinput", sources=["src/evdev/uinput.c"], extra_compile_args=cflags),
+        Extension("evdev._ecodes", sources=["src/evdev/ecodes.c"], extra_compile_args=cflags),
     ],
     cmdclass={
         "build_ext": build_ext,

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/device.py

@@ -1,9 +1,6 @@
-# encoding: utf-8
-
-import collections
 import contextlib
 import os
-import warnings
+from typing import NamedTuple, Tuple, Union
 
 from . import _input, ecodes, util
 
@@ -13,18 +10,10 @@ except ImportError:
     from .eventio import EvdevError, EventIO
 
 
-# --------------------------------------------------------------------------
-_AbsInfo = collections.namedtuple("AbsInfo", ["value", "min", "max", "fuzz", "flat", "resolution"])
-
-_KbdInfo = collections.namedtuple("KbdInfo", ["delay", "repeat"])
-
-_DeviceInfo = collections.namedtuple("DeviceInfo", ["bustype", "vendor", "product", "version"])
-
-
-class AbsInfo(_AbsInfo):
+class AbsInfo(NamedTuple):
     """Absolute axis information.
 
-    A ``namedtuple`` used for storing absolute axis information -
+    A ``namedtuple`` with absolute axis information -
     corresponds to the ``input_absinfo`` struct:
 
     Attributes
@@ -60,11 +49,18 @@ class AbsInfo(_AbsInfo):
 
     """
 
+    value: int
+    min: int
+    max: int
+    fuzz: int
+    flat: int
+    resolution: int
+
     def __str__(self):
-        return "val {}, min {}, max {}, fuzz {}, flat {}, res {}".format(*self)
+        return "value {}, min {}, max {}, fuzz {}, flat {}, res {}".format(*self)  # pylint: disable=not-an-iterable
 
 
-class KbdInfo(_KbdInfo):
+class KbdInfo(NamedTuple):
     """Keyboard repeat rate.
 
     Attributes
@@ -77,11 +73,14 @@ class KbdInfo(_KbdInfo):
       Keyboard repeat rate in characters per second.
     """
 
+    delay: int
+    repeat: int
+
     def __str__(self):
-        return "delay {}, repeat {}".format(*self)
+        return "delay {}, repeat {}".format(self.delay, self.repeat)
 
 
-class DeviceInfo(_DeviceInfo):
+class DeviceInfo(NamedTuple):
     """
     Attributes
     ----------
@@ -91,9 +90,14 @@ class DeviceInfo(_DeviceInfo):
     version
     """
 
+    bustype: int
+    vendor: int
+    product: int
+    version: int
+
     def __str__(self):
         msg = "bus: {:04x}, vendor {:04x}, product {:04x}, version {:04x}"
-        return msg.format(*self)
+        return msg.format(*self)  # pylint: disable=not-an-iterable
 
 
 class InputDevice(EventIO):
@@ -103,7 +107,7 @@ class InputDevice(EventIO):
 
     __slots__ = ("path", "fd", "info", "name", "phys", "uniq", "_rawcapabilities", "version", "ff_effects_count")
 
-    def __init__(self, dev):
+    def __init__(self, dev: Union[str, bytes, os.PathLike]):
         """
         Arguments
         ---------
@@ -114,15 +118,14 @@ class InputDevice(EventIO):
         #: Path to input device.
         self.path = dev if not hasattr(dev, "__fspath__") else dev.__fspath__()
 
-        # Certain operations are possible only when the device is opened in
-        # read-write mode.
+        # Certain operations are possible only when the device is opened in read-write mode.
         try:
             fd = os.open(dev, os.O_RDWR | os.O_NONBLOCK)
         except OSError:
             fd = os.open(dev, os.O_RDONLY | os.O_NONBLOCK)
 
         #: A non-blocking file descriptor to the device file.
-        self.fd = fd
+        self.fd: int = fd
 
         # Returns (bustype, vendor, product, version, name, phys, capabilities).
         info_res = _input.ioctl_devinfo(self.fd)
@@ -131,16 +134,16 @@ class InputDevice(EventIO):
         self.info = DeviceInfo(*info_res[:4])
 
         #: The name of the event device.
-        self.name = info_res[4]
+        self.name: str = info_res[4]
 
         #: The physical topology of the device.
-        self.phys = info_res[5]
+        self.phys: str = info_res[5]
 
         #: The unique identifier of the device.
-        self.uniq = info_res[6]
+        self.uniq: str = info_res[6]
 
         #: The evdev protocol version.
-        self.version = _input.ioctl_EVIOCGVERSION(self.fd)
+        self.version: int = _input.ioctl_EVIOCGVERSION(self.fd)
 
         #: The raw dictionary of device capabilities - see `:func:capabilities()`.
         self._rawcapabilities = _input.ioctl_capabilities(self.fd)
@@ -155,7 +158,7 @@ class InputDevice(EventIO):
             except (OSError, ImportError, AttributeError):
                 pass
 
-    def _capabilities(self, absinfo=True):
+    def _capabilities(self, absinfo: bool = True):
         res = {}
 
         for etype, _ecodes in self._rawcapabilities.items():
@@ -173,7 +176,7 @@ class InputDevice(EventIO):
 
         return res
 
-    def capabilities(self, verbose=False, absinfo=True):
+    def capabilities(self, verbose: bool = False, absinfo: bool = True):
         """
         Return the event types that this device supports as a mapping of
         supported event types to lists of handled event codes.
@@ -218,7 +221,7 @@ class InputDevice(EventIO):
         else:
             return self._capabilities(absinfo)
 
-    def input_props(self, verbose=False):
+    def input_props(self, verbose: bool = False):
         """
         Get device properties and quirks.
 
@@ -239,7 +242,7 @@ class InputDevice(EventIO):
 
         return props
 
-    def leds(self, verbose=False):
+    def leds(self, verbose: bool = False):
         """
         Return currently set LED keys.
 
@@ -260,7 +263,7 @@ class InputDevice(EventIO):
 
         return leds
 
-    def set_led(self, led_num, value):
+    def set_led(self, led_num: int, value: int):
         """
         Set the state of the selected LED.
 
@@ -330,7 +333,7 @@ class InputDevice(EventIO):
         yield
         self.ungrab()
 
-    def upload_effect(self, effect):
+    def upload_effect(self, effect: "ff.Effect"):
         """
         Upload a force feedback effect to a force feedback device.
         """
@@ -357,10 +360,10 @@ class InputDevice(EventIO):
         return KbdInfo(*_input.ioctl_EVIOCGREP(self.fd))
 
     @repeat.setter
-    def repeat(self, value):
+    def repeat(self, value: Tuple[int, int]):
         return _input.ioctl_EVIOCSREP(self.fd, *value)
 
-    def active_keys(self, verbose=False):
+    def active_keys(self, verbose: bool = False):
         """
         Return currently active keys.
 
@@ -383,13 +386,7 @@ class InputDevice(EventIO):
 
         return active_keys
 
-    @property
-    def fn(self):
-        msg = "Please use {0}.path instead of {0}.fn".format(self.__class__.__name__)
-        warnings.warn(msg, DeprecationWarning, stacklevel=2)
-        return self.path
-
-    def absinfo(self, axis_num):
+    def absinfo(self, axis_num: int):
         """
         Return current :class:`AbsInfo` for input device axis
 
@@ -405,7 +402,7 @@ class InputDevice(EventIO):
         """
         return AbsInfo(*_input.ioctl_EVIOCGABS(self.fd, axis_num))
 
-    def set_absinfo(self, axis_num, value=None, min=None, max=None, fuzz=None, flat=None, resolution=None):
+    def set_absinfo(self, axis_num: int, value=None, min=None, max=None, fuzz=None, flat=None, resolution=None):
         """
         Update :class:`AbsInfo` values. Only specified values will be overwritten.
 

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/ecodes.py

@@ -1,5 +1,5 @@
-# When installed, this module is replaced by an ecodes.py generated at 
+# When installed, this module is replaced by an ecodes.py generated at
 # build time by genecodes_py.py (see build_ext in setup.py).
 
-# This stub exists to make development of evdev itself more convenient. 
-from . ecodes_runtime import *
+# This stub exists to make development of evdev itself more convenient.
+from .ecodes_runtime import *

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/eventio.py

@@ -2,6 +2,7 @@ import fcntl
 import functools
 import os
 import select
+from typing import Iterator, Union
 
 from . import _input, _uinput, ecodes
 from .events import InputEvent
@@ -35,7 +36,7 @@ class EventIO:
         """
         return self.fd
 
-    def read_loop(self):
+    def read_loop(self) -> Iterator[InputEvent]:
         """
         Enter an endless :func:`select.select()` loop that yields input events.
         """
@@ -45,7 +46,7 @@ class EventIO:
             for event in self.read():
                 yield event
 
-    def read_one(self):
+    def read_one(self) -> Union[InputEvent, None]:
         """
         Read and return a single input event as an instance of
         :class:`InputEvent <evdev.events.InputEvent>`.
@@ -59,14 +60,14 @@ class EventIO:
         if event:
             return InputEvent(*event)
 
-    def read(self):
+    def read(self) -> Iterator[InputEvent]:
         """
         Read multiple input events from device. Return a generator object that
         yields :class:`InputEvent <evdev.events.InputEvent>` instances. Raises
         `BlockingIOError` if there are no available events at the moment.
         """
 
-        # events -> [(sec, usec, type, code, val), ...]
+        # events -> ((sec, usec, type, code, val), ...)
         events = _input.device_read_many(self.fd)
 
         for event in events:
@@ -114,7 +115,7 @@ class EventIO:
         self.write(event.type, event.code, event.value)
 
     @need_write
-    def write(self, etype, code, value):
+    def write(self, etype: int, code: int, value: int):
         """
         Inject an input event into the input subsystem. Events are
         queued until a synchronization event is received.

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/events.py

@@ -38,6 +38,7 @@ methods::
 # http://www.kernel.org/doc/Documentation/input/event-codes.txt
 
 # pylint: disable=no-name-in-module
+from typing import Final
 from .ecodes import ABS, EV_ABS, EV_KEY, EV_REL, EV_SYN, KEY, REL, SYN, keys
 
 
@@ -48,21 +49,21 @@ class InputEvent:
 
     def __init__(self, sec, usec, type, code, value):
         #: Time in seconds since epoch at which event occurred.
-        self.sec = sec
+        self.sec: int = sec
 
         #: Microsecond portion of the timestamp.
-        self.usec = usec
+        self.usec: int = usec
 
         #: Event type - one of ``ecodes.EV_*``.
-        self.type = type
+        self.type: int = type
 
         #: Event code related to the event type.
-        self.code = code
+        self.code: int = code
 
         #: Event value related to the event type.
-        self.value = value
+        self.value: int = value
 
-    def timestamp(self):
+    def timestamp(self) -> float:
         """Return event timestamp as a float."""
         return self.sec + (self.usec / 1000000.0)
 
@@ -78,20 +79,20 @@ class InputEvent:
 class KeyEvent:
     """An event generated by a keyboard, button or other key-like devices."""
 
-    key_up = 0x0
-    key_down = 0x1
-    key_hold = 0x2
+    key_up: Final[int] = 0x0
+    key_down: Final[int] = 0x1
+    key_hold: Final[int] = 0x2
 
     __slots__ = "scancode", "keycode", "keystate", "event"
 
-    def __init__(self, event, allow_unknown=False):
+    def __init__(self, event: InputEvent, allow_unknown: bool = False):
         """
         The ``allow_unknown`` argument determines what to do in the event of an event code
         for which a key code cannot be found. If ``False`` a ``KeyError`` will be raised.
         If ``True`` the keycode will be set to the hex value of the event code.
         """
 
-        self.scancode = event.code
+        self.scancode: int = event.code
 
         if event.value == 0:
             self.keystate = KeyEvent.key_up
@@ -109,7 +110,7 @@ class KeyEvent:
                 raise
 
         #: Reference to an :class:`InputEvent` instance.
-        self.event = event
+        self.event: InputEvent = event
 
     def __str__(self):
         try:
@@ -129,9 +130,9 @@ class RelEvent:
 
     __slots__ = "event"
 
-    def __init__(self, event):
+    def __init__(self, event: InputEvent):
         #: Reference to an :class:`InputEvent` instance.
-        self.event = event
+        self.event: InputEvent = event
 
     def __str__(self):
         msg = "relative axis event at {:f}, {}"
@@ -146,9 +147,9 @@ class AbsEvent:
 
     __slots__ = "event"
 
-    def __init__(self, event):
+    def __init__(self, event: InputEvent):
         #: Reference to an :class:`InputEvent` instance.
-        self.event = event
+        self.event: InputEvent = event
 
     def __str__(self):
         msg = "absolute axis event at {:f}, {}"
@@ -166,9 +167,9 @@ class SynEvent:
 
     __slots__ = "event"
 
-    def __init__(self, event):
+    def __init__(self, event: InputEvent):
         #: Reference to an :class:`InputEvent` instance.
-        self.event = event
+        self.event: InputEvent = event
 
     def __str__(self):
         msg = "synchronization event at {:f}, {}"

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/evtest.py

@@ -16,7 +16,6 @@ Examples:
   evtest /dev/input/event0 /dev/input/event1
 """
 
-
 import atexit
 import optparse
 import re
@@ -149,9 +148,11 @@ def print_capabilities(device):
 def print_event(e):
     if e.type == ecodes.EV_SYN:
         if e.code == ecodes.SYN_MT_REPORT:
-            msg = "time {:<16} +++++++++ {} ++++++++"
+            msg = "time {:<17} +++++++++++++ {} +++++++++++++"
+        elif e.code == ecodes.SYN_DROPPED:
+            msg = "time {:<17} !!!!!!!!!!!!! {} !!!!!!!!!!!!!"
         else:
-            msg = "time {:<16} --------- {} --------"
+            msg = "time {:<17} ------------- {} -------------"
         print(msg.format(e.timestamp(), ecodes.SYN[e.code]))
     else:
         if e.type in ecodes.bytype:
@@ -159,7 +160,7 @@ def print_event(e):
         else:
             codename = "?"
 
-        evfmt = "time {:<16} type {} ({}), code {:<4} ({}), value {}"
+        evfmt = "time {:<17} type {} ({}), code {:<4} ({}), value {}"
         print(evfmt.format(e.timestamp(), e.type, ecodes.EV[e.type], e.code, codename, e.value))
 
 

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/genecodes_c.py

@@ -20,9 +20,12 @@ if not opts:
     print("usage: genecodes.py [--ecodes|--stubs] <headers>")
     exit(2)
 
+if args:
+    headers = args
+
 
 # -----------------------------------------------------------------------------
-macro_regex = r"#define +((?:KEY|ABS|REL|SW|MSC|LED|BTN|REP|SND|ID|EV|BUS|SYN|FF|UI_FF|INPUT_PROP)_\w+)"
+macro_regex = r"#define\s+((?:KEY|ABS|REL|SW|MSC|LED|BTN|REP|SND|ID|EV|BUS|SYN|FF|UI_FF|INPUT_PROP)_\w+)"
 macro_regex = re.compile(macro_regex)
 
 # Uname without hostname.
@@ -35,6 +38,7 @@ template_ecodes = r"""
 #include <Python.h>
 #ifdef __FreeBSD__
 #include <dev/evdev/input.h>
+#include <dev/evdev/uinput.h>
 #else
 #include <linux/input.h>
 #include <linux/uinput.h>

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/input.c

@@ -46,12 +46,10 @@ int test_bit(const char* bitmask, int bit) {
 static PyObject *
 device_read(PyObject *self, PyObject *args)
 {
-    int fd;
     struct input_event event;
 
     // get device file descriptor (O_RDONLY|O_NONBLOCK)
-    if (PyArg_ParseTuple(args, "i", &fd) < 0)
-        return NULL;
+    int fd = (int)PyLong_AsLong(PyTuple_GET_ITEM(args, 0));
 
     int n = read(fd, &event, sizeof(event));
 
@@ -68,12 +66,9 @@ device_read(PyObject *self, PyObject *args)
     PyObject* sec  = PyLong_FromLong(event.input_event_sec);
     PyObject* usec = PyLong_FromLong(event.input_event_usec);
     PyObject* val  = PyLong_FromLong(event.value);
-    PyObject* py_input_event = NULL;
-
-    py_input_event = Py_BuildValue("OOhhO", sec, usec, event.type, event.code, val);
-    Py_DECREF(sec);
-    Py_DECREF(usec);
-    Py_DECREF(val);
+    PyObject* type = PyLong_FromLong(event.type);
+    PyObject* code = PyLong_FromLong(event.code);
+    PyObject* py_input_event = PyTuple_Pack(5, sec, usec, type, code, val);
 
     return py_input_event;
 }
@@ -83,17 +78,16 @@ device_read(PyObject *self, PyObject *args)
 static PyObject *
 device_read_many(PyObject *self, PyObject *args)
 {
-    int fd;
-
     // get device file descriptor (O_RDONLY|O_NONBLOCK)
-    int ret = PyArg_ParseTuple(args, "i", &fd);
-    if (!ret) return NULL;
+    int fd = (int)PyLong_AsLong(PyTuple_GET_ITEM(args, 0));
 
-    PyObject* event_list = PyList_New(0);
     PyObject* py_input_event = NULL;
+    PyObject* events = NULL;
     PyObject* sec  = NULL;
     PyObject* usec = NULL;
     PyObject* val  = NULL;
+    PyObject* type = NULL;
+    PyObject* code = NULL;
 
     struct input_event event[64];
 
@@ -102,26 +96,24 @@ device_read_many(PyObject *self, PyObject *args)
 
     if (nread < 0) {
         PyErr_SetFromErrno(PyExc_OSError);
-        Py_DECREF(event_list);
         return NULL;
     }
 
-    // Construct a list of event tuples, which we'll make sense of in Python
-    for (unsigned i = 0 ; i < nread/event_size ; i++) {
+    // Construct a tuple of event tuples. Each tuple is the arguments to InputEvent.
+    size_t num_events = nread / event_size;
+    events = PyTuple_New(num_events);
+    for (size_t i = 0 ; i < num_events; i++) {
         sec  = PyLong_FromLong(event[i].input_event_sec);
         usec = PyLong_FromLong(event[i].input_event_usec);
         val  = PyLong_FromLong(event[i].value);
+        type = PyLong_FromLong(event[i].type);
+        code = PyLong_FromLong(event[i].code);
 
-        py_input_event = Py_BuildValue("OOhhO", sec, usec, event[i].type, event[i].code, val);
-        PyList_Append(event_list, py_input_event);
-
-        Py_DECREF(py_input_event);
-        Py_DECREF(sec);
-        Py_DECREF(usec);
-        Py_DECREF(val);
+        py_input_event = PyTuple_Pack(5, sec, usec, type, code, val);
+        PyTuple_SET_ITEM(events, i, py_input_event);
     }
 
-    return event_list;
+    return events;
 }
 
 
@@ -309,7 +301,7 @@ static PyObject *
 ioctl_EVIOCGREP(PyObject *self, PyObject *args)
 {
     int fd, ret;
-    unsigned int rep[2] = {0};
+    unsigned int rep[REP_CNT] = {0};
     ret = PyArg_ParseTuple(args, "i", &fd);
     if (!ret) return NULL;
 
@@ -317,7 +309,7 @@ ioctl_EVIOCGREP(PyObject *self, PyObject *args)
     if (ret == -1)
         return NULL;
 
-    return Py_BuildValue("(ii)", rep[0], rep[1]);
+    return Py_BuildValue("(ii)", rep[REP_DELAY], rep[REP_PERIOD]);
 }
 
 
@@ -325,7 +317,7 @@ static PyObject *
 ioctl_EVIOCSREP(PyObject *self, PyObject *args)
 {
     int fd, ret;
-    unsigned int rep[2] = {0};
+    unsigned int rep[REP_CNT] = {0};
 
     ret = PyArg_ParseTuple(args, "iii", &fd, &rep[0], &rep[1]);
     if (!ret) return NULL;
@@ -539,7 +531,6 @@ ioctl_EVIOCGPROP(PyObject *self, PyObject *args)
 }
 
 
-
 static PyMethodDef MethodTable[] = {
     { "ioctl_devinfo",        ioctl_devinfo,        METH_VARARGS, "fetch input device info" },
     { "ioctl_capabilities",   ioctl_capabilities,   METH_VARARGS, "fetch input device capabilities" },
@@ -561,14 +552,10 @@ static PyMethodDef MethodTable[] = {
 };
 
 
-#define MODULE_NAME "_input"
-#define MODULE_HELP "Python bindings to certain linux input subsystem functions"
-
-#if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
-    MODULE_NAME,
-    MODULE_HELP,
+    "_input",
+    "Python bindings to certain linux input subsystem functions",
     -1,          /* m_size */
     MethodTable, /* m_methods */
     NULL,        /* m_reload */
@@ -590,19 +577,3 @@ PyInit__input(void)
 {
     return moduleinit();
 }
-
-#else
-static PyObject *
-moduleinit(void)
-{
-    PyObject* m = Py_InitModule3(MODULE_NAME, MethodTable, MODULE_HELP);
-    if (m == NULL) return NULL;
-    return m;
-}
-
-PyMODINIT_FUNC
-init_input(void)
-{
-    moduleinit();
-}
-#endif

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/uinput.c

@@ -356,8 +356,6 @@ int _uinput_end_erase(int fd, struct uinput_ff_erase *upload)
     return ioctl(fd, UI_END_FF_ERASE, upload);
 }
 
-#define MODULE_NAME "_uinput"
-#define MODULE_HELP "Python bindings for parts of linux/uinput.c"
 
 static PyMethodDef MethodTable[] = {
     { "open",  uinput_open, METH_VARARGS,
@@ -390,11 +388,10 @@ static PyMethodDef MethodTable[] = {
     { NULL, NULL, 0, NULL}
 };
 
-#if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
-    MODULE_NAME,
-    MODULE_HELP,
+    "_uinput",
+    "Python bindings for parts of linux/uinput.c",
     -1,          /* m_size */
     MethodTable, /* m_methods */
     NULL,        /* m_reload */
@@ -418,21 +415,3 @@ PyInit__uinput(void)
 {
     return moduleinit();
 }
-
-#else
-static PyObject *
-moduleinit(void)
-{
-    PyObject* m = Py_InitModule3(MODULE_NAME, MethodTable, MODULE_HELP);
-    if (m == NULL) return NULL;
-
-    PyModule_AddIntConstant(m, "maxnamelen", UINPUT_MAX_NAME_SIZE);
-    return m;
-}
-
-PyMODINIT_FUNC
-init_uinput(void)
-{
-    moduleinit();
-}
-#endif

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/uinput.py

@@ -5,8 +5,10 @@ import re
 import stat
 import time
 from collections import defaultdict
+from typing import Union, Tuple, Dict, Sequence, Optional
 
-from . import _uinput, device, ecodes, ff, util
+from . import _uinput, ecodes, ff, util
+from .device import InputDevice, AbsInfo
 from .events import InputEvent
 
 try:
@@ -38,7 +40,12 @@ class UInput(EventIO):
     )
 
     @classmethod
-    def from_device(cls, *devices, filtered_types=(ecodes.EV_SYN, ecodes.EV_FF), **kwargs):
+    def from_device(
+        cls,
+        *devices: Union[InputDevice, Union[str, bytes, os.PathLike]],
+        filtered_types: Tuple[int] = (ecodes.EV_SYN, ecodes.EV_FF),
+        **kwargs,
+    ):
         """
         Create an UInput device with the capabilities of one or more input
         devices.
@@ -57,8 +64,8 @@ class UInput(EventIO):
 
         device_instances = []
         for dev in devices:
-            if not isinstance(dev, device.InputDevice):
-                dev = device.InputDevice(str(dev))
+            if not isinstance(dev, InputDevice):
+                dev = InputDevice(str(dev))
             device_instances.append(dev)
 
         all_capabilities = defaultdict(set)
@@ -79,14 +86,14 @@ class UInput(EventIO):
 
     def __init__(
         self,
-        events=None,
-        name="py-evdev-uinput",
-        vendor=0x1,
-        product=0x1,
-        version=0x1,
-        bustype=0x3,
-        devnode="/dev/uinput",
-        phys="py-evdev-uinput",
+        events: Optional[Dict[int, Sequence[int]]] = None,
+        name: str = "py-evdev-uinput",
+        vendor: int = 0x1,
+        product: int = 0x1,
+        version: int = 0x1,
+        bustype: int = 0x3,
+        devnode: str = "/dev/uinput",
+        phys: str = "py-evdev-uinput",
         input_props=None,
         # CentOS 7 has sufficiently old headers that FF_MAX_EFFECTS is not defined there,
         # which causes the whole module to fail loading. Fallback on a hardcoded value of
@@ -131,13 +138,13 @@ class UInput(EventIO):
         to inject only ``KEY_*`` and ``BTN_*`` event codes.
         """
 
-        self.name = name  #: Uinput device name.
-        self.vendor = vendor  #: Device vendor identifier.
-        self.product = product  #: Device product identifier.
-        self.version = version  #: Device version identifier.
-        self.bustype = bustype  #: Device bustype - e.g. ``BUS_USB``.
-        self.phys = phys  #: Uinput device physical path.
-        self.devnode = devnode  #: Uinput device node - e.g. ``/dev/uinput/``.
+        self.name: str = name  #: Uinput device name.
+        self.vendor: int = vendor  #: Device vendor identifier.
+        self.product: int = product  #: Device product identifier.
+        self.version: int = version  #: Device version identifier.
+        self.bustype: int = bustype  #: Device bustype - e.g. ``BUS_USB``.
+        self.phys: str = phys  #: Uinput device physical path.
+        self.devnode: str = devnode  #: Uinput device node - e.g. ``/dev/uinput/``.
 
         if not events:
             events = {ecodes.EV_KEY: ecodes.keys.keys()}
@@ -173,7 +180,7 @@ class UInput(EventIO):
         #: An :class:`InputDevice <evdev.device.InputDevice>` instance
         #: for the fake input device. ``None`` if the device cannot be
         #: opened for reading and writing.
-        self.device = self._find_device(self.fd)
+        self.device: InputDevice = self._find_device(self.fd)
 
     def _prepare_events(self, events):
         """Prepare events for passing to _uinput.enable and _uinput.setup"""
@@ -181,7 +188,7 @@ class UInput(EventIO):
         for etype, codes in events.items():
             for code in codes:
                 # Handle max, min, fuzz, flat.
-                if isinstance(code, (tuple, list, device.AbsInfo)):
+                if isinstance(code, (tuple, list, AbsInfo)):
                     # Flatten (ABS_Y, (0, 255, 0, 0, 0, 0)) to (ABS_Y, 0, 255, 0, 0, 0, 0).
                     f = [code[0]]
                     f.extend(code[1])
@@ -206,7 +213,7 @@ class UInput(EventIO):
         return "{}({})".format(self.__class__.__name__, ", ".join(v))
 
     def __str__(self):
-        msg = 'name "{}", bus "{}", vendor "{:04x}", product "{:04x}", version "{:04x}", phys "{}"\n' "event types: {}"
+        msg = 'name "{}", bus "{}", vendor "{:04x}", product "{:04x}", version "{:04x}", phys "{}"\nevent types: {}'
 
         evtypes = [i[0] for i in self.capabilities(True).keys()]
         msg = msg.format(
@@ -225,7 +232,7 @@ class UInput(EventIO):
             _uinput.close(self.fd)
             self.fd = -1
 
-    def capabilities(self, verbose=False, absinfo=True):
+    def capabilities(self, verbose: bool = False, absinfo: bool = True):
         """See :func:`capabilities <evdev.device.InputDevice.capabilities>`."""
         if self.device is None:
             raise UInputError("input device not opened - cannot read capabilities")
@@ -281,7 +288,7 @@ class UInput(EventIO):
             msg = "uinput device name must not be longer than {} characters"
             raise UInputError(msg.format(_uinput.maxnamelen))
 
-    def _find_device(self, fd):
+    def _find_device(self, fd: int) -> InputDevice:
         """
         Tries to find the device node. Will delegate this task to one of
         several platform-specific functions.
@@ -299,7 +306,7 @@ class UInput(EventIO):
         # use the generic fallback method.
         return self._find_device_fallback()
 
-    def _find_device_linux(self, sysname):
+    def _find_device_linux(self, sysname: str) -> InputDevice:
         """
         Tries to find the device node when running on Linux.
         """
@@ -327,15 +334,15 @@ class UInput(EventIO):
         # device to show up or the permissions to be set.
         for attempt in range(19):
             try:
-                return device.InputDevice(device_path)
+                return InputDevice(device_path)
             except (FileNotFoundError, PermissionError):
                 time.sleep(0.1)
 
         # Last attempt. If this fails, whatever exception the last attempt raises
         # shall be the exception that this function raises.
-        return device.InputDevice(device_path)
+        return InputDevice(device_path)
 
-    def _find_device_fallback(self):
+    def _find_device_fallback(self) -> Union[InputDevice, None]:
         """
         Tries to find the device node when UI_GET_SYSNAME is not available or
         we're running on a system sufficiently exotic that we do not know how
@@ -363,6 +370,6 @@ class UInput(EventIO):
         path_number_pairs.sort(key=lambda pair: pair[1], reverse=True)
 
         for path, _ in path_number_pairs:
-            d = device.InputDevice(path)
+            d = InputDevice(path)
             if d.name == self.name:
                 return d

{evdev-1.8.0 → evdev-1.9.0/src}/evdev/util.py

@@ -3,21 +3,20 @@ import glob
 import os
 import re
 import stat
+from typing import Union, List
 
 from . import ecodes
 from .events import event_factory
 
 
-def list_devices(input_device_dir="/dev/input"):
+def list_devices(input_device_dir: Union[str, bytes, os.PathLike] = "/dev/input") -> List[str]:
     """List readable character devices in ``input_device_dir``."""
 
     fns = glob.glob("{}/event*".format(input_device_dir))
-    fns = list(filter(is_device, fns))
+    return list(filter(is_device, fns))
 
-    return fns
 
-
-def is_device(fn):
+def is_device(fn: Union[str, bytes, os.PathLike]) -> bool:
     """Check if ``fn`` is a readable and writable character device."""
 
     if not os.path.exists(fn):

{evdev-1.8.0 → evdev-1.9.0/src/evdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: evdev
-Version: 1.8.0
+Version: 1.9.0
 Summary: Bindings to the Linux input handling subsystem
 Author-email: Georgi Valkov <georgi.t.valkov@gmail.com>
 Maintainer-email: Tobi <proxima@sezanzeb.de>

evdev-1.9.0/src/evdev.egg-info/SOURCES.txt

@@ -0,0 +1,29 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+setup.py
+src/evdev/__init__.py
+src/evdev/device.py
+src/evdev/ecodes.py
+src/evdev/ecodes_runtime.py
+src/evdev/eventio.py
+src/evdev/eventio_async.py
+src/evdev/events.py
+src/evdev/evtest.py
+src/evdev/ff.py
+src/evdev/genecodes_c.py
+src/evdev/genecodes_py.py
+src/evdev/input.c
+src/evdev/py.typed
+src/evdev/uinput.c
+src/evdev/uinput.py
+src/evdev/util.py
+src/evdev.egg-info/PKG-INFO
+src/evdev.egg-info/SOURCES.txt
+src/evdev.egg-info/dependency_links.txt
+src/evdev.egg-info/top_level.txt
+tests/test_ecodes.py
+tests/test_events.py
+tests/test_uinput.py
+tests/test_util.py

{evdev-1.8.0 → evdev-1.9.0}/tests/test_util.py

@@ -6,7 +6,7 @@ def test_match_ecodes_a():
     assert res == {1: [372, 418, 419, 420]}
     assert dict(util.resolve_ecodes_dict(res)) == {
         ("EV_KEY", 1): [
-            (["KEY_FULL_SCREEN", "KEY_ZOOM"], 372),
+            (("KEY_FULL_SCREEN", "KEY_ZOOM"), 372),
             ("KEY_ZOOMIN", 418),
             ("KEY_ZOOMOUT", 419),
             ("KEY_ZOOMRESET", 420),

evdev-1.8.0/evdev.egg-info/SOURCES.txt

@@ -1,28 +0,0 @@
-LICENSE
-MANIFEST.in
-README.md
-pyproject.toml
-setup.py
-evdev/__init__.py
-evdev/device.py
-evdev/ecodes.py
-evdev/ecodes_runtime.py
-evdev/eventio.py
-evdev/eventio_async.py
-evdev/events.py
-evdev/evtest.py
-evdev/ff.py
-evdev/genecodes_c.py
-evdev/genecodes_py.py
-evdev/input.c
-evdev/uinput.c
-evdev/uinput.py
-evdev/util.py
-evdev.egg-info/PKG-INFO
-evdev.egg-info/SOURCES.txt
-evdev.egg-info/dependency_links.txt
-evdev.egg-info/top_level.txt
-tests/test_ecodes.py
-tests/test_events.py
-tests/test_uinput.py
-tests/test_util.py