Mercurial > emacs
changeset 70042:abc53f51fd3e
(coordinates_in_window): On the vertical border, calculate the row number
measured from the top of the window, not the top of the frame.
| author | Nick Roberts <nickrob@snap.net.nz> |
|---|---|
| date | Mon, 17 Apr 2006 00:24:50 +0000 |
| parents | e4de974e4d99 |
| children | cec61a0fff33 |
| files | src/window.c |
| diffstat | 1 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Mon Apr 17 00:23:20 2006 +0000 +++ b/src/window.c Mon Apr 17 00:24:50 2006 +0000 @@ -661,12 +661,20 @@ || WINDOW_RIGHTMOST_P (w)) { if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width) - return ON_VERTICAL_BORDER; + { + *x = max (0, *x - x0); + *y -= top_y; + return ON_VERTICAL_BORDER; + } } else { if (abs (*x - x1) < grabbable_width) - return ON_VERTICAL_BORDER; + { + *x = min (x1, *x) - x0; + *y -= top_y; + return ON_VERTICAL_BORDER; + } } if (*x < x0 || *x >= x1) @@ -708,7 +716,11 @@ && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) && !WINDOW_RIGHTMOST_P (w) && (abs (*x - right_x) < grabbable_width)) - return ON_VERTICAL_BORDER; + { + *x = min (right_x, *x) - left_x; + *y -= top_y; + return ON_VERTICAL_BORDER; + } } else { @@ -720,6 +732,8 @@ { /* On the border on the right side of the window? Assume that this area begins at RIGHT_X minus a canonical char width. */ + *x = min (right_x, *x) - left_x; + *y -= top_y; return ON_VERTICAL_BORDER; } }