[Emacs-diffs] Changes to emacs/src/macterm.c,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   07/03/10 06:25:53

Index: macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- macterm.c   7 Mar 2007 08:13:38 -0000       1.209
+++ macterm.c   10 Mar 2007 06:25:53 -0000      1.210
@@ -9988,23 +9988,30 @@
        if (err != noErr || axis != kEventMouseWheelAxisY)
          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;
+
+       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;
+
        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);