[mediaqueries] Per WG discussion, restrict pointer/hover to just primary device, add any-pointer/any-hover as the union of all devices.

Author: tabatkins

mediaqueries/Overview.bs

@@ -1369,20 +1369,20 @@ pointer</h3>
 
 	The 'pointer' media feature is used to query about the presence and accuracy of a pointing device such as a mouse.
 	If a device has multiple input mechanisms,
-	it is recommended that the UA reports the characteristics of the least capable pointing device of the primary input mechanisms;
-	if there are multiple reasonable "primary" input mechanisms with different characteristics,
-	UAs may make the feature match multiple values.
-	This media query takes the following values:
+	the 'pointer' media feature must reflect the characteristics of the “primary” input mechanism,
+	as determined by the user agent.
+	(To query the capabilities of <em>any</em> available input mechanism,
+		see the 'any-pointer' media feature.)
 
 	<dl dfn-type=value dfn-for="@media/pointer">
 		<dt><dfn>none</dfn>
-		<dd>The input mechanism of the device does not include a pointing device.
+		<dd>The primary input mechanism of the device does not include a pointing device.
 
 		<dt><dfn>coarse</dfn>
-		<dd>The input mechanism of the device includes a pointing device of limited accuracy.
+		<dd>The primary input mechanism of the device includes a pointing device of limited accuracy.
 
 		<dt><dfn>fine</dfn>
-		<dd>The input mechanism of the device includes an accurate pointing device.
+		<dd>The primary input mechanism of the device includes an accurate pointing device.
 	</dl>
 
 	Both ''coarse'' and ''fine'' indicate the presence of a pointing device,
@@ -1459,8 +1459,12 @@ hover</h3>
 	Type: discrete
 	</pre>
 
-	The 'hover' media feature is used to query whether primary pointing system
-	used on the output device can hover or not.
+	The 'hover' media feature is used to query the user's ability to hover over elements on the page.
+	If a device has multiple input mechanisms,
+	the 'hover' media feature must reflect the characteristics of the “primary” input mechanism,
+	as determined by the user agent.
+	(To query the capabilities of <em>any</em> available input mechanism,
+		see the 'any-hover' media feature.)
 
 	<dl dfn-type=value dfn-for="@media/hover">
 		<dt><dfn>none</dfn>
@@ -1480,10 +1484,6 @@ hover</h3>
 			Indicates that the primary pointing system can easily hover over parts of the page.
 	</dl>
 
-	If a device has multiple pointing devices,
-	some of which support hovering and some of which not,
-	it is recommended that the UA reports the hovering ability of the least capable of the primary pointing devices.
-
 	<div class='example'>
 		For example, on a touch screen device that can also be controlled by an optional mouse,
 		the 'hover' <a>media feature</a> should match ''hover/none'',
@@ -1510,6 +1510,28 @@ hover</h3>
 		</pre>
 	</div>
 
+<h3 id='any-input'>
+any-pointer and any-hover</h3>
+
+	<pre class='descdef mq'>
+	Name: any-pointer
+	Value: none | coarse | fine
+	For: @media
+	Type: discrete
+	</pre>
+
+	<pre class='descdef mq'>
+	Name: any-hover
+	Value: none | on-demand | hover
+	For: @media
+	Type: discrete
+	</pre>
+
+	The 'any-pointer' and 'any-hover' media features are identical to the 'pointer' and 'hover' media features,
+	but they correspond to the union of capabilities of all the input devices available to the user.
+	More than one of their values can match,
+	if different input devices have different characteristics.
+
 
 <h2 id='mf-environment'>
 Environment Media Features</h2>

mediaqueries/Overview.html

@@ -160,7 +160,8 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
 	<li><a href=#mf-interaction><span class=secno>7</span> Interaction Media Features</a>
 		<ul class=toc>
 		<li><a href=#pointer><span class=secno>7.1</span> pointer</a>
-		<li><a href=#hover><span class=secno>7.2</span> hover</a></ul>
+		<li><a href=#hover><span class=secno>7.2</span> hover</a>
+		<li><a href=#any-input><span class=secno>7.3</span> any-pointer and any-hover</a></ul>
 	<li><a href=#mf-environment><span class=secno>8</span> Environment Media Features</a>
 		<ul class=toc>
 		<li><a href=#light-level><span class=secno>8.1</span> light-level</a></ul>
@@ -1785,20 +1786,20 @@ <h3 class="heading settled heading" data-level=7.1 id=pointer><span class=secno>
 
 <p>The <a class=property data-link-type=propdesc href=#descdef-pointer title=pointer>pointer</a> media feature is used to query about the presence and accuracy of a pointing device such as a mouse.
 	If a device has multiple input mechanisms,
