Merge pull request gvalkov#52 from paulo-raca/uinput_phys

gvalkov · gvalkov · commit af11cb246890 · 2016-02-06T23:09:08.000+01:00
Support setting physical path ("phys") on UInput
diff --git a/evdev/uinput.c b/evdev/uinput.c
@@ -47,6 +47,27 @@ uinput_open(PyObject *self, PyObject *args)
 }
 
 
+static PyObject *
+uinput_set_phys(PyObject *self, PyObject *args)
+{
+    int fd;
+    const char* phys;
+
+    int ret = PyArg_ParseTuple(args, "is", &fd, &phys);
+    if (!ret) return NULL;
+
+    if (ioctl(fd, UI_SET_PHYS, phys) < 0)
+        goto on_err;
+
+    Py_RETURN_NONE;
+
+    on_err:
+        _uinput_close(fd);
+        PyErr_SetFromErrno(PyExc_IOError);
+        return NULL;
+}
+
+
 static PyObject *
 uinput_create(PyObject *self, PyObject *args) {
     int fd, len, i, abscode;
@@ -205,6 +226,9 @@ static PyMethodDef MethodTable[] = {
     { "enable", uinput_enable_event, METH_VARARGS,
       "Enable a type of event."},
 
+    { "set_phys", uinput_set_phys, METH_VARARGS,
+      "Set physical path"},
+      
     { NULL, NULL, 0, NULL}
 };
 
diff --git a/evdev/uinput.py b/evdev/uinput.py
@@ -14,6 +14,7 @@
     from evdev.eventio import EventIO
 
 
+
 class UInputError(Exception):
     pass
 
@@ -33,7 +34,7 @@ def __init__(self,
                  events=None,
                  name='py-evdev-uinput',
                  vendor=0x1, product=0x1, version=0x1, bustype=0x3,
-                 devnode='/dev/uinput'):
+                 devnode='/dev/uinput', phys='py-evdev-uinput'):
         '''
         Arguments
         ---------
@@ -57,6 +58,9 @@ def __init__(self,
         bustype
           bustype identifier.
 
+        phys
+          physical path.
+          
         Note
         ----
         If you do not specify any events, the uinput device will be able
@@ -68,6 +72,7 @@ def __init__(self,
         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/``.
 
         if not events:
@@ -81,6 +86,9 @@ def __init__(self,
 
         #: Write-only, non-blocking file descriptor to the uinput device node.
         self.fd = _uinput.open(devnode)
+        
+        # Set phys name
+        _uinput.set_phys(self.fd, phys)
 
         # Set device capabilities.
         for etype, codes in events.items():
@@ -113,17 +121,17 @@ def __exit__(self, type, value, tb):
     def __repr__(self):
         # TODO:
         v = (repr(getattr(self, i)) for i in
-             ('name', 'bustype', 'vendor', 'product', 'version'))
+             ('name', 'bustype', 'vendor', 'product', 'version', 'phys'))
         return '{}({})'.format(self.__class__.__name__, ', '.join(v))
 
     def __str__(self):
-        msg = ('name "{}", bus "{}", vendor "{:04x}", product "{:04x}", version "{:04x}"\n'
+        msg = ('name "{}", bus "{}", vendor "{:04x}", product "{:04x}", version "{:04x}", phys "{}"\n'
                'event types: {}')
 
         evtypes = [i[0] for i in self.capabilities(True).keys()]
         msg = msg.format(self.name, ecodes.BUS[self.bustype],
                          self.vendor, self.product,
-                         self.version, ' '.join(evtypes))
+                         self.version, self.phys, ' '.join(evtypes))
 
         return msg
 
