diff options
| author | Steven Tamm | 2003-01-20 16:53:38 +0000 |
|---|---|---|
| committer | Steven Tamm | 2003-01-20 16:53:38 +0000 |
| commit | 539e69a9fd648d083c27aa5afd5d70d60cfae1ca (patch) | |
| tree | bf5e263c788c7fbb1ecdb16c7a6e1c19b3220d37 | |
| parent | 2bdbfa86da206b18a8a88c695e88f0705e682c19 (diff) | |
| download | emacs-539e69a9fd648d083c27aa5afd5d70d60cfae1ca.tar.gz emacs-539e69a9fd648d083c27aa5afd5d70d60cfae1ca.zip | |
* macterm.c (XTread_socket): Checks for valid, visible window
before sending a scroll-wheel event.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/macterm.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3f0eb5db6a9..c110217d1e6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-01-20 Steven Tamm <steventamm@mac.com> | ||
| 2 | |||
| 3 | * macterm.c (XTread_socket): Checks for valid, visible window | ||
| 4 | before sending a scroll-wheel event. | ||
| 5 | |||
| 1 | 2003-01-20 Richard M. Stallman <rms@gnu.org> | 6 | 2003-01-20 Richard M. Stallman <rms@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (redisplay_window): If mini window's buffer is not | 8 | * xdisp.c (redisplay_window): If mini window's buffer is not |
diff --git a/src/macterm.c b/src/macterm.c index cae4172854e..e969a4b6dce 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -12644,6 +12644,13 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected) | |||
| 12644 | Point point; | 12644 | Point point; |
| 12645 | WindowPtr window_ptr = FrontNonFloatingWindow (); | 12645 | WindowPtr window_ptr = FrontNonFloatingWindow (); |
| 12646 | struct mac_output *mwp = (mac_output *) GetWRefCon (window_ptr); | 12646 | struct mac_output *mwp = (mac_output *) GetWRefCon (window_ptr); |
| 12647 | if (!IsValidWindowPtr (window_ptr)) | ||
| 12648 | { | ||
| 12649 | SysBeep(1); | ||
| 12650 | UNBLOCK_INPUT; | ||
| 12651 | return 0; | ||
| 12652 | } | ||
| 12653 | |||
| 12647 | GetEventParameter(eventRef, kEventParamMouseWheelDelta, | 12654 | GetEventParameter(eventRef, kEventParamMouseWheelDelta, |
| 12648 | typeSInt32, NULL, sizeof (SInt32), | 12655 | typeSInt32, NULL, sizeof (SInt32), |
| 12649 | NULL, &delta); | 12656 | NULL, &delta); |