Peter Hutterer said the following on 11/23/2012 12:27 AM:
this should be a ';' right?

Yes.

To be consistent with my previous definition of "unset" (and to why we want to differentiate devices where the flag are explicitly set and those where it is not), I have now added "IntegratedIn=" (empty) for the tablet definitions which previously had "BuiltIn=false so that we remain perfectly consistent with the previous BuiltIn definitions for the tablets which had that set.

Updated patch attached.

Cheers,
Olivier.
>From bde7fffc9ee6c47be26186f9c9ae75a7b1ad062d Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofour...@redhat.com>
Date: Mon, 8 Oct 2012 16:02:39 +0200
Subject: [PATCH 2/3] data: add the IntegratedIn field to the tablet definitions

If set, "IntegratedIn" specifies if the device is integrated
in the "Display" (screen tablet) and/or "System" (ISD, TabletPC).

This field supersedes the "BuiltIn" value.

Signed-off-by: Olivier Fourdan <ofour...@redhat.com>
---
 data/bamboo-2fg-4x5.tablet        |    2 +-
 data/bamboo-2fg-6x8.tablet        |    2 +-
 data/bamboo-2fg.tablet            |    2 +-
 data/bamboo-craft.tablet          |    2 +-
 data/bamboo-one.tablet            |    2 +-
 data/bamboo-pen.tablet            |    2 +-
 data/cintiq-12wx.tablet           |    2 +-
 data/cintiq-20wsx.tablet          |    2 +-
 data/cintiq-21ux.tablet           |    2 +-
 data/cintiq-21ux2.tablet          |    2 +-
 data/cintiq-22hd.tablet           |    2 +-
 data/cintiq-24hd-touch.tablet     |    2 +-
 data/cintiq-24hd.tablet           |    2 +-
 data/dtf-720.tablet               |    2 +-
 data/dti-520.tablet               |    2 +-
 data/dtu-1631.tablet              |    2 +-
 data/dtu-2231.tablet              |    2 +-
 data/generic.tablet               |    1 -
 data/graphire-wireless-8x6.tablet |    2 +-
 data/intuos4-12x19.tablet         |    2 +-
 data/intuos4-4x6.tablet           |    2 +-
 data/intuos4-6x9-wl.tablet        |    2 +-
 data/intuos4-6x9.tablet           |    2 +-
 data/intuos4-8x13.tablet          |    2 +-
 data/intuos5-m.tablet             |    2 +-
 data/intuos5-s.tablet             |    2 +-
 data/intuos5-touch-l.tablet       |    2 +-
 data/intuos5-touch-m.tablet       |    2 +-
 data/intuos5-touch-s.tablet       |    2 +-
 data/isdv4-100.tablet             |    2 +-
 data/isdv4-101.tablet             |    2 +-
 data/isdv4-90.tablet              |    2 +-
 data/isdv4-93.tablet              |    2 +-
 data/isdv4-e3.tablet              |    2 +-
 data/isdv4-e5.tablet              |    2 +-
 data/isdv4-e6.tablet              |    2 +-
 data/isdv4-ed.tablet              |    2 +-
 data/isdv4-ef.tablet              |    2 +-
 data/n-trig-pen.tablet            |    2 +-
 data/serial-wacf004.tablet        |    2 +-
 data/wacom.example                |   15 ++++++++-------
 41 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/data/bamboo-2fg-4x5.tablet b/data/bamboo-2fg-4x5.tablet
index fb0cb90..ab7afaf 100644
--- a/data/bamboo-2fg-4x5.tablet
+++ b/data/bamboo-2fg-4x5.tablet
@@ -14,13 +14,13 @@ DeviceMatch=usb:056a:00d1
 Class=Bamboo
 Width=6
 Height=4
+IntegratedIn=
 
 [Features]
 Stylus=true
 Reversible=true
 Touch=true
 Buttons=4
-BuiltIn=false
 
 [Buttons]
 Left=A;B;C;D
