svn merge ^/branches/released .

5 files changed, 21 insertions, 11 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index e90268a06..3a48fe9c3 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -1296,7 +1296,7 @@ xf86ScaleAxis(int	Cx,
     }

     else {

 	X = 0;

-	ErrorF ("Divide by Zero in xf86ScaleAxis");

+	ErrorF ("Divide by Zero in xf86ScaleAxis\n");

     }

     

     if (X > to_max)

diff --git a/xorg-server/hw/xfree86/doc/man/Xorg.man.pre b/xorg-server/hw/xfree86/doc/man/Xorg.man.pre
index 297eda1fb..c497a0e8c 100644
--- a/xorg-server/hw/xfree86/doc/man/Xorg.man.pre
+++ b/xorg-server/hw/xfree86/doc/man/Xorg.man.pre
@@ -32,8 +32,8 @@ SPARC and PowerPC.  The most widely supported operating systems are the
 free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD,

 OpenBSD, and Solaris.  Commercial UNIX operating systems such as

 UnixWare are also supported.  Other supported operating systems include

-GNU Hurd.  Darwin and Mac OS X are supported with the

-XDarwin(__appmansuffix__) X server.  Win32/Cygwin is supported with the 

+GNU Hurd.  Mac OS X is supported with the

+Xquartz(__appmansuffix__) X server.  Win32/Cygwin is supported with the

 XWin(__appmansuffix__) X server.

 .PP

 .SH "NETWORK CONNECTIONS"

diff --git a/xorg-server/hw/xfree86/doc/sgml/Makefile.am b/xorg-server/hw/xfree86/doc/sgml/Makefile.am
index 7756c47ac..e6661c544 100644
--- a/xorg-server/hw/xfree86/doc/sgml/Makefile.am
+++ b/xorg-server/hw/xfree86/doc/sgml/Makefile.am
@@ -19,13 +19,9 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 

-XML_FILES = DESIGN.xml

-

-include ../../../../doc/xml/xmlrules.in

+doc_sources = DESIGN.xml

 

+# Developer's documentation is not installed

 if ENABLE_DEVEL_DOCS

-noinst_DATA = $(BUILT_DOC_FILES)

+include $(top_srcdir)/doc/xml/xmlrules-noinst.in

 endif

-CLEANFILES = $(CLEAN_DOC_FILES)

-

-EXTRA_DIST = $(XML_FILES)

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 0f4c40c09..2b19d82ad 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -1731,6 +1731,7 @@ xf86RandR12EnterVT (int screen_index, int flags)
     ScreenPtr        pScreen = screenInfo.screens[screen_index];

     ScrnInfoPtr	     pScrn = xf86Screens[screen_index];

     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);

+    rrScrPrivPtr     rp = rrGetScrPriv(pScreen);

     Bool	     ret;

 

     if (randrp->orig_EnterVT) {

@@ -1742,6 +1743,11 @@ xf86RandR12EnterVT (int screen_index, int flags)
 	    return FALSE;

     }

 

+    /* reload gamma */

+    int i;

+    for (i = 0; i < rp->numCrtcs; i++)

+	xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);

+

     return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */

 }

 

@@ -1751,6 +1757,7 @@ xf86RandR12Init12 (ScreenPtr pScreen)
     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];

     rrScrPrivPtr	rp = rrGetScrPriv(pScreen);

     XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);

+    int i;

 

     rp->rrGetInfo = xf86RandR12GetInfo12;

     rp->rrScreenSetSize = xf86RandR12ScreenSetSize;

@@ -1780,6 +1787,9 @@ xf86RandR12Init12 (ScreenPtr pScreen)
      */

     if (!xf86RandR12SetInfo12 (pScreen))

 	return FALSE;

+    for (i = 0; i < rp->numCrtcs; i++) {

+	xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]);

+    }

     return TRUE;

 }

 

diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
index 7be65dcf9..7adf0ff73 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
@@ -85,7 +85,11 @@ static void *console_handler;
 static void

 drain_console(int fd, void *closure)

 {

-    tcflush(fd, TCIOFLUSH);

+    errno = 0;

+    if (tcflush(fd, TCIOFLUSH) == -1 && errno == EIO) {

+	xf86RemoveGeneralHandler(console_handler);

+	console_handler = NULL;

+    }

 }

 

 void