Fix absinfo item indexes in uinput_create (see gvalkov#40)

John Titor · John Titor · commit 62969d7bca43 · 2016-01-25T02:32:42.000+01:00
diff --git a/evdev/uinput.c b/evdev/uinput.c
@@ -70,14 +70,15 @@ uinput_create(PyObject *self, PyObject *args) {
 
     len = PyList_Size(absinfo);
     for (i=0; i<len; i++) {
-        // item -> (ABS_X, 0, 255, 0, 0)
+        // item -> (ABS_X, 0, 255, 0, 0, 0, 0)
         item = PyList_GetItem(absinfo, i);
         abscode = (int)PyLong_AsLong(PyList_GetItem(item, 0));
 
-        uidev.absmin[abscode]  = PyLong_AsLong(PyList_GetItem(item, 1));
-        uidev.absmax[abscode]  = PyLong_AsLong(PyList_GetItem(item, 2));
-        uidev.absfuzz[abscode] = PyLong_AsLong(PyList_GetItem(item, 3));
-        uidev.absflat[abscode] = PyLong_AsLong(PyList_GetItem(item, 4));
+		/* min/max/fuzz/flat start from index 2 because index 1 is value */
+        uidev.absmin[abscode]  = PyLong_AsLong(PyList_GetItem(item, 2));
+        uidev.absmax[abscode]  = PyLong_AsLong(PyList_GetItem(item, 3));
+        uidev.absfuzz[abscode] = PyLong_AsLong(PyList_GetItem(item, 4));
+        uidev.absflat[abscode] = PyLong_AsLong(PyList_GetItem(item, 5));
     }
 
     if (write(fd, &uidev, sizeof(uidev)) != sizeof(uidev))
diff --git a/evdev/uinput.py b/evdev/uinput.py
@@ -71,7 +71,7 @@ def __init__(self,
             for code in codes:
                 # handle max, min, fuzz, flat
                 if isinstance(code, (tuple, list, device.AbsInfo)):
-                    # flatten (ABS_Y, (0, 255, 0, 0)) to (ABS_Y, 0, 255, 0, 0)
+                    # flatten (ABS_Y, (0, 255, 0, 0, 0, 0)) to (ABS_Y, 0, 255, 0, 0, 0, 0)
                     f = [code[0]]; f += code[1]
                     absinfo.append(f)
                     code = code[0]