diff --git a/data/bamboo-2fg-6x8.tablet b/data/bamboo-2fg-6x8.tablet
index d7bf97c..08874e4 100644
--- a/data/bamboo-2fg-6x8.tablet
+++ b/data/bamboo-2fg-6x8.tablet
@@ -14,13 +14,13 @@ DeviceMatch=usb:056a:00d3
 Class=Bamboo
 Width=9
 Height=5
+IntegratedIn=
 
 [Features]
 Stylus=true
 Reversible=true
 Touch=true
 Buttons=4
-BuiltIn=false
 
 [Buttons]
 Left=A;B;C;D
diff --git a/data/bamboo-2fg.tablet b/data/bamboo-2fg.tablet
index 4e74ccd..103af68 100644
--- a/data/bamboo-2fg.tablet
+++ b/data/bamboo-2fg.tablet
@@ -13,13 +13,13 @@ DeviceMatch=usb:056a:00d0
 Class=Bamboo
 Width=5
 Height=3
+IntegratedIn=
 
 [Features]
 Stylus=false
 Reversible=true
 Touch=true
 Buttons=4
-BuiltIn=false
 
 [Buttons]
 Left=A;B;C;D
diff --git a/data/bamboo-craft.tablet b/data/bamboo-craft.tablet
index e68ca5d..e6e36ba 100644
--- a/data/bamboo-craft.tablet
+++ b/data/bamboo-craft.tablet
@@ -14,13 +14,13 @@ DeviceMatch=usb:056a:00d2
 Class=Bamboo
 Width=6
 Height=4
+IntegratedIn=
 
 [Features]
 Stylus=true
 Reversible=true
 Touch=true
 Buttons=4
-BuiltIn=false
 
 [Buttons]
 Left=A;B;C;D
diff --git a/data/bamboo-one.tablet b/data/bamboo-one.tablet
index feacf54..888f770 100644
--- a/data/bamboo-one.tablet
+++ b/data/bamboo-one.tablet
@@ -5,6 +5,7 @@ DeviceMatch=usb:056a:0069
 Class=Bamboo
 Width=5
 Height=4
+IntegratedIn=
 
 [Features]
 Reversible=true
@@ -13,4 +14,3 @@ Touch=false
 Ring=false
 NumStrips=0
 Buttons=0
-BuiltIn=false
diff --git a/data/bamboo-pen.tablet b/data/bamboo-pen.tablet
index a5b5aea..05f1689 100644
--- a/data/bamboo-pen.tablet
+++ b/data/bamboo-pen.tablet
@@ -13,10 +13,10 @@ DeviceMatch=usb:056a:00d4
 Class=Bamboo
 Width=6
 Height=4
+IntegratedIn=
 
 [Features]
 Stylus=true
 Reversible=true
 Touch=false
 Buttons=0
-BuiltIn=false
diff --git a/data/cintiq-12wx.tablet b/data/cintiq-12wx.tablet
index 006500d..75b2457 100644
--- a/data/cintiq-12wx.tablet
+++ b/data/cintiq-12wx.tablet
@@ -38,12 +38,12 @@ Width=10
 Height=7
 Layout=cintiq-12wx.svg
 Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+IntegratedIn=Display
 
 [Features]
 Stylus=true
 NumStrips=2
 Buttons=10
-BuiltIn=true
 
 [Buttons]
 Left=A;B;C;D;I
diff --git a/data/cintiq-20wsx.tablet b/data/cintiq-20wsx.tablet
index 3cc6c23..4bc91d0 100644
--- a/data/cintiq-20wsx.tablet
+++ b/data/cintiq-20wsx.tablet
@@ -40,13 +40,13 @@ Class=Cintiq
 Width=17
 Height=11
 Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+IntegratedIn=Display
 
 [Features]
 Reversible=false
 Stylus=true
 NumStrips=2
 Buttons=14
-BuiltIn=true
 
 [Buttons]
 Left=A;B;C;D;I;K;L
