frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <alan.coopersmith@oracle.com>
(cherry picked from commit 4ad21c3247)
This commit is contained in:
Alan Coopersmith 2019-02-21 15:22:57 -08:00 committed by Matt Turner
parent bb405cdc85
commit e3f26605d8
9 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/dmx/dmxinit.c
View File

@ -838,6 +838,15 @@ ddxGiveUp(enum ExitCode error)
AbortDDX(error); AbortDDX(error);
} }
#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(). */ /** This function is called in Xserver/os/osinit.c from \a OsInit(). */
void void
OsVendorInit(void) OsVendorInit(void)

9
hw/kdrive/ephyr/ephyrinit.c
View File

@ -100,6 +100,15 @@ CloseInput(void)
KdCloseInput(); KdCloseInput();
} }
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
#ifdef DDXBEFORERESET #ifdef DDXBEFORERESET
void void
ddxBeforeReset(void) ddxBeforeReset(void)

9
hw/vfb/InitOutput.c
View File

@ -232,6 +232,15 @@ ddxBeforeReset(void)
} }
#endif #endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
void void
ddxUseMsg(void) ddxUseMsg(void)
{ {

9
hw/xfree86/common/xf86Init.c
View File

@ -1444,3 +1444,12 @@ ddxBeforeReset(void)
{ {
} }
#endif #endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif

9
hw/xnest/Init.c
View File

@ -169,3 +169,12 @@ ddxBeforeReset(void)
return; return;
} }
#endif #endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif

9
hw/xwayland/xwayland.c
View File

@ -72,6 +72,15 @@ ddxBeforeReset(void)
{ {
return; return;
} }
#endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif #endif
_X_NORETURN _X_NORETURN

9
hw/xwin/InitOutput.c
View File

@ -151,6 +151,15 @@ ddxBeforeReset(void)
} }
#endif #endif
#if INPUTTHREAD
/** This function is called in Xserver/os/inputthread.c when starting
the input thread. */
void
ddxInputThreadInit(void)
{
}
#endif
int int
main(int argc, char *argv[], char *envp[]) main(int argc, char *argv[], char *envp[])
{ {

2
include/os.h
View File

@ -556,6 +556,8 @@ extern _X_EXPORT void
AbortDDX(enum ExitCode error); AbortDDX(enum ExitCode error);
extern _X_EXPORT void extern _X_EXPORT void
ddxGiveUp(enum ExitCode error); ddxGiveUp(enum ExitCode error);
extern _X_EXPORT void
ddxInputThreadInit(void);
extern _X_EXPORT int extern _X_EXPORT int
TimeSinceLastInputEvent(void); TimeSinceLastInputEvent(void);

2
os/inputthread.c
View File

@ -318,6 +318,8 @@ InputThreadDoWork(void *arg)
sigfillset(&set); sigfillset(&set);
pthread_sigmask(SIG_BLOCK, &set, NULL); pthread_sigmask(SIG_BLOCK, &set, NULL);
ddxInputThreadInit();
inputThreadInfo->running = TRUE; inputThreadInfo->running = TRUE;
#if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID) #if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID)