From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 24 Feb 1994 06:20:30 +0000 (+0000)
Subject: (Fmouse_position): Convert to glyph units.
X-Git-Tag: emacs-19.34~9798
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5384466adef7b9937df07974bb692bbb9d699ecd;p=emacs.git

(Fmouse_position): Convert to glyph units.
---

diff --git a/src/frame.c b/src/frame.c
index f3b83ff106c..98b6fb32f3e 100644
--- 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));
 }