aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2000-11-25 18:40:15 +0000
committerJason Rumney2000-11-25 18:40:15 +0000
commitafabdbe5992645245b87012fc1a66348714501ac (patch)
tree58b526bffa4cf4d19580764c9f95f39d1a97983b
parent640a9cdd27498e747fcbce0a542717cce45c9870 (diff)
downloademacs-afabdbe5992645245b87012fc1a66348714501ac.tar.gz
emacs-afabdbe5992645245b87012fc1a66348714501ac.zip
(make_lispy_event) [mouse_wheel, drag_n_drop]: Args to
window_from_coordinates should be pixel coordinates.
-rw-r--r--src/keyboard.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 51f2e3b9968..beaf5507ef5 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4975,7 +4975,8 @@ make_lispy_event (event)
4975 return Qnil; 4975 return Qnil;
4976 pixel_to_glyph_coords (f, XINT (event->x), XINT (event->y), 4976 pixel_to_glyph_coords (f, XINT (event->x), XINT (event->y),
4977 &column, &row, NULL, 1); 4977 &column, &row, NULL, 1);
4978 window = window_from_coordinates (f, column, row, &part, 0); 4978 window = window_from_coordinates (f, XINT (event->x),
4979 XINT (event->y), &part, 0);
4979 4980
4980 if (!WINDOWP (window)) 4981 if (!WINDOWP (window))
4981 { 4982 {
@@ -5033,7 +5034,6 @@ make_lispy_event (event)
5033 Lisp_Object window; 5034 Lisp_Object window;
5034 Lisp_Object posn; 5035 Lisp_Object posn;
5035 Lisp_Object files; 5036 Lisp_Object files;
5036 int row, column;
5037 5037
5038 /* The frame_or_window field should be a cons of the frame in 5038 /* The frame_or_window field should be a cons of the frame in
5039 which the event occurred and a list of the filenames 5039 which the event occurred and a list of the filenames
@@ -5048,9 +5048,9 @@ make_lispy_event (event)
5048 have been deleted. */ 5048 have been deleted. */
5049 if (! FRAME_LIVE_P (f)) 5049 if (! FRAME_LIVE_P (f))
5050 return Qnil; 5050 return Qnil;
5051 pixel_to_glyph_coords (f, XINT (event->x), XINT (event->y), 5051
5052 &column, &row, NULL, 1); 5052 window = window_from_coordinates (f, XINT (event->x),
5053 window = window_from_coordinates (f, column, row, &part, 0); 5053 XINT (event->y), &part, 0);
5054 5054
5055 if (!WINDOWP (window)) 5055 if (!WINDOWP (window))
5056 { 5056 {