wintab32: Compute our physical device characteristics based on the first tablet…

wintab32: Compute our physical device characteristics based on the first tablet device that looks like a stylus. Otherwise, we may be computing based on a mouse or cursor, and then come to incorrect values for our tilt and pressure settings.

wintab32: Compute our physical device characteristics based on the first tablet…
d58429d0 · Jeremy White · Alexandre Julliard · 5132ab46 · d58429d0
Commit d58429d0 authored Dec 23, 2007 by Jeremy White Committed by Alexandre Julliard Dec 26, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

wintab.c dlls/winex11.drv/wintab.c +7 -1

No files found.
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -528,7 +528,13 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
                        if (TRACE_ON(wintab32))
                            trace_axes(Val);

-                        if (!axis_read_complete)
+                        /* FIXME:  This is imperfect; we compute our devices capabilities based upon the
+                        **         first pen type device we find.  However, a more correct implementation
+                        **         would require acquiring a wide variety of tablets and running through
+                        **         the various inputs to see what the values are.  Odds are that a
+                        **         more 'correct' algorithm would condense to this one anyway.
+                        */
+                        if (!axis_read_complete && Val->num_axes >= 5 && cursor->TYPE == CSR_TYPE_PEN)
                        {
                            Axis = (XAxisInfoPtr) ((char *) Val + sizeof
                                (XValuatorInfo));