diff --git a/data/cintiq-21ux.tablet b/data/cintiq-21ux.tablet
index 30d3922..1c353a4 100644
--- a/data/cintiq-21ux.tablet
+++ b/data/cintiq-21ux.tablet
@@ -33,13 +33,13 @@ Class=Cintiq
 Width=17
 Height=13
 Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+IntegratedIn=Display
 
 [Features]
 Reversible=false
 Stylus=true
 NumStrips=2
 Buttons=8
-BuiltIn=true
 
 [Buttons]
 Left=A;B;C;D
diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet
index 85f2686..734f9f3 100644
--- a/data/cintiq-21ux2.tablet
+++ b/data/cintiq-21ux2.tablet
@@ -49,13 +49,13 @@ Class=Cintiq
 Width=17
 Height=13
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
+IntegratedIn=Display
 
 [Features]
 Stylus=true
 Ring=false
 NumStrips=2
 Buttons=18
-BuiltIn=true
 StatusLEDs=Touchstrip2;Touchstrip
 
 [Buttons]
diff --git a/data/cintiq-22hd.tablet b/data/cintiq-22hd.tablet
index 8898aa9..f290e2f 100644
--- a/data/cintiq-22hd.tablet
+++ b/data/cintiq-22hd.tablet
@@ -37,6 +37,7 @@ Class=Cintiq
 Width=19
 Height=11
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
+IntegratedIn=Display
 
 [Features]
 Stylus=true
@@ -45,7 +46,6 @@ Touch=false
 Ring=false
 NumStrips=2
 Buttons=18
-BuiltIn=true
 
 [Buttons]
 Left=B;C;D;E;A;F;G;H;I
diff --git a/data/cintiq-24hd-touch.tablet b/data/cintiq-24hd-touch.tablet
index c672bbd..8e9bad1 100644
--- a/data/cintiq-24hd-touch.tablet
+++ b/data/cintiq-24hd-touch.tablet
@@ -46,6 +46,7 @@ Class=Cintiq
 Width=21
 Height=13
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
+IntegratedIn=Display
 
 [Features]
 Stylus=true
@@ -54,7 +55,6 @@ Touch=true
 Buttons=16
 Ring=true
 Ring2=true
-BuiltIn=true
 StatusLEDs=Ring2;Ring
 
 [Buttons]
diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet
index c5ae581..39b749f 100644
--- a/data/cintiq-24hd.tablet
+++ b/data/cintiq-24hd.tablet
@@ -45,6 +45,7 @@ Class=Cintiq
 Width=21
 Height=13
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
+IntegratedIn=Display
 
 [Features]
 Stylus=true
@@ -53,7 +54,6 @@ Touch=false
 Buttons=16
 Ring=true
 Ring2=true
-BuiltIn=true
 StatusLEDs=Ring2;Ring
 
 [Buttons]
diff --git a/data/dtf-720.tablet b/data/dtf-720.tablet
index 9bcf19f..e724fa7 100644
--- a/data/dtf-720.tablet
+++ b/data/dtf-720.tablet
@@ -9,9 +9,9 @@ DeviceMatch=usb:056a:00c0
 Width=13
 Height=11
 Class=PenDisplay
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Buttons=0
-BuiltIn=true
 
diff --git a/data/dti-520.tablet b/data/dti-520.tablet
index e2f20d7..700ab51 100644
--- a/data/dti-520.tablet
+++ b/data/dti-520.tablet
@@ -22,6 +22,7 @@ Width=14
 Height=12
 # FIXME does the stylus have an eraser?
 # Styli=0xfffff;
+IntegratedIn=Display;System
 
 [Features]
 # This tablet does not appear to support erasers on styli
@@ -33,7 +34,6 @@ Ring2=false
 NumStrips=0
 # Actually 11 buttons but the two Ctrl ones send the same scancode
 Buttons=10
-BuiltIn=true
 
 [Buttons]
 Top=F;G;H;I;J
diff --git a/data/dtu-1631.tablet b/data/dtu-1631.tablet
index 13b6014..201a251 100644
--- a/data/dtu-1631.tablet
+++ b/data/dtu-1631.tablet
@@ -9,9 +9,9 @@ DeviceMatch=usb:056a:00f0
 Width=14
 Height=8
 Class=PenDisplay
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Buttons=0
-BuiltIn=true
 