-	it is recommended that the UA reports the characteristics of the least capable pointing device of the primary input mechanisms;
-	if there are multiple reasonable "primary" input mechanisms with different characteristics,
-	UAs may make the feature match multiple values.
-	This media query takes the following values:</p>
+	the <a class=property data-link-type=propdesc href=#descdef-pointer title=pointer>pointer</a> media feature must reflect the characteristics of the “primary” input mechanism,
+	as determined by the user agent.
+	(To query the capabilities of <em>any</em> available input mechanism,
+		see the <a class=property data-link-type=propdesc href=#descdef-any-pointer title=any-pointer>any-pointer</a> media feature.)</p>
 
 	<dl data-dfn-for=@media/pointer data-dfn-type=value>
 		<dt><dfn class=css-code data-dfn-for=@media/pointer data-dfn-type=value data-export="" id=valuedef-none3>none<a class=self-link href=#valuedef-none3></a></dfn>
-		<dd>The input mechanism of the device does not include a pointing device.
+		<dd>The primary input mechanism of the device does not include a pointing device.
 
 		<dt><dfn class=css-code data-dfn-for=@media/pointer data-dfn-type=value data-export="" id=valuedef-coarse>coarse<a class=self-link href=#valuedef-coarse></a></dfn>
-		<dd>The input mechanism of the device includes a pointing device of limited accuracy.
+		<dd>The primary input mechanism of the device includes a pointing device of limited accuracy.
 
 		<dt><dfn class=css-code data-dfn-for=@media/pointer data-dfn-type=value data-export="" id=valuedef-fine>fine<a class=self-link href=#valuedef-fine></a></dfn>
-		<dd>The input mechanism of the device includes an accurate pointing device.
+		<dd>The primary input mechanism of the device includes an accurate pointing device.
 	</dl>
 
 <p>Both <a class=css data-link-type=maybe href=#valuedef-coarse title=coarse>coarse</a> and <a class=css data-link-type=maybe href=#valuedef-fine title=fine>fine</a> indicate the presence of a pointing device,
@@ -1863,8 +1864,12 @@ <h3 class="heading settled heading" data-level=7.2 id=hover><span class=secno>7.
 
 <table class="definition descdef mq" data-dfn-for=@media><tr><th>Name:<td><dfn class=css-code data-dfn-for=@media data-dfn-type=descriptor data-export="" id=descdef-hover>hover<a class=self-link href=#descdef-hover></a></dfn><tr><th>For:<td><a class=css-code data-link-type=at-rule href=http://dev.w3.org/csswg/css-conditional-3/#at-ruledef-media title=@media>@media</a><tr><th>Value:<td class=prod>none <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> on-demand <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> hover<tr><th>Type:<td>discrete</table>
 
-<p>The <a class=property data-link-type=propdesc href=#descdef-hover title=hover>hover</a> media feature is used to query whether primary pointing system
-	used on the output device can hover or not.</p>
+<p>The <a class=property data-link-type=propdesc href=#descdef-hover title=hover>hover</a> media feature is used to query the user’s ability to hover over elements on the page.
+	If a device has multiple input mechanisms,
+	the <a class=property data-link-type=propdesc href=#descdef-hover title=hover>hover</a> media feature must reflect the characteristics of the “primary” input mechanism,
+	as determined by the user agent.
+	(To query the capabilities of <em>any</em> available input mechanism,
+		see the <a class=property data-link-type=propdesc href=#descdef-any-hover title=any-hover>any-hover</a> media feature.)</p>
 
 	<dl data-dfn-for=@media/hover data-dfn-type=value>
 		<dt><dfn class=css-code data-dfn-for=@media/hover data-dfn-type=value data-export="" id=valuedef-none4>none<a class=self-link href=#valuedef-none4></a></dfn>
@@ -1884,10 +1889,6 @@ <h3 class="heading settled heading" data-level=7.2 id=hover><span class=secno>7.
 			Indicates that the primary pointing system can easily hover over parts of the page.
 	</dl>
 
-<p>If a device has multiple pointing devices,
-	some of which support hovering and some of which not,
-	it is recommended that the UA reports the hovering ability of the least capable of the primary pointing devices.</p>
-
 	<div class=example>
 		For example, on a touch screen device that can also be controlled by an optional mouse,
 		the <a class=property data-link-type=propdesc href=#descdef-hover title=hover>hover</a> <a data-link-type=dfn href=#media-feature title="media feature">media feature</a> should match <a class=css data-link-for=hover data-link-type=maybe href=#valuedef-none4 title=none>none</a>,
@@ -1913,6 +1914,18 @@ <h3 class="heading settled heading" data-level=7.2 id=hover><span class=secno>7.
 </pre>
 	</div>
 
+<h3 class="heading settled heading" data-level=7.3 id=any-input><span class=secno>7.3 </span><span class=content>
+any-pointer and any-hover</span><a class=self-link href=#any-input></a></h3>
+
+<table class="definition descdef mq" data-dfn-for=@media><tr><th>Name:<td><dfn class=css-code data-dfn-for=@media data-dfn-type=descriptor data-export="" id=descdef-any-pointer>any-pointer<a class=self-link href=#descdef-any-pointer></a></dfn><tr><th>For:<td><a class=css-code data-link-type=at-rule href=http://dev.w3.org/csswg/css-conditional-3/#at-ruledef-media title=@media>@media</a><tr><th>Value:<td class=prod>none <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> coarse <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> fine<tr><th>Type:<td>discrete</table>
+
+<table class="definition descdef mq" data-dfn-for=@media><tr><th>Name:<td><dfn class=css-code data-dfn-for=@media data-dfn-type=descriptor data-export="" id=descdef-any-hover>any-hover<a class=self-link href=#descdef-any-hover></a></dfn><tr><th>For:<td><a class=css-code data-link-type=at-rule href=http://dev.w3.org/csswg/css-conditional-3/#at-ruledef-media title=@media>@media</a><tr><th>Value:<td class=prod>none <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> on-demand <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> hover<tr><th>Type:<td>discrete</table>
+
+<p>The <a class=property data-link-type=propdesc href=#descdef-any-pointer title=any-pointer>any-pointer</a> and <a class=property data-link-type=propdesc href=#descdef-any-hover title=any-hover>any-hover</a> media features are identical to the <a class=property data-link-type=propdesc href=#descdef-pointer title=pointer>pointer</a> and <a class=property data-link-type=propdesc href=#descdef-hover title=hover>hover</a> media features,
+	but they correspond to the union of capabilities of all the input devices available to the user.
+	More than one of their values can match,
+	if different input devices have different characteristics.</p>
+
 
 <h2 class="heading settled heading" data-level=8 id=mf-environment><span class=secno>8 </span><span class=content>
 Environment Media Features</span><a class=self-link href=#mf-environment></a></h2>
@@ -2411,6 +2424,8 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 Index</span><a class=self-link href=#index></a></h2>
 <div data-fill-with=index><ul class=indexlist>
 <li>all, <a href=#valuedef-all title="section 2.3">2.3</a>
+<li>any-hover, <a href=#descdef-any-hover title="section 7.3">7.3</a>
+<li>any-pointer, <a href=#descdef-any-pointer title="section 7.3">7.3</a>
 <li>aspect-ratio, <a href=#descdef-aspect-ratio title="section 4.3">4.3</a>
 <li>aural, <a href=#valuedef-aural title="section 2.3">2.3</a>
 <li>boolean context, <a href=#boolean-context title="section 2.4.2">2.4.2</a>
@@ -2521,6 +2536,8 @@ <h2 class="no-num no-ref heading settled heading" id=property-index><span class=
 <tr><th scope-row=""><a class=css-code data-link-type=descriptor href=#descdef-monochrome title=monochrome>monochrome</a><td>&lt;integer&gt;<td><td>range
 <tr><th scope-row=""><a class=css-code data-link-type=descriptor href=#descdef-pointer title=pointer>pointer</a><td>none | coarse | fine<td><td>discrete
 <tr><th scope-row=""><a class=css-code data-link-type=descriptor href=#descdef-hover title=hover>hover</a><td>none | on-demand | hover<td><td>discrete
+<tr><th scope-row=""><a class=css-code data-link-type=descriptor href=#descdef-any-pointer title=any-pointer>any-pointer</a><td>none | coarse | fine<td><td>discrete
+<tr><th scope-row=""><a class=css-code data-link-type=descriptor href=#descdef-any-hover title=any-hover>any-hover</a><td>none | on-demand | hover<td><td>discrete
 <tr><th scope-row=""><a class=css-code data-link-type=descriptor href=#descdef-light-level title=light-level>light-level</a><td>dim | normal | washed<td><td>discrete
 <tr><th scope-row=""><a class=css-code data-link-type=descriptor href=#descdef-scripting title=scripting>scripting</a><td>none | initial-only | enabled<td><td>discrete</table></div>