xfree86: xf86{Enable, Disable}InputHandler can be static.
This commit is contained in:
		
							parent
							
								
									50081d2dfb
								
							
						
					
					
						commit
						278c11f01f
					
				| 
						 | 
				
			
			@ -191,8 +191,6 @@ xf86SetDGAModeProc xf86SetDGAMode;
 | 
			
		|||
void SetTimeSinceLastInputEvent(void);
 | 
			
		||||
pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data);
 | 
			
		||||
int xf86RemoveInputHandler(pointer handler);
 | 
			
		||||
void xf86DisableInputHandler(pointer handler);
 | 
			
		||||
void xf86EnableInputHandler(pointer handler);
 | 
			
		||||
pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
 | 
			
		||||
int xf86RemoveGeneralHandler(pointer handler);
 | 
			
		||||
void xf86InterceptSignals(int *signo);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -635,6 +635,34 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
 | 
			
		|||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
xf86EnableInputHandler(pointer handler)
 | 
			
		||||
{
 | 
			
		||||
    IHPtr ih;
 | 
			
		||||
 | 
			
		||||
    if (!handler)
 | 
			
		||||
	return;
 | 
			
		||||
 | 
			
		||||
    ih = handler;
 | 
			
		||||
    ih->enabled = TRUE;
 | 
			
		||||
    if (ih->fd >= 0)
 | 
			
		||||
	AddEnabledDevice(ih->fd);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
xf86DisableInputHandler(pointer handler)
 | 
			
		||||
{
 | 
			
		||||
    IHPtr ih;
 | 
			
		||||
 | 
			
		||||
    if (!handler)
 | 
			
		||||
	return;
 | 
			
		||||
 | 
			
		||||
    ih = handler;
 | 
			
		||||
    ih->enabled = FALSE;
 | 
			
		||||
    if (ih->fd >= 0)
 | 
			
		||||
	RemoveEnabledDevice(ih->fd);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * xf86VTSwitch --
 | 
			
		||||
 *      Handle requests for switching the vt.
 | 
			
		||||
| 
						 | 
				
			
			@ -901,34 +929,6 @@ xf86RemoveGeneralHandler(pointer handler)
 | 
			
		|||
    return fd;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
_X_EXPORT void
 | 
			
		||||
xf86DisableInputHandler(pointer handler)
 | 
			
		||||
{
 | 
			
		||||
    IHPtr ih;
 | 
			
		||||
 | 
			
		||||
    if (!handler)
 | 
			
		||||
	return;
 | 
			
		||||
 | 
			
		||||
    ih = handler;
 | 
			
		||||
    ih->enabled = FALSE;
 | 
			
		||||
    if (ih->fd >= 0)
 | 
			
		||||
	RemoveEnabledDevice(ih->fd);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
_X_EXPORT void
 | 
			
		||||
xf86EnableInputHandler(pointer handler)
 | 
			
		||||
{
 | 
			
		||||
    IHPtr ih;
 | 
			
		||||
 | 
			
		||||
    if (!handler)
 | 
			
		||||
	return;
 | 
			
		||||
 | 
			
		||||
    ih = handler;
 | 
			
		||||
    ih->enabled = TRUE;
 | 
			
		||||
    if (ih->fd >= 0)
 | 
			
		||||
	AddEnabledDevice(ih->fd);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * As used currently by the DRI, the return value is ignored.
 | 
			
		||||
 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -375,8 +375,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
 | 
			
		|||
    SYMFUNC(SetTimeSinceLastInputEvent)
 | 
			
		||||
    SYMFUNC(xf86AddInputHandler)
 | 
			
		||||
    SYMFUNC(xf86RemoveInputHandler)
 | 
			
		||||
    SYMFUNC(xf86DisableInputHandler)
 | 
			
		||||
    SYMFUNC(xf86EnableInputHandler)
 | 
			
		||||
    SYMFUNC(xf86AddEnabledDevice)
 | 
			
		||||
    SYMFUNC(xf86RemoveEnabledDevice)
 | 
			
		||||
    SYMFUNC(xf86InterceptSignals)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue