-From 73d915296302f49024bf3d7cab2b11e253d5c8da Mon Sep 17 00:00:00 2001
+From 3f5e8e89ea149a105ac191e3b7ebee922f78868f Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 6 Jan 2010 10:42:17 -0500
Subject: [PATCH] xfree86: Add DontLie server flag.
Since commit fff00df94d7ebd18a8e24537ec96073717375a3f, RandR 1.2 drivers
-lie about attached screen resolution by default. The new server flag,
-DontLie, causes the server to be honest by default.
+lie about the resolution of the attached screen by default. When the
+reported resolution is wrong, fonts and other UI elements that use
+physical units are not sized correctly.
+
+This patch adds a new server flag, DontLie, which encourages the server
+to be honest by default.
Signed-off-by: Nick Bowler <nbowler@draconx.ca>
---
Bool caughtSignal;
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index 942c397..dd1269c 100644
+index f0a7373..21ea017 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -490,6 +490,12 @@ When this option is enabled, those key sequences have no special meaning
This disables the parts of the VidMode extension used by the xvidtune client
that can be used to change the video modes.
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 1fc63c4..5d8bc29 100644
+index 7ba09b6..c51857b 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -806,6 +806,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
else
{
- xf86OutputPtr output = config->output[config->compat_output];
+ xf86OutputPtr output = xf86CompatOutput(pScrn);
+ xf86CrtcPtr crtc = output->crtc;
- if (output->conf_monitor &&
- (output->conf_monitor->mon_width > 0 &&
-@@ -817,6 +818,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+ if (output &&
+ output->conf_monitor &&
+@@ -818,6 +819,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
mmWidth = output->conf_monitor->mon_width;
mmHeight = output->conf_monitor->mon_height;
}
{
/*
--
-1.6.6
+1.7.0