diff --git a/data/dtu-2231.tablet b/data/dtu-2231.tablet
index 9cf0ef6..034c8f0 100644
--- a/data/dtu-2231.tablet
+++ b/data/dtu-2231.tablet
@@ -8,9 +8,9 @@ DeviceMatch=usb:056a:00ce
 Class=PenDisplay
 Width=19
 Height=11
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Buttons=0
-BuiltIn=true
 
diff --git a/data/generic.tablet b/data/generic.tablet
index 7be3033..8b7f867 100644
--- a/data/generic.tablet
+++ b/data/generic.tablet
@@ -8,4 +8,3 @@ Stylus=true
 Ring=true
 NumStrips=2
 Buttons=4
-BuiltIn=false
diff --git a/data/graphire-wireless-8x6.tablet b/data/graphire-wireless-8x6.tablet
index 5cc5f71..1a922c4 100644
--- a/data/graphire-wireless-8x6.tablet
+++ b/data/graphire-wireless-8x6.tablet
@@ -4,13 +4,13 @@ DeviceMatch=bluetooth:056a:81
 Class=Graphire
 Width=8
 Height=6
+IntegratedIn=
 
 [Features]
 Reversible=false
 Stylus=true
 Ring=false
 Buttons=2
-BuiltIn=false
 
 [Buttons]
 Top=A;B
diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet
index f3cc114..fe7a110 100644
--- a/data/intuos4-12x19.tablet
+++ b/data/intuos4-12x19.tablet
@@ -38,6 +38,7 @@ DeviceMatch=usb:056a:00bb
 Class=Intuos4
 Width=19
 Height=12
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
 
 [Features]
@@ -45,7 +46,6 @@ Reversible=true
 Stylus=true
 Ring=true
 Buttons=9
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet
index 7aa7a44..8ac8fb7 100644
--- a/data/intuos4-4x6.tablet
+++ b/data/intuos4-4x6.tablet
@@ -39,6 +39,7 @@ DeviceMatch=usb:056a:00b8
 Class=Intuos4
 Width=6
 Height=4
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 
 [Features]
@@ -46,7 +47,6 @@ Reversible=true
 Stylus=true
 Ring=true
 Buttons=7
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet
index a66aa12..786a7a5 100644
--- a/data/intuos4-6x9-wl.tablet
+++ b/data/intuos4-6x9-wl.tablet
@@ -38,6 +38,7 @@ DeviceMatch=usb:056a:00bc;bluetooth:056a:00bd
 Class=Intuos4
 Width=8
 Height=5
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 
 [Features]
@@ -45,7 +46,6 @@ Reversible=true
 Stylus=true
 Ring=true
 Buttons=9
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet
index be6b9f2..9d0356a 100644
--- a/data/intuos4-6x9.tablet
+++ b/data/intuos4-6x9.tablet
@@ -38,6 +38,7 @@ DeviceMatch=usb:056a:00b9
 Class=Intuos4
 Width=9
 Height=6
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 
 [Features]
@@ -45,7 +46,6 @@ Reversible=true
 Stylus=true
 Ring=true
 Buttons=9
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet
index 52747c1..2339d14 100644
--- a/data/intuos4-8x13.tablet
+++ b/data/intuos4-8x13.tablet
@@ -38,6 +38,7 @@ DeviceMatch=usb:056a:00ba
 Class=Intuos4
 Width=13
 Height=8
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
 
 [Features]
@@ -45,7 +46,6 @@ Reversible=true
 Stylus=true
 Ring=true
 Buttons=9
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet
index 153cf84..f39a2b7 100644
--- a/data/intuos5-m.tablet
+++ b/data/intuos5-m.tablet
@@ -49,6 +49,7 @@ Class=Intuos5
 Width=9
 Height=6
 Layout=intuos5-m.svg
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 
 [Features]
