diff options
| author | Keith Packard <keithp@keithp.com> | 2015-12-08 14:39:46 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2016-05-26 16:07:54 -0700 |
| commit | 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 (patch) | |
| tree | 1643ea974c60cefb7dbd6d646e40d77263babaa3 /include | |
| parent | 8cf832c288dec13cbf3c25478a8ccef52d61f3db (diff) | |
Remove SIGIO support for input [v5]
This removes all of the SIGIO handling support used for input
throughout the X server, preparing the way for using threads for input
handling instead.
Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls
to stub functions input_lock/input_unlock so that we don't lose this
information.
xfree86 SIGIO support is reworked to use internal versions of
OsBlockSIGIO and OsReleaseSIGIO.
v2: Don't change locking order (Peter Hutterer)
v3: Comment weird && FALSE in xf86Helper.c
Leave errno save/restore in xf86ReadInput
Squash with stub adding patch (Peter Hutterer)
v4: Leave UseSIGIO config parameter so that
existing config files don't break (Peter Hutterer)
v5: Split a couple of independent patch bits out
of kinput.c (Peter Hutterer)
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 9 | ||||
| -rw-r--r-- | include/os.h | 6 | ||||
| -rw-r--r-- | include/xorg-config.h.in | 3 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/input.h b/include/input.h index cfdea2ad4..9069a1cb5 100644 --- a/include/input.h +++ b/include/input.h @@ -714,4 +714,13 @@ extern _X_HIDDEN void input_constrain_cursor(DeviceIntPtr pDev, ScreenPtr screen int *out_x, int *out_y, int *nevents, InternalEvent* events); +static inline void input_lock(void) { +} + +static inline void input_unlock(void) { +} + +static inline void input_force_unlock(void) { +} + #endif /* INPUT_H */ diff --git a/include/os.h b/include/os.h index 461d5d6ce..e9b3709a1 100644 --- a/include/os.h +++ b/include/os.h @@ -336,12 +336,6 @@ OsBlockSignals(void); extern _X_EXPORT void OsReleaseSignals(void); -extern _X_EXPORT int -OsBlockSIGIO(void); - -extern _X_EXPORT void -OsReleaseSIGIO(void); - extern void OsResetSignals(void); diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index 7c03126e1..63dc5b3b4 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -127,9 +127,6 @@ /* Path to text files containing PCI IDs */ #undef PCI_TXT_IDS_PATH -/* Use SIGIO handlers for input device events by default */ -#undef USE_SIGIO_BY_DEFAULT - /* Build with libdrm support */ #undef WITH_LIBDRM |