(Fmouse_position): Convert to glyph units.

diff --git a/src/frame.c b/src/frame.c
index f3b83ff106c5e54dd35caca391ed10d6a0d0cc2b..98b6fb32f3edc4ce83b2c643188c031a3ffd2123 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -825,6 +825,7 @@ and nil for X and Y.")
   Lisp_Object lispy_dummy;
   enum scroll_bar_part party_dummy;
   Lisp_Object x, y;
+  int col, row;
   unsigned long long_dummy;
 
   f = selected_frame;
@@ -836,7 +837,11 @@ and nil for X and Y.")
                            &lispy_dummy, &party_dummy,
                            &x, &y,
                            &long_dummy);
-
+  col = XINT (x);
+  row = XINT (y);
+  glyph_to_pixel_coords (f, col, row, &col, &row);
+  XSETINT (x, col);
+  XSETINT (y, row);
   XSET (lispy_dummy, Lisp_Frame, f);
   return Fcons (lispy_dummy, Fcons (x, y));
 }
@@ -1769,6 +1774,11 @@ and nil for X and Y.")
                            &x, &y,
                            &long_dummy);
 
+  col = XINT (x);
+  row = XINT (y);
+  glyph_to_pixel_coords (f, col, row, &col, &row);
+  XSETINT (x, col);
+  XSETINT (y, row);
   /* Always return nil for frame.  */
   return Fcons (Qnil, Fcons (x, y));
 }