Rework input props functionality

- Merged geniprops into genecodes and reverted the changes to setup.py.
- Renamed InputDevice.props to InputDevice.input_props.
- Renamed UInput(props=) to UInput(input_props=).

Author: gvalkov

docs/changelog.rst

@@ -1,6 +1,15 @@
 Changelog
 ---------
 
+Master
+====================
+
+- Fix build on 32bit arches with 64bit time_t
+
+- Add functionality to query device properties. See ``InputDevice.input_props``
+  and the ``input_props`` argument to ``Uinput``.
+
+
 1.2.0 (Apr 7, 2019)
 ====================
 

evdev/device.py

@@ -223,8 +223,24 @@ def capabilities(self, verbose=False, absinfo=True):
         else:
             return self._capabilities(absinfo)
 
-    def props(self):
+    def input_props(self, verbose=False):
+        '''
+        Get device properties and quirks.
+
+        Example
+        -------
+        >>> device.input_props()
+        [0, 5]
+
+        If ``verbose`` is ``True``, input properties are resolved to their
+        names. Unknown codes are resolved to ``'?'``::
+
+        [('INPUT_PROP_POINTER', 0), ('INPUT_PROP_POINTING_STICK', 5)]
+
+        '''
         props = _input.ioctl_EVIOCGPROP(self.fd)
+        if verbose:
+            return util.resolve_ecodes(ecodes.INPUT_PROP, props)
 
         return props
 

evdev/ecodes.py

@@ -7,7 +7,7 @@
 Exposed constants::
 
     KEY, ABS, REL, SW, MSC, LED, BTN, REP, SND, ID, EV,
-    BUS, SYN, FF, FF_STATUS
+    BUS, SYN, FF, FF_STATUS, INPUT_PROP
 
 This module also provides reverse and forward mappings of the names and values
 of the above mentioned constants::
@@ -47,7 +47,7 @@
 #: Mapping of names to values.
 ecodes = {}
 
-prefixes = 'KEY ABS REL SW MSC LED BTN REP SND ID EV BUS SYN FF_STATUS FF'
+prefixes = 'KEY ABS REL SW MSC LED BTN REP SND ID EV BUS SYN FF_STATUS FF INPUT_PROP'
 prev_prefix = ''
 g = globals()
 
@@ -94,7 +94,8 @@
     _ecodes.EV_SND: SND,
     _ecodes.EV_SYN: SYN,
     _ecodes.EV_FF:  FF,
-    _ecodes.EV_FF_STATUS: FF_STATUS, }
+    _ecodes.EV_FF_STATUS: FF_STATUS,
+}
 
 from evdev._ecodes import *
 

evdev/genecodes.py

@@ -20,7 +20,7 @@
 
 
 #-----------------------------------------------------------------------------
-macro_regex = r'#define +((?:KEY|ABS|REL|SW|MSC|LED|BTN|REP|SND|ID|EV|BUS|SYN|FF|UI_FF)_\w+)'
+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 = re.compile(macro_regex)
 
 uname = list(os.uname()); del uname[1]

evdev/geniprops.py

@@ -491,11 +491,11 @@ static PyMethodDef MethodTable[] = {
     { "ioctl_EVIOCGRAB",      ioctl_EVIOCGRAB,      METH_VARARGS},
     { "ioctl_EVIOCGEFFECTS",  ioctl_EVIOCGEFFECTS,  METH_VARARGS, "fetch the number of effects the device can keep in its memory." },
     { "ioctl_EVIOCG_bits",    ioctl_EVIOCG_bits,    METH_VARARGS, "get state of KEY|LED|SND|SW"},
+    { "ioctl_EVIOCGPROP",     ioctl_EVIOCGPROP,     METH_VARARGS, "get device properties"},
     { "device_read",          device_read,          METH_VARARGS, "read an input event from a device" },
     { "device_read_many",     device_read_many,     METH_VARARGS, "read all available input events from a device" },
     { "upload_effect",        upload_effect,        METH_VARARGS, "" },
     { "erase_effect",         erase_effect,         METH_VARARGS, "" },
-    { "ioctl_EVIOCGPROP",     ioctl_EVIOCGPROP,     METH_VARARGS, "get device properties"},
 
     { NULL, NULL, 0, NULL}
 };

evdev/input.c

@@ -360,7 +360,7 @@ static PyMethodDef MethodTable[] = {
       "Set physical path"},
 
     { "set_prop", uinput_set_prop, METH_VARARGS,
-      "Set device property"},
+      "Set device input property"},
 
     { NULL, NULL, 0, NULL}
 };

evdev/uinput.c

