-From 1557c71c858c7e16a54f959135faa1620cad11ab Mon Sep 17 00:00:00 2001
+From db1abe87be5b4bbe7db906ac3d56c69cf3785b23 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.
Signed-off-by: Nick Bowler <nbowler@draconx.ca>
---
- hw/xfree86/common/xf86Config.c | 6 +++++-
- hw/xfree86/common/xf86Globals.c | 1 +
- hw/xfree86/common/xf86Privstr.h | 2 ++
- hw/xfree86/doc/man/xorg.conf.man.pre | 6 ++++++
- hw/xfree86/modes/xf86RandR12.c | 12 ++++++++++++
+ hw/xfree86/common/xf86Config.c | 6 +++++-
+ hw/xfree86/common/xf86Globals.c | 1 +
+ hw/xfree86/common/xf86Privstr.h | 2 ++
+ hw/xfree86/man/xorg.conf.man | 6 ++++++
+ hw/xfree86/modes/xf86RandR12.c | 12 ++++++++++++
5 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 1e9543f..eb0b23e 100644
+index 114bdc3..22391df 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
-@@ -715,7 +715,8 @@ typedef enum {
+@@ -690,7 +690,8 @@ typedef enum {
FLAG_AUTO_ENABLE_DEVICES,
FLAG_GLX_VISUALS,
FLAG_DRI2,
} FlagValues;
/**
-@@ -779,6 +780,8 @@ static OptionInfoRec FlagOptions[] = {
+@@ -752,6 +753,8 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE },
{ FLAG_USE_SIGIO, "UseSIGIO", OPTV_BOOLEAN,
{0}, FALSE },
{ -1, NULL, OPTV_NONE,
{0}, FALSE },
};
-@@ -836,6 +839,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
+@@ -809,6 +812,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
if (xf86Info.ignoreABI) {
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index 8b483f3..6402329 100644
+index 16d5557..b0f602a 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
-@@ -110,6 +110,7 @@ xf86InfoRec xf86Info = {
+@@ -105,6 +105,7 @@ xf86InfoRec xf86Info = {
.dontVTSwitch = FALSE,
.dontZap = FALSE,
.dontZoom = FALSE,
.caughtSignal = FALSE,
.currentScreen = NULL,
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index b2095aa..05166f9 100644
+index 608f9bd..d05f206 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -68,6 +68,8 @@ typedef struct {
Bool notrapSignals; /* don't exit cleanly - die at fault */
Bool caughtSignal;
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index f7ff6f6..e2e5a55 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -550,6 +550,12 @@ When this option is enabled, those key sequences have no special meaning
+diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
+index f406f82..a9d418c 100644
+--- a/hw/xfree86/man/xorg.conf.man
++++ b/hw/xfree86/man/xorg.conf.man
+@@ -544,6 +544,12 @@ When this option is enabled, those key sequences have no special meaning
and are passed to clients.
Default: off.
.TP 7
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 7ba09b6..c51857b 100644
+index cb20d1c..65da9bf 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -806,6 +806,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+@@ -805,6 +805,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
else
{
xf86OutputPtr output = xf86CompatOutput(pScrn);
if (output &&
output->conf_monitor &&
-@@ -818,6 +819,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+@@ -817,6 +818,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
mmWidth = output->conf_monitor->mon_width;
mmHeight = output->conf_monitor->mon_height;
}
{
/*
--
-1.7.0.4
+1.7.3.4