dix: GetProximityEvents needs to check up to the last valuator
valuator_mask_size() returns the highest valuator set as opposed to the number of set bits (which obviously changes as we unset valuators). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
		
							parent
							
								
									048e93593e
								
							
						
					
					
						commit
						45131bb67f
					
				| 
						 | 
					@ -1248,7 +1248,7 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, const Valuato
 | 
				
			||||||
    valuator_mask_copy(&mask, mask_in);
 | 
					    valuator_mask_copy(&mask, mask_in);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* ignore relative axes for proximity. */
 | 
					    /* ignore relative axes for proximity. */
 | 
				
			||||||
    for (i = 0; i < valuator_mask_num_valuators(&mask); i++)
 | 
					    for (i = 0; i < valuator_mask_size(&mask); i++)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        if (valuator_mask_isset(&mask, i) &&
 | 
					        if (valuator_mask_isset(&mask, i) &&
 | 
				
			||||||
            valuator_get_mode(pDev, i) == Relative)
 | 
					            valuator_get_mode(pDev, i) == Relative)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue