/[emacs]/emacs/src/macterm.c
ViewVC logotype

Diff of /emacs/src/macterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.137 by mituharu, Wed Oct 12 12:18:18 2005 UTC revision 1.138 by mituharu, Fri Oct 14 08:08:37 2005 UTC
# Line 4149  x_get_keysym_name (keysym) Line 4149  x_get_keysym_name (keysym)
4149  static Point last_mouse_motion_position;  static Point last_mouse_motion_position;
4150  static Lisp_Object last_mouse_motion_frame;  static Lisp_Object last_mouse_motion_frame;
4151    
4152  static void  static int
4153  note_mouse_movement (frame, pos)  note_mouse_movement (frame, pos)
4154       FRAME_PTR frame;       FRAME_PTR frame;
4155       Point *pos;       Point *pos;
# Line 4180  note_mouse_movement (frame, pos) Line 4180  note_mouse_movement (frame, pos)
4180              rif->define_frame_cursor (frame,              rif->define_frame_cursor (frame,
4181                                        frame->output_data.mac->nontext_cursor);                                        frame->output_data.mac->nontext_cursor);
4182          }          }
4183          return 1;
4184      }      }
4185    /* Has the mouse moved off the glyph it was on at the last sighting?  */    /* Has the mouse moved off the glyph it was on at the last sighting?  */
4186    else if (pos->h < last_mouse_glyph.left    if (pos->h < last_mouse_glyph.left
4187             || pos->h >= last_mouse_glyph.right        || pos->h >= last_mouse_glyph.right
4188             || pos->v < last_mouse_glyph.top        || pos->v < last_mouse_glyph.top
4189             || pos->v >= last_mouse_glyph.bottom)        || pos->v >= last_mouse_glyph.bottom)
4190      {      {
4191        frame->mouse_moved = 1;        frame->mouse_moved = 1;
4192        last_mouse_scroll_bar = Qnil;        last_mouse_scroll_bar = Qnil;
4193        note_mouse_highlight (frame, pos->h, pos->v);        note_mouse_highlight (frame, pos->h, pos->v);
4194        /* Remember which glyph we're now on.  */        /* Remember which glyph we're now on.  */
4195        remember_mouse_glyph (frame, pos->h, pos->v, &last_mouse_glyph);        remember_mouse_glyph (frame, pos->h, pos->v, &last_mouse_glyph);
4196          return 1;
4197      }      }
4198    
4199      return 0;
4200  }  }
4201    
4202    
# Line 10031  XTread_socket (sd, expected, hold_quit) Line 10035  XTread_socket (sd, expected, hold_quit)
10035                            er.where.h + 1, er.where.v + 1);                            er.where.h + 1, er.where.v + 1);
10036  #endif  #endif
10037                previous_help_echo_string = help_echo_string;                previous_help_echo_string = help_echo_string;
10038                help_echo_string = help_echo_object = help_echo_window = Qnil;                help_echo_string = Qnil;
               help_echo_pos = -1;  
10039    
10040                if (dpyinfo->grabbed && last_mouse_frame                if (dpyinfo->grabbed && last_mouse_frame
10041                    && FRAME_LIVE_P (last_mouse_frame))                    && FRAME_LIVE_P (last_mouse_frame))
# Line 10091  XTread_socket (sd, expected, hold_quit) Line 10094  XTread_socket (sd, expected, hold_quit)
10094    
10095                            last_window=window;                            last_window=window;
10096                          }                          }
10097                        note_mouse_movement (f, &mouse_pos);                        if (!note_mouse_movement (f, &mouse_pos))
10098                            help_echo_string = previous_help_echo_string;
10099                      }                      }
10100                  }                  }
10101    

Legend:
Removed from v.1.137  
changed lines
  Added in v.1.138

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26