@@ -57,7 +58,6 @@ Reversible=true
 Touch=false
 Buttons=9
 Ring=true
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet
index ad3e7eb..e5a7d26 100644
--- a/data/intuos5-s.tablet
+++ b/data/intuos5-s.tablet
@@ -46,6 +46,7 @@ DeviceMatch=usb:056a:0029
 Class=Intuos5
 Width=6
 Height=4
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 
 [Features]
@@ -54,7 +55,6 @@ Reversible=true
 Touch=false
 Buttons=7
 Ring=true
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet
index aaeda44..bcc9165 100644
--- a/data/intuos5-touch-l.tablet
+++ b/data/intuos5-touch-l.tablet
@@ -48,6 +48,7 @@ DeviceMatch=usb:056a:0028
 Class=Intuos5
 Width=13
 Height=8
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
 
 [Features]
@@ -56,7 +57,6 @@ Reversible=true
 Touch=true
 Buttons=9
 Ring=true
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet
index c53694e..92ae854 100644
--- a/data/intuos5-touch-m.tablet
+++ b/data/intuos5-touch-m.tablet
@@ -49,6 +49,7 @@ Class=Intuos5
 Width=9
 Height=6
 Layout=intuos5-m.svg
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 
 [Features]
@@ -57,7 +58,6 @@ Reversible=true
 Touch=true
 Buttons=9
 Ring=true
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet
index 2abb2ae..0630f02 100644
--- a/data/intuos5-touch-s.tablet
+++ b/data/intuos5-touch-s.tablet
@@ -46,6 +46,7 @@ DeviceMatch=usb:056a:0026
 Class=Intuos5
 Width=6
 Height=4
+IntegratedIn=
 Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 
 [Features]
@@ -54,7 +55,6 @@ Reversible=true
 Touch=true
 Buttons=7
 Ring=true
-BuiltIn=false
 StatusLEDs=Ring
 
 [Buttons]
diff --git a/data/isdv4-100.tablet b/data/isdv4-100.tablet
index 3a78ee3..330a76c 100644
--- a/data/isdv4-100.tablet
+++ b/data/isdv4-100.tablet
@@ -6,9 +6,9 @@ DeviceMatch=usb:056a:0100
 Class=ISDV4
 Width=11
 Height=6
+IntegratedIn=Display;System
 
 [Features]
 Stylus=false
 Touch=true
-BuiltIn=true
 Buttons=0
diff --git a/data/isdv4-101.tablet b/data/isdv4-101.tablet
index dea7256..40fc7e1 100644
--- a/data/isdv4-101.tablet
+++ b/data/isdv4-101.tablet
@@ -6,9 +6,9 @@ DeviceMatch=usb:056a:0101
 Class=ISDV4
 Width=11
 Height=6
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Touch=true
-BuiltIn=true
 Buttons=0
diff --git a/data/isdv4-90.tablet b/data/isdv4-90.tablet
index c92c333..fbba291 100644
--- a/data/isdv4-90.tablet
+++ b/data/isdv4-90.tablet
@@ -10,9 +10,9 @@ DeviceMatch=usb:056a:0090;serial:056a:0090
 Class=ISDV4
 Width=12
 Height=8
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Touch=false
 Buttons=0
-BuiltIn=true
diff --git a/data/isdv4-93.tablet b/data/isdv4-93.tablet
index c6ab4b5..c0fe0d1 100644
--- a/data/isdv4-93.tablet
+++ b/data/isdv4-93.tablet
@@ -10,9 +10,9 @@ DeviceMatch=usb:056a:0093;serial:056a:0093
 Class=ISDV4
 Width=10
 Height=6
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Touch=true
 Buttons=0
-BuiltIn=true
diff --git a/data/isdv4-e3.tablet b/data/isdv4-e3.tablet
index 6e68cb4..bf6e075 100644
--- a/data/isdv4-e3.tablet
+++ b/data/isdv4-e3.tablet
@@ -4,9 +4,9 @@
 Name=Wacom ISDv4 E3
 DeviceMatch=usb:056a:00e3;serial:056a:00e3
 Class=ISDV4
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Touch=true
-BuiltIn=true
 Buttons=0
