diff src/macfns.c @ 83561:dc002877ce12

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-674 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-675 Update from CVS * [e-mail]/emacs--devo--0--patch-676 Update from CVS * [e-mail]/emacs--devo--0--patch-677 Update from CVS * [e-mail]/emacs--devo--0--patch-678 Update from CVS * [e-mail]/emacs--devo--0--patch-679 Update from CVS * [e-mail]/emacs--devo--0--patch-680 Update from CVS * [e-mail]/emacs--devo--0--patch-681 Update from CVS * [e-mail]/emacs--devo--0--patch-682 Update from CVS * [e-mail]/emacs--devo--0--patch-683 Update from CVS * [e-mail]/emacs--devo--0--patch-684 Update from CVS * [e-mail]/emacs--devo--0--patch-685 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-686 Update from CVS * [e-mail]/emacs--devo--0--patch-687 Release ERC 5.2. * [e-mail]/emacs--devo--0--patch-688 Update from CVS * [e-mail]/emacs--devo--0--patch-689 Update from CVS * [e-mail]/emacs--devo--0--patch-690 Update from CVS * [e-mail]/emacs--devo--0--patch-691 Update from CVS * [e-mail]/emacs--devo--0--patch-692 Update from CVS * [e-mail]/emacs--devo--0--patch-693 Update from CVS * [e-mail]/emacs--devo--0--patch-694 Update from CVS * [e-mail]/emacs--devo--0--patch-695 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-696 Update from CVS * [e-mail]/emacs--devo--0--patch-697 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-698 Update from CVS * [e-mail]/emacs--devo--0--patch-699 Update from CVS * [e-mail]/emacs--devo--0--patch-700 Update from CVS * [e-mail]/emacs--devo--0--patch-701 Update from CVS * [e-mail]/gnus--rel--5.10--patch-209 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-210 Update from CVS * [e-mail]/gnus--rel--5.10--patch-211 Update from CVS * [e-mail]/gnus--rel--5.10--patch-212 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-213 Update from CVS * [e-mail]/gnus--rel--5.10--patch-214 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-215 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-601

--- a/src/macfns.c	Sun Apr 22 12:12:29 2007 +0000
+++ b/src/macfns.c	Sun Apr 22 12:42:47 2007 +0000
@@ -3105,8 +3105,8 @@
      Lisp_Object display;
 {
   struct mac_display_info *dpyinfo = check_x_display_info (display);
-
-  /* Only of the main display.  */
+  float mm_per_pixel;
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
 #if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
   if (CGDisplayScreenSize != NULL)
@@ -3116,9 +3116,8 @@
 
       BLOCK_INPUT;
       size = CGDisplayScreenSize (kCGDirectMainDisplay);
+      mm_per_pixel = size.height / CGDisplayPixelsHigh (kCGDirectMainDisplay);
       UNBLOCK_INPUT;
-
-      return make_number ((int) (size.height + .5f));
     }
 #if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
   else
@@ -3127,9 +3126,11 @@
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 || MAC_OS_X_VERSION_MIN_REQUIRED == 1020
     {
       /* This is an approximation.  */
-      return make_number ((int) (dpyinfo->height * 25.4 / dpyinfo->resy));
+      mm_per_pixel = 25.4f / dpyinfo->resy;
     }
 #endif
+
+  return make_number ((int) (dpyinfo->height * mm_per_pixel + 0.5f));
 }
 
 DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0,
@@ -3141,8 +3142,8 @@
      Lisp_Object display;
 {
   struct mac_display_info *dpyinfo = check_x_display_info (display);
-
-  /* Only of the main display.  */
+  float mm_per_pixel;
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
 #if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
   if (CGDisplayScreenSize != NULL)
@@ -3152,9 +3153,8 @@
 
       BLOCK_INPUT;
       size = CGDisplayScreenSize (kCGDirectMainDisplay);
+      mm_per_pixel = size.width / CGDisplayPixelsWide (kCGDirectMainDisplay);
       UNBLOCK_INPUT;
-
-      return make_number ((int) (size.width + .5f));
     }
 #if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
   else
@@ -3163,9 +3163,11 @@
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 || MAC_OS_X_VERSION_MIN_REQUIRED == 1020
     {
       /* This is an approximation.  */
-      return make_number ((int) (dpyinfo->width * 25.4 / dpyinfo->resx));
+      mm_per_pixel = 25.4f / dpyinfo->resx;
     }
 #endif
+
+  return make_number ((int) (dpyinfo->width * mm_per_pixel + 0.5f));
 }
 
 DEFUN ("x-display-backing-store", Fx_display_backing_store,
@@ -4115,6 +4117,8 @@
        doc: /* Show STRING in a "tooltip" window on frame FRAME.
 A tooltip window is a small window displaying a string.
 
+This is an internal function; Lisp code should call `tooltip-show'.
+
 FRAME nil or omitted means use the selected frame.
 
 PARMS is an optional list of frame parameters which can be used to