SyntheticMotion: don't dereference sprite.screen when not using Xinerama
(cherry picked from aa052e43c6c293e14f78837e00c6b7581f9713bb commit)
This commit is contained in:
parent
d17ec01e83
commit
f2903c12bb
|
@ -328,7 +328,8 @@ static void ConfineToShape(RegionPtr shape, int *px, int *py);
|
||||||
static void PostNewCursor(void);
|
static void PostNewCursor(void);
|
||||||
|
|
||||||
#define SyntheticMotion(x, y) \
|
#define SyntheticMotion(x, y) \
|
||||||
PostSyntheticMotion(x, y, sprite.screen, \
|
PostSyntheticMotion(x, y, noPanoramiXExtension ? 0 : \
|
||||||
|
sprite.screen->myNum, \
|
||||||
syncEvents.playingEvents ? \
|
syncEvents.playingEvents ? \
|
||||||
syncEvents.time.milliseconds : \
|
syncEvents.time.milliseconds : \
|
||||||
currentTime.milliseconds);
|
currentTime.milliseconds);
|
||||||
|
|
|
@ -745,14 +745,11 @@ LinuxKeyboardEnable (KdKeyboardInfo *ki)
|
||||||
cfsetispeed(&nTty, 9600);
|
cfsetispeed(&nTty, 9600);
|
||||||
cfsetospeed(&nTty, 9600);
|
cfsetospeed(&nTty, 9600);
|
||||||
tcsetattr(fd, TCSANOW, &nTty);
|
tcsetattr(fd, TCSANOW, &nTty);
|
||||||
/* Our kernel cleverly ignores O_NONBLOCK. Sigh. */
|
|
||||||
#if 0
|
|
||||||
/*
|
/*
|
||||||
* Flush any pending keystrokes
|
* Flush any pending keystrokes
|
||||||
*/
|
*/
|
||||||
while ((n = read (fd, buf, sizeof (buf))) > 0)
|
while ((n = read (fd, buf, sizeof (buf))) > 0)
|
||||||
;
|
;
|
||||||
#endif
|
|
||||||
KdRegisterFd (fd, LinuxKeyboardRead, ki);
|
KdRegisterFd (fd, LinuxKeyboardRead, ki);
|
||||||
return Success;
|
return Success;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user