/[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.139 by mituharu, Sun Oct 16 02:22:59 2005 UTC revision 1.140 by mituharu, Tue Oct 18 08:07:06 2005 UTC
# Line 3910  note_mouse_movement (frame, pos) Line 3910  note_mouse_movement (frame, pos)
3910        return 1;        return 1;
3911      }      }
3912    /* 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?  */
3913    if (pos->h < last_mouse_glyph.left    if (!PtInRect (*pos, &last_mouse_glyph))
       || pos->h >= last_mouse_glyph.right  
       || pos->v < last_mouse_glyph.top  
       || pos->v >= last_mouse_glyph.bottom)  
3914      {      {
3915        frame->mouse_moved = 1;        frame->mouse_moved = 1;
3916        last_mouse_scroll_bar = Qnil;        last_mouse_scroll_bar = Qnil;
# Line 9521  XTread_socket (sd, expected, hold_quit) Line 9518  XTread_socket (sd, expected, hold_quit)
9518                    }                    }
9519                }                }
9520    
9521              if (er.what != mouseDown && part_code != inContent)              if (er.what != mouseDown &&
9522                    (part_code != inContent || dpyinfo->grabbed == 0))
9523                break;                break;
9524    
9525              switch (part_code)              switch (part_code)
# Line 9644  XTread_socket (sd, expected, hold_quit) Line 9642  XTread_socket (sd, expected, hold_quit)
9642                        {                        {
9643                          dpyinfo->grabbed |= (1 << inev.code);                          dpyinfo->grabbed |= (1 << inev.code);
9644                          last_mouse_frame = f;                          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;  
9645    
9646                          if (!tool_bar_p)                          if (!tool_bar_p)
9647                            last_tool_bar_item = -1;                            last_tool_bar_item = -1;
# Line 9665  XTread_socket (sd, expected, hold_quit) Line 9657  XTread_socket (sd, expected, hold_quit)
9657                            dpyinfo->grabbed &= ~(1 << inev.code);                            dpyinfo->grabbed &= ~(1 << inev.code);
9658                        }                        }
9659    
9660                        /* Ignore any mouse motion that happened before
9661                           this event; any subsequent mouse-movement Emacs
9662                           events should reflect only motion after the
9663                           ButtonPress.  */
9664                        if (f != 0)
9665                          f->mouse_moved = 0;
9666    
9667  #ifdef USE_TOOLKIT_SCROLL_BARS  #ifdef USE_TOOLKIT_SCROLL_BARS
9668                      if (inev.kind == MOUSE_CLICK_EVENT)                      if (inev.kind == MOUSE_CLICK_EVENT)
9669  #endif  #endif

Legend:
Removed from v.1.139  
changed lines
  Added in v.1.140

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