Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch by idefix: Add support for four different Bamboo devices. Closes ticket

Browse Source 
#3744, thanks a bunch!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36843 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-05-17 15:39:42 +00:00
parent a9f29dd29c
commit 3e3162e3af
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/add-ons/input_server/devices/wacom/TabletDevice.cpp
View File

@ -134,6 +134,12 @@ TabletDevice::DetectDevice(const DeviceReader* reader)
case 0x16: // Graphire 4 6x8 (tested) case 0x16: // Graphire 4 6x8 (tested)
SetDevice(16704.0, 12064.0, DEVICE_GRAPHIRE); SetDevice(16704.0, 12064.0, DEVICE_GRAPHIRE);
break; break;
case 0x17: // BambooFun 4x5 (from Linux Wacom Project)
SetDevice(14760.0, 9225.0, DEVICE_BAMBOO);
break;
case 0x18: // BambooFun 6x8 (from Linux Wacom Project)
SetDevice(21648.0, 13530.0, DEVICE_BAMBOO);
break;
case 0x20: case 0x20:
SetDevice(12700.0, 10600.0, DEVICE_INTUOS); SetDevice(12700.0, 10600.0, DEVICE_INTUOS);
break; break;
@ -202,6 +208,12 @@ TabletDevice::DetectDevice(const DeviceReader* reader)
// SetDevice(3450.0, 2100.0, DEVICE_PENSTATION); // SetDevice(3450.0, 2100.0, DEVICE_PENSTATION);
SetDevice(3248.0, 2320.0, DEVICE_PENSTATION); SetDevice(3248.0, 2320.0, DEVICE_PENSTATION);
break; break;
case 0x65: // Bamboo (from Linux Wacom Project)
SetDevice(14760.0, 9225.0, DEVICE_BAMBOO);
break;
case 0x69: // Bamboo1 (from Linux Wacom Project)
SetDevice(5104.0, 3712.0, DEVICE_BAMBOO);
break;
case 0xB0: case 0xB0:
SetDevice(25400.0, 20320.0, DEVICE_INTUOS3); SetDevice(25400.0, 20320.0, DEVICE_INTUOS3);
break; break;
@ -261,7 +273,9 @@ TabletDevice::ReadData(const uchar* data, bool& hasContact, uint32& mode,
hasContact = true; hasContact = true;
break; break;
} }
case DEVICE_GRAPHIRE: { case DEVICE_GRAPHIRE:
case DEVICE_BAMBOO:
{
xPos = data[3] << 8 | data[2]; xPos = data[3] << 8 | data[2];
yPos = data[5] << 8 | data[4]; yPos = data[5] << 8 | data[4];
@ -661,6 +675,12 @@ TabletDevice::_GetName(uint16 productID, const char** name) const
case 0x16: case 0x16:
*name = "Wacom Graphire4 6x8\" USB"; *name = "Wacom Graphire4 6x8\" USB";
break; break;
case 0x17:
*name = "Wacom BambooFun 4x5\" USB";
break;
case 0x18:
*name = "Wacom BambooFun 6x8\" USB";
break;
case 0x20: case 0x20:
*name = "Wacom Intuos 4x5\" USB"; *name = "Wacom Intuos 4x5\" USB";
break; break;
@ -730,6 +750,12 @@ TabletDevice::_GetName(uint16 productID, const char** name) const
case 0x64: case 0x64:
*name = "Wacom PenPartner.1 USB"; *name = "Wacom PenPartner.1 USB";
break; break;
case 0x65:
*name = "Wacom Bamboo USB";
break;
case 0x69:
*name = "Wacom Bamboo1 USB";
break;
case 0xB0: case 0xB0:
*name = "Wacom Intuos3 4x5 USB"; *name = "Wacom Intuos3 4x5 USB";

1
src/add-ons/input_server/devices/wacom/TabletDevice.h
View File

@ -75,6 +75,7 @@ class TabletDevice : public PointingDevice {
DEVICE_VOLITO, DEVICE_VOLITO,
DEVICE_PENSTATION, DEVICE_PENSTATION,
DEVICE_CINTIQ, DEVICE_CINTIQ,
DEVICE_BAMBOO,
}; };
enum { enum {