fix dpi

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5036 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 2ff0128cbf0b7fb333a62838410c85c047441e32..d4ff5d86bba6e7dbaaf7c055f545df598584c5ff 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-20  John Levon  <levon@movementarian.org>
+
+       * lyx_gui.C: estimate default DPI
+ 
 2002-08-16  Angus Leeming  <leeming@lyx.org>
 
        * Dialogs.C:

diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C
index 2082d46c0688db48d2f0988aaa09c34082e0d2c4..d5949c7be9542e13c54612280a2c753aa92dc7ca 100644 (file)
--- a/src/frontends/xforms/lyx_gui.C
+++ b/src/frontends/xforms/lyx_gui.C
@@ -66,6 +66,15 @@ namespace {
 /// quit lyx
 bool finished = false;
 
+/// estimate DPI from X server
+float getDPI()
+{
+       Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
+       return ((HeightOfScreen(scr) * 25.4 / HeightMMOfScreen(scr)) +
+               (WidthOfScreen(scr) * 25.4 / WidthMMOfScreen(scr))) / 2; 
+}
+
+ 
 /// set default GUI configuration
 void setDefaults()
 {
@@ -167,14 +176,14 @@ void lyx_gui::parse_init(int & argc, char * argv[])
        Image::newImage = boost::bind(&ImageXPM::newImage);
        Image::loadableFormats = boost::bind(&ImageXPM::loadableFormats);
 #endif
+
+       // must do this /before/ lyxrc gets read 
+       lyxrc.dpi = getDPI();
 }
 
 
 void lyx_gui::parse_lyxrc()
 {
-       // FIXME !!!!
-       //lyxrc.dpi = 95;
-
        XformsColor::read(AddName(user_lyxdir, "preferences.xform"));
 
        if (lyxrc.popup_font_encoding.empty())