Fix extra devices being enumerated on Tablet creation (#491)

examples/input/tablet.py

@@ -1,8 +1,3 @@
-#!/usr/bin/python
-# $Id:$
-
-from __future__ import print_function
-
 import pyglet
 
 window = pyglet.window.Window()
@@ -34,6 +29,7 @@ def on_text(text):
         canvas = tablets[i].open(window)
     except pyglet.input.DeviceException:
         print('Failed to open tablet %d on window' % index)
+        return
 
     print('Opened %s' % name)
 
@@ -46,8 +42,8 @@ def on_leave(cursor):
         print('%s: on_leave(%r)' % (name, cursor))
 
     @canvas.event
-    def on_motion(cursor, x, y, pressure):
-        print('%s: on_motion(%r, %r, %r, %r)' % (name, cursor, x, y, pressure))
+    def on_motion(cursor, x, y, pressure, tilt_x, tilt_y):
+        print('%s: on_motion(%r, %r, %r, %r, %r, %r)' % (name, cursor, x, y, pressure, tilt_x, tilt_y))
 
 
 @window.event

pyglet/input/base.py

@@ -698,7 +698,7 @@ def on_leave(self, cursor):
             :event:
             """
 
-        def on_motion(self, cursor, x, y, pressure):
+        def on_motion(self, cursor, x, y, pressure, tilt_x, tilt_y):
             """The cursor moved on the tablet surface.
 
             If `pressure` is 0, then the cursor is actually hovering above the

pyglet/input/x11_xinput_tablet.py

@@ -113,7 +113,7 @@ def __init__(self, device):
 def get_tablets(display=None):
     # Each cursor appears as a separate xinput device; find devices that look
     # like Wacom tablet cursors and amalgamate them into a single tablet. 
-    valid_names = ('stylus', 'cursor', 'eraser', 'wacom', 'pen', 'pad')
+    valid_names = ('stylus', 'cursor', 'eraser', 'pen', 'pad')
     cursors = []
     devices = get_devices(display)
     for device in devices: