← Back to branch summary

~ubuntu-branches/ubuntu/raring/wacom-tools/raring

« back to all changes in this revision

Viewing changes to linuxwacom/src/xdrv/wcmISDV4.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-03-24 10:06:54 UTC
  • mfrom: (1.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090324100654-u7x4rd2ked2gpksz
Tags: 1:0.8.2.2-0ubuntu1
https://launchpad.net/bugs/355340
https://launchpad.net/bugs/215689
https://launchpad.net/bugs/356091
https://launchpad.net/bugs/337112
* New upstream release. (LP: #355340)
* Patch 100_allow_eraser.patch dropped, included in this version.
* 100_fedora-fix-build.diff
  - Make the driver to build against xserver 1.6.
* 101_fedora-fix-mapping.diff
  - No button 0 in the server, all offsets have to begin at 1.
* 102_fedora-wcmmaxx.diff
  - Don't assign priv->wcmMaxX/Y back into common->wcmMaxX/Y.
* 103_fedora-hal-setup.diff
  - Add a hal callout program to set up the device.
  (LP: #215689, #356091)
* 104_revert-check.diff
  - Don't check the serial number, it breaks some devices.
* Modify 10-wacom.fdi to include changes from Fedora. Should allow
  hotplugging (built-in) serial tablets. (LP: #337112)
* rules:
  - Run autoreconf on build
  - xserver-xorg-input-wacom includes /usr/lib/hal/hal-setup-wacom
* control:
  - autoreconf: add automake, libtool to build-deps.
  - hal-setup-wacom: add libhal-dev to build-deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linuxwacom/src/xdrv/wcmISDV4.c
233
233
                if (isdv4Query(local, WC_ISDV4_TOUCH_QUERY, data) == Success)
234
234
                {
235
235
                        /* (data[2] & 0x07) == 0 is for resistive touch */
 
236
                        if (!(data[2] & 0x07) && data[1])
 
237
                        {
 
238
                                common->wcmMaxTouchX = common->wcmMaxTouchY = (int)(1 << data[1]);
 
239
                        }
 
240
 
236
241
                        if ((data[0] & 0x41) && (data[2] & 0x07))
237
242
                        {
238
243
                                /* tablet model */
292
297
                if (common->wcmMaxX && common->wcmMaxY && !common->wcmTouchResolX)
293
298
                {
294
299
                        /* Some touch tablet don't report physical size */
295
 
                        common->wcmTouchResolX = common->wcmMaxTouchX / 
296
 
                                (common->wcmResolX * common->wcmMaxX);
297
 
                        common->wcmTouchResolY = common->wcmMaxTouchY / 
298
 
                                (common->wcmResolY * common->wcmMaxY);
 
300
                        common->wcmTouchResolX = (int)((double)(common->wcmMaxTouchX * 
 
301
                                common->wcmResolX) / (double)common->wcmMaxX + 0.5);
 
302
                        common->wcmTouchResolY = (int)((double)(common->wcmMaxTouchY * 
 
303
                                common->wcmResolY) / (double)common->wcmMaxY + 0.5);
299
304
                }
300
305
        }
301
306