diff --git a/data/isdv4-e5.tablet b/data/isdv4-e5.tablet
index a22f476..d7b5d18 100644
--- a/data/isdv4-e5.tablet
+++ b/data/isdv4-e5.tablet
@@ -6,9 +6,9 @@ DeviceMatch=usb:056a:00e5
 Class=ISDV4
 Width=11
 Height=6
+IntegratedIn=Display;System
 
 [Features]
 Stylus=false
 Touch=true
-BuiltIn=true
 Buttons=0
diff --git a/data/isdv4-e6.tablet b/data/isdv4-e6.tablet
index 328a702..70d0729 100644
--- a/data/isdv4-e6.tablet
+++ b/data/isdv4-e6.tablet
@@ -6,9 +6,9 @@ DeviceMatch=usb:056a:00e6
 Class=ISDV4
 Width=11
 Height=6
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Touch=true
-BuiltIn=true
 Buttons=0
diff --git a/data/isdv4-ed.tablet b/data/isdv4-ed.tablet
index cee499b..2bbe464 100644
--- a/data/isdv4-ed.tablet
+++ b/data/isdv4-ed.tablet
@@ -4,9 +4,9 @@
 Name=Wacom ISDv4 ED
 DeviceMatch=usb:056a:00ed
 Class=ISDV4
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Touch=true
-BuiltIn=true
 Buttons=0
diff --git a/data/isdv4-ef.tablet b/data/isdv4-ef.tablet
index 6f8816f..a21af41 100644
--- a/data/isdv4-ef.tablet
+++ b/data/isdv4-ef.tablet
@@ -4,8 +4,8 @@
 Name=Wacom ISDv4 EF
 DeviceMatch=usb:056a:00ef
 Class=ISDV4
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
-BuiltIn=true
 Buttons=0
diff --git a/data/n-trig-pen.tablet b/data/n-trig-pen.tablet
index 5297228..d306c06 100644
--- a/data/n-trig-pen.tablet
+++ b/data/n-trig-pen.tablet
@@ -11,9 +11,9 @@ DeviceMatch=usb:1b96:0001
 Class=ISDV4
 Width=10
 Height=6
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Touch=true
 Buttons=0
-BuiltIn=true
diff --git a/data/serial-wacf004.tablet b/data/serial-wacf004.tablet
index d1ba472..e2b5f74 100644
--- a/data/serial-wacf004.tablet
+++ b/data/serial-wacf004.tablet
@@ -2,9 +2,9 @@
 Name=Wacom Serial Tablet WACf004
 DeviceMatch=serial:0000:0000
 Class=ISDV4
+IntegratedIn=Display;System
 
 [Features]
 Stylus=true
 Ring=false
 Buttons=0
-BuiltIn=true
diff --git a/data/wacom.example b/data/wacom.example
index 762c360..7be0d17 100644
--- a/data/wacom.example
+++ b/data/wacom.example
@@ -34,6 +34,14 @@ Width=9
 # (Optional) Height in inches, as advertised by the manufacturer
 Height=6
 
+# Integration flags, is the tablet is part of the system, such as a
+# TabletPC or integrated in the screen, ie a screen tablet (most serial
+# tablets, Cintiqs)
+# Note, if unspecified, the integration flags will be taken from the kernel.
+# Using an empty value or "None" forces the intergration flags to remain unset
+# even if the relevant kernel flags would state otherwise.
+IntegratedIn=Display;System
+
 # Styli
 #
 # This is a list of stylus IDs supported by the tablet. This is the
@@ -97,13 +105,6 @@ NumStrips=1
 # Number of buttons on the tablet
 Buttons=9
 
-# This tablet is built-in (most serial tablets, Cintiqs)
-#
-# The value within the file is ignored if the WacomDevice
-# is created through the device path, in which case the
-# value comes from kernel properties
-BuiltIn=false
-
 # Metadata about the buttons on the tablet
 # Buttons are "numbered" using upper-case letters
 [Buttons]
-- 
1.7.1

------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to