Use NumRings instead of separate Ring/Ring2 (#669)

This deprecates libwacom_has_ring() and libwacom_has_ring2() for the
new libwacom_get_num_rings(). In our tablet files we also remove
Ring=true/Ring2=true and replace that with NumRings=.

This makes the support line up better with strip support and removes
some of the confusion in the tablet file where we have two independent
Ring and Ring2 entries with different meanings.

data/bamboo-0fg-m-p-alt.tablet

@@ -52,7 +52,7 @@ Layout=bamboo-0fg-s-p-alt.svg
 Stylus=true
 Reversible=false
 Touch=false
-Ring=true
+NumRings=1
 
 [Buttons]
 Top=A;B;C;D

data/bamboo-0fg-s-p-alt.tablet

@@ -53,7 +53,7 @@ Layout=bamboo-0fg-s-p-alt.svg
 Stylus=true
 Reversible=false
 Touch=false
-Ring=true
+NumRings=1
 
 [Buttons]
 Top=A;B;C;D

data/bamboo-0fg-s-p.tablet

@@ -53,7 +53,7 @@ Layout=bamboo-0fg-s-p.svg
 Stylus=true
 Reversible=false
 Touch=false
-Ring=true
+NumRings=1
 
 [Buttons]
 Top=A;B;C;D

data/bamboo-one.tablet

@@ -15,5 +15,5 @@ IntegratedIn=
 Reversible=true
 Stylus=true
 Touch=false
-Ring=false
+NumRings=0
 NumStrips=0

data/cintiq-13hd.tablet

@@ -36,7 +36,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=B;C;G;H;A;F;I;D;E

data/cintiq-13hdt.tablet

@@ -38,7 +38,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=B;C;G;H;A;F;I;D;E

data/cintiq-16-2.tablet

@@ -17,4 +17,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0

data/cintiq-16.tablet

@@ -17,4 +17,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0

data/cintiq-21ux2.tablet

@@ -55,7 +55,7 @@ IntegratedIn=Display
 
 [Features]
 Stylus=true
-Ring=false
+NumRings=0
 NumStrips=2
 StatusLEDs=Touchstrip2;Touchstrip
 

data/cintiq-22.tablet

@@ -17,4 +17,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0

data/cintiq-22hd.tablet

@@ -45,7 +45,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0
 NumStrips=2
 
 [Buttons]

data/cintiq-22hdt.tablet

@@ -47,7 +47,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0
 NumStrips=2
 
 [Buttons]

data/cintiq-24hd-touch.tablet

@@ -55,8 +55,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=true
-Ring2=true
+NumRings=2
 StatusLEDs=Ring2;Ring
 
 [Buttons]

data/cintiq-24hd.tablet

@@ -53,8 +53,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=true
-Ring2=true
+NumRings=2
 StatusLEDs=Ring2;Ring
 
 [Buttons]

data/cintiq-27hd.tablet

@@ -17,5 +17,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0

data/cintiq-27hdt.tablet

@@ -19,5 +19,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
-Ring2=false
+NumRings=0

data/cintiq-companion-2.tablet

@@ -41,7 +41,7 @@ IntegratedIn=Display;System
 [Features]
 Stylus=true
 Touch=true
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=A;B;C;D;E;F;G;H;I;J;K

data/cintiq-companion-hybrid.tablet

@@ -40,7 +40,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=B;C;G;H;A;F;I;D;E

data/cintiq-companion.tablet

@@ -39,7 +39,7 @@ IntegratedIn=Display;System
 [Features]
 Stylus=true
 Touch=true
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=B;C;G;H;A;F;I;D;E

data/cintiq-pro-13.tablet

@@ -42,7 +42,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0
 
 [Keys]
 # first key is in-kernel display toggle

data/cintiq-pro-16-2.tablet

@@ -39,7 +39,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=A;B;C;D

data/cintiq-pro-16.tablet

@@ -42,4 +42,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0

data/cintiq-pro-17.tablet

@@ -40,7 +40,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=A;B;C;D

data/cintiq-pro-22.tablet

@@ -40,7 +40,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=A;B;C;D

data/cintiq-pro-24-p.tablet

@@ -41,4 +41,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0

data/cintiq-pro-24-pt.tablet

@@ -42,4 +42,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0

data/cintiq-pro-27.tablet

@@ -40,7 +40,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0
 
 [Buttons]
 Left=A;B;C;D

data/cintiq-pro-32.tablet

@@ -42,4 +42,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0

data/dell-canvas-27.tablet

@@ -34,4 +34,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0

data/dtc-121.tablet

@@ -19,4 +19,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0

data/dth-1152.tablet

@@ -18,6 +18,5 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0

data/dth-134.tablet

@@ -19,4 +19,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
+NumRings=0

data/dth-2242.tablet

@@ -31,8 +31,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 # Actually 7 buttons but one is reserved for onscreen menus
 

data/dth-2452.tablet

@@ -28,8 +28,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=true
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 # Actually 5 buttons but one is reserved for onscreen menus
 

data/dti-520.tablet

@@ -31,8 +31,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 # Actually 11 buttons but the two Ctrl ones send the same scancode
 

data/dtk-1651.tablet

@@ -26,8 +26,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 
 [Buttons]

data/dtk-1660e-2.tablet

@@ -16,4 +16,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0

data/dtk-1660e.tablet

@@ -16,4 +16,4 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
+NumRings=0

data/dtk-2241.tablet

@@ -29,8 +29,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 # Actually 7 buttons but one is reserved for onscreen menus
 

data/dtk-2451.tablet

@@ -27,8 +27,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 # Actually 5 buttons but one is reserved for onscreen menus
 

data/dtu-1031.tablet

@@ -29,8 +29,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 
 [Buttons]

data/dtu-1031x.tablet

@@ -17,6 +17,5 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0

data/dtu-1141.tablet

@@ -29,8 +29,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 
 [Buttons]

data/dtu-1141b.tablet

@@ -27,8 +27,7 @@ IntegratedIn=Display
 Stylus=true
 Reversible=false
 Touch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0
 
 [Buttons]

data/ek-remote.tablet

@@ -20,7 +20,7 @@ Class=Remote
 
 [Features]
 Stylus=false
-Ring=true
+NumRings=1
 NumStrips=0
 StatusLEDs=Ring
 

data/elan-22e2.tablet

@@ -13,6 +13,5 @@ Stylus=true
 Reversible=false
 Touch=false
 TouchSwitch=false
-Ring=false
-Ring2=false
+NumRings=0
 NumStrips=0

data/elan-24d8.tablet

@@ -13,8 +13,7 @@ Styli=@generic-with-eraser;
 [Features]
 Reversible=false
 Stylus=true
-Ring=false
-Ring2=false
+NumRings=0
 Touch=true
 TouchSwitch=false
 # StatusLEDs=

data/generic.tablet

@@ -7,4 +7,4 @@ IntegratedIn=Display;System;
 [Features]
 Reversible=false
 Stylus=true
-Ring=false
+NumRings=0