xf86-video-intel: src/i830_driver.c

[Alan Hourihane]

 src/i830_driver.c |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+)

New commits:
diff-tree 9a5106401a65c90df32cb71987fca7126dc22e81 (from 319be199ba657d2b82ba034edf3581aea6dcc3f0)
Author: Emilio Scalise <emisca.ml at gmail.com>
Date:   Mon Jan 15 17:22:27 2007 +0000

    patch to control mergedfb options, bug #9664

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 11c23ca..f7c700a 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -270,6 +270,9 @@ typedef enum {
    OPTION_SECONDHSYNC,
    OPTION_SECONDVREFRESH,
    OPTION_SECONDPOSITION,
+   OPTION_SECONDISSCRN0,
+   OPTION_MERGEDFBNONRECT,
+   OPTION_MERGEDFBMOUSER,
    OPTION_INTELXINERAMA,
    OPTION_INTELTEXPOOL,
    OPTION_INTELMMSIZE
@@ -299,6 +302,9 @@ static OptionInfoRec I830BIOSOptions[] =
    {OPTION_SECONDHSYNC,	"SecondMonitorHorizSync",OPTV_STRING,	{0}, FALSE },
    {OPTION_SECONDVREFRESH,"SecondMonitorVertRefresh",OPTV_STRING,{0}, FALSE },
    {OPTION_SECONDPOSITION,"SecondPosition",OPTV_STRING,	{0},	FALSE },
+   {OPTION_SECONDISSCRN0,"MergedXineramaSecondIsScreen0", OPTV_BOOLEAN, {0}, FALSE },
+   {OPTION_MERGEDFBNONRECT,"MergedNonRectangular",OPTV_BOOLEAN,	{0},	FALSE},
+   {OPTION_MERGEDFBMOUSER,"MergedMouseRestriction",OPTV_BOOLEAN, {0},    FALSE},
    {OPTION_INTELXINERAMA,"MergedXinerama",OPTV_BOOLEAN,	{0},	TRUE},
    {OPTION_INTELTEXPOOL,"Legacy3D",     OPTV_BOOLEAN,	{0},	FALSE},
    {OPTION_INTELMMSIZE, "AperTexSize",  OPTV_INTEGER,	{0},	FALSE},
@@ -4755,6 +4761,27 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
          }
          xfree(tempstr);
       }
+
+      /* If OPTION_SECONDISSCRN0 is true then swap screens */
+      if(xf86GetOptValBool(pI830->Options, OPTION_SECONDISSCRN0, TRUE)) {
+         if (pI830->SecondIsScrn0) 
+	    pI830->SecondIsScrn0 = FALSE;
+         else 
+	    pI830->SecondIsScrn0 = TRUE;
+      }
+
+      /* Set pI830->NonRect according to OPTION_MERGEDFBNONRECT */
+      if(xf86GetOptValBool(pI830->Options, OPTION_MERGEDFBNONRECT, TRUE))
+	 pI830->NonRect = TRUE;
+      else
+	 pI830->NonRect = FALSE;
+	
+      /* Set pI830->MouseRestrictions according to OPTION_MERGEDFBMOUSER */
+      if(xf86GetOptValBool(pI830->Options, OPTION_MERGEDFBMOUSER, TRUE))
+         pI830->MouseRestrictions = TRUE;
+      else
+         pI830->MouseRestrictions = FALSE;
+							 
       if((s = (char *)xf86GetOptValString(pI830->Options, OPTION_METAMODES))) {
          pI830->MetaModes = xalloc(strlen(s) + 1);
 	 if(pI830->MetaModes)