Commit 4ad21c32 authored by Alan Coopersmith's avatar Alan Coopersmith Committed by Adam Jackson

Add ddxInputThread call from os layer into ddx layer

Allows ddx's to run additional code as necessary to set up the
input thread.
Signed-off-by: Alan Coopersmith's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
parent 7533fa9b
......@@ -830,6 +830,15 @@ ddxBeforeReset(void)
}
#endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
/** This function is called in Xserver/os/osinit.c from \a OsInit(). */
void
OsVendorInit(void)
......
......@@ -100,6 +100,15 @@ CloseInput(void)
KdCloseInput();
}
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
#ifdef DDXBEFORERESET
void
ddxBeforeReset(void)
......
......@@ -226,6 +226,15 @@ ddxBeforeReset(void)
}
#endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
void
ddxUseMsg(void)
{
......
......@@ -1340,3 +1340,12 @@ ddxBeforeReset(void)
{
}
#endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
......@@ -159,3 +159,12 @@ ddxBeforeReset(void)
return;
}
#endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
......@@ -66,6 +66,15 @@ ddxBeforeReset(void)
{
return;
}
#endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
_X_NORETURN
......
......@@ -151,6 +151,15 @@ ddxBeforeReset(void)
}
#endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
int
main(int argc, char *argv[], char *envp[])
{
......
......@@ -559,6 +559,8 @@ enum ExitCode {
extern _X_EXPORT void
ddxGiveUp(enum ExitCode error);
extern _X_EXPORT void
ddxInputThreadInit(void);
extern _X_EXPORT int
TimeSinceLastInputEvent(void);
......
......@@ -318,6 +318,8 @@ InputThreadDoWork(void *arg)
sigfillset(&set);
pthread_sigmask(SIG_BLOCK, &set, NULL);
ddxInputThreadInit();
inputThreadInfo->running = TRUE;
#if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment