dix: SetFocusOut and LeaveWindow don't need parameters other than dev.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
		
							parent
							
								
									d040940efe
								
							
						
					
					
						commit
						97ed946cfc
					
				| 
						 | 
				
			
			@ -167,7 +167,7 @@ EnterWindow(DeviceIntPtr dev, WindowPtr win, int mode)
 | 
			
		|||
 * Unset the presence flag for dev to mark that it is not in 'win' anymore.
 | 
			
		||||
 */
 | 
			
		||||
static void
 | 
			
		||||
LeaveWindow(DeviceIntPtr dev, WindowPtr win, int mode)
 | 
			
		||||
LeaveWindow(DeviceIntPtr dev)
 | 
			
		||||
{
 | 
			
		||||
    PointerWindows[dev->id] = NULL;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -185,7 +185,7 @@ SetFocusIn(DeviceIntPtr dev, WindowPtr win)
 | 
			
		|||
 * Unset the presence flag for dev to mark that it is not in 'win' anymore.
 | 
			
		||||
 */
 | 
			
		||||
void
 | 
			
		||||
SetFocusOut(DeviceIntPtr dev, WindowPtr win)
 | 
			
		||||
SetFocusOut(DeviceIntPtr dev)
 | 
			
		||||
{
 | 
			
		||||
    FocusWindows[dev->id] = NULL;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -550,7 +550,7 @@ CoreEnterLeaveEvents(DeviceIntPtr dev,
 | 
			
		|||
    if (!IsMaster(dev))
 | 
			
		||||
        return;
 | 
			
		||||
 | 
			
		||||
    LeaveWindow(dev, from, mode);
 | 
			
		||||
    LeaveWindow(dev);
 | 
			
		||||
 | 
			
		||||
    if (IsParent(from, to))
 | 
			
		||||
        CoreEnterLeaveToDescendant(dev, from, to, mode);
 | 
			
		||||
| 
						 | 
				
			
			@ -1223,7 +1223,7 @@ CoreFocusEvents(DeviceIntPtr dev,
 | 
			
		|||
    if (!IsMaster(dev))
 | 
			
		||||
        return;
 | 
			
		||||
 | 
			
		||||
    SetFocusOut(dev, from);
 | 
			
		||||
    SetFocusOut(dev);
 | 
			
		||||
 | 
			
		||||
    if (((to == NullWindow) || (to == PointerRootWin)) &&
 | 
			
		||||
        ((from == NullWindow) || (from == PointerRootWin)))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -92,6 +92,5 @@ extern void DeviceFocusEvent(DeviceIntPtr kbd,
 | 
			
		|||
extern void SetFocusIn(DeviceIntPtr kbd,
 | 
			
		||||
                       WindowPtr win);
 | 
			
		||||
 | 
			
		||||
extern void SetFocusOut(DeviceIntPtr dev,
 | 
			
		||||
                        WindowPtr win);
 | 
			
		||||
extern void SetFocusOut(DeviceIntPtr dev);
 | 
			
		||||
#endif /* _ENTERLEAVE_H_ */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue