diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-11-07 21:29:19 +0100 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2019-05-10 19:02:51 +0200 |
| commit | b32a984f8f34d34fcc4114028712367c47c545d7 (patch) | |
| tree | b89c98d30a8c36d3fc75b06503539ff364f87361 /nx-X11/programs/Xserver/os/WaitFor.c | |
| parent | dece08252b6696b74091ebcde3dc557e2e60171b (diff) | |
| download | nx-libs-b32a984f8f34d34fcc4114028712367c47c545d7.tar.gz nx-libs-b32a984f8f34d34fcc4114028712367c47c545d7.tar.bz2 nx-libs-b32a984f8f34d34fcc4114028712367c47c545d7.zip | |
Die XTESTEXT1, die!
commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 18:47:47 2006 +0000
Die XTESTEXT1, die!
Citing an email from the xorg-modular mailing list:
On Tuesday 21 February 2006 23:04, Enrico Weigelt wrote:
> Hi folks,
>
> I'm wondering what's the difference between XTEST and XTESTEXT1
> (the second one can be configured w/ my current patch ...)
> Are they both the same ( -> XTest extension ) ?
> Can I put both symbols together ?
They're not the same extension. XTest is the one you want, if you want
either. The other hasn't been built by default in ages and I should probably
go ahead and nuke it from the tree.
- ajax
Diffstat (limited to 'nx-X11/programs/Xserver/os/WaitFor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/WaitFor.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index 55fb997ea..9db3faef1 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -143,13 +143,6 @@ mffs(fd_mask mask) #include <nx-X11/extensions/dpms.h> #endif -#ifdef XTESTEXT1 -/* - * defined in xtestext1dd.c - */ -extern int playback_on; -#endif /* XTESTEXT1 */ - struct _OsTimerRec { OsTimerPtr next; CARD32 expires; @@ -244,13 +237,6 @@ WaitForSomething(int *pClientsReady) BlockHandler((void *)&wt, (void *)&LastSelectMask); if (NewOutputPending) FlushAllOutput(); -#ifdef XTESTEXT1 - /* XXX how does this interact with new write block handling? */ - if (playback_on) { - wt = &waittime; - XTestComputeWaitTime (&waittime); - } -#endif /* XTESTEXT1 */ #if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_WAKEUP) @@ -375,11 +361,7 @@ WaitForSomething(int *pClientsReady) #endif selecterr = GetErrno(); WakeupHandler(i, (void *)&LastSelectMask); -#ifdef XTESTEXT1 - if (playback_on) { - i = XTestProcessInputAction (i, &waittime); - } -#endif /* XTESTEXT1 */ + SmartScheduleStartTimer (); if (i <= 0) /* An error or timeout occurred */ |