diff options
| author | Chong Yidong | 2010-11-16 21:37:45 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-11-16 21:37:45 -0500 |
| commit | 9173a8fbd77df7db68247a331df1c84f8ff074ec (patch) | |
| tree | 551f2115d72059c703f73206bcc23a859a996b83 /src/w32term.c | |
| parent | 809fde057f0f7c2d04825c910e3f323e38a9d342 (diff) | |
| download | emacs-9173a8fbd77df7db68247a331df1c84f8ff074ec.tar.gz emacs-9173a8fbd77df7db68247a331df1c84f8ff074ec.zip | |
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 33b60c568c0..7145efbc604 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -4317,7 +4317,7 @@ w32_read_socket (struct terminal *terminal, int expected, | |||
| 4317 | int x = LOWORD (msg.msg.lParam); | 4317 | int x = LOWORD (msg.msg.lParam); |
| 4318 | int y = HIWORD (msg.msg.lParam); | 4318 | int y = HIWORD (msg.msg.lParam); |
| 4319 | 4319 | ||
| 4320 | window = window_from_coordinates (f, x, y, 0, 0, 0, 0); | 4320 | window = window_from_coordinates (f, x, y, 0, 0); |
| 4321 | 4321 | ||
| 4322 | /* Window will be selected only when it is not | 4322 | /* Window will be selected only when it is not |
| 4323 | selected now and last mouse movement event was | 4323 | selected now and last mouse movement event was |
| @@ -4396,7 +4396,7 @@ w32_read_socket (struct terminal *terminal, int expected, | |||
| 4396 | int x = XFASTINT (inev.x); | 4396 | int x = XFASTINT (inev.x); |
| 4397 | int y = XFASTINT (inev.y); | 4397 | int y = XFASTINT (inev.y); |
| 4398 | 4398 | ||
| 4399 | window = window_from_coordinates (f, x, y, 0, 0, 0, 1); | 4399 | window = window_from_coordinates (f, x, y, 0, 1); |
| 4400 | 4400 | ||
| 4401 | if (EQ (window, f->tool_bar_window)) | 4401 | if (EQ (window, f->tool_bar_window)) |
| 4402 | { | 4402 | { |