SyntheticMotion: don't dereference sprite.screen when not using Xinerama

(cherry picked from aa052e43c6c293e14f78837e00c6b7581f9713bb commit)
This commit is contained in:
Daniel Stone 2006-11-07 11:13:32 +02:00 committed by Daniel Stone
parent d17ec01e83
commit f2903c12bb
2 changed files with 2 additions and 4 deletions

View File

@ -328,7 +328,8 @@ static void ConfineToShape(RegionPtr shape, int *px, int *py);
static void PostNewCursor(void);
#define SyntheticMotion(x, y) \
PostSyntheticMotion(x, y, sprite.screen, \
PostSyntheticMotion(x, y, noPanoramiXExtension ? 0 : \
sprite.screen->myNum, \
syncEvents.playingEvents ? \
syncEvents.time.milliseconds : \
currentTime.milliseconds);

View File

@ -745,14 +745,11 @@ LinuxKeyboardEnable (KdKeyboardInfo *ki)
cfsetispeed(&nTty, 9600);
cfsetospeed(&nTty, 9600);
tcsetattr(fd, TCSANOW, &nTty);
/* Our kernel cleverly ignores O_NONBLOCK. Sigh. */
#if 0
/*
* Flush any pending keystrokes
*/
while ((n = read (fd, buf, sizeof (buf))) > 0)
;
#endif
KdRegisterFd (fd, LinuxKeyboardRead, ki);
return Success;
}