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

[YAMAMOTO Mitsuharu]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.139 emacs/src/macterm.c:1.140
*** emacs/src/macterm.c:1.139   Sun Oct 16 02:22:59 2005
--- emacs/src/macterm.c Tue Oct 18 08:07:06 2005
***************
*** 3910,3919 ****
        return 1;
      }
    /* Has the mouse moved off the glyph it was on at the last sighting?  */
!   if (pos->h < last_mouse_glyph.left
!       || pos->h >= last_mouse_glyph.right
!       || pos->v < last_mouse_glyph.top
!       || pos->v >= last_mouse_glyph.bottom)
      {
        frame->mouse_moved = 1;
        last_mouse_scroll_bar = Qnil;
--- 3910,3916 ----
        return 1;
      }
    /* Has the mouse moved off the glyph it was on at the last sighting?  */
!   if (!PtInRect (*pos, &last_mouse_glyph))
      {
        frame->mouse_moved = 1;
        last_mouse_scroll_bar = Qnil;
***************
*** 9521,9527 ****
                  }
              }
  
!           if (er.what != mouseDown && part_code != inContent)
              break;
  
            switch (part_code)
--- 9518,9525 ----
                  }
              }
  
!           if (er.what != mouseDown &&
!               (part_code != inContent || dpyinfo->grabbed == 0))
              break;
  
            switch (part_code)
***************
*** 9644,9655 ****
                      {
                        dpyinfo->grabbed |= (1 << inev.code);
                        last_mouse_frame = f;
-                       /* Ignore any mouse motion that happened
-                          before this event; any subsequent
-                          mouse-movement Emacs events should reflect
-                          only motion after the ButtonPress.  */
-                       if (f != 0)
-                         f->mouse_moved = 0;
  
                        if (!tool_bar_p)
                          last_tool_bar_item = -1;
--- 9642,9647 ----
***************
*** 9664,9669 ****
--- 9656,9668 ----
                        else
                          dpyinfo->grabbed &= ~(1 << inev.code);
                      }
+ 
+                   /* Ignore any mouse motion that happened before
+                      this event; any subsequent mouse-movement Emacs
+                      events should reflect only motion after the
+                      ButtonPress.  */
+                   if (f != 0)
+                     f->mouse_moved = 0;
  
  #ifdef USE_TOOLKIT_SCROLL_BARS
                    if (inev.kind == MOUSE_CLICK_EVENT)