Mercurial > emacs

diff src/xterm.c @ 57144:1b899494bbe2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_term_init): Work around a bug in some X servers.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 18 Sep 2004 21:36:02 +0000
parents 1dac05def6d8
children 0d912ccf6554 4df500c93e1d 0796fc36c2bd
line wrap: on
line diff
--- a/src/xterm.c	Sat Sep 18 21:33:44 2004 +0000
+++ b/src/xterm.c	Sat Sep 18 21:36:02 2004 +0000
@@ -10432,10 +10432,12 @@
     int screen_number = XScreenNumberOfScreen (dpyinfo->screen);
     double pixels = DisplayHeight (dpyinfo->display, screen_number);
     double mm = DisplayHeightMM (dpyinfo->display, screen_number);
-    dpyinfo->resy = pixels * 25.4 / mm;
+    /* Mac OS X 10.3's Xserver sometimes reports 0.0mm.  */
+    dpyinfo->resy = (mm < 1) ? 100 : pixels * 25.4 / mm;
     pixels = DisplayWidth (dpyinfo->display, screen_number);
+    /* Mac OS X 10.3's Xserver sometimes reports 0.0mm.  */
     mm = DisplayWidthMM (dpyinfo->display, screen_number);
-    dpyinfo->resx = pixels * 25.4 / mm;
+    dpyinfo->resx = (mm < 1) ? 100 : pixels * 25.4 / mm;
   }
 
   dpyinfo->Xatom_wm_protocols