Mercurial > emacs
comparison src/macterm.c @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 21 Mar 2007 13:33:07 +0000 |
parents | 91bf6e05918b 12069a316614 |
children | 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
90788:a12805fdabe8 | 90789:c0409ee15cee |
---|---|
4484 | 4484 |
4485 last_mouse_movement_time = TickCount () * (1000 / 60); /* to milliseconds */ | 4485 last_mouse_movement_time = TickCount () * (1000 / 60); /* to milliseconds */ |
4486 last_mouse_motion_position = *pos; | 4486 last_mouse_motion_position = *pos; |
4487 XSETFRAME (last_mouse_motion_frame, frame); | 4487 XSETFRAME (last_mouse_motion_frame, frame); |
4488 | 4488 |
4489 if (frame == dpyinfo->mouse_face_mouse_frame | |
4489 #if TARGET_API_MAC_CARBON | 4490 #if TARGET_API_MAC_CARBON |
4490 if (!PtInRect (*pos, GetWindowPortBounds (FRAME_MAC_WINDOW (frame), &r))) | 4491 && !PtInRect (*pos, GetWindowPortBounds (FRAME_MAC_WINDOW (frame), &r)) |
4491 #else | 4492 #else |
4492 if (!PtInRect (*pos, &FRAME_MAC_WINDOW (frame)->portRect)) | 4493 && !PtInRect (*pos, &FRAME_MAC_WINDOW (frame)->portRect) |
4493 #endif | 4494 #endif |
4494 { | 4495 ) |
4495 if (frame == dpyinfo->mouse_face_mouse_frame) | 4496 { |
4496 /* This case corresponds to LeaveNotify in X11. */ | 4497 /* This case corresponds to LeaveNotify in X11. If we move |
4497 { | 4498 outside the frame, then we're certainly no longer on any text |
4498 /* If we move outside the frame, then we're certainly no | 4499 in the frame. */ |
4499 longer on any text in the frame. */ | 4500 clear_mouse_face (dpyinfo); |
4500 clear_mouse_face (dpyinfo); | 4501 dpyinfo->mouse_face_mouse_frame = 0; |
4501 dpyinfo->mouse_face_mouse_frame = 0; | 4502 if (!dpyinfo->grabbed) |
4502 if (!dpyinfo->grabbed) | 4503 rif->define_frame_cursor (frame, |
4503 rif->define_frame_cursor (frame, | 4504 frame->output_data.mac->nontext_cursor); |
4504 frame->output_data.mac->nontext_cursor); | 4505 } |
4505 } | 4506 |
4506 return 1; | |
4507 } | |
4508 /* Has the mouse moved off the glyph it was on at the last sighting? */ | 4507 /* Has the mouse moved off the glyph it was on at the last sighting? */ |
4509 if (frame != last_mouse_glyph_frame | 4508 if (frame != last_mouse_glyph_frame |
4510 || !PtInRect (*pos, &last_mouse_glyph)) | 4509 || !PtInRect (*pos, &last_mouse_glyph)) |
4511 { | 4510 { |
4512 frame->mouse_moved = 1; | 4511 frame->mouse_moved = 1; |