diff options
| author | Chong Yidong <[email protected]> | 2010-11-16 14:59:24 -0500 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2010-11-16 14:59:24 -0500 |
| commit | 77cd1a622a5d365eba4f686bb52f92357cadfcf9 (patch) | |
| tree | f91358a7053025ec0d8520ce26ce640b045ab993 /src/w32term.c | |
| parent | 023ec128fd95eadac7b607177969267cc8b9accf (diff) | |
Cleanup of window coordinate positioning code.
Now, text area click input events measure Y from the top of the text
area, excluding the header line if any.
* src/dispnew.c (buffer_posn_from_coords): Assume that X counts from
the start of the text area.
* src/keyboard.c (make_lispy_position): For text area clicks, record Y
pixel position relative to the text area, excluding header line.
Also change X and Y to Lisp_Objects, not pointers; don't return
coordinate values via pointers. Pass ON_TEXT_AREA coordinate to
buffer_posn_from_coords counting from the start of the text area.
(Fposn_at_x_y, make_lispy_event): Callers changed.
* src/w32term.c (w32_read_socket):
* src/msdos.c (dos_rawgetc):
* src/xterm.c (handle_one_xevent): Likewise.
* src/window.c (coordinates_in_window): Change X and Y to ints rather
than pointers; don't return coordinates via pointers.
(struct check_window_data): Change X and Y from pointers to ints.
(window_from_coordinates): Remove args WX and WY; don't return
coordinates via pointers.
(Fcoordinates_in_window_p, window_from_coordinates):
(check_window_containing, Fwindow_at): Callers changed.
(window_relative_x_coord): New function.
* src/window.h (window_from_coordinates, window_relative_x_coord):
Update prototypes.
* src/xdisp.c (remember_mouse_glyph): Change window_from_coordinates
call. Use window_relative_x_coord.
(note_mouse_highlight): Change window_from_coordinates call.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32term.c b/src/w32term.c index 33b60c568c..7145efbc60 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -4317,7 +4317,7 @@ w32_read_socket (struct terminal *terminal, int expected, int x = LOWORD (msg.msg.lParam); int y = HIWORD (msg.msg.lParam); - window = window_from_coordinates (f, x, y, 0, 0, 0, 0); + window = window_from_coordinates (f, x, y, 0, 0); /* Window will be selected only when it is not selected now and last mouse movement event was @@ -4396,7 +4396,7 @@ w32_read_socket (struct terminal *terminal, int expected, int x = XFASTINT (inev.x); int y = XFASTINT (inev.y); - window = window_from_coordinates (f, x, y, 0, 0, 0, 1); + window = window_from_coordinates (f, x, y, 0, 1); if (EQ (window, f->tool_bar_window)) { |