aboutsummaryrefslogtreecommitdiffstats
path: root/src/msdos.c
diff options
context:
space:
mode:
authorChong Yidong2010-11-16 21:37:45 -0500
committerChong Yidong2010-11-16 21:37:45 -0500
commit9173a8fbd77df7db68247a331df1c84f8ff074ec (patch)
tree551f2115d72059c703f73206bcc23a859a996b83 /src/msdos.c
parent809fde057f0f7c2d04825c910e3f323e38a9d342 (diff)
downloademacs-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/msdos.c')
-rw-r--r--src/msdos.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/msdos.c b/src/msdos.c
index 6593714ba1f..964fde0cbf5 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -2698,7 +2698,7 @@ dos_rawgetc (void)
2698 mouse_window = window_from_coordinates (SELECTED_FRAME(), 2698 mouse_window = window_from_coordinates (SELECTED_FRAME(),
2699 mouse_last_x, 2699 mouse_last_x,
2700 mouse_last_y, 2700 mouse_last_y,
2701 0, 0, 0, 0); 2701 0, 0);
2702 /* A window will be selected only when it is not 2702 /* A window will be selected only when it is not
2703 selected now, and the last mouse movement event was 2703 selected now, and the last mouse movement event was
2704 not in it. A minibuffer window will be selected iff 2704 not in it. A minibuffer window will be selected iff