emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Kim F . Storm
Subject: [Emacs-diffs] Changes to emacs/src/xterm.c
Date: Thu, 13 Oct 2005 18:41:22 -0400

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.883 emacs/src/xterm.c:1.884
*** emacs/src/xterm.c:1.883     Wed Oct 12 12:18:42 2005
--- emacs/src/xterm.c   Thu Oct 13 22:41:21 2005
***************
*** 3582,3588 ****
  static XMotionEvent last_mouse_motion_event;
  static Lisp_Object last_mouse_motion_frame;
  
! static void
  note_mouse_movement (frame, event)
       FRAME_PTR frame;
       XMotionEvent *event;
--- 3582,3588 ----
  static XMotionEvent last_mouse_motion_event;
  static Lisp_Object last_mouse_motion_frame;
  
! static int
  note_mouse_movement (frame, event)
       FRAME_PTR frame;
       XMotionEvent *event;
***************
*** 3596,3605 ****
        frame->mouse_moved = 1;
        last_mouse_scroll_bar = Qnil;
        note_mouse_highlight (frame, -1, -1);
      }
  
    /* Has the mouse moved off the glyph it was on at the last sighting?  */
!   else if (event->x < last_mouse_glyph.x
           || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
           || event->y < last_mouse_glyph.y
           || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
--- 3596,3606 ----
        frame->mouse_moved = 1;
        last_mouse_scroll_bar = Qnil;
        note_mouse_highlight (frame, -1, -1);
+       return 1;
      }
  
    /* Has the mouse moved off the glyph it was on at the last sighting?  */
!   if (event->x < last_mouse_glyph.x
           || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
           || event->y < last_mouse_glyph.y
           || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
***************
*** 3609,3615 ****
--- 3610,3619 ----
        note_mouse_highlight (frame, event->x, event->y);
        /* Remember which glyph we're now on.  */
        remember_mouse_glyph (frame, event->x, event->y, &last_mouse_glyph);
+       return 1;
      }
+ 
+   return 0;
  }
  
  
***************
*** 6483,6490 ****
      case MotionNotify:
        {
          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))
--- 6487,6493 ----
      case MotionNotify:
        {
          previous_help_echo_string = help_echo_string;
!         help_echo_string = Qnil;
  
          if (dpyinfo->grabbed && last_mouse_frame
              && FRAME_LIVE_P (last_mouse_frame))
***************
*** 6523,6529 ****
  
                  last_window=window;
                }
!             note_mouse_movement (f, &event.xmotion);
            }
          else
            {
--- 6526,6533 ----
  
                  last_window=window;
                }
!             if (!note_mouse_movement (f, &event.xmotion))
!             help_echo_string = previous_help_echo_string;
            }
          else
            {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]