[haiku-commits] r36843 - haiku/trunk/src/add-ons/input_server/devices/wacom
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 17 May 2010 17:39:43 +0200 (CEST)
Author: stippi
Date: 2010-05-17 17:39:42 +0200 (Mon, 17 May 2010)
New Revision: 36843
Changeset: http://dev.haiku-os.org/changeset/36843/haiku
Ticket: http://dev.haiku-os.org/ticket/3744
Modified:
haiku/trunk/src/add-ons/input_server/devices/wacom/TabletDevice.cpp
haiku/trunk/src/add-ons/input_server/devices/wacom/TabletDevice.h
Log:
Patch by idefix: Add support for four different Bamboo devices. Closes ticket
#3744, thanks a bunch!
Modified: haiku/trunk/src/add-ons/input_server/devices/wacom/TabletDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/wacom/TabletDevice.cpp
2010-05-17 15:38:25 UTC (rev 36842)
+++ haiku/trunk/src/add-ons/input_server/devices/wacom/TabletDevice.cpp
2010-05-17 15:39:42 UTC (rev 36843)
@@ -134,6 +134,12 @@
case 0x16: // Graphire 4 6x8 (tested)
SetDevice(16704.0, 12064.0, DEVICE_GRAPHIRE);
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:
SetDevice(12700.0, 10600.0, DEVICE_INTUOS);
break;
@@ -202,6 +208,12 @@
// SetDevice(3450.0, 2100.0, DEVICE_PENSTATION);
SetDevice(3248.0, 2320.0, DEVICE_PENSTATION);
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:
SetDevice(25400.0, 20320.0, DEVICE_INTUOS3);
break;
@@ -261,7 +273,9 @@
hasContact = true;
break;
}
- case DEVICE_GRAPHIRE: {
+ case DEVICE_GRAPHIRE:
+ case DEVICE_BAMBOO:
+ {
xPos = data[3] << 8 | data[2];
yPos = data[5] << 8 | data[4];
@@ -661,6 +675,12 @@
case 0x16:
*name = "Wacom Graphire4 6x8\" USB";
break;
+ case 0x17:
+ *name = "Wacom BambooFun 4x5\" USB";
+ break;
+ case 0x18:
+ *name = "Wacom BambooFun 6x8\" USB";
+ break;
case 0x20:
*name = "Wacom Intuos 4x5\" USB";
break;
@@ -730,6 +750,12 @@
case 0x64:
*name = "Wacom PenPartner.1 USB";
break;
+ case 0x65:
+ *name = "Wacom Bamboo USB";
+ break;
+ case 0x69:
+ *name = "Wacom Bamboo1 USB";
+ break;
case 0xB0:
*name = "Wacom Intuos3 4x5 USB";
Modified: haiku/trunk/src/add-ons/input_server/devices/wacom/TabletDevice.h
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/wacom/TabletDevice.h
2010-05-17 15:38:25 UTC (rev 36842)
+++ haiku/trunk/src/add-ons/input_server/devices/wacom/TabletDevice.h
2010-05-17 15:39:42 UTC (rev 36843)
@@ -75,6 +75,7 @@
DEVICE_VOLITO,
DEVICE_PENSTATION,
DEVICE_CINTIQ,
+ DEVICE_BAMBOO,
};
enum {
Other related posts:
- » [haiku-commits] r36843 - haiku/trunk/src/add-ons/input_server/devices/wacom - superstippi
