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

[YAMAMOTO Mitsuharu]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.137 emacs/src/macterm.c:1.138
*** emacs/src/macterm.c:1.137   Wed Oct 12 12:18:18 2005
--- emacs/src/macterm.c Fri Oct 14 08:08:37 2005
***************
*** 4149,4155 ****
  static Point last_mouse_motion_position;
  static Lisp_Object last_mouse_motion_frame;
  
! static void
  note_mouse_movement (frame, pos)
       FRAME_PTR frame;
       Point *pos;
--- 4149,4155 ----
  static Point last_mouse_motion_position;
  static Lisp_Object last_mouse_motion_frame;
  
! static int
  note_mouse_movement (frame, pos)
       FRAME_PTR frame;
       Point *pos;
***************
*** 4180,4198 ****
            rif->define_frame_cursor (frame,
                                      frame->output_data.mac->nontext_cursor);
        }
      }
    /* Has the mouse moved off the glyph it was on at the last sighting?  */
!   else 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;
        note_mouse_highlight (frame, pos->h, pos->v);
        /* Remember which glyph we're now on.  */
        remember_mouse_glyph (frame, pos->h, pos->v, &last_mouse_glyph);
      }
  }
  
  
--- 4180,4202 ----
            rif->define_frame_cursor (frame,
                                      frame->output_data.mac->nontext_cursor);
        }
+       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;
        note_mouse_highlight (frame, pos->h, pos->v);
        /* Remember which glyph we're now on.  */
        remember_mouse_glyph (frame, pos->h, pos->v, &last_mouse_glyph);
+       return 1;
      }
+ 
+   return 0;
  }
  
  
***************
*** 10031,10038 ****
                          er.where.h + 1, er.where.v + 1);
  #endif
              previous_help_echo_string = help_echo_string;
!             help_echo_string = help_echo_object = help_echo_window = Qnil;
!             help_echo_pos = -1;
  
              if (dpyinfo->grabbed && last_mouse_frame
                  && FRAME_LIVE_P (last_mouse_frame))
--- 10035,10041 ----
                          er.where.h + 1, er.where.v + 1);
  #endif
              previous_help_echo_string = help_echo_string;
!             help_echo_string = Qnil;
  
              if (dpyinfo->grabbed && last_mouse_frame
                  && FRAME_LIVE_P (last_mouse_frame))
***************
*** 10091,10097 ****
  
                          last_window=window;
                        }
!                     note_mouse_movement (f, &mouse_pos);
                    }
                }
  
--- 10094,10101 ----
  
                          last_window=window;
                        }
!                     if (!note_mouse_movement (f, &mouse_pos))
!                       help_echo_string = previous_help_echo_string;
                    }
                }