Mercurial > emacs
changeset 76437:d29bfdf8ae75
[USE_CARBON_EVENTS] (mac_handle_mouse_event): Ignore
mouse wheel movement on title bar or tool bar.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Sat, 10 Mar 2007 06:25:53 +0000 |
| parents | abf6e5660200 |
| children | c6ac3e0be713 |
| files | src/macterm.c |
| diffstat | 1 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macterm.c Sat Mar 10 04:57:32 2007 +0000 +++ b/src/macterm.c Sat Mar 10 06:25:53 2007 +0000 @@ -9988,23 +9988,30 @@ if (err != noErr || axis != kEventMouseWheelAxisY) break; + err = GetEventParameter (event, kEventParamMouseLocation, + typeQDPoint, NULL, sizeof (Point), + NULL, &point); + if (err != noErr) + break; + + SetPortWindowPort (wp); + GlobalToLocal (&point); + if (point.h < 0 || point.v < 0 + || EQ (window_from_coordinates (f, point.h, point.v, 0, 0, 0, 1), + f->tool_bar_window)) + break; + err = GetEventParameter (event, kEventParamMouseWheelDelta, typeSInt32, NULL, sizeof (SInt32), NULL, &delta); if (err != noErr) break; - err = GetEventParameter (event, kEventParamMouseLocation, - typeQDPoint, NULL, sizeof (Point), - NULL, &point); - if (err != noErr) - break; + read_socket_inev->kind = WHEEL_EVENT; read_socket_inev->code = 0; read_socket_inev->modifiers = (mac_event_to_emacs_modifiers (event) | ((delta < 0) ? down_modifier : up_modifier)); - SetPortWindowPort (wp); - GlobalToLocal (&point); XSETINT (read_socket_inev->x, point.h); XSETINT (read_socket_inev->y, point.v); XSETFRAME (read_socket_inev->frame_or_window, f);