← Back to branch summary

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

« back to all changes in this revision

Viewing changes to linuxwacom/src/xdrv/xf86WacomDefs.h

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-05-22 12:04:32 UTC
  • mfrom: (1.12.2 upstream) (2.2.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090522120432-00suvwukj864ipib
Tags: 1:0.8.3.2-1ubuntu1
* Merge with Debian unstable, remaining changes:
  - Bump the epoch because of old Ubuntu packaging.
  - debian/control:
    - Change the Maintainer address.
    - Bump the epoch on Replaces/Conflicts.
    - Don't build wacom-kernel-source anymore (#71944).
  - debian/wacom.postinst:
    Remove old files.
  - debian/rules: Disable the scaling quirk.
  - Enable patch system (quilt).
    - Import debian/xsfbs/*
    - Add quilt to build-deps.
  - Include wacomcpl so the stylus can be calibrated. (#216347)
    - debian/rules: --enable-libwacomxi
    - debian/control: Add tcl-dev, tk-dev to Build-Depends, and tcl,
      tk to wacom-tools Depends.
  - Modify 10-linuxwacom.fdi to support WALTOP and N-Trig.
  - Add 104_revert-check.diff: Don't check the serial number, it breaks
    some devices. Disabled for now, needs testing because part of it
    is upstream now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linuxwacom/src/xdrv/xf86WacomDefs.h
1
1
/*
2
2
 * Copyright 1995-2002 by Frederic Lepied, France. <Lepied@XFree86.org>
3
 
 * Copyright 2002-2008 by Ping Cheng, Wacom Technology. <pingc@wacom.com>
 
3
 * Copyright 2002-2009 by Ping Cheng, Wacom Technology. <pingc@wacom.com>
4
4
 * 
5
5
 * This program is free software; you can redistribute it and/or
6
6
 * modify it under the terms of the GNU General Public License
161
161
        int screenBottomY[32];  /* bottom cordinate of the associated screen */
162
162
        int maxWidth;           /* max active screen width */
163
163
        int maxHeight;          /* max active screen height */
 
164
        int leftPadding;        /* left padding for virtual tablet */
 
165
        int topPadding;         /* top padding for virtual tablet */
164
166
        int button[MAX_BUTTONS];/* buttons assignments */
165
167
        unsigned keys[MAX_BUTTONS][256]; /* keystrokes assigned to buttons */
166
168
        int relup;