@@ -77,7 +77,7 @@ def __init__(self,
                  events=None,
                  name='py-evdev-uinput',
                  vendor=0x1, product=0x1, version=0x1, bustype=0x3,
-                 devnode='/dev/uinput', phys='py-evdev-uinput', props=[]):
+                 devnode='/dev/uinput', phys='py-evdev-uinput', input_props=None):
         '''
         Arguments
         ---------
@@ -96,13 +96,16 @@ def __init__(self,
           Product identifier.
 
         version
-          version identifier.
+          Version identifier.
 
         bustype
-          bustype identifier.
+          Bustype identifier.
 
         phys
-          physical path.
+          Physical path.
+
+        input_props
+          Input properties and quirks.
 
         Note
         ----
@@ -133,7 +136,8 @@ def __init__(self,
         _uinput.set_phys(self.fd, phys)
 
         # Set properties
-        for prop in props:
+        input_props = input_props or []
+        for prop in input_props:
             _uinput.set_prop(self.fd, prop)
 
         for etype, code in prepared_events:

evdev/uinput.py

@@ -40,7 +40,6 @@
 input_c  = Extension('evdev._input',  sources=['evdev/input.c'],  extra_compile_args=cflags)
 uinput_c = Extension('evdev._uinput', sources=['evdev/uinput.c'], extra_compile_args=cflags)
 ecodes_c = Extension('evdev._ecodes', sources=['evdev/ecodes.c'], extra_compile_args=cflags)
-iprops_c = Extension('evdev.iprops', sources=['evdev/iprops.c'], extra_compile_args=cflags)
 
 #-----------------------------------------------------------------------------
 kw = {
@@ -58,7 +57,7 @@
     'classifiers':          classifiers,
 
     'packages':             ['evdev'],
-    'ext_modules':          [input_c, uinput_c, ecodes_c, iprops_c],
+    'ext_modules':          [input_c, uinput_c, ecodes_c],
     'include_package_data': False,
     'zip_safe':             True,
     'cmdclass':             {},
@@ -107,48 +106,6 @@ def create_ecodes(headers=None):
     check_call(cmd, cwd="%s/evdev" % here, shell=True)
 
 
-#-----------------------------------------------------------------------------
-def create_iprops(headers=None):
-    if not headers:
-        headers = [
-            '/usr/include/linux/input.h',
-            '/usr/include/linux/input-event-codes.h',
-            '/usr/include/linux/uinput.h',
-        ]
-
-    headers = [header for header in headers if os.path.isfile(header)]
-    if not headers:
-        msg = '''\
-        The 'linux/input.h' and 'linux/input-event-codes.h' include files
-        are missing. You will have to install the kernel header files in
-        order to continue:
-
-            yum install kernel-headers-$(uname -r)
-            apt-get install linux-headers-$(uname -r)
-            emerge sys-kernel/linux-headers
-            pacman -S kernel-headers
-
-        In case they are installed in a non-standard location, you may use
-        the '--evdev-headers' option to specify one or more colon-separated
-        paths. For example:
-
-            python setup.py \\
-              build \\
-              build_iprops --evdev-headers path/input.h:path/input-event-codes.h \\
-              build_ext --include-dirs  path/ \\
-              install
-        '''
-
-        sys.stderr.write(textwrap.dedent(msg))
-        sys.exit(1)
-
-    from subprocess import check_call
-
-    print('writing iprops.c (using %s)' % ' '.join(headers))
-    cmd = '%s geniprops.py %s > iprops.c' % (sys.executable, ' '.join(headers))
-    check_call(cmd, cwd="%s/evdev" % here, shell=True)
-
-
 #-----------------------------------------------------------------------------
 class build_ecodes(Command):
     description = 'generate ecodes.c'
@@ -168,24 +125,6 @@ def run(self):
         create_ecodes(self.evdev_headers)
 
 
-class build_iprops(Command):
-    description = 'generate iprops.c'
-
-    user_options = [
-        ('evdev-headers=', None, 'colon-separated paths to input subsystem headers'),
-    ]
-
-    def initialize_options(self):
-        self.evdev_headers = None
-
-    def finalize_options(self):
-        if self.evdev_headers:
-            self.evdev_headers = self.evdev_headers.split(':')
-
-    def run(self):
-        create_iprops(self.evdev_headers)
-
-
 class build_ext(_build_ext.build_ext):
     def has_ecodes(self):
         ecodes_path = os.path.join(here, 'evdev/ecodes.c')
@@ -194,25 +133,17 @@ def has_ecodes(self):
             print('ecodes.c already exists ... skipping build_ecodes')
         return not res
 
-    def has_iprops(self):
-        iprops_path = os.path.join(here, 'evdev/iprops.c')
-        res = os.path.exists(iprops_path)
-        if res:
-            print('iprops.c already exists ... skipping build_iprops')
-        return not res
-
     def run(self):
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
         _build_ext.build_ext.run(self)
 
-    sub_commands =  [('build_ecodes', has_ecodes), ('build_iprops', has_iprops)] + _build_ext.build_ext.sub_commands
+    sub_commands =  [('build_ecodes', has_ecodes)] + _build_ext.build_ext.sub_commands
 
 
 #-----------------------------------------------------------------------------
 kw['cmdclass']['build_ext'] = build_ext
 kw['cmdclass']['build_ecodes'] = build_ecodes
-kw['cmdclass']['build_iprops'] = build_iprops
 
 
 #-----------------------------------------------------------------------------