xserver pixman git update 7-12-2010

60 files changed, 7660 insertions, 4424 deletions

diff --git a/xorg-server/COPYING b/xorg-server/COPYING
index 3fb06b8df..16b719376 100644
--- a/xorg-server/COPYING
+++ b/xorg-server/COPYING
@@ -1,1822 +1,1822 @@
-The following is the 'standard copyright' agreed upon by most contributors,
-and is currently the canonical license preferred by the X.Org Foundation.
-This is a slight variant of the common MIT license form published by the
-Open Source Initiative at http://www.opensource.org/licenses/mit-license.php
-
-Copyright holders of new code should use this license statement where
-possible, and insert their name to this list.  Please sort by surname
-for people, and by the full name for other entities (e.g.  Juliusz
-Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
-
-Copyright © 2000-2001 Juliusz Chroboczek
-Copyright © 1998 Egbert Eich
-Copyright © 2006-2007 Intel Corporation
-Copyright © 2006 Nokia Corporation
-Copyright © 2006-2008 Peter Hutterer
-Copyright © 2006 Adam Jackson
-Copyright © 2009 NVIDIA Corporation
-Copyright © 1999 Keith Packard
-Copyright © 2007-2009 Red Hat, Inc.
-Copyright © 2005-2008 Daniel Stone
-Copyright © 2006-2009 Simon Thum
-Copyright © 1987, 2003-2006, 2008-2009 Sun Microsystems, Inc.
-Copyright © 2006 Luc Verhaegen
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-
-
-The following licenses are 'legacy': usually MIT/X11 licenses with the name
-of the copyright holder(s) in the license statement, but also some BSD-like
-licenses.
-
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-Copyright (C) Colin Harrison 2005-2008
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the XFree86 Project.
-
-
-Copyright 1997 by The XFree86 Project, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the XFree86 Project, Inc.
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The Xfree86
-Project, Inc. makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1985-1998, 2001  The Open Group
-Copyright 2002 Red Hat Inc., Durham, North Carolina.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright (c) 1987, 1989-1990, 1992-1995  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright © 1999-2000 SuSE, Inc.
-Copyright © 2007 Red Hat, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SuSE makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts.
-Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts.
-Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-Copyright 1994 Quarterdeck Office Systems.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital and
-Quarterdeck not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1997 Digital Equipment Corporation.
-All rights reserved.
-
-This software is furnished under license and may be used and copied only in
-accordance with the following terms and conditions.  Subject to these
-conditions, you may download, copy, install, use, modify and distribute
-this software in source and/or binary form. No title or ownership is
-transferred hereby.
-
-1) Any source code used, modified or distributed must reproduce and retain
-   this copyright notice and list of conditions as they appear in the
-   source file.
-
-2) No right is granted to use any trade name, trademark, or logo of Digital
-   Equipment Corporation. Neither the "Digital Equipment Corporation"
-   name nor any trademark or logo of Digital Equipment Corporation may be
-   used to endorse or promote products derived from this software without
-   the prior written permission of Digital Equipment Corporation.
-
-3) This software is provided "AS-IS" and any express or implied warranties,
-   including but not limited to, any implied warranties of merchantability,
-   fitness for a particular purpose, or non-infringement are disclaimed.
-   In no event shall DIGITAL be liable for any damages whatsoever, and in
-   particular, DIGITAL shall not be liable for special, indirect,
-   consequential, or incidental damages or damages for lost profits, loss
-   of revenue or loss of use, whether such damages arise in contract,
-   negligence, tort, under statute, in equity, at law or otherwise, even
-   if advised of the possibility of such damage.
-
-
-Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-
-
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice including the dates of first publication and
-either this permission notice or a reference to
-http://oss.sgi.com/projects/FreeB/
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Copyright (c) 1994, 1995  Hewlett-Packard Company
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the Hewlett-Packard
-Company shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization from the Hewlett-Packard Company.
-
-
-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Hewlett-Packard not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-Copyright (c) 2003 by the XFree86 Project, Inc.
-Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation on the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Copyright © 2008 Red Hat, Inc.
-Partly based on code Copyright © 2000 SuSE, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without
-fee, provided that the above copyright notice appear in all copies
-and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Red Hat
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.  Red
-Hat makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied
-warranty.
-
-Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SuSE makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2006  Red Hat, Inc.
-(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright (c) 1995  X Consortium
-Copyright 2004 Red Hat Inc., Durham, North Carolina.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation on the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,
-AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in this Software without prior written
-authorization from the X Consortium.
-
-
-Copyright 1998-2000 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.
-Copyright (c) 2003-2004 Torrey T. Lyons.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-(C) Copyright IBM Corporation 2003
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-(C) Copyright IBM Corporation 2004-2005
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-IBM,
-AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Copyright (c) 1997  Metro Link Incorporated
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the Metro Link shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from Metro Link.
-
-
-Copyright 1995-1998 by Metro Link, Inc.
-Copyright (c) 1997 Matthieu Herrb
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Metro Link, Inc. not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Metro Link, Inc. makes no
-representations about the suitability of this software for any purpose.
- It is provided "as is" without express or implied warranty.
-
-METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998 by Metro Link Incorporated
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Metro Link
-Incorporated not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  Metro Link Incorporated makes no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of Conectiva Linux shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-Conectiva Linux.
-
-
-Copyright (c) 2001, Andy Ritger  aritger@nvidia.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-o Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-o Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer
-  in the documentation and/or other materials provided with the
-  distribution.
-o Neither the name of NVIDIA nor the names of its contributors
-  may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-Copyright 1992 Vrije Universiteit, The Netherlands
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the Vrije Universiteit not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  The Vrije Universiteit makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998 by Concurrent Computer Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Concurrent Computer
-Corporation not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  Concurrent Computer Corporation makes no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright © 2004 Nokia
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Nokia not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Nokia makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-(c)Copyright 1988,1991 Adobe Systems Incorporated.
-All rights reserved.
-
-Permission to use, copy, modify, distribute, and sublicense this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notices appear in all copies and that both those copyright
-notices and this permission notice appear in supporting documentation and that
-the name of Adobe Systems Incorporated not be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission.  No trademark license to use the Adobe trademarks is hereby
-granted.  If the Adobe trademark "Display PostScript"(tm) is used to describe
-this software, its functionality or for any other purpose, such use shall be
-limited to a statement that this software works in conjunction with the Display
-PostScript system.  Proper trademark attribution to reflect Adobe's ownership
-of the trademark shall be given whenever any such reference to the Display
-PostScript system is made.
-
-ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY
-PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.  ADOBE
-DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
-INFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL ADOBE BE LIABLE TO YOU
-OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT
-LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER
-SUPPORT FOR THE SOFTWARE.
-
-Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
-Incorporated which may be registered in certain jurisdictions.
-
-
-Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of N.C.D. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  N.C.D. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-
-Copyright (c) 1987 by the Regents of the University of California
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies.  The University of California
-makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without
-express or implied warranty.
-
-
-Copyright 1992, 1993 Data General Corporation;
-Copyright 1992, 1993 OMRON Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-neither the name OMRON or DATA GENERAL be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission of the party whose name is to be used.  Neither OMRON or
-DATA GENERAL make any representation about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.
-
-OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-
-Copyright © 1998-2004, 2006 Keith Packard
-Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-Copyright (c) 2003 Torrey T. Lyons.
-All Rights Reserved.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 1999 Keith Packard
-Copyright © 2000 Compaq Computer Corporation
-Copyright © 2002 MontaVista Software Inc.
-Copyright © 2005 OpenedHand Ltd.
-Copyright © 2006 Nokia Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the authors and/or copyright holders
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  The authors and/or
-copyright holders make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1993 by Davor Matic
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.  Davor Matic makes no representations about
-the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-
-Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
-Copyright (C) Colin Harrison 2005-2008
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Harold L Hunt II
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Harold L Hunt II.
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Thomas Roell not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Thomas Roell makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Thomas Roell and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Thomas Roell and
-David Wexelblat makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1990,91,92,93 by Thomas Roell, Germany.
-Copyright 1991,92,93    by SGCS (Snitily Graphics Consulting Services), USA.
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this  permission notice appear
-in supporting documentation, and that the name of Thomas Roell nor
-SGCS be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-Thomas Roell nor SGCS makes no representations about the suitability
-of this software for any purpose. It is provided "as is" without
-express or implied warranty.
-
-THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998 by Alan Hourihane, Wigan, England.
-Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Alan Hourihane makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1995  Kaleb S. KEITHLEY
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-
-Copyright (c) 1997 Matthieu Herrb
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Matthieu Herrb not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Matthieu Herrb makes no
-representations about the suitability of this software for any purpose.
- It is provided "as is" without express or implied warranty.
-
-MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2004, Egbert Eich
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Egbert Eich shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from Egbert Eich.
-
-
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-Copyright 2005 by Kean Johnston <jkj@sco.com>
-Copyright 1993 by David McCullough <davidm@stallion.oz.au>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of David Wexelblat not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  David Wexelblat makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Orest Zborowski <obz@Kodak.com>
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Orest Zborowski
-and David Wexelblat make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Orest Zborowski <obz@Kodak.com>
-Copyright 1993 by David Dawes <dawes@xfree86.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Dawes
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Orest Zborowski
-and David Dawes make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1995-1999 by Frederic Lepied, France. <fred@sugix.frmug.fr.net>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is  hereby granted without fee, provided that
-the  above copyright   notice appear  in   all  copies and  that both  that
-copyright  notice   and   this  permission   notice  appear  in  supporting
-documentation, and that   the  name of  Frederic   Lepied not  be  used  in
-advertising or publicity pertaining to distribution of the software without
-specific,  written      prior  permission.     Frederic  Lepied   makes  no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
-INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
-EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
-TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Rich Murphey and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Rich Murphey and
-David Wexelblat make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1993 by David Dawes <dawes@xfree86.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Rich Murphey and David Dawes
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Rich Murphey and
-David Dawes make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2003-2004 Anders Carlsson
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Anders Carlsson not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Anders Carlsson makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2003 Anders Carlsson
-Copyright © 2003-2004 Eric Anholt
-Copyright © 2004 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Eric Anholt not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Eric Anholt makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2003-2004 Philip Blundell
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Philip Blundell not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Philip Blundell makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-
-Copyright (c) 1994-2003 by The XFree86 Project, Inc.
-Copyright 1997 by Metro Link, Inc.
-Copyright 2003 by David H. Dawes.
-Copyright 2003 by X-Oz Technologies.
-Copyright (c) 2004, X.Org Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the copyright holder(s)
-and author(s) shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Software without prior written
-authorization from the copyright holder(s) and author(s).
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-Copyright 1999 by David Holland <davidh@iquest.net>
-Copyright © 2000 Compaq Computer Corporation
-Copyright © 2002 Hewlett-Packard Company
-Copyright © 2004, 2005 Red Hat, Inc.
-Copyright © 2004 Nicholas Miell
-Copyright © 2005 Trolltech AS
-Copyright © 2006 Intel Corporation
-Copyright © 2006-2007 Keith Packard
-Copyright © 2008 Red Hat, Inc
-Copyright © 2008 George Sapountzis <gsap7@yahoo.gr>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of the copyright holders not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  The copyright holders make no representations
-about the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-            2005 Lars Knoll & Zack Rusin, Trolltech
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 1987, 1998  The Open Group
-Copyright © 1998-1999, 2001 The XFree86 Project, Inc.
-Copyright © 2000 VA Linux Systems, Inc.
-Copyright (c) 2000, 2001 Nokia Home Communications
-Copyright © 2007, 2008 Red Hat, Inc.
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-
-Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2001 Andreas Monitzer.
-Copyright (c) 2001-2004 Greg Parker.
-Copyright (c) 2001-2004 Torrey T. Lyons
-Copyright (c) 2002-2003 Apple Computer, Inc.
-Copyright (c) 2004-2005 Alexander Gottwald
-Copyright (c) 2002-2009 Apple Inc.
-Copyright (c) 2007 Jeremy Huddleston
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in this Software without prior written authorization.
-
-
-Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. The name of the author may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the author shall not be used in
-advertising or otherwise to promote the sale, use or other dealings in this
-Software without prior written authorization from the author.
-
-
-Copyright © 2002 David Dawes
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the author(s) shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-the author(s).
-
-
-Copyright (C) 1996-1999 SciTech Software, Inc.
-Copyright (C) David Mosberger-Tang
-Copyright (C) 1999 Egbert Eich
-Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the authors not be used
-in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  The authors makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2005-2006 Luc Verhaegen.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright 1995 by Robin Cutshaw <robin@XFree86.Org>
-Copyright 2000 by Egbert Eich
-Copyright 2002 by David Dawes
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of the above listed copyright holder(s)
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The above listed
-copyright holder(s) make(s) no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of Marc Aurele La France not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  Marc Aurele La France makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as-is" without express or implied warranty.
-
-MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
-EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-
-Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1992 by David Dawes <dawes@XFree86.org>
-Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
-Copyright 1992 by Orest Zborowski <obz@eskimo.com>
-Copyright 1993 by Vrije Universiteit, The Netherlands
-Copyright 1993 by David Wexelblat <dwex@XFree86.org>
-Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>
-Copyright 1997 by Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk>
-Copyright 1994-2003 by The XFree86 Project, Inc
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of the above listed copyright holders
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The above listed
-copyright holders make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name J. Kean Johnston not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  J. Kean Johnston makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright 1997,1998 by UCHIYAMA Yasushi
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of UCHIYAMA Yasushi not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  UCHIYAMA Yasushi makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2000 Keith Packard
-              2004 Eric Anholt
-              2005 Zack Rusin
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of copyright holders not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Copyright holders make no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-(C) Copyright IBM Corporation 2002-2007
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-this permission notice appear in supporting documentation.  This permission
-notice shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright © 2007 OpenedHand Ltd
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of OpenedHand Ltd not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. OpenedHand Ltd makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1989, 1990, 1993, 1994
-     The Regents of the University of California.  All rights reserved.
-
-This code is derived from software contributed to Berkeley by
-Chris Torek.
-
-This code is derived from software contributed to Berkeley by
-Michael Rendell of Memorial University of Newfoundland.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 4. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+The following is the 'standard copyright' agreed upon by most contributors,

+and is currently the canonical license preferred by the X.Org Foundation.

+This is a slight variant of the common MIT license form published by the

+Open Source Initiative at http://www.opensource.org/licenses/mit-license.php

+

+Copyright holders of new code should use this license statement where

+possible, and insert their name to this list.  Please sort by surname

+for people, and by the full name for other entities (e.g.  Juliusz

+Chroboczek sorts before Intel Corporation sorts before Daniel Stone).

+

+Copyright © 2000-2001 Juliusz Chroboczek

+Copyright © 1998 Egbert Eich

+Copyright © 2006-2007 Intel Corporation

+Copyright © 2006 Nokia Corporation

+Copyright © 2006-2008 Peter Hutterer

+Copyright © 2006 Adam Jackson

+Copyright © 2009-2010 NVIDIA Corporation

+Copyright © 1999 Keith Packard

+Copyright © 2007-2009 Red Hat, Inc.

+Copyright © 2005-2008 Daniel Stone

+Copyright © 2006-2009 Simon Thum

+Copyright © 1987, 2003-2006, 2008-2009 Sun Microsystems, Inc.

+Copyright © 2006 Luc Verhaegen

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice (including the next

+paragraph) shall be included in all copies or substantial portions of the

+Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+DEALINGS IN THE SOFTWARE.

+

+

+

+

+The following licenses are 'legacy': usually MIT/X11 licenses with the name

+of the copyright holder(s) in the license statement, but also some BSD-like

+licenses.

+

+

+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.

+Copyright (C) Colin Harrison 2005-2008

+

+Permission is hereby granted, free of charge, to any person obtaining a copy of

+this software and associated documentation files (the "Software"), to deal in

+the Software without restriction, including without limitation the rights to

+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

+of the Software, and to permit persons to whom the Software is furnished to do

+so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all

+copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-

+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the XFree86 Project shall not

+be used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from the XFree86 Project.

+

+

+Copyright 1997 by The XFree86 Project, Inc.

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of the XFree86 Project, Inc.

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  The Xfree86

+Project, Inc. makes no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE

+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1985-1998, 2001  The Open Group

+Copyright 2002 Red Hat Inc., Durham, North Carolina.

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+

+Copyright (c) 1987, 1989-1990, 1992-1995  X Consortium

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the X Consortium shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from the X Consortium.

+

+

+Copyright © 1999-2000 SuSE, Inc.

+Copyright © 2007 Red Hat, Inc.

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of SuSE not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  SuSE makes no representations about the

+suitability of this software for any purpose.  It is provided "as is"

+without express or implied warranty.

+

+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE

+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts.

+Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts.

+Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,

+Copyright 1994 Quarterdeck Office Systems.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the names of Digital and

+Quarterdeck not be used in advertising or publicity pertaining to

+distribution of the software without specific, written prior

+permission.

+

+DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT

+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE

+OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1997 Digital Equipment Corporation.

+All rights reserved.

+

+This software is furnished under license and may be used and copied only in

+accordance with the following terms and conditions.  Subject to these

+conditions, you may download, copy, install, use, modify and distribute

+this software in source and/or binary form. No title or ownership is

+transferred hereby.

+

+1) Any source code used, modified or distributed must reproduce and retain

+   this copyright notice and list of conditions as they appear in the

+   source file.

+

+2) No right is granted to use any trade name, trademark, or logo of Digital

+   Equipment Corporation. Neither the "Digital Equipment Corporation"

+   name nor any trademark or logo of Digital Equipment Corporation may be

+   used to endorse or promote products derived from this software without

+   the prior written permission of Digital Equipment Corporation.

+

+3) This software is provided "AS-IS" and any express or implied warranties,

+   including but not limited to, any implied warranties of merchantability,

+   fitness for a particular purpose, or non-infringement are disclaimed.

+   In no event shall DIGITAL be liable for any damages whatsoever, and in

+   particular, DIGITAL shall not be liable for special, indirect,

+   consequential, or incidental damages or damages for lost profits, loss

+   of revenue or loss of use, whether such damages arise in contract,

+   negligence, tort, under statute, in equity, at law or otherwise, even

+   if advised of the possibility of such damage.

+

+

+Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts.

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR

+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Digital Equipment Corporation

+shall not be used in advertising or otherwise to promote the sale, use or other

+dealings in this Software without prior written authorization from Digital

+Equipment Corporation.

+

+

+SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

+Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice including the dates of first publication and

+either this permission notice or a reference to

+http://oss.sgi.com/projects/FreeB/

+shall be included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+

+Copyright (c) 1994, 1995  Hewlett-Packard Company

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sublicense, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,

+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

+THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the Hewlett-Packard

+Company shall not be used in advertising or otherwise to promote the

+sale, use or other dealings in this Software without prior written

+authorization from the Hewlett-Packard Company.

+

+

+Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.

+All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of Hewlett-Packard not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.

+

+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

+Copyright (c) 2003 by the XFree86 Project, Inc.

+Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina.

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation on the rights to use, copy, modify, merge,

+publish, distribute, sublicense, and/or sell copies of the Software,

+and to permit persons to whom the Software is furnished to do so,

+subject to the following conditions:

+

+The above copyright notice and this permission notice (including the

+next paragraph) shall be included in all copies or substantial

+portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+

+Copyright © 2008 Red Hat, Inc.

+Partly based on code Copyright © 2000 SuSE, Inc.

+

+Permission to use, copy, modify, distribute, and sell this software

+and its documentation for any purpose is hereby granted without

+fee, provided that the above copyright notice appear in all copies

+and that both that copyright notice and this permission notice

+appear in supporting documentation, and that the name of Red Hat

+not be used in advertising or publicity pertaining to distribution

+of the software without specific, written prior permission.  Red

+Hat makes no representations about the suitability of this software

+for any purpose.  It is provided "as is" without express or implied

+warranty.

+

+Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

+NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of SuSE not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  SuSE makes no representations about the

+suitability of this software for any purpose.  It is provided "as is"

+without express or implied warranty.

+

+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE

+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright © 2006  Red Hat, Inc.

+(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sub license,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice (including the next

+paragraph) shall be included in all copies or substantial portions of the

+Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY

+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT

+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

+THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Copyright (c) 1995  X Consortium

+Copyright 2004 Red Hat Inc., Durham, North Carolina.

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation on the rights to use, copy, modify, merge,

+publish, distribute, sublicense, and/or sell copies of the Software,

+and to permit persons to whom the Software is furnished to do so,

+subject to the following conditions:

+

+The above copyright notice and this permission notice shall be

+included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,

+AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the X Consortium

+shall not be used in advertising or otherwise to promote the sale,

+use or other dealings in this Software without prior written

+authorization from the X Consortium.

+

+

+Copyright 1998-2000 Precision Insight, Inc., Cedar Park, Texas.

+Copyright 2000 VA Linux Systems, Inc.

+Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.

+Copyright (c) 2003-2004 Torrey T. Lyons.

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sub license, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice (including the

+next paragraph) shall be included in all copies or substantial portions

+of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR

+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+(C) Copyright IBM Corporation 2003

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+on the rights to use, copy, modify, merge, publish, distribute, sub

+license, and/or sell copies of the Software, and to permit persons to whom

+the Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice (including the next

+paragraph) shall be included in all copies or substantial portions of the

+Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,

+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

+USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+(C) Copyright IBM Corporation 2004-2005

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sub license,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice (including the next

+paragraph) shall be included in all copies or substantial portions of the

+Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+IBM,

+AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+

+Copyright (c) 1997  Metro Link Incorporated

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+Except as contained in this notice, the name of the Metro Link shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from Metro Link.

+

+

+Copyright 1995-1998 by Metro Link, Inc.

+Copyright (c) 1997 Matthieu Herrb

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Metro Link, Inc. not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Metro Link, Inc. makes no

+representations about the suitability of this software for any purpose.

+ It is provided "as is" without express or implied warranty.

+

+METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1998 by Metro Link Incorporated

+

+Permission to use, copy, modify, distribute, and sell this software

+and its documentation for any purpose is hereby granted without fee,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of Metro Link

+Incorporated not be used in advertising or publicity pertaining to

+distribution of the software without specific, written prior

+permission.  Metro Link Incorporated makes no representations

+about the suitability of this software for any purpose.  It is

+provided "as is" without express or implied warranty.

+

+METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+Except as contained in this notice, the name of Conectiva Linux shall

+not be used in advertising or otherwise to promote the sale, use or other

+dealings in this Software without prior written authorization from

+Conectiva Linux.

+

+

+Copyright (c) 2001, Andy Ritger  aritger@nvidia.com

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions

+are met:

+

+o Redistributions of source code must retain the above copyright

+  notice, this list of conditions and the following disclaimer.

+o Redistributions in binary form must reproduce the above copyright

+  notice, this list of conditions and the following disclaimer

+  in the documentation and/or other materials provided with the

+  distribution.

+o Neither the name of NVIDIA nor the names of its contributors

+  may be used to endorse or promote products derived from this

+  software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT

+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL

+THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER

+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN

+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGE.

+

+

+Copyright 1992 Vrije Universiteit, The Netherlands

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted, provided

+that the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of the Vrije Universiteit not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  The Vrije Universiteit makes no

+representations about the suitability of this software for any purpose.

+It is provided "as is" without express or implied warranty.

+

+The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1998 by Concurrent Computer Corporation

+

+Permission to use, copy, modify, distribute, and sell this software

+and its documentation for any purpose is hereby granted without fee,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of Concurrent Computer

+Corporation not be used in advertising or publicity pertaining to

+distribution of the software without specific, written prior

+permission.  Concurrent Computer Corporation makes no representations

+about the suitability of this software for any purpose.  It is

+provided "as is" without express or implied warranty.

+

+CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright © 2004 Nokia

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Nokia not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission. Nokia makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+(c)Copyright 1988,1991 Adobe Systems Incorporated.

+All rights reserved.

+

+Permission to use, copy, modify, distribute, and sublicense this software and its

+documentation for any purpose and without fee is hereby granted, provided that

+the above copyright notices appear in all copies and that both those copyright

+notices and this permission notice appear in supporting documentation and that

+the name of Adobe Systems Incorporated not be used in advertising or publicity

+pertaining to distribution of the software without specific, written prior

+permission.  No trademark license to use the Adobe trademarks is hereby

+granted.  If the Adobe trademark "Display PostScript"(tm) is used to describe

+this software, its functionality or for any other purpose, such use shall be

+limited to a statement that this software works in conjunction with the Display

+PostScript system.  Proper trademark attribution to reflect Adobe's ownership

+of the trademark shall be given whenever any such reference to the Display

+PostScript system is made.

+

+ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY

+PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.  ADOBE

+DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED

+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-

+INFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL ADOBE BE LIABLE TO YOU

+OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT

+LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER

+SUPPORT FOR THE SOFTWARE.

+

+Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems

+Incorporated which may be registered in certain jurisdictions.

+

+

+Copyright 1989 Network Computing Devices, Inc., Mountain View, California.

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted, provided

+that the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of N.C.D. not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  N.C.D. makes no representations about the

+suitability of this software for any purpose.  It is provided "as is"

+without express or implied warranty.

+

+

+Copyright (c) 1987 by the Regents of the University of California

+

+Permission to use, copy, modify, and distribute this

+software and its documentation for any purpose and without

+fee is hereby granted, provided that the above copyright

+notice appear in all copies.  The University of California

+makes no representations about the suitability of this

+software for any purpose.  It is provided "as is" without

+express or implied warranty.

+

+

+Copyright 1992, 1993 Data General Corporation;

+Copyright 1992, 1993 OMRON Corporation

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that the

+above copyright notice appear in all copies and that both that copyright

+notice and this permission notice appear in supporting documentation, and that

+neither the name OMRON or DATA GENERAL be used in advertising or publicity

+pertaining to distribution of the software without specific, written prior

+permission of the party whose name is to be used.  Neither OMRON or

+DATA GENERAL make any representation about the suitability of this software

+for any purpose.  It is provided "as is" without express or implied warranty.

+

+OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,

+IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT

+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+OF THIS SOFTWARE.

+

+

+Copyright © 1998-2004, 2006 Keith Packard

+Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc.

+Copyright (c) 2002 Apple Computer, Inc.

+Copyright (c) 2003 Torrey T. Lyons.

+All Rights Reserved.

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Keith Packard not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Keith Packard makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright © 1999 Keith Packard

+Copyright © 2000 Compaq Computer Corporation

+Copyright © 2002 MontaVista Software Inc.

+Copyright © 2005 OpenedHand Ltd.

+Copyright © 2006 Nokia Corporation

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of the authors and/or copyright holders

+not be used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  The authors and/or

+copyright holders make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1993 by Davor Matic

+

+Permission to use, copy, modify, distribute, and sell this software

+and its documentation for any purpose is hereby granted without fee,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation.  Davor Matic makes no representations about

+the suitability of this software for any purpose.  It is provided "as

+is" without express or implied warranty.

+

+

+Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.

+Copyright (C) Colin Harrison 2005-2008

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sublicense, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice shall be

+included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR

+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Harold L Hunt II

+shall not be used in advertising or otherwise to promote the sale, use

+or other dealings in this Software without prior written authorization

+from Harold L Hunt II.

+

+

+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Thomas Roell not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Thomas Roell makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as is" without express or implied warranty.

+

+THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Thomas Roell and David Wexelblat

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Thomas Roell and

+David Wexelblat makes no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO

+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR

+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER

+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1990,91,92,93 by Thomas Roell, Germany.

+Copyright 1991,92,93    by SGCS (Snitily Graphics Consulting Services), USA.

+

+Permission to use, copy, modify, distribute, and sell this software

+and its documentation for any purpose is hereby granted without fee,

+provided that the above copyright notice appear in all copies and

+that both that copyright notice and this  permission notice appear

+in supporting documentation, and that the name of Thomas Roell nor

+SGCS be used in advertising or publicity pertaining to distribution

+of the software without specific, written prior permission.

+Thomas Roell nor SGCS makes no representations about the suitability

+of this software for any purpose. It is provided "as is" without

+express or implied warranty.

+

+THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY

+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER

+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1998 by Alan Hourihane, Wigan, England.

+Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Alan Hourihane not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Alan Hourihane makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as is" without express or implied warranty.

+

+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1995  Kaleb S. KEITHLEY

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sublicense, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice shall be

+included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES

+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Kaleb S. KEITHLEY

+shall not be used in advertising or otherwise to promote the sale, use

+or other dealings in this Software without prior written authorization

+from Kaleb S. KEITHLEY

+

+

+Copyright (c) 1997 Matthieu Herrb

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Matthieu Herrb not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Matthieu Herrb makes no

+representations about the suitability of this software for any purpose.

+ It is provided "as is" without express or implied warranty.

+

+MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 2004, Egbert Eich

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to

+deal in the Software without restriction, including without limitation the

+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

+sell copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER

+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-

+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Egbert Eich shall not

+be used in advertising or otherwise to promote the sale, use or other deal-

+ings in this Software without prior written authorization from Egbert Eich.

+

+

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+Copyright 2005 by Kean Johnston <jkj@sco.com>

+Copyright 1993 by David McCullough <davidm@stallion.oz.au>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of David Wexelblat not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  David Wexelblat makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as is" without express or implied warranty.

+

+DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1992 by Orest Zborowski <obz@Kodak.com>

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Orest Zborowski and David Wexelblat

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Orest Zborowski

+and David Wexelblat make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE

+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1992 by Orest Zborowski <obz@Kodak.com>

+Copyright 1993 by David Dawes <dawes@xfree86.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Orest Zborowski and David Dawes

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Orest Zborowski

+and David Dawes make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE

+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1995-1999 by Frederic Lepied, France. <fred@sugix.frmug.fr.net>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is  hereby granted without fee, provided that

+the  above copyright   notice appear  in   all  copies and  that both  that

+copyright  notice   and   this  permission   notice  appear  in  supporting

+documentation, and that   the  name of  Frederic   Lepied not  be  used  in

+advertising or publicity pertaining to distribution of the software without

+specific,  written      prior  permission.     Frederic  Lepied   makes  no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,

+INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO

+EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER

+TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1992 by Rich Murphey <Rich@Rice.edu>

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Rich Murphey and David Wexelblat

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Rich Murphey and

+David Wexelblat make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO

+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR

+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER

+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1992 by Rich Murphey <Rich@Rice.edu>

+Copyright 1993 by David Dawes <dawes@xfree86.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Rich Murphey and David Dawes

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Rich Murphey and

+David Dawes make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO

+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR

+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER

+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright © 2003-2004 Anders Carlsson

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Anders Carlsson not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Anders Carlsson makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (C) 2003 Anders Carlsson

+Copyright © 2003-2004 Eric Anholt

+Copyright © 2004 Keith Packard

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Eric Anholt not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Eric Anholt makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>

+

+Permission to use, copy, modify, and distribute this software for any

+purpose with or without fee is hereby granted, provided that the above

+copyright notice and this permission notice appear in all copies.

+

+THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL

+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES

+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE

+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright © 2003-2004 Philip Blundell

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Philip Blundell not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Philip Blundell makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+

+Copyright (c) 1994-2003 by The XFree86 Project, Inc.

+Copyright 1997 by Metro Link, Inc.

+Copyright 2003 by David H. Dawes.

+Copyright 2003 by X-Oz Technologies.

+Copyright (c) 2004, X.Org Foundation

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the copyright holder(s)

+and author(s) shall not be used in advertising or otherwise to promote

+the sale, use or other dealings in this Software without prior written

+authorization from the copyright holder(s) and author(s).

+

+

+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+Copyright 1999 by David Holland <davidh@iquest.net>

+Copyright © 2000 Compaq Computer Corporation

+Copyright © 2002 Hewlett-Packard Company

+Copyright © 2004, 2005 Red Hat, Inc.

+Copyright © 2004 Nicholas Miell

+Copyright © 2005 Trolltech AS

+Copyright © 2006 Intel Corporation

+Copyright © 2006-2007 Keith Packard

+Copyright © 2008 Red Hat, Inc

+Copyright © 2008 George Sapountzis <gsap7@yahoo.gr>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that copyright

+notice and this permission notice appear in supporting documentation, and

+that the name of the copyright holders not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  The copyright holders make no representations

+about the suitability of this software for any purpose.  It is provided "as

+is" without express or implied warranty.

+

+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY

+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN

+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.

+            2005 Lars Knoll & Zack Rusin, Trolltech

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of Keith Packard not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Keith Packard makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY

+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN

+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright 1987, 1998  The Open Group

+Copyright © 1998-1999, 2001 The XFree86 Project, Inc.

+Copyright © 2000 VA Linux Systems, Inc.

+Copyright (c) 2000, 2001 Nokia Home Communications

+Copyright © 2007, 2008 Red Hat, Inc.

+All rights reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, and/or sell copies of the Software, and to permit persons

+to whom the Software is furnished to do so, provided that the above

+copyright notice(s) and this permission notice appear in all copies of

+the Software and that both the above copyright notice(s) and this

+permission notice appear in supporting documentation.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+Except as contained in this notice, the name of a copyright holder

+shall not be used in advertising or otherwise to promote the sale, use

+or other dealings in this Software without prior written authorization

+of the copyright holder.

+

+

+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of the above listed

+copyright holder(s) not be used in advertising or publicity pertaining

+to distribution of the software without specific, written prior

+permission.

+

+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+Copyright (c) 2001 Andreas Monitzer.

+Copyright (c) 2001-2004 Greg Parker.

+Copyright (c) 2001-2004 Torrey T. Lyons

+Copyright (c) 2002-2003 Apple Computer, Inc.

+Copyright (c) 2004-2005 Alexander Gottwald

+Copyright (c) 2002-2009 Apple Inc.

+Copyright (c) 2007 Jeremy Huddleston

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name(s) of the above copyright

+holders shall not be used in advertising or otherwise to promote the sale,

+use or other dealings in this Software without prior written authorization.

+

+

+Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>

+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.

+

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions are met:

+

+  1. Redistributions of source code must retain the above copyright

+     notice, this list of conditions and the following disclaimer.

+  2. Redistributions in binary form must reproduce the above copyright

+     notice, this list of conditions and the following disclaimer in the

+     documentation and/or other materials provided with the distribution.

+  3. The name of the author may not be used to endorse or promote products

+     derived from this software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN

+NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+

+Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net

+

+Permission is hereby granted, free of charge, to any person obtaining a copy of

+this software and associated documentation files (the "Software"), to deal in

+the Software without restriction, including without limitation the rights to

+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

+of the Software, and to permit persons to whom the Software is furnished to do

+so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all

+copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the author shall not be used in

+advertising or otherwise to promote the sale, use or other dealings in this

+Software without prior written authorization from the author.

+

+

+Copyright © 2002 David Dawes

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+Except as contained in this notice, the name of the author(s) shall

+not be used in advertising or otherwise to promote the sale, use or other

+dealings in this Software without prior written authorization from

+the author(s).

+

+

+Copyright (C) 1996-1999 SciTech Software, Inc.

+Copyright (C) David Mosberger-Tang

+Copyright (C) 1999 Egbert Eich

+Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC

+

+Permission to use, copy, modify, distribute, and sell this software and

+its documentation for any purpose is hereby granted without fee,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of the authors not be used

+in advertising or publicity pertaining to distribution of the software

+without specific, written prior permission.  The authors makes no

+representations about the suitability of this software for any purpose.

+It is provided "as is" without express or implied warranty.

+

+THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 2005-2006 Luc Verhaegen.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+

+Copyright 1995 by Robin Cutshaw <robin@XFree86.Org>

+Copyright 2000 by Egbert Eich

+Copyright 2002 by David Dawes

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of the above listed copyright holder(s)

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  The above listed

+copyright holder(s) make(s) no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER

+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that copyright

+notice and this permission notice appear in supporting documentation, and

+that the name of Marc Aurele La France not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  Marc Aurele La France makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as-is" without express or implied warranty.

+

+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO

+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+OF THIS SOFTWARE.

+

+

+Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany

+Copyright 1992 by David Dawes <dawes@XFree86.org>

+Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>

+Copyright 1992 by Rich Murphey <Rich@Rice.edu>

+Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>

+Copyright 1992 by Orest Zborowski <obz@eskimo.com>

+Copyright 1993 by Vrije Universiteit, The Netherlands

+Copyright 1993 by David Wexelblat <dwex@XFree86.org>

+Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>

+Copyright 1997 by Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk>

+Copyright 1994-2003 by The XFree86 Project, Inc

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of the above listed copyright holders

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  The above listed

+copyright holders make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER

+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name J. Kean Johnston not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  J. Kean Johnston makes no

+representations about the suitability of this software for any purpose.

+It is provided "as is" without express or implied warranty.

+

+J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER

+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Copyright 1997,1998 by UCHIYAMA Yasushi

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of UCHIYAMA Yasushi not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  UCHIYAMA Yasushi makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as is" without express or implied warranty.

+

+UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (C) 2000 Keith Packard

+              2004 Eric Anholt

+              2005 Zack Rusin

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of copyright holders not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission. Copyright holders make no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY

+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN

+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+(C) Copyright IBM Corporation 2002-2007

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+on the rights to use, copy, modify, merge, publish, distribute, sub

+license, and/or sell copies of the Software, and to permit persons to whom

+the Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice (including the next

+paragraph) shall be included in all copies or substantial portions of the

+Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,

+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

+USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+this permission notice appear in supporting documentation.  This permission

+notice shall be included in all copies or substantial portions of the

+Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Copyright © 2007 OpenedHand Ltd

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of OpenedHand Ltd not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission. OpenedHand Ltd makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (c) 1989, 1990, 1993, 1994

+     The Regents of the University of California.  All rights reserved.

+

+This code is derived from software contributed to Berkeley by

+Chris Torek.

+

+This code is derived from software contributed to Berkeley by

+Michael Rendell of Memorial University of Newfoundland.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions

+are met:

+ 1. Redistributions of source code must retain the above copyright

+    notice, this list of conditions and the following disclaimer.

+ 2. Redistributions in binary form must reproduce the above copyright

+    notice, this list of conditions and the following disclaimer in the

+    documentation and/or other materials provided with the distribution.

+ 4. Neither the name of the University nor the names of its contributors

+    may be used to endorse or promote products derived from this software

+    without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+SUCH DAMAGE.

diff --git a/xorg-server/Xext/Makefile.am b/xorg-server/Xext/Makefile.am
index cdf8366c1..8a604c3e7 100644
--- a/xorg-server/Xext/Makefile.am
+++ b/xorg-server/Xext/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 AM_CFLAGS = $(DIX_CFLAGS)

 

 if XORG

-sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h

+sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h syncsdk.h

 endif

 

 # Sources always included in libXextbuiltin.la & libXext.la

@@ -26,6 +26,7 @@ BUILTIN_SRCS =			\
 	sleepuntil.c		\

 	sleepuntil.h		\

 	sync.c			\

+	syncsdk.h		\

 	syncsrv.h		\

 	xcmisc.c		\

 	xtest.c

diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c
index bd2d50a1b..097900058 100644
--- a/xorg-server/Xext/sync.c
+++ b/xorg-server/Xext/sync.c
@@ -59,14 +59,17 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>

 #include <X11/Xproto.h>

 #include <X11/Xmd.h>

-#include "misc.h"

+#include "scrnintstr.h"

 #include "os.h"

 #include "extnsionst.h"

 #include "dixstruct.h"

+#include "pixmapstr.h"

 #include "resource.h"

 #include "opaque.h"

 #include <X11/extensions/syncproto.h>

 #include "syncsrv.h"

+#include "syncsdk.h"

+#include "protocol-versions.h"

 

 #include <stdio.h>

 #if !defined(WIN32)

@@ -84,11 +87,12 @@ static RESTYPE  RTCounter = 0;
 static RESTYPE  RTAwait;

 static RESTYPE  RTAlarm;

 static RESTYPE  RTAlarmClient;

+static RESTYPE  RTFence;

 static int SyncNumSystemCounters = 0;

 static SyncCounter **SysCounterList = NULL;

 

 #define IsSystemCounter(pCounter) \

-    (pCounter && (pCounter->client == NULL))

+    (pCounter && (pCounter->sync.client == NULL))

 

 /* these are all the alarm attributes that pertain to the alarm's trigger */

 #define XSyncCAAllTrigger \

@@ -106,18 +110,19 @@ static void SyncInitIdleTime(void);
  *  delete and add triggers on this list.

  */

 static void

-SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)

+SyncDeleteTriggerFromSyncObject(SyncTrigger *pTrigger)

 {

     SyncTriggerList *pCur;

     SyncTriggerList *pPrev;

+    SyncCounter *pCounter;

 

-    /* pCounter needs to be stored in pTrigger before calling here. */

+    /* pSync needs to be stored in pTrigger before calling here. */

 

-    if (!pTrigger->pCounter)

+    if (!pTrigger->pSync)

 	return;

 

     pPrev = NULL;

-    pCur = pTrigger->pCounter->pTriglist;

+    pCur = pTrigger->pSync->pTriglist;

 

     while (pCur)

     {

@@ -126,7 +131,7 @@ SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)
 	    if (pPrev)

 		pPrev->next = pCur->next;

 	    else

-		pTrigger->pCounter->pTriglist = pCur->next;

+		pTrigger->pSync->pTriglist = pCur->next;

 

 	    free(pCur);

 	    break;

@@ -136,21 +141,30 @@ SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)
 	pCur = pCur->next;

     }

 

-    if (IsSystemCounter(pTrigger->pCounter))

-	SyncComputeBracketValues(pTrigger->pCounter);

+    if (SYNC_COUNTER == pTrigger->pSync->type)

+    {

+	pCounter = (SyncCounter *)pTrigger->pSync;

+

+	if (IsSystemCounter(pCounter))

+	    SyncComputeBracketValues(pCounter);

+    } else if (SYNC_FENCE == pTrigger->pSync->type) {

+	SyncFence* pFence = (SyncFence*) pTrigger->pSync;

+	pFence->funcs.DeleteTrigger(pTrigger);

+    }

 }

 

 

 static int

-SyncAddTriggerToCounter(SyncTrigger *pTrigger)

+SyncAddTriggerToSyncObject(SyncTrigger *pTrigger)

 {

     SyncTriggerList *pCur;

+    SyncCounter *pCounter;

 

-    if (!pTrigger->pCounter)

+    if (!pTrigger->pSync)

 	return Success;

 

     /* don't do anything if it's already there */

-    for (pCur = pTrigger->pCounter->pTriglist; pCur; pCur = pCur->next)

+    for (pCur = pTrigger->pSync->pTriglist; pCur; pCur = pCur->next)

     {

 	if (pCur->pTrigger == pTrigger)

 	    return Success;

@@ -160,96 +174,137 @@ SyncAddTriggerToCounter(SyncTrigger *pTrigger)
 	return BadAlloc;

 

     pCur->pTrigger = pTrigger;

-    pCur->next = pTrigger->pCounter->pTriglist;

-    pTrigger->pCounter->pTriglist = pCur;

+    pCur->next = pTrigger->pSync->pTriglist;

+    pTrigger->pSync->pTriglist = pCur;

+

+    if (SYNC_COUNTER == pTrigger->pSync->type)

+    {

+	pCounter = (SyncCounter *)pTrigger->pSync;

 

-    if (IsSystemCounter(pTrigger->pCounter))

-	SyncComputeBracketValues(pTrigger->pCounter);

+	if (IsSystemCounter(pCounter))

+	    SyncComputeBracketValues(pCounter);

+    } else if (SYNC_FENCE == pTrigger->pSync->type) {

+	SyncFence* pFence = (SyncFence*) pTrigger->pSync;

+	pFence->funcs.AddTrigger(pTrigger);

+    }

 

     return Success;

 }

 

 

-/*  Below are four possible functions that can be plugged into

- *  pTrigger->CheckTrigger, corresponding to the four possible

- *  test-types.  These functions are called after the counter's

- *  value changes but are also passed the old counter value

- *  so they can inspect both the old and new values.

- *  (PositiveTransition and NegativeTransition need to see both

- *  pieces of information.)  These functions return the truth value

- *  of the trigger.

+/*  Below are five possible functions that can be plugged into

+ *  pTrigger->CheckTrigger for counter sync objects, corresponding to

+ *  the four possible test-types, and the one possible function that

+ *  can be plugged into pTrigger->CheckTrigger for fence sync objects.

+ *  These functions are called after the sync object's state changes

+ *  but are also passed the old state so they can inspect both the old

+ *  and new values.  (PositiveTransition and NegativeTransition need to

+ *  see both pieces of information.)  These functions return the truth

+ *  value of the trigger.

  *

- *  All of them include the condition pTrigger->pCounter == NULL.

- *  This is because the spec says that a trigger with a counter value

+ *  All of them include the condition pTrigger->pSync == NULL.

+ *  This is because the spec says that a trigger with a sync value

  *  of None is always TRUE.

  */

 

 static Bool

 SyncCheckTriggerPositiveComparison(SyncTrigger *pTrigger, CARD64 oldval)

 {

-    return (pTrigger->pCounter == NULL ||

-	    XSyncValueGreaterOrEqual(pTrigger->pCounter->value,

-				     pTrigger->test_value));

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

+    return (pCounter == NULL ||

+	    XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value));

 }

 

 static Bool

 SyncCheckTriggerNegativeComparison(SyncTrigger *pTrigger,  CARD64 oldval)

 {

-    return (pTrigger->pCounter == NULL ||

-	    XSyncValueLessOrEqual(pTrigger->pCounter->value,

-				  pTrigger->test_value));

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

+    return (pCounter == NULL ||

+	    XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value));

 }

 

 static Bool

 SyncCheckTriggerPositiveTransition(SyncTrigger *pTrigger, CARD64 oldval)

 {

-    return (pTrigger->pCounter == NULL ||

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

+    return (pCounter == NULL ||

 	    (XSyncValueLessThan(oldval, pTrigger->test_value) &&

-	     XSyncValueGreaterOrEqual(pTrigger->pCounter->value,

-				      pTrigger->test_value)));

+	     XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value)));

 }

 

 static Bool

 SyncCheckTriggerNegativeTransition(SyncTrigger *pTrigger, CARD64 oldval)

 {

-    return (pTrigger->pCounter == NULL ||

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

+    return (pCounter == NULL ||

 	    (XSyncValueGreaterThan(oldval, pTrigger->test_value) &&

-	     XSyncValueLessOrEqual(pTrigger->pCounter->value,

-				   pTrigger->test_value)));

+	     XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value)));

+}

+

+static Bool

+SyncCheckTriggerFence(SyncTrigger *pTrigger, CARD64 unused)

+{

+    SyncFence* pFence = (SyncFence*) pTrigger->pSync;

+    (void)unused;

+

+    return (pFence == NULL ||

+	    pFence->funcs.CheckTriggered(pFence));

 }

 

 static int

-SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter,

-		Mask changes)

+SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XID syncObject,

+		RESTYPE resType, Mask changes)

 {

-    SyncCounter *pCounter = pTrigger->pCounter;

+    SyncObject *pSync = pTrigger->pSync;

+    SyncCounter *pCounter = NULL;

     int		rc;

-    Bool	newcounter = FALSE;

+    Bool	newSyncObject = FALSE;

 

     if (changes & XSyncCACounter)

     {

-	if (counter == None)

-	    pCounter = NULL;

-	else if (Success != (rc = dixLookupResourceByType ((pointer *)&pCounter,

-				counter, RTCounter, client, DixReadAccess)))

+	if (syncObject == None)

+	    pSync = NULL;

+	else if (Success != (rc = dixLookupResourceByType ((pointer *)&pSync,

+				syncObject, resType, client, DixReadAccess)))

 	{

-	    client->errorValue = counter;

+	    client->errorValue = syncObject;

 	    return rc;

 	}

-	if (pCounter != pTrigger->pCounter)

+	if (pSync != pTrigger->pSync)

 	{ /* new counter for trigger */

-	    SyncDeleteTriggerFromCounter(pTrigger);

-	    pTrigger->pCounter = pCounter;

-	    newcounter = TRUE;

+	    SyncDeleteTriggerFromSyncObject(pTrigger);

+	    pTrigger->pSync = pSync;

+	    newSyncObject = TRUE;

 	}

     }

 

     /* if system counter, ask it what the current value is */

 

-    if (IsSystemCounter(pCounter))

+    if (pSync && SYNC_COUNTER == pSync->type)

     {

-	(*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,

-						  &pCounter->value);

+	pCounter = (SyncCounter *)pSync;

+

+	if (IsSystemCounter(pCounter))

+	{

+	    (*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,

+						      &pCounter->value);

+	}

     }

 

     if (changes & XSyncCAValueType)

@@ -264,30 +319,38 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter,
 

     if (changes & XSyncCATestType)

     {

-	if (pTrigger->test_type != XSyncPositiveTransition &&

-	    pTrigger->test_type != XSyncNegativeTransition &&

-	    pTrigger->test_type != XSyncPositiveComparison &&

-	    pTrigger->test_type != XSyncNegativeComparison)

+

+	if (pSync && SYNC_FENCE == pSync->type)

 	{

-	    client->errorValue = pTrigger->test_type;

-	    return BadValue;

+	    pTrigger->CheckTrigger = SyncCheckTriggerFence;

 	}

-	/* select appropriate CheckTrigger function */

-

-	switch (pTrigger->test_type)

+	else

 	{

-        case XSyncPositiveTransition:

-	    pTrigger->CheckTrigger = SyncCheckTriggerPositiveTransition;

-	    break;

-        case XSyncNegativeTransition:

-	    pTrigger->CheckTrigger = SyncCheckTriggerNegativeTransition;

-	    break;

-        case XSyncPositiveComparison:

-	    pTrigger->CheckTrigger = SyncCheckTriggerPositiveComparison;

-	    break;

-        case XSyncNegativeComparison:

-	    pTrigger->CheckTrigger = SyncCheckTriggerNegativeComparison;

-	    break;

+	    if (pTrigger->test_type != XSyncPositiveTransition &&

+		pTrigger->test_type != XSyncNegativeTransition &&

+		pTrigger->test_type != XSyncPositiveComparison &&

+		pTrigger->test_type != XSyncNegativeComparison)

+	    {

+		client->errorValue = pTrigger->test_type;

+		return BadValue;

+	    }

+	    /* select appropriate CheckTrigger function */

+

+	    switch (pTrigger->test_type)

+	    {

+	    case XSyncPositiveTransition:

+		pTrigger->CheckTrigger = SyncCheckTriggerPositiveTransition;

+		break;

+	    case XSyncNegativeTransition:

+		pTrigger->CheckTrigger = SyncCheckTriggerNegativeTransition;

+		break;

+	    case XSyncPositiveComparison:

+		pTrigger->CheckTrigger = SyncCheckTriggerPositiveComparison;

+		break;

+	    case XSyncNegativeComparison:

+		pTrigger->CheckTrigger = SyncCheckTriggerNegativeComparison;

+		break;

+	    }

 	}

     }

 

@@ -314,12 +377,12 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter,
     /*  we wait until we're sure there are no errors before registering

      *  a new counter on a trigger

      */

-    if (newcounter)

+    if (newSyncObject)

     {

-	if ((rc = SyncAddTriggerToCounter(pTrigger)) != Success)

+	if ((rc = SyncAddTriggerToSyncObject(pTrigger)) != Success)

 	    return rc;

     }

-    else if (IsSystemCounter(pCounter))

+    else if (pCounter && IsSystemCounter(pCounter))

     {

 	SyncComputeBracketValues(pCounter);

     }

@@ -337,16 +400,21 @@ SyncSendAlarmNotifyEvents(SyncAlarm *pAlarm)
     SyncAlarmClientList *pcl;

     xSyncAlarmNotifyEvent ane;

     SyncTrigger *pTrigger = &pAlarm->trigger;

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+

+    pCounter = (SyncCounter *)pTrigger->pSync;

 

     UpdateCurrentTime();

 

     ane.type = SyncEventBase + XSyncAlarmNotify;

     ane.kind = XSyncAlarmNotify;

     ane.alarm = pAlarm->alarm_id;

-    if (pTrigger->pCounter)

+    if (pTrigger->pSync && SYNC_COUNTER == pTrigger->pSync->type)

     {

-	ane.counter_value_hi = XSyncValueHigh32(pTrigger->pCounter->value);

-	ane.counter_value_lo = XSyncValueLow32(pTrigger->pCounter->value);

+	ane.counter_value_hi = XSyncValueHigh32(pCounter->value);

+	ane.counter_value_lo = XSyncValueLow32(pCounter->value);

     }

     else

     { /* XXX what else can we do if there's no counter? */

@@ -389,14 +457,25 @@ SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait **ppAwait,
 	SyncTrigger *pTrigger = &(*ppAwait)->trigger;

 	pev->type = SyncEventBase + XSyncCounterNotify;

 	pev->kind = XSyncCounterNotify;

-	pev->counter = pTrigger->pCounter->id;

+	pev->counter = pTrigger->pSync->id;

 	pev->wait_value_lo = XSyncValueLow32(pTrigger->test_value);

 	pev->wait_value_hi = XSyncValueHigh32(pTrigger->test_value);

-	pev->counter_value_lo = XSyncValueLow32(pTrigger->pCounter->value);

-	pev->counter_value_hi = XSyncValueHigh32(pTrigger->pCounter->value);

+	if (SYNC_COUNTER == pTrigger->pSync->type)

+	{

+	    SyncCounter *pCounter = (SyncCounter *)pTrigger->pSync;

+

+	    pev->counter_value_lo = XSyncValueLow32(pCounter->value);

+	    pev->counter_value_hi = XSyncValueHigh32(pCounter->value);

+	}

+	else

+	{

+	    pev->counter_value_lo = 0;

+	    pev->counter_value_hi = 0;

+	}

+

 	pev->time = currentTime.milliseconds;

 	pev->count = num_events - i - 1; /* events remaining */

-	pev->destroyed = pTrigger->pCounter->beingDestroyed;

+	pev->destroyed = pTrigger->pSync->beingDestroyed;

     }

     /* swapping will be taken care of by this */

     WriteEventsToClient(client, num_events, (xEvent *)pEvents);

@@ -414,7 +493,7 @@ SyncAlarmCounterDestroyed(SyncTrigger *pTrigger)
 

     pAlarm->state = XSyncAlarmInactive;

     SyncSendAlarmNotifyEvents(pAlarm);

-    pTrigger->pCounter = NULL;

+    pTrigger->pSync = NULL;

 }

 

 

@@ -425,8 +504,12 @@ static void
 SyncAlarmTriggerFired(SyncTrigger *pTrigger)

 {

     SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;

+    SyncCounter *pCounter;

     CARD64 new_test_value;

 

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

     /* no need to check alarm unless it's active */

     if (pAlarm->state != XSyncAlarmActive)

 	return;

@@ -436,7 +519,7 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger)
      *    no change is made to value (test-value) and the alarm

      *    state is changed to Inactive before the event is generated."

      */

-    if (pAlarm->trigger.pCounter == NULL

+    if (pCounter == NULL

 	|| (XSyncValueIsZero(pAlarm->delta)

 	    && (pAlarm->trigger.test_type == XSyncPositiveComparison

 		|| pAlarm->trigger.test_type == XSyncNegativeComparison)))

@@ -449,6 +532,10 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger)
 	Bool overflow;

 	CARD64 oldvalue;

 	SyncTrigger *paTrigger = &pAlarm->trigger;

+	SyncCounter *paCounter;

+

+	assert(!paTrigger->pSync || (SYNC_COUNTER == paTrigger->pSync->type));

+	paCounter = (SyncCounter *)pTrigger->pSync;

 

 	/* "The alarm is updated by repeatedly adding delta to the

 	 *  value of the trigger and re-initializing it until it

@@ -464,7 +551,7 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger)
 			  pAlarm->delta, &overflow);

 	} while (!overflow &&

 	      (*paTrigger->CheckTrigger)(paTrigger,

-					paTrigger->pCounter->value));

+					paCounter->value));

 

 	new_test_value = paTrigger->test_value;

 	paTrigger->test_value = oldvalue;

@@ -531,46 +618,51 @@ SyncAwaitTriggerFired(SyncTrigger *pTrigger)
 	 *  always generated if the counter for one of the triggers is

 	 *  destroyed."

 	 */

-	if (pAwait->trigger.pCounter->beingDestroyed)

+	if (pAwait->trigger.pSync->beingDestroyed)

 	{

 	    ppAwait[num_events++] = pAwait;

 	    continue;

 	}

+	

+	if (SYNC_COUNTER == pAwait->trigger.pSync->type)

+	{

+	    SyncCounter *pCounter = (SyncCounter *) pAwait->trigger.pSync;

 

-	/* "The difference between the counter and the test value is

-	 *  calculated by subtracting the test value from the value of

-	 *  the counter."

-	 */

-	XSyncValueSubtract(&diff, pAwait->trigger.pCounter->value,

-			   pAwait->trigger.test_value, &overflow);

+	    /* "The difference between the counter and the test value is

+	     *  calculated by subtracting the test value from the value of

+	     *  the counter."

+	     */

+	    XSyncValueSubtract(&diff, pCounter->value,

+			       pAwait->trigger.test_value, &overflow);

 

-	/* "If the difference lies outside the range for an INT64, an

-	 *  event is not generated."

-	 */

-	if (overflow)

-	    continue;

-	diffgreater = XSyncValueGreaterThan(diff, pAwait->event_threshold);

-	diffequal   = XSyncValueEqual(diff, pAwait->event_threshold);

-

-	/* "If the test-type is PositiveTransition or

-	 *  PositiveComparison, a CounterNotify event is generated if

-	 *  the difference is at least event-threshold. If the test-type

-	 *  is NegativeTransition or NegativeComparison, a CounterNotify

-	 *  event is generated if the difference is at most

-	 *  event-threshold."

-	 */

+	    /* "If the difference lies outside the range for an INT64, an

+	     *  event is not generated."

+	     */

+	    if (overflow)

+		continue;

+	    diffgreater = XSyncValueGreaterThan(diff, pAwait->event_threshold);

+	    diffequal   = XSyncValueEqual(diff, pAwait->event_threshold);

+

+	    /* "If the test-type is PositiveTransition or

+	     *  PositiveComparison, a CounterNotify event is generated if

+	     *  the difference is at least event-threshold. If the test-type

+	     *  is NegativeTransition or NegativeComparison, a CounterNotify

+	     *  event is generated if the difference is at most

+	     *  event-threshold."

+	     */

 

-	if ( ((pAwait->trigger.test_type == XSyncPositiveComparison ||

-	       pAwait->trigger.test_type == XSyncPositiveTransition)

-	       && (diffgreater || diffequal))

-	     ||

-	     ((pAwait->trigger.test_type == XSyncNegativeComparison ||

-	       pAwait->trigger.test_type == XSyncNegativeTransition)

-	      && (!diffgreater) /* less or equal */

-	      )

-	   )

-	{

-	    ppAwait[num_events++] = pAwait;

+	    if ( ((pAwait->trigger.test_type == XSyncPositiveComparison ||

+		   pAwait->trigger.test_type == XSyncPositiveTransition)

+		  && (diffgreater || diffequal))

+		 ||

+		 ((pAwait->trigger.test_type == XSyncNegativeComparison ||

+		   pAwait->trigger.test_type == XSyncNegativeTransition)

+		  && (!diffgreater) /* less or equal */

+		 )

+	       )

+	    {

+		ppAwait[num_events++] = pAwait;

+	    }

 	}

     }

     if (num_events)

@@ -599,7 +691,7 @@ SyncChangeCounter(SyncCounter *pCounter, CARD64 newval)
     pCounter->value = newval;

 

     /* run through triggers to see if any become true */

-    for (ptl = pCounter->pTriglist; ptl; ptl = pnext)

+    for (ptl = pCounter->sync.pTriglist; ptl; ptl = pnext)

     {

 	pnext = ptl->next;

 	if ((*ptl->pTrigger->CheckTrigger)(ptl->pTrigger, oldval))

@@ -691,7 +783,8 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,
     XSyncCounter   counter;

     Mask	   origmask = mask;

 

-    counter = pAlarm->trigger.pCounter ? pAlarm->trigger.pCounter->id : None;

+    counter =

+	pAlarm->trigger.pSync ? pAlarm->trigger.pSync->id : None;

 

     while (mask)

     {

@@ -771,7 +864,7 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,
     }

 

     /* postpone this until now, when we're sure nothing else can go wrong */

-    if ((status = SyncInitTrigger(client, &pAlarm->trigger, counter,

+    if ((status = SyncInitTrigger(client, &pAlarm->trigger, counter, RTCounter,

 			     origmask & XSyncCAAllTrigger)) != Success)

 	return status;

 

@@ -780,26 +873,63 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,
     return Success;

 }

 

-

-static SyncCounter *

-SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)

+static SyncObject *

+SyncCreate(ClientPtr client, XID id, unsigned char type)

 {

-    SyncCounter *pCounter;

+    SyncObject *pSync;

+    RESTYPE resType;

 

-    if (!(pCounter = malloc(sizeof(SyncCounter))))

+    switch (type) {

+    case SYNC_COUNTER:

+	resType = RTCounter;

+	pSync = malloc(sizeof(SyncCounter));

+	break;

+    case SYNC_FENCE:

+	resType = RTFence;

+	pSync = dixAllocateObjectWithPrivates(SyncFence,

+					      PRIVATE_SYNC_FENCE);

+	break;

+    default:

+	return NULL;

+    }

+

+    if (!pSync)

 	return NULL;

 

-    if (!AddResource(id, RTCounter, (pointer) pCounter))

+    if (!AddResource(id, resType, (pointer) pSync))

     {

-	free(pCounter);

+	switch (type) {

+	case SYNC_FENCE:

+	    dixFreeObjectWithPrivates((SyncFence *)pSync, PRIVATE_SYNC_FENCE);

+	    break;

+	default:

+	    free(pSync);

+	}

+

 	return NULL;

     }

 

-    pCounter->client = client;

-    pCounter->id = id;

+    pSync->client = client;

+    pSync->id = id;

+    pSync->pTriglist = NULL;

+    pSync->beingDestroyed = FALSE;

+    pSync->type = type;

+

+    return pSync;

+}

+

+

+static SyncCounter *

+SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)

+{

+    SyncCounter *pCounter;

+

+    if (!(pCounter = (SyncCounter *)SyncCreate(client,

+					       id,

+					       SYNC_COUNTER)))

+	return NULL;

+

     pCounter->value = initialvalue;

-    pCounter->pTriglist = NULL;

-    pCounter->beingDestroyed = FALSE;

     pCounter->pSysCounterInfo = NULL;

     return pCounter;

 }

@@ -851,7 +981,7 @@ SyncCreateSystemCounter(
 	psci = malloc(sizeof(SysCounterInfo));

 	if (!psci)

 	{

-	    FreeResource(pCounter->id, RT_NONE);

+	    FreeResource(pCounter->sync.id, RT_NONE);

 	    return pCounter;

 	}

 	pCounter->pSysCounterInfo = psci;

@@ -871,7 +1001,7 @@ void
 SyncDestroySystemCounter(pointer pSysCounter)

 {

     SyncCounter *pCounter = (SyncCounter *)pSysCounter;

-    FreeResource(pCounter->id, RT_NONE);

+    FreeResource(pCounter->sync.id, RT_NONE);

 }

 

 static void

@@ -895,7 +1025,7 @@ SyncComputeBracketValues(SyncCounter *pCounter)
     XSyncMaxValue(&psci->bracket_greater);

     XSyncMinValue(&psci->bracket_less);

 

-    for (pCur = pCounter->pTriglist; pCur; pCur = pCur->next)

+    for (pCur = pCounter->sync.pTriglist; pCur; pCur = pCur->next)

     {

 	pTrigger = pCur->pTrigger;

 	

@@ -968,7 +1098,7 @@ FreeAlarm(void *addr, XID id)
     while (pAlarm->pEventClients)

 	FreeResource(pAlarm->pEventClients->delete_id, RT_NONE);

 

-    SyncDeleteTriggerFromCounter(&pAlarm->trigger);

+    SyncDeleteTriggerFromSyncObject(&pAlarm->trigger);

 

     free(pAlarm);

     return Success;

@@ -985,9 +1115,9 @@ FreeCounter(void *env, XID id)
     SyncCounter     *pCounter = (SyncCounter *) env;

     SyncTriggerList *ptl, *pnext;

 

-    pCounter->beingDestroyed = TRUE;

+    pCounter->sync.beingDestroyed = TRUE;

     /* tell all the counter's triggers that the counter has been destroyed */

-    for (ptl = pCounter->pTriglist; ptl; ptl = pnext)

+    for (ptl = pCounter->sync.pTriglist; ptl; ptl = pnext)

     {

 	(*ptl->pTrigger->CounterDestroyed)(ptl->pTrigger);

 	pnext = ptl->next;

@@ -1046,9 +1176,9 @@ FreeAwait(void *addr, XID id)
 	/* If the counter is being destroyed, FreeCounter will delete

 	 * the trigger list itself, so don't do it here.

 	 */

-	SyncCounter *pCounter = pAwait->trigger.pCounter;

-	if (pCounter && !pCounter->beingDestroyed)

-	    SyncDeleteTriggerFromCounter(&pAwait->trigger);

+	SyncObject *pSync = pAwait->trigger.pSync;

+	if (pSync && !pSync->beingDestroyed)

+	    SyncDeleteTriggerFromSyncObject(&pAwait->trigger);

     }

     free(pAwaitUnion);

     return Success;

@@ -1099,8 +1229,8 @@ ProcSyncInitialize(ClientPtr client)
     memset(&rep, 0, sizeof(xSyncInitializeReply));

     rep.type = X_Reply;

     rep.sequenceNumber = client->sequence;

-    rep.majorVersion = SYNC_MAJOR_VERSION;

-    rep.minorVersion = SYNC_MINOR_VERSION;

+    rep.majorVersion = SERVER_SYNC_MAJOR_VERSION;

+    rep.minorVersion = SERVER_SYNC_MINOR_VERSION;

     rep.length = 0;

 

     if (client->swapped)

@@ -1157,7 +1287,7 @@ ProcSyncListSystemCounters(ClientPtr client)
 	char *pname_in_reply;

 	SysCounterInfo *psci = SysCounterList[i]->pSysCounterInfo;

 

-	walklist->counter = SysCounterList[i]->id;

+	walklist->counter = SysCounterList[i]->sync.id;

 	walklist->resolution_hi = XSyncValueHigh32(psci->resolution);

 	walklist->resolution_lo = XSyncValueLow32(psci->resolution);

 	namelen = strlen(psci->name);

@@ -1370,10 +1500,70 @@ ProcSyncDestroyCounter(ClientPtr client)
 	client->errorValue = stuff->counter;

 	return BadAccess;

     }

-    FreeResource(pCounter->id, RT_NONE);

+    FreeResource(pCounter->sync.id, RT_NONE);

     return Success;

 }

 

+static SyncAwaitUnion*

+SyncAwaitPrologue(ClientPtr client, int items)

+{

+    SyncAwaitUnion *pAwaitUnion;

+

+    /*  all the memory for the entire await list is allocated

+     *  here in one chunk

+     */

+    pAwaitUnion = malloc((items+1) * sizeof(SyncAwaitUnion));

+    if (!pAwaitUnion)

+	return NULL;

+

+    /* first item is the header, remainder are real wait conditions */

+

+    pAwaitUnion->header.delete_id = FakeClientID(client->index);

+    if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))

+    {

+	free(pAwaitUnion);

+	return NULL;

+    }

+

+    pAwaitUnion->header.client = client;

+    pAwaitUnion->header.num_waitconditions = 0;

+

+    return pAwaitUnion;

+}

+

+static void

+SyncAwaitEpilogue(ClientPtr client, int items, SyncAwaitUnion *pAwaitUnion)

+{

+    SyncAwait *pAwait;

+    int i;

+

+    IgnoreClient(client);

+

+    /* see if any of the triggers are already true */

+

+    pAwait = &(pAwaitUnion+1)->await; /* skip over header */

+    for (i = 0; i < items; i++, pAwait++)

+    {

+	CARD64 value;

+

+	/*  don't have to worry about NULL counters because the request

+	 *  errors before we get here out if they occur

+	 */

+	switch (pAwait->trigger.pSync->type) {

+	case SYNC_COUNTER:

+	    value = ((SyncCounter *)pAwait->trigger.pSync)->value;

+	    break;

+	default:

+	    XSyncIntToValue(&value, 0);

+	}

+

+	if ((*pAwait->trigger.CheckTrigger)(&pAwait->trigger, value))

+	{

+	    (*pAwait->trigger.TriggerFired)(&pAwait->trigger);

+	    break; /* once is enough */

+	}

+    }

+}

 

 /*

  * ** Await

@@ -1405,28 +1595,12 @@ ProcSyncAwait(ClientPtr client)
 	return BadValue;

     }

 

-    pProtocolWaitConds = (xSyncWaitCondition *) & stuff[1];

-

-    /*  all the memory for the entire await list is allocated

-     *  here in one chunk

-     */

-    pAwaitUnion = malloc((items+1) * sizeof(SyncAwaitUnion));

-    if (!pAwaitUnion)

-	return BadAlloc;

-

-    /* first item is the header, remainder are real wait conditions */

-

-    pAwaitUnion->header.delete_id = FakeClientID(client->index);

-    if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))

-    {

-	free(pAwaitUnion);

+    if (!(pAwaitUnion = SyncAwaitPrologue(client, items)))

 	return BadAlloc;

-    }

 

     /* don't need to do any more memory allocation for this request! */

 

-    pAwaitUnion->header.client = client;

-    pAwaitUnion->header.num_waitconditions = 0;

+    pProtocolWaitConds = (xSyncWaitCondition *) & stuff[1];

 

     pAwait = &(pAwaitUnion+1)->await; /* skip over header */

     for (i = 0; i < items; i++, pProtocolWaitConds++, pAwait++)

@@ -1434,7 +1608,7 @@ ProcSyncAwait(ClientPtr client)
 	if (pProtocolWaitConds->counter == None) /* XXX protocol change */

 	{

 	    /*  this should take care of removing any triggers created by

-	     *  this request that have already been registered on counters

+	     *  this request that have already been registered on sync objects

 	     */

 	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

 	    client->errorValue = pProtocolWaitConds->counter;

@@ -1442,7 +1616,7 @@ ProcSyncAwait(ClientPtr client)
 	}

 

 	/* sanity checks are in SyncInitTrigger */

-	pAwait->trigger.pCounter = NULL;

+	pAwait->trigger.pSync = NULL;

 	pAwait->trigger.value_type = pProtocolWaitConds->value_type;

 	XSyncIntsToValue(&pAwait->trigger.wait_value,

 			 pProtocolWaitConds->wait_value_lo,

@@ -1450,11 +1624,12 @@ ProcSyncAwait(ClientPtr client)
 	pAwait->trigger.test_type = pProtocolWaitConds->test_type;

 

 	status = SyncInitTrigger(client, &pAwait->trigger,

-			 pProtocolWaitConds->counter, XSyncCAAllTrigger);

+				 pProtocolWaitConds->counter, RTCounter,

+				 XSyncCAAllTrigger);

 	if (status != Success)

 	{

 	    /*  this should take care of removing any triggers created by

-	     *  this request that have already been registered on counters

+	     *  this request that have already been registered on sync objects

 	     */

 	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

 	    return status;

@@ -1469,23 +1644,8 @@ ProcSyncAwait(ClientPtr client)
 	pAwaitUnion->header.num_waitconditions++;

     }

 

-    IgnoreClient(client);

-

-    /* see if any of the triggers are already true */

+    SyncAwaitEpilogue(client, items, pAwaitUnion);

 

-    pAwait = &(pAwaitUnion+1)->await; /* skip over header */

-    for (i = 0; i < items; i++, pAwait++)

-    {

-	/*  don't have to worry about NULL counters because the request

-	 *  errors before we get here out if they occur

-	 */

-	if ((*pAwait->trigger.CheckTrigger)(&pAwait->trigger,

-					    pAwait->trigger.pCounter->value))

-	{

-	    (*pAwait->trigger.TriggerFired)(&pAwait->trigger);

-	    break; /* once is enough */

-	}

-    }

     return Success;

 }

 

@@ -1565,13 +1725,14 @@ ProcSyncCreateAlarm(ClientPtr client)
     /* set up defaults */

 

     pTrigger = &pAlarm->trigger;

-    pTrigger->pCounter = NULL;

+    pTrigger->pSync = NULL;

     pTrigger->value_type = XSyncAbsolute;

     XSyncIntToValue(&pTrigger->wait_value, 0L);

     pTrigger->test_type = XSyncPositiveComparison;

     pTrigger->TriggerFired = SyncAlarmTriggerFired;

     pTrigger->CounterDestroyed = SyncAlarmCounterDestroyed;

-    status = SyncInitTrigger(client, pTrigger, None, XSyncCAAllTrigger);

+    status = SyncInitTrigger(client, pTrigger, None, RTCounter,

+			     XSyncCAAllTrigger);

     if (status != Success)

     {

 	free(pAlarm);

@@ -1602,13 +1763,19 @@ ProcSyncCreateAlarm(ClientPtr client)
      *  in CreateAlarm and sets alarm state to Inactive.

      */

 

-    if (!pTrigger->pCounter)

+    if (!pTrigger->pSync)

     {

 	pAlarm->state = XSyncAlarmInactive; /* XXX protocol change */

     }

-    else if ((*pTrigger->CheckTrigger)(pTrigger, pTrigger->pCounter->value))

+    else

     {

-	(*pTrigger->TriggerFired)(pTrigger);

+	SyncCounter *pCounter;

+

+	assert(SYNC_COUNTER == pTrigger->pSync->type);

+	pCounter = (SyncCounter *)pTrigger->pSync;

+

+	if ((*pTrigger->CheckTrigger)(pTrigger, pCounter->value))

+	    (*pTrigger->TriggerFired)(pTrigger);

     }

 

     return Success;

@@ -1622,6 +1789,7 @@ ProcSyncChangeAlarm(ClientPtr client)
 {

     REQUEST(xSyncChangeAlarmReq);

     SyncAlarm   *pAlarm;

+    SyncCounter *pCounter = NULL;

     long        vmask;

     int         len, status;

 

@@ -1642,13 +1810,18 @@ ProcSyncChangeAlarm(ClientPtr client)
 					    (CARD32 *)&stuff[1])) != Success)

 	return status;

 

+    if (pAlarm->trigger.pSync)

+    {

+	assert(SYNC_COUNTER == pAlarm->trigger.pSync->type);

+	pCounter = (SyncCounter *)pAlarm->trigger.pSync;

+    }

+

     /*  see if alarm already triggered.  NULL counter WILL trigger

      *  in ChangeAlarm.

      */

 

-    if (!pAlarm->trigger.pCounter ||

-	(*pAlarm->trigger.CheckTrigger)(&pAlarm->trigger,

-					pAlarm->trigger.pCounter->value))

+    if (!pCounter ||

+	(*pAlarm->trigger.CheckTrigger)(&pAlarm->trigger, pCounter->value))

     {

 	(*pAlarm->trigger.TriggerFired)(&pAlarm->trigger);

     }

@@ -1676,7 +1849,7 @@ ProcSyncQueryAlarm(ClientPtr client)
     rep.sequenceNumber = client->sequence;

 

     pTrigger = &pAlarm->trigger;

-    rep.counter = (pTrigger->pCounter) ? pTrigger->pCounter->id : None;

+    rep.counter = (pTrigger->pSync) ? pTrigger->pSync->id : None;

 

 #if 0 /* XXX unclear what to do, depends on whether relative value-types

        * are "consumed" immediately and are considered absolute from then

@@ -1732,6 +1905,228 @@ ProcSyncDestroyAlarm(ClientPtr client)
     return Success;

 }

 

+static int

+ProcSyncCreateFence(ClientPtr client)

+{

+    REQUEST(xSyncCreateFenceReq);

+    DrawablePtr pDraw;

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncCreateFenceReq);

+

+    rc = dixLookupDrawable(&pDraw, stuff->d, client, M_ANY, DixGetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+    LEGAL_NEW_RESOURCE(stuff->fid, client);

+

+    if (!(pFence = (SyncFence *)SyncCreate(client,

+					   stuff->fid,

+					   SYNC_FENCE)))

+	return BadAlloc;

+

+    miSyncInitFence(pDraw->pScreen, pFence, stuff->initially_triggered);

+

+    return client->noClientException;

+}

+

+static int

+FreeFence(void *obj, XID id)

+{

+    SyncFence *pFence = (SyncFence *) obj;

+

+    miSyncDestroyFence(pFence);

+

+    return Success;

+}

+

+int SyncVerifyFence(SyncFence **ppSyncFence, XID fid,

+		    ClientPtr client, Mask mode)

+{

+    int rc = dixLookupResourceByType((pointer *)ppSyncFence, fid, RTFence,

+				     client, mode);

+

+    if (rc != Success)

+	client->errorValue = fid;

+

+    return rc;

+}

+

+static int

+ProcSyncTriggerFence(ClientPtr client)

+{

+    REQUEST(xSyncTriggerFenceReq);

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncTriggerFenceReq);

+

+    rc = dixLookupResourceByType((pointer *)&pFence, stuff->fid, RTFence,

+				 client, DixWriteAccess);

+    if (rc != Success)

+	return rc;

+

+    miSyncTriggerFence(pFence);

+

+    return client->noClientException;

+}

+

+static int

+ProcSyncResetFence(ClientPtr client)

+{

+    REQUEST(xSyncResetFenceReq);

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncResetFenceReq);

+

+    rc = dixLookupResourceByType((pointer *)&pFence, stuff->fid, RTFence,

+				 client, DixWriteAccess);

+    if (rc != Success)

+	return rc;

+

+    if (pFence->funcs.CheckTriggered(pFence) != TRUE)

+	return BadMatch;

+

+    pFence->funcs.Reset(pFence);

+

+    return client->noClientException;

+}

+

+static int

+ProcSyncDestroyFence(ClientPtr client)

+{

+    REQUEST(xSyncDestroyFenceReq);

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncDestroyFenceReq);

+

+    rc = dixLookupResourceByType((pointer *)&pFence, stuff->fid, RTFence,

+				 client, DixDestroyAccess);

+    if (rc != Success)

+	return rc;

+

+    FreeResource(stuff->fid, RT_NONE);

+    return client->noClientException;

+}

+

+static int

+ProcSyncQueryFence(ClientPtr client)

+{

+    REQUEST(xSyncQueryFenceReq);

+    xSyncQueryFenceReply rep;

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncQueryFenceReq);

+

+    rc = dixLookupResourceByType((pointer *)&pFence, stuff->fid,

+				 RTFence, client, DixReadAccess);

+    if (rc != Success)

+	return rc;

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+

+    rep.triggered = pFence->funcs.CheckTriggered(pFence);

+

+    if (client->swapped)

+    {

+	char n;

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+    }

+

+    WriteToClient(client, sizeof(xSyncQueryFenceReply), (char *) &rep);

+    return client->noClientException;

+}

+

+static int

+ProcSyncAwaitFence(ClientPtr client)

+{

+    REQUEST(xSyncAwaitFenceReq);

+    SyncAwaitUnion *pAwaitUnion;

+    SyncAwait *pAwait;

+    /* Use CARD32 rather than XSyncFence because XIDs are hard-coded to

+     * CARD32 in protocol definitions */

+    CARD32 *pProtocolFences;

+    int status;

+    int len;

+    int items;

+    int i;

+

+    REQUEST_AT_LEAST_SIZE(xSyncAwaitFenceReq);

+

+    len = client->req_len << 2;

+    len -= sz_xSyncAwaitFenceReq;

+    items = len / sizeof(CARD32);

+

+    if (items * sizeof(CARD32) != len)

+    {

+	return BadLength;

+    }

+    if (items == 0)

+    {

+	client->errorValue = items; /* XXX protocol change */

+	return BadValue;

+    }

+

+    if (!(pAwaitUnion = SyncAwaitPrologue(client, items)))

+	return BadAlloc;

+

+    /* don't need to do any more memory allocation for this request! */

+

+    pProtocolFences = (CARD32 *) & stuff[1];

+

+    pAwait = &(pAwaitUnion+1)->await; /* skip over header */

+    for (i = 0; i < items; i++, pProtocolFences++, pAwait++)

+    {

+	if (*pProtocolFences == None) /* XXX protocol change */

+	{

+	    /*  this should take care of removing any triggers created by

+	     *  this request that have already been registered on sync objects

+	     */

+	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

+	    client->errorValue = *pProtocolFences;

+	    return SyncErrorBase + XSyncBadCounter;

+	}

+

+	pAwait->trigger.pSync = NULL;

+	/* Provide acceptable values for these unused fields to

+	 * satisfy SyncInitTrigger's validation logic

+	 */

+	pAwait->trigger.value_type = XSyncAbsolute;

+	XSyncIntToValue(&pAwait->trigger.wait_value, 0);

+	pAwait->trigger.test_type = 0;

+

+	status = SyncInitTrigger(client, &pAwait->trigger,

+				 *pProtocolFences, RTFence,

+				 XSyncCAAllTrigger);

+	if (status != Success)

+	{

+	    /*  this should take care of removing any triggers created by

+	     *  this request that have already been registered on sync objects

+	     */

+	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

+	    return status;

+	}

+	/* this is not a mistake -- same function works for both cases */

+	pAwait->trigger.TriggerFired = SyncAwaitTriggerFired;

+	pAwait->trigger.CounterDestroyed = SyncAwaitTriggerFired;

+	/* event_threshold is unused for fence syncs */

+	XSyncIntToValue(&pAwait->event_threshold, 0);

+	pAwait->pHeader = &pAwaitUnion->header;

+	pAwaitUnion->header.num_waitconditions++;

+    }

+

+    SyncAwaitEpilogue(client, items, pAwaitUnion);

+

+    return client->noClientException;

+}

+

 /*

  * ** Given an extension request, call the appropriate request procedure

  */

@@ -1770,6 +2165,18 @@ ProcSyncDispatch(ClientPtr client)
 	return ProcSyncSetPriority(client);

       case X_SyncGetPriority:

 	return ProcSyncGetPriority(client);

+      case X_SyncCreateFence:

+	return ProcSyncCreateFence(client);

+      case X_SyncTriggerFence:

+	return ProcSyncTriggerFence(client);

+      case X_SyncResetFence:

+	return ProcSyncResetFence(client);

+      case X_SyncDestroyFence:

+	return ProcSyncDestroyFence(client);

+      case X_SyncQueryFence:

+	return ProcSyncQueryFence(client);

+      case X_SyncAwaitFence:

+	return ProcSyncAwaitFence(client);

       default:

 	return BadRequest;

     }

@@ -1969,6 +2376,83 @@ SProcSyncGetPriority(ClientPtr client)
     return ProcSyncGetPriority(client);

 }

 

+static int

+SProcSyncCreateFence(ClientPtr client)

+{

+    REQUEST(xSyncCreateFenceReq);

+    char n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncCreateFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncCreateFence(client);

+}

+

+static int

+SProcSyncTriggerFence(ClientPtr client)

+{

+    REQUEST(xSyncTriggerFenceReq);

+    char n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncTriggerFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncTriggerFence(client);

+}

+

+static int

+SProcSyncResetFence(ClientPtr client)

+{

+    REQUEST(xSyncResetFenceReq);

+    char n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncResetFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncResetFence(client);

+}

+

+static int

+SProcSyncDestroyFence(ClientPtr client)

+{

+    REQUEST(xSyncDestroyFenceReq);

+    char n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncDestroyFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncDestroyFence(client);

+}

+

+static int

+SProcSyncQueryFence(ClientPtr client)

+{

+    REQUEST(xSyncQueryFenceReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncQueryFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncQueryFence(client);

+}

+

+static int

+SProcSyncAwaitFence(ClientPtr client)

+{

+    REQUEST(xSyncAwaitFenceReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_AT_LEAST_SIZE(xSyncAwaitFenceReq);

+    SwapRestL(stuff);

+

+    return ProcSyncAwaitFence(client);

+}

 

 static int

 SProcSyncDispatch(ClientPtr client)

@@ -2005,6 +2489,18 @@ SProcSyncDispatch(ClientPtr client)
 	return SProcSyncSetPriority(client);

       case X_SyncGetPriority:

 	return SProcSyncGetPriority(client);

+      case X_SyncCreateFence:

+	return SProcSyncCreateFence(client);

+      case X_SyncTriggerFence:

+	return SProcSyncTriggerFence(client);

+      case X_SyncResetFence:

+	return SProcSyncResetFence(client);

+      case X_SyncDestroyFence:

+	return SProcSyncDestroyFence(client);

+      case X_SyncQueryFence:

+	return SProcSyncQueryFence(client);

+      case X_SyncAwaitFence:

+	return SProcSyncAwaitFence(client);

       default:

 	return BadRequest;

     }

@@ -2058,7 +2554,6 @@ SyncResetProc(ExtensionEntry *extEntry)
     RTCounter = 0;

 }

 

-

 /*

  * ** Initialise the extension.

  */

@@ -2066,6 +2561,10 @@ void
 SyncExtensionInit(void)

 {

     ExtensionEntry *extEntry;

+    int 	    s;

+

+    for (s = 0; s < screenInfo.numScreens; s++)

+	miSyncSetup(screenInfo.screens[s]);

 

     if (RTCounter == 0)

     {

@@ -2073,6 +2572,7 @@ SyncExtensionInit(void)
     }

     RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm");

     RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait");

+    RTFence = CreateNewResourceType(FreeFence, "SyncFence");

     if (RTAwait)

 	RTAwait |= RC_NEVERRETAIN;

     RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient");

@@ -2099,6 +2599,7 @@ SyncExtensionInit(void)
 

     SetResourceTypeErrorValue(RTCounter, SyncErrorBase + XSyncBadCounter);

     SetResourceTypeErrorValue(RTAlarm, SyncErrorBase + XSyncBadAlarm);

+    SetResourceTypeErrorValue(RTFence, SyncErrorBase + XSyncBadFence);

 

     /*

      * Although SERVERTIME is implemented by the OS layer, we initialise it

@@ -2242,7 +2743,7 @@ static void
 IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)

 {

     XSyncValue idle, old_idle;

-    SyncTriggerList *list = IdleTimeCounter->pTriglist;

+    SyncTriggerList *list = IdleTimeCounter->sync.pTriglist;

     SyncTrigger *trig;

 

     if (!pIdleTimeValueLess && !pIdleTimeValueGreater)

@@ -2263,7 +2764,7 @@ IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
 	 * immediately so we can reschedule.

 	 */

 

-	for (list = IdleTimeCounter->pTriglist; list; list = list->next) {

+	for (list = IdleTimeCounter->sync.pTriglist; list; list = list->next) {

 	    trig = list->pTrigger;

 	    if (trig->CheckTrigger(trig, old_idle)) {

 		AdjustWaitForDelay(wt, 0);

@@ -2289,7 +2790,7 @@ IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
 	                        idle, &overflow);

 	    timeout = min(timeout, XSyncValueLow32 (value));

 	} else {

-	    for (list = IdleTimeCounter->pTriglist; list; list = list->next) {

+	    for (list = IdleTimeCounter->sync.pTriglist; list; list = list->next) {

 		trig = list->pTrigger;

 		if (trig->CheckTrigger(trig, old_idle)) {

 		    timeout = min(timeout, 0);

diff --git a/xorg-server/Xext/syncsdk.h b/xorg-server/Xext/syncsdk.h
new file mode 100644
index 000000000..eab5451f1
--- /dev/null
+++ b/xorg-server/Xext/syncsdk.h
@@ -0,0 +1,47 @@
+/*

+ * Copyright © 2010 NVIDIA Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifndef _SYNCSDK_H_

+#define _SYNCSDK_H_

+

+#include "misync.h"

+

+extern _X_EXPORT int

+SyncVerifyFence(SyncFence **ppFence, XID fid, ClientPtr client, Mask mode);

+

+#define VERIFY_SYNC_FENCE(pFence, fid, client, mode)			\

+    do {								\

+	int rc;								\

+	rc = SyncVerifyFence(&(pFence), (fid), (client), (mode));	\

+	if (Success != rc) return rc;					\

+    } while (0)

+

+#define VERIFY_SYNC_FENCE_OR_NONE(pFence, fid, client, mode)		\

+    do {								\

+        pFence = 0;							\

+        if (None != fid)						\

+	    VERIFY_SYNC_FENCE((pFence), (fid), (client), (mode));	\

+    } while (0)

+

+#endif /* _SYNCSDK_H_ */

+

diff --git a/xorg-server/Xext/syncsrv.h b/xorg-server/Xext/syncsrv.h
index 6d0e3d64a..6fe9cd123 100644
--- a/xorg-server/Xext/syncsrv.h
+++ b/xorg-server/Xext/syncsrv.h
@@ -1,177 +1,146 @@
-/*
-
-Copyright 1991, 1993, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/***********************************************************
-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-
-#ifndef _SYNCSRV_H_
-#define _SYNCSRV_H_
-
-#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
-
-typedef struct _SyncCounter {
-    ClientPtr		client;	/* Owning client. 0 for system counters */
-    XSyncCounter	id;		/* resource ID */
-    CARD64		value;		/* counter value */
-    struct _SyncTriggerList *pTriglist;	/* list of triggers */
-    Bool		beingDestroyed; /* in process of going away */
-    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
-} SyncCounter;
-
-/*
- * The System Counter interface
- */
-
-typedef enum {
-    XSyncCounterNeverChanges,
-    XSyncCounterNeverIncreases,
-    XSyncCounterNeverDecreases,
-    XSyncCounterUnrestricted
-} SyncCounterType;
-
-typedef struct _SysCounterInfo {
-    char	*name;
-    CARD64	resolution;
-    CARD64	bracket_greater;
-    CARD64	bracket_less;
-    SyncCounterType counterType;  /* how can this counter change */
-    void        (*QueryValue)(
-			      pointer /*pCounter*/,
-			      CARD64 * /*freshvalue*/
-);
-    void	(*BracketValues)(
-				 pointer /*pCounter*/,
-				 CARD64 * /*lessthan*/,
-				 CARD64 * /*greaterthan*/
-);
-} SysCounterInfo;
-
-
-
-typedef struct _SyncTrigger {
-    SyncCounter *pCounter;
-    CARD64	wait_value;	/* wait value */
-    unsigned int value_type;     /* Absolute or Relative */
-    unsigned int test_type;	/* transition or Comparision type */
-    CARD64	test_value;	/* trigger event threshold value */
-    Bool	(*CheckTrigger)(
-				struct _SyncTrigger * /*pTrigger*/,
-				CARD64 /*newval*/
-				);
-    void	(*TriggerFired)(
-				struct _SyncTrigger * /*pTrigger*/
-				);
-    void	(*CounterDestroyed)(
-				struct _SyncTrigger * /*pTrigger*/
-				    );
-} SyncTrigger;
-
-typedef struct _SyncTriggerList {
-    SyncTrigger *pTrigger;
-    struct _SyncTriggerList *next;
-} SyncTriggerList;
-
-typedef struct _SyncAlarmClientList {
-    ClientPtr	client;
-    XID		delete_id;
-    struct _SyncAlarmClientList *next;
-} SyncAlarmClientList;
-
-typedef struct _SyncAlarm {
-    SyncTrigger trigger;
-    ClientPtr	client;
-    XSyncAlarm 	alarm_id;
-    CARD64	delta;
-    int		events;
-    int		state;
-    SyncAlarmClientList *pEventClients;
-} SyncAlarm;
-
-typedef struct {
-    ClientPtr	client;
-    CARD32 	delete_id;
-    int		num_waitconditions;
-} SyncAwaitHeader;
-
-typedef struct {
-    SyncTrigger trigger;
-    CARD64	event_threshold;
-    SyncAwaitHeader *pHeader;
-} SyncAwait;
-
-typedef union {
-    SyncAwaitHeader header;
-    SyncAwait	    await;
-} SyncAwaitUnion;
-
-
-extern pointer SyncCreateSystemCounter(
-    char *	/* name */,
-    CARD64  	/* inital_value */,
-    CARD64  	/* resolution */,
-    SyncCounterType /* change characterization */,
-    void        (* /*QueryValue*/ ) (
-        pointer /* pCounter */,
-        CARD64 * /* pValue_return */), /* XXX prototype */
-    void        (* /*BracketValues*/) (
-        pointer /* pCounter */, 
-        CARD64 * /* pbracket_less */,
-        CARD64 * /* pbracket_greater */)
-);
-
-extern void SyncChangeCounter(
-    SyncCounter *	/* pCounter*/,
-    CARD64  		/* new_value */
-);
-
-extern void SyncDestroySystemCounter(
-    pointer pCounter
-);
-extern void InitServertime(void);
-
-extern void SyncExtensionInit(void);
-#endif /* _SYNCSRV_H_ */
+/*

+

+Copyright 1991, 1993, 1994, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+/***********************************************************

+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without fee is hereby granted, 

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in 

+supporting documentation, and that the names of Digital or Olivetti

+not be used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+******************************************************************/

+

+#ifndef _SYNCSRV_H_

+#define _SYNCSRV_H_

+

+#include "misync.h"

+#include "misyncstr.h"

+

+/*

+ * The System Counter interface

+ */

+

+typedef enum {

+    XSyncCounterNeverChanges,

+    XSyncCounterNeverIncreases,

+    XSyncCounterNeverDecreases,

+    XSyncCounterUnrestricted

+} SyncCounterType;

+

+typedef struct _SysCounterInfo {

+    char	*name;

+    CARD64	resolution;

+    CARD64	bracket_greater;

+    CARD64	bracket_less;

+    SyncCounterType counterType;  /* how can this counter change */

+    void        (*QueryValue)(

+			      pointer /*pCounter*/,

+			      CARD64 * /*freshvalue*/

+);

+    void	(*BracketValues)(

+				 pointer /*pCounter*/,

+				 CARD64 * /*lessthan*/,

+				 CARD64 * /*greaterthan*/

+);

+} SysCounterInfo;

+

+

+

+typedef struct _SyncAlarmClientList {

+    ClientPtr	client;

+    XID		delete_id;

+    struct _SyncAlarmClientList *next;

+} SyncAlarmClientList;

+

+typedef struct _SyncAlarm {

+    SyncTrigger trigger;

+    ClientPtr	client;

+    XSyncAlarm 	alarm_id;

+    CARD64	delta;

+    int		events;

+    int		state;

+    SyncAlarmClientList *pEventClients;

+} SyncAlarm;

+

+typedef struct {

+    ClientPtr	client;

+    CARD32 	delete_id;

+    int		num_waitconditions;

+} SyncAwaitHeader;

+

+typedef struct {

+    SyncTrigger trigger;

+    CARD64	event_threshold;

+    SyncAwaitHeader *pHeader;

+} SyncAwait;

+

+typedef union {

+    SyncAwaitHeader header;

+    SyncAwait	    await;

+} SyncAwaitUnion;

+

+extern pointer SyncCreateSystemCounter(

+    char *	/* name */,

+    CARD64  	/* inital_value */,

+    CARD64  	/* resolution */,

+    SyncCounterType /* change characterization */,

+    void        (* /*QueryValue*/ ) (

+        pointer /* pCounter */,

+        CARD64 * /* pValue_return */), /* XXX prototype */

+    void        (* /*BracketValues*/) (

+        pointer /* pCounter */, 

+        CARD64 * /* pbracket_less */,

+        CARD64 * /* pbracket_greater */)

+);

+

+extern void SyncChangeCounter(

+    SyncCounter *	/* pCounter*/,

+    CARD64  		/* new_value */

+);

+

+extern void SyncDestroySystemCounter(

+    pointer pCounter

+);

+

+extern void InitServertime(void);

+

+extern void SyncExtensionInit(void);

+#endif /* _SYNCSRV_H_ */

diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 6cb9c0dac..40e03337d 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -870,8 +870,10 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
                     continue;

                 if (!sd->button)

                     continue;

-                if (button_is_down(sd, key, BUTTON_PROCESSED))

-                    return DONT_PROCESS;

+                for (i = 1; i <= sd->button->numButtons; i++)

+                    if (sd->button->map[i] == key &&

+                        button_is_down(sd, i, BUTTON_PROCESSED))

+                        return DONT_PROCESS;

             }

         }

         set_button_up(device, key, BUTTON_PROCESSED);

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index e3b9a865d..ea2803795 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.

 

 AC_PREREQ(2.57)

-AC_INIT([xorg-server], 1.9.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

-RELEASE_DATE="2010-10-01"

+AC_INIT([xorg-server], 1.9.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

+RELEASE_DATE="2010-12-06"

 AC_CONFIG_SRCDIR([Makefile.am])

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

@@ -64,9 +64,7 @@ dnl version-config.h covers the version numbers so they can be bumped without
 dnl forcing an entire recompile.x

 AC_CONFIG_HEADERS(include/version-config.h)

 

-AC_PROG_CC

 AM_PROG_AS

-AC_PROG_INSTALL

 AC_PROG_LN_S

 AC_LIBTOOL_WIN32_DLL

 AC_DISABLE_STATIC

@@ -77,7 +75,6 @@ AC_PROG_LEX
 AC_PROG_YACC

 AC_SYS_LARGEFILE

 XORG_PROG_RAWCPP

-AC_PROG_SED

 

 # Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow

 # easier overrides at build time.

@@ -791,7 +788,7 @@ WINDOWSWMPROTO="windowswmproto"
 APPLEWMPROTO="applewmproto >= 1.4"

 

 dnl Core modules for most extensions, et al.

-SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.0.99.3] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"

+SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.4] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"

 # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc

 AC_SUBST(SDK_REQUIRED_MODULES)

 

@@ -1353,6 +1350,8 @@ FB_LIB='$(top_builddir)/fb/libfb.la'
 FB_INC='-I$(top_srcdir)/fb'

 MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'

 MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'

+MIEXT_SYNC_INC='-I$(top_srcdir)/miext/sync'

+MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la'

 CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'

 

 # SHA1 hashing

@@ -1492,7 +1491,7 @@ AC_EGREP_CPP([I_AM_SVR4],[
 AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])

 AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))

 

-XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"

+XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"

 

 dnl ---------------------------------------------------------------------------

 dnl DDX section.

@@ -1505,7 +1504,7 @@ AC_MSG_RESULT([$XVFB])
 AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])

 

 if test "x$XVFB" = xyes; then

-	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"

+	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"

 	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"

 	AC_SUBST([XVFB_LIBS])

 	AC_SUBST([XVFB_SYS_LIBS])

@@ -1526,7 +1525,7 @@ if test "x$XNEST" = xyes; then
 	if test "x$have_xnest" = xno; then

 		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])

 	fi

-	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"

+	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"

 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"

 	AC_SUBST([XNEST_LIBS])

 	AC_SUBST([XNEST_SYS_LIBS])

@@ -1554,7 +1553,7 @@ if test "x$XORG" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'

 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"

 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"

-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"

+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"

 

 	dnl ==================================================================

 	dnl symbol visibility

@@ -1889,7 +1888,7 @@ if test "x$XWIN" = xyes; then
 			XWIN_SYS_LIBS=-lwinsock2

 			;;

 	esac

-	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"

+	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $RANDR_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"

 	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"

 	AC_SUBST(XWIN_LIBS)

 	AC_SUBST(XWIN_SERVER_NAME)

@@ -1919,7 +1918,7 @@ if test "x$XQUARTZ" = xyes; then
 	AC_DEFINE(XQUARTZ,1,[Have Quartz])

 	AC_DEFINE(ROOTLESS,1,[Build Rootless code])

 

-	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"

+	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"

 	AC_SUBST([DARWIN_LIBS])

 

 	AC_CHECK_LIB([Xplugin],[xp_init],[:])

@@ -1980,7 +1979,7 @@ if test "x$DMX" = xyes; then
 	fi

 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"

 	XDMX_CFLAGS="$DMXMODULES_CFLAGS"

-	XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XEXT_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"

+	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"

 	XDMX_SYS_LIBS="$DMXMODULES_LIBS"

 	AC_SUBST([XDMX_CFLAGS])

 	AC_SUBST([XDMX_LIBS])

@@ -2085,13 +2084,13 @@ if test "$KDRIVE" = yes; then
     

     # damage shadow extension glx (NOTYET) fb mi

     KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'

-    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"

+    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"

     KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'

     KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"

     

     KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"

 

-    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"

+    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"

     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'

     case $host_os in

 	*linux*)

@@ -2183,6 +2182,7 @@ damageext/Makefile
 dbe/Makefile

 dix/Makefile

 doc/Makefile

+doc/man/Makefile

 doc/xml/Makefile

 doc/xml/dtrace/Makefile

 doc/xml/xserver.ent

@@ -2191,6 +2191,7 @@ record/Makefile
 config/Makefile

 mi/Makefile

 miext/Makefile

+miext/sync/Makefile

 miext/damage/Makefile

 miext/shadow/Makefile

 miext/cw/Makefile

diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c
index e9297149c..dff1a5631 100644
--- a/xorg-server/dix/eventconvert.c
+++ b/xorg-server/dix/eventconvert.c
@@ -326,14 +326,6 @@ countValuators(DeviceEvent *ev, int *first)
     {

         if (BitIsOn(ev->valuators.mask, i))

         {

-            /* Assume mode of first_valuator matches XI1 device mode. Stop when the

-             * event mode changes since XI1 can't handle mixed mode devices.

-             */

-            if (first_valuator > -1 &&

-                 BitIsOn(ev->valuators.mode, i) !=

-                 BitIsOn(ev->valuators.mode, first_valuator))

-                break;

-

             if (first_valuator == -1)

                 first_valuator = i;

             last_valuator = i;

diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c
index 1500dabb1..583b9f1f5 100644
--- a/xorg-server/dix/privates.c
+++ b/xorg-server/dix/privates.c
@@ -447,6 +447,7 @@ static const char *key_names[PRIVATE_LAST] = {
     [PRIVATE_GLYPH] = "GLYPH",

     [PRIVATE_GLYPHSET] = "GLYPHSET",

     [PRIVATE_PICTURE] = "PICTURE",

+    [PRIVATE_SYNC_FENCE] = "SYNC_FENCE",

 };

 

 void

diff --git a/xorg-server/doc/Makefile.am b/xorg-server/doc/Makefile.am
index 1cfc1d6a1..8cb3649fe 100644
--- a/xorg-server/doc/Makefile.am
+++ b/xorg-server/doc/Makefile.am
@@ -1,26 +1,3 @@
+SUBDIRS = man xml

 

-# Xserver.man covers options generic to all X servers built in this tree

-# (i.e. those handled in the os/utils.c options processing instead of in

-#  the DDX-level options processing)

-appmandir = $(APP_MAN_DIR)

-appman_PRE = Xserver.man.pre

-

-appman_PROCESSED = $(appman_PRE:man.pre=man)

-appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)

-

-BUILT_SOURCES = $(appman_PROCESSED)

-CLEANFILES = $(appman_PROCESSED) $(appman_DATA)

-

-include $(top_srcdir)/cpprules.in

-

-.man.$(APP_MAN_SUFFIX):

-	$(AM_V_at)cp $< $@

-

-EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | $(SED) -e 's/,/, /g'`"

-

-# Docs about X server internals that we ship with source but don't install

-DEVEL_DOCS = smartsched

-

-EXTRA_DIST = $(DEVEL_DOCS) $(appman_PRE) $(fileman_PRE)

-

-SUBDIRS = xml

+dist_noinst_DATA = smartsched

diff --git a/xorg-server/doc/man/Makefile.am b/xorg-server/doc/man/Makefile.am
new file mode 100644
index 000000000..5259a104f
--- /dev/null
+++ b/xorg-server/doc/man/Makefile.am
@@ -0,0 +1,20 @@
+# Xserver.man covers options generic to all X servers built in this tree

+# (i.e. those handled in the os/utils.c options processing instead of in

+#  the DDX-level options processing)

+

+appmandir = $(APP_MAN_DIR)

+appman_PRE = Xserver.man

+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))

+

+EXTRA_DIST = $(appman_PRE)

+CLEANFILES = $(appman_DATA)

+SUFFIXES = .$(APP_MAN_SUFFIX) .man

+

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

+# 's|/,|/, |g' will add a space to help font path formatting

+MAN_SUBSTS += 	-e 's|__datadir__|$(datadir)|g' \

+		-e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \

+		-e '\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g'

+

+.man.$(APP_MAN_SUFFIX):

+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

diff --git a/xorg-server/doc/man/Xserver.man b/xorg-server/doc/man/Xserver.man
new file mode 100644
index 000000000..d3a16e2b7
--- /dev/null
+++ b/xorg-server/doc/man/Xserver.man
@@ -0,0 +1,584 @@
+.\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $

+.\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $

+.\" Copyright 1984 - 1991, 1993, 1994, 1998  The Open Group

+.\"

+.\" Permission to use, copy, modify, distribute, and sell this software and its

+.\" documentation for any purpose is hereby granted without fee, provided that

+.\" the above copyright notice appear in all copies and that both that

+.\" copyright notice and this permission notice appear in supporting

+.\" documentation.

+.\"

+.\" The above copyright notice and this permission notice shall be included

+.\" in all copies or substantial portions of the Software.

+.\"

+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+.\" OTHER DEALINGS IN THE SOFTWARE.

+.\"

+.\" Except as contained in this notice, the name of The Open Group shall

+.\" not be used in advertising or otherwise to promote the sale, use or

+.\" other dealings in this Software without prior written authorization

+.\" from The Open Group.

+.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.31 2004/01/10 22:27:46 dawes Exp $

+.\" shorthand for double quote that works everywhere.

+.ds q \N'34'

+.TH XSERVER 1 __xorgversion__

+.SH NAME

+Xserver \- X Window System display server

+.SH SYNOPSIS

+.B X

+[option ...]

+.SH DESCRIPTION

+.I X

+is the generic name for the X Window System display server.  It is

+frequently a link or a copy of the appropriate server binary for

+driving the most frequently used server on a given machine.

+.SH "STARTING THE SERVER"

+The X server is usually started from the X Display Manager program

+\fIxdm\fP(1) or a similar display manager program.

+This utility is run from the system boot files and takes care of keeping

+the server running, prompting for usernames and passwords, and starting up

+the user sessions.

+.PP

+Installations that run more than one window system may need to use the

+\fIxinit\fP(1) utility instead of a display manager.  However, \fIxinit\fP is

+to be considered a tool for building startup scripts and is not

+intended for use by end users.  Site administrators are \fBstrongly\fP

+urged to use a display manager, or build other interfaces for novice users.

+.PP

+The X server may also be started directly by the user, though this

+method is usually reserved for testing and is not recommended for

+normal operation.  On some platforms, the user must have special

+permission to start the X server, often because access to certain

+devices (e.g. \fI/dev/mouse\fP) is restricted.

+.PP

+When the X server starts up, it typically takes over the display.  If

+you are running on a workstation whose console is the display, you may

+not be able to log into the console while the server is running.

+.SH OPTIONS

+Many X servers have device-specific command line options.  See the manual

+pages for the individual servers for more details; a list of

+server-specific manual pages is provided in the SEE ALSO section below.

+.PP

+All of the X servers accept the command line options described below.

+Some X servers may have alternative ways of providing the parameters

+described here, but the values provided via the command line options

+should override values specified via other mechanisms.

+.TP 8

+.B :\fIdisplaynumber\fP

+The X server runs as the given \fIdisplaynumber\fP, which by default is 0.

+If multiple X servers are to run simultaneously on a host, each must have

+a unique display number.  See the DISPLAY

+NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to

+specify which display number clients should try to use.

+.TP 8

+.B \-a \fInumber\fP

+sets pointer acceleration (i.e. the ratio of how much is reported to how much

+the user actually moved the pointer).

+.TP 8

+.B \-ac

+disables host-based access control mechanisms.  Enables access by any host,

+and permits any host to modify the access control list.

+Use with extreme caution.

+This option exists primarily for running test suites remotely.

+.TP 8

+.B \-audit \fIlevel\fP

+sets the audit trail level.  The default level is 1, meaning only connection

+rejections are reported.  Level 2 additionally reports all successful

+connections and disconnects.  Level 4 enables messages from the

+SECURITY extension, if present, including generation and revocation of

+authorizations and violations of the security policy.

+Level 0 turns off the audit trail.

+Audit lines are sent as standard error output.

+.TP 8

+.B \-auth \fIauthorization-file\fP

+specifies a file which contains a collection of authorization records used

+to authenticate access.  See also the \fIxdm\fP(1) and

+\fIXsecurity\fP(__miscmansuffix__) manual pages.

+.TP 8

+.B \-br

+sets the default root window to solid black instead of the standard root weave

+pattern.   This is the default unless -retro or -wr is specified.

+.TP 8

+.B \-bs

+disables backing store support on all screens.

+.TP 8

+.B \-c

+turns off key-click.

+.TP 8

+.B c \fIvolume\fP

+sets key-click volume (allowable range: 0-100).

+.TP 8

+.B \-cc \fIclass\fP

+sets the visual class for the root window of color screens.

+The class numbers are as specified in the X protocol.

+Not obeyed by all servers.

+.TP 8

+.B \-core

+causes the server to generate a core dump on fatal errors.

+.TP 8

+.B \-deferglyphs \fIwhichfonts\fP

+specifies the types of fonts for which the server should attempt to use

+deferred glyph loading.  \fIwhichfonts\fP can be all (all fonts),

+none (no fonts), or 16 (16 bit fonts only).

+.TP 8

+.B \-dpi \fIresolution\fP

+sets the resolution for all screens, in dots per inch.

+To be used when the server cannot determine the screen size(s) from the

+hardware.

+.TP 8

+.B dpms

+enables DPMS (display power management services), where supported.  The

+default state is platform and configuration specific.

+.TP 8

+.B \-dpms

+disables DPMS (display power management services).  The default state

+is platform and configuration specific.

+.TP 8

+.BI \-extension extensionName

+disables named extension.   If an unknown extension name is specified,

+a list of accepted extension names is printed.

+.TP 8

+.BI \+extension extensionName

+enables named extension.   If an unknown extension name is specified,

+a list of accepted extension names is printed.

+.TP 8

+.B \-f \fIvolume\fP

+sets feep (bell) volume (allowable range: 0-100).

+.TP 8

+.B \-fc \fIcursorFont\fP

+sets default cursor font.

+.TP 8

+.B \-fn \fIfont\fP

+sets the default font.

+.TP 8

+.B \-fp \fIfontPath\fP

+sets the search path for fonts.  This path is a comma separated list

+of directories which the X server searches for font databases.

+See the FONTS section of this manual page for more information and the default

+list.

+.TP 8

+.B \-help

+prints a usage message.

+.TP 8

+.B \-I

+causes all remaining command line arguments to be ignored.

+.TP 8

+.B \-maxbigreqsize \fIsize\fP

+sets the maximum big request to

+.I size

+MB.

+.TP 8

+.B \-nocursor

+disable the display of the pointer cursor.

+.TP 8

+.B \-nolisten \fItrans-type\fP

+disables a transport type.  For example, TCP/IP connections can be disabled

+with

+.BR "\-nolisten tcp" .

+This option may be issued multiple times to disable listening to different

+transport types.

+.TP 8

+.B \-noreset

+prevents a server reset when the last client connection is closed.  This

+overrides a previous

+.B \-terminate

+command line option.

+.TP 8

+.B \-p \fIminutes\fP

+sets screen-saver pattern cycle time in minutes.

+.TP 8

+.B \-pn

+permits the server to continue running if it fails to establish all of

+its well-known sockets (connection points for clients), but

+establishes at least one.  This option is set by default.

+.TP 8

+.B \-nopn

+causes the server to exit if it fails to establish all of its well-known

+sockets (connection points for clients).

+.TP 8

+.B \-r

+turns off auto-repeat.

+.TP 8

+.B r

+turns on auto-repeat.

+.TP 8

+.B -retro

+starts the stipple with the classic stipple and cursor visible.  The default

+is to start with a black root window, and to suppress display of the cursor

+until the first time an application calls XDefineCursor().  For the Xorg

+server, this also sets the default for the DontZap option to FALSE.  For

+kdrive servers, this implies -zap.

+.TP 8

+.B \-s \fIminutes\fP

+sets screen-saver timeout time in minutes.

+.TP 8

+.B \-su

+disables save under support on all screens.

+.TP 8

+.B \-t \fInumber\fP

+sets pointer acceleration threshold in pixels (i.e. after how many pixels

+pointer acceleration should take effect).

+.TP 8

+.B \-terminate

+causes the server to terminate at server reset, instead of continuing to run.

+This overrides a previous

+.B \-noreset

+command line option.

+.TP 8

+.B \-to \fIseconds\fP

+sets default connection timeout in seconds.

+.TP 8

+.B \-tst

+disables all testing extensions (e.g., XTEST, XTrap, XTestExtension1, RECORD).

+.TP 8

+.B tty\fIxx\fP

+ignored, for servers started the ancient way (from init).

+.TP 8

+.B v

+sets video-off screen-saver preference.

+.TP 8

+.B \-v

+sets video-on screen-saver preference.

+.TP 8

+.B \-wm

+forces the default backing-store of all windows to be WhenMapped.  This

+is a backdoor way of getting backing-store to apply to all windows.

+Although all mapped windows will have backing store, the backing store

+attribute value reported by the server for a window will be the last

+value established by a client.  If it has never been set by a client,

+the server will report the default value, NotUseful.  This behavior is

+required by the X protocol, which allows the server to exceed the

+client's backing store expectations but does not provide a way to tell

+the client that it is doing so.

+.TP 8

+.B \-wr

+sets the default root window to solid white instead of the standard root weave

+pattern.

+.TP 8

+.B \-x \fIextension\fP

+loads the specified extension at init.

+This is a no-op for most implementations.

+.TP 8

+.B [+-]xinerama

+enables(+) or disables(-) the XINERAMA extension.  The default state is

+platform and configuration specific.

+.SH SERVER DEPENDENT OPTIONS

+Some X servers accept the following options:

+.TP 8

+.B \-ld \fIkilobytes\fP

+sets the data space limit of the server to the specified number of kilobytes.

+A value of zero makes the data size as large as possible.  The default value

+of \-1 leaves the data space limit unchanged.

+.TP 8

+.B \-lf \fIfiles\fP

+sets the number-of-open-files limit of the server to the specified number.

+A value of zero makes the limit as large as possible.  The default value

+of \-1 leaves the limit unchanged.

+.TP 8

+.B \-ls \fIkilobytes\fP

+sets the stack space limit of the server to the specified number of kilobytes.

+A value of zero makes the stack size as large as possible.  The default value

+of \-1 leaves the stack space limit unchanged.

+.TP 8

+.B \-render

+.BR default | mono | gray | color

+sets the color allocation policy that will be used by the render extension.

+.RS 8

+.TP 8

+.I default

+selects the default policy defined for the display depth of the X

+server.

+.TP 8

+.I mono

+don't use any color cell.

+.TP 8

+.I gray

+use a gray map of 13 color cells for the X render extension.

+.TP 8

+.I color

+use a color cube of at most 4*4*4 colors (that is 64 color cells).

+.RE

+.TP 8

+.B \-dumbSched

+disables smart scheduling on platforms that support the smart scheduler.

+.TP

+.B \-schedInterval \fIinterval\fP

+sets the smart scheduler's scheduling interval to

+.I interval

+milliseconds.

+.SH XDMCP OPTIONS

+X servers that support XDMCP have the following options.

+See the \fIX Display Manager Control Protocol\fP specification for more

+information.

+.TP 8

+.B \-query \fIhostname\fP

+enables XDMCP and sends Query packets to the specified

+.IR hostname .

+.TP 8

+.B \-broadcast

+enable XDMCP and broadcasts BroadcastQuery packets to the network.  The

+first responding display manager will be chosen for the session.

+.TP 8

+.B \-multicast [\fIaddress\fP [\fIhop count\fP]]

+Enable XDMCP and multicast BroadcastQuery packets to the  network.

+The first responding display manager is chosen for the session.  If an

+address is specified, the multicast is sent to that address.  If no

+address is specified, the multicast is sent to the default XDMCP IPv6

+multicast group.  If a hop count is specified, it is used as the maximum

+hop count for the multicast.  If no hop count is specified, the multicast

+is set to a maximum of 1 hop, to prevent the multicast from being routed

+beyond the local network.

+.TP 8

+.B \-indirect \fIhostname\fP

+enables XDMCP and send IndirectQuery packets to the specified

+.IR hostname .

+.TP 8

+.B \-port \fIport-number\fP

+uses the specified \fIport-number\fP for XDMCP packets, instead of the

+default.  This option must be specified before any \-query, \-broadcast,

+\-multicast, or \-indirect options.

+.TP 8

+.B \-from \fIlocal-address\fP

+specifies the local address to connect from (useful if the connecting host

+has multiple network interfaces).  The \fIlocal-address\fP may be expressed

+in any form acceptable to the host platform's \fIgethostbyname\fP(3)

+implementation.

+.TP 8

+.B \-once

+causes the server to terminate (rather than reset) when the XDMCP session

+ends.

+.TP 8

+.B \-class \fIdisplay-class\fP

+XDMCP has an additional display qualifier used in resource lookup for

+display-specific options.  This option sets that value, by default it

+is "MIT-Unspecified" (not a very useful value).

+.TP 8

+.B \-cookie \fIxdm-auth-bits\fP

+When testing XDM-AUTHENTICATION-1, a private key is shared between the

+server and the manager.  This option sets the value of that private

+data (not that it is very private, being on the command line!).

+.TP 8

+.B \-displayID \fIdisplay-id\fP

+Yet another XDMCP specific value, this one allows the display manager to

+identify each display so that it can locate the shared key.

+.SH XKEYBOARD OPTIONS

+X servers that support the XKEYBOARD (a.k.a. \*qXKB\*q) extension accept the

+following options.  All layout files specified on the command line must be

+located in the XKB base directory or a subdirectory, and specified as the

+relative path from the XKB base directory.  The default XKB base directory is

+.IR __projectroot__/lib/X11/xkb .

+.TP 8

+.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"

+enables(+) or disables(-) AccessX key sequences.

+.TP 8

+.B \-xkbdir \fIdirectory\fP

+base directory for keyboard layout files.  This option is not available

+for setuid X servers (i.e., when the X server's real and effective uids

+are different).

+.TP 8

+.B \-ardelay \fImilliseconds\fP

+sets the autorepeat delay (length of time in milliseconds that a key must

+be depressed before autorepeat starts).

+.TP 8

+.B \-arinterval \fImilliseconds\fP

+sets the autorepeat interval (length of time in milliseconds that should

+elapse between autorepeat-generated keystrokes).

+.TP 8

+.B \-xkbmap \fIfilename\fP

+loads keyboard description in \fIfilename\fP on server startup.

+.SH "NETWORK CONNECTIONS"

+The X server supports client connections via a platform-dependent subset of

+the following transport types: TCP\/IP, Unix Domain sockets, DECnet,

+and several varieties of SVR4 local connections.  See the DISPLAY

+NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to

+specify which transport type clients should try to use.

+.SH GRANTING ACCESS

+The X server implements a platform-dependent subset of the following

+authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1,

+XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5.  See the

+\fIXsecurity\fP(__miscmansuffix__) manual page for information on the

+operation of these protocols.

+.PP

+Authorization data required by the above protocols is passed to the

+server in a private file named with the \fB\-auth\fP command line

+option.  Each time the server is about to accept the first connection

+after a reset (or when the server is starting), it reads this file.

+If this file contains any authorization records, the local host is not

+automatically allowed access to the server, and only clients which

+send one of the authorization records contained in the file in the

+connection setup information will be allowed access.  See the

+\fIXau\fP manual page for a description of the binary format of this

+file.  See \fIxauth\fP(1) for maintenance of this file, and distribution

+of its contents to remote hosts.

+.PP

+The X server also uses a host-based access control list for deciding

+whether or not to accept connections from clients on a particular machine.

+If no other authorization mechanism is being used,

+this list initially consists of the host on which the server is running as

+well as any machines listed in the file \fI/etc/X\fBn\fI.hosts\fR, where

+\fBn\fP is the display number of the server.  Each line of the file should

+contain either an Internet hostname (e.g. expo.lcs.mit.edu) or a DECnet

+hostname in double colon format (e.g. hydra::) or a complete name in the format

+\fIfamily\fP:\fIname\fP as described in the \fIxhost\fP(1) manual page.

+There should be no leading or trailing spaces on any lines.  For example:

+.sp

+.in +8

+.nf

+joesworkstation

+corporate.company.com

+star::

+inet:bigcpu

+local:

+.fi

+.in -8

+.PP

+Users can add or remove hosts from this list and enable or disable access

+control using the \fIxhost\fP command from the same machine as the server.

+.PP

+If the X FireWall Proxy (\fIxfwp\fP) is being used without a sitepolicy,

+host-based authorization must be turned on for clients to be able to

+connect to the X server via the \fIxfwp\fP.  If \fIxfwp\fP is run without

+a configuration file and thus no sitepolicy is defined, if \fIxfwp\fP

+is using an X server where xhost + has been run to turn off host-based

+authorization checks, when a client tries to connect to this X server

+via \fIxfwp\fP, the X server will deny the connection.  See \fIxfwp\fP(1)

+for more information about this proxy.

+.PP

+The X protocol intrinsically does not have any notion of window operation

+permissions or place any restrictions on what a client can do; if a program can

+connect to a display, it has full run of the screen.

+X servers that support the SECURITY extension fare better because clients

+can be designated untrusted via the authorization they use to connect; see

+the \fIxauth\fP(1) manual page for details.  Restrictions are imposed

+on untrusted clients that curtail the mischief they can do.  See the SECURITY

+extension specification for a complete list of these restrictions.

+.PP

+Sites that have better

+authentication and authorization systems might wish to make

+use of the hooks in the libraries and the server to provide additional

+security models.

+.SH SIGNALS

+The X server attaches special meaning to the following signals:

+.TP 8

+.I SIGHUP

+This signal causes the server to close all existing connections, free all

+resources, and restore all defaults.  It is sent by the display manager

+whenever the main user's main application (usually an \fIxterm\fP or window

+manager) exits to force the server to clean up and prepare for the next

+user.

+.TP 8

+.I SIGTERM

+This signal causes the server to exit cleanly.

+.TP 8

+.I SIGUSR1

+This signal is used quite differently from either of the above.  When the

+server starts, it checks to see if it has inherited SIGUSR1 as SIG_IGN

+instead of the usual SIG_DFL.  In this case, the server sends a SIGUSR1 to

+its parent process after it has set up the various connection schemes.

+\fIXdm\fP uses this feature to recognize when connecting to the server

+is possible.

+.SH FONTS

+The X server can obtain fonts from directories and/or from font servers.

+The list of directories and font servers

+the X server uses when trying to open a font is controlled

+by the \fIfont path\fP.

+.LP

+The default font path is

+__default_font_path__ .

+.LP

+A special kind of directory can be specified using the \fBcatalogue\fP:

+prefix. Directories specified this way can contain symlinks pointing to the

+real font directories. See the FONTPATH.D section for details.

+.LP

+The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)

+after the server has started.

+.SH "FONTPATH.D"

+You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.

+The directory specified after the catalogue: prefix will be scanned for symlinks

+and each symlink destination will be added as a local fontfile FPE.

+.PP

+The symlink can be suffixed by attributes such as '\fBunscaled\fR', which

+will be passed through to the underlying fontfile FPE. The only exception is

+the newly introduced '\fBpri\fR' attribute, which will be used for ordering

+the font paths specified by the symlinks.

+

+An example configuration:

+

+.nf

+    75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi

+    ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript

+    misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc

+    type1:pri=40 \-> /usr/share/X11/fonts/Type1

+    type1:pri=50 \-> /usr/share/fonts/default/Type1

+.fi

+

+This will add /usr/share/X11/fonts/misc as the first FPE with the attribute

+'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with

+the attribute unscaled etc. This is functionally equivalent to setting

+the following font path:

+

+.nf

+    /usr/share/X11/fonts/misc:unscaled,

+    /usr/share/X11/fonts/75dpi:unscaled,

+    /usr/share/X11/fonts/Type1,

+    /usr/share/fonts/default/Type1,

+    /usr/share/fonts/default/ghostscript

+.fi

+

+.SH FILES

+.TP 30

+.I /etc/X\fBn\fP.hosts

+Initial access control list for display number \fBn\fP

+.TP 30

+.IR __datadir__/fonts/X11/misc , __datadir__/fonts/X11/75dpi , __datadir__/fonts/X11/100dpi

+Bitmap font directories

+.TP 30

+.IR __datadir__/fonts/X11/TTF , __datadir__/fonts/X11/Type1

+Outline font directories

+.TP 30

+.I /tmp/.X11-unix/X\fBn\fP

+Unix domain socket for display number \fBn\fP

+.TP 30

+.I /usr/adm/X\fBn\fPmsgs

+Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)

+.TP 30

+.I __projectroot__/lib/X11/xdm/xdm-errors

+Default error log file if the server is run from \fIxdm\fP(1)

+.SH "SEE ALSO"

+General information: \fIX\fP(__miscmansuffix__)

+.PP

+Protocols:

+.I "X Window System Protocol,"

+.I "The X Font Service Protocol,"

+.I "X Display Manager Control Protocol"

+.PP

+Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),

+\fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1),

+.I "X Logical Font Description Conventions"

+.PP

+Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),

+\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),

+.I "Security Extension Specification"

+.PP

+Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)

+.PP

+Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),

+\fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1)

+.PP

+Server-specific man pages:

+\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),

+\fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).

+.PP

+Server internal documentation:

+.I "Definition of the Porting Layer for the X v11 Sample Server"

+.SH AUTHORS

+The sample server was originally written by Susan Angebranndt, Raymond

+Drewry, Philip Karlton, and Todd Newman, from Digital Equipment

+Corporation, with support from a large cast.  It has since been

+extensively rewritten by Keith Packard and Bob Scheifler, from MIT.

+Dave Wiggins took over post-R5 and made substantial improvements.

diff --git a/xorg-server/doc/xml/Xserver-spec.xml b/xorg-server/doc/xml/Xserver-spec.xml
index 6b8917042..c31a8c4e2 100644
--- a/xorg-server/doc/xml/Xserver-spec.xml
+++ b/xorg-server/doc/xml/Xserver-spec.xml
@@ -442,18 +442,29 @@ and type; if skipFree is true, then the deleteFunc is not called.
 To look up a resource, use one of the following.

 <blockquote><programlisting>

 

-	pointer LookupIDByType(id, rtype)

-	    XID id;

-	    RESTYPE rtype;

-

-	pointer LookupIDByClass(id, classes)

-	    XID id;

-	    RESTYPE classes;

-

-</programlisting></blockquote>

-LookupIDByType finds a resource with the given id and exact type.

-LookupIDByClass finds a resource with the given id whose type is

-included in any one of the specified classes.</para>

+	int dixLookupResourceByType(

+	    pointer *result,

+	    XID id,

+	    RESTYPE rtype,

+	    ClientPtr client,

+	    Mask access_mode);

+

+	int dixLookupResourceByClass(

+	    pointer *result,

+	    XID id,

+	    RESTYPE rclass,

+	    ClientPtr client,

+	    Mask access_mode);

+

+</programlisting></blockquote>

+dixLookupResourceByType finds a resource with the given id and exact type.

+dixLookupResourceByClass finds a resource with the given id whose type is

+included in any one of the specified classes.

+The client and access_mode must be provided to allow security extensions to

+check if the client has the right privileges for the requested access.

+The bitmask values defined in the dixaccess.h header are or'ed together

+to define the requested access_mode.

+</para>

 </section>

 </section>

 <section>

@@ -469,7 +480,7 @@ these operations.</para>
 Before getting bogged down in the interface details, an typical usage

 example should establish the framework.  Let's look at the

 ClientStateCallback in dix/dispatch.c.  The purpose of this particular

-callback is to notify intereseted parties when a client's state

+callback is to notify interested parties when a client's state

 (initial, running, gone) changes.  The callback is "created" in this

 case by simply declaring a variable:

 <blockquote><programlisting>

@@ -478,7 +489,7 @@ case by simply declaring a variable:
 </para>

 <para>

 Whenever the client's state changes, the following code appears, which notifies

-all intereseted parties of the change:

+all interested parties of the change:

 <blockquote><programlisting>

 	if (ClientStateCallback) CallCallbacks(&amp;ClientStateCallback, (pointer)client);

 </programlisting></blockquote>

@@ -499,24 +510,6 @@ When CallCallbacks is invoked on the list, func will be called thusly:
 Now for the details.

 <blockquote><programlisting>

 

-	Bool CreateCallbackList(pcbl, cbfuncs)

-	    CallbackListPtr  *pcbl;

-	    CallbackFuncsPtr cbfuncs;

-

-</programlisting></blockquote>

-CreateCallbackList creates a callback list.  We envision that this

-function will be rarely used because the callback list is created

-automatically (if it doesn't already exist) when the first call to

-AddCallback is made on the list.  The only reason to explicitly create

-the callback list with this function is if you want to override the

-implementation of some of the other operations on the list by passing

-your own cbfuncs.  You also lose something by explicit creation: you

-introduce an order dependency during server startup because the list

-must be created before any modules subscribe to it.  Returns TRUE if

-successful.</para>

-<para>

-<blockquote><programlisting>

-

 	Bool AddCallback(pcbl, callback, subscriber_data)

 	    CallbackListPtr *pcbl;

 	    CallbackProcPtr callback;

@@ -595,8 +588,9 @@ used here which takes the minor opcode from the normal place in the request
 There are a number of macros in Xserver/include/dix.h which

 are useful to the extension writer.  Ones of particular interest

 are: REQUEST, REQUEST_SIZE_MATCH, REQUEST_AT_LEAST_SIZE,

-REQUEST_FIXED_SIZE, LEGAL_NEW_RESOURCE, LOOKUP_DRAWABLE, VERIFY_GC, and

+REQUEST_FIXED_SIZE, LEGAL_NEW_RESOURCE, and

 VALIDATE_DRAWABLE_AND_GC. Useful byte swapping macros can be found

+in Xserver/include/dix.h: WriteReplyToClient and WriteSwappedDataToClient; and

 in Xserver/include/misc.h: lswapl, lswaps, LengthRestB, LengthRestS,

 LengthRestL, SwapRestS, SwapRestL, swapl, swaps, cpswapl, and cpswaps.</para>

 </section>

@@ -765,7 +759,7 @@ These registered block handlers are called after the per-screen handlers:
 <programlisting>

 	void (*BlockHandler) (blockData, pptv, pReadmask)

 		pointer	blockData;

-		OSTimePtr pptv;

+		OsTimerPtr pptv;

 		pointer	pReadmask;

 </programlisting>

 </blockquote>

@@ -776,7 +770,7 @@ which on UNIX family systems is generally represented by a struct timeval
 consisting of seconds and microseconds in 32 bit values.

 As a convenience to reduce error prone struct timeval computations which

 require modulus arithmetic and correct overflow behavior in the face of

-millisecond wrapping throrugh 32 bits,

+millisecond wrapping through 32 bits,

 <blockquote><programlisting>

 

 	void AdjustWaitForDelay(pointer /*waitTime*, unsigned long /* newdelay */)

@@ -881,7 +875,7 @@ and RemoveEnabledDevice are in Xserver/os/connection.c.
 Similarly, the X server or an extension may need to wait for some timeout.

 Early X releases implemented this functionality using block and wakeup handlers,

 but this has been rewritten to use a general timer facilty, and the

-internal screen saver facilties reimplemented to use Timers.

+internal screen saver facilities reimplemented to use Timers.

 These functions are TimerInit, TimerForce, TimerSet, TimerCheck, TimerCancel,

 and TimerFree, as defined in Xserver/include/os.h. A callback function will be called

 when the timer fires, along with the current time, and a user provided argument.

@@ -919,11 +913,11 @@ for the timer entry.
 

 	void TimerCancel(OsTimerPtr /* pTimer */)

 

-	void TimerFree(OSTimerPtr /* pTimer */)

+	void TimerFree(OsTimerPtr /* pTimer */)

 </programlisting></blockquote>

 </para>

 <para>

-TimerInit frees any exisiting timer entries. TimerForce forces a call to the timer's

+TimerInit frees any existing timer entries. TimerForce forces a call to the timer's

 callback function and returns true if the timer entry existed, else it returns false and

 does not call the callback function. TimerCancel will cancel the specified timer.

 TimerFree calls TimerCancel and frees the specified timer.

@@ -1188,7 +1182,8 @@ are requests in that client's input queue.
   <title>Font Support</title>

 <para>

 In the sample server, fonts are encoded in disk files or fetched from the

-font server.

+font server.   The two fonts required by the server, <quote>fixed</quote>

+and <quote>cursor</quote> are commonly compiled into the font library.

 For disk fonts, there is one file per font, with a file name like

 "fixed.pcf".  Font server fonts are read over the network using the

 X Font Server Protocol.  The disk directories containing disk fonts and

@@ -1202,9 +1197,10 @@ appropriate code in the Font Library, you will automatically export fonts in
 that format both through the X server and the Font server.

 </para>

 <para>

-With the incorporation of font-server based fonts and the Speedo donation

-from Bitstream, the font interfaces have been moved into a separate

-library, now called the Font Library (../fonts/lib).  These routines are

+The code for processing fonts in different formats, as well as handling the

+metadata files for them on disk (such as <filename>fonts.dir</filename>) is

+located in the libXfont library, which is provided as a separately compiled

+module.  These routines are

 shared between the X server and the Font server, so instead of this document

 specifying what you must implement, simply refer to the font

 library interface specification for the details.  All of the interface code to the Font

@@ -1215,20 +1211,12 @@ library is contained in dix/dixfonts.c
   <title>Memory Management</title>

 <para>

 Memory management is based on functions in the C runtime library.

-Xalloc(), Xrealloc(), and Xfree() work just like malloc(), realloc(),

-and free(), except that you can pass a null pointer to Xrealloc() to

-have it allocate anew or pass a null pointer to Xfree() and nothing

-will happen.  The versions in the sample server also do some checking

-that is useful for debugging.  Consult a C runtime library reference

+Xalloc(), Xrealloc(), and Xfree() are deprecated aliases for malloc(),

+realloc(), and free(), and you should simply call the C library functions

+directly.  Consult a C runtime library reference

 manual for more details.

 </para>

 <para>

-The macros ALLOCATE_LOCAL and DEALLOCATE_LOCAL are provided in

-Xserver/include/os.h.  These are useful if your compiler supports

-alloca() (or some method of allocating memory from the stack); and are

-defined appropriately on systems which support it.

-</para>

-<para>

 Treat memory allocation carefully in your implementation.  Memory

 leaks can be very hard to find and are frustrating to a user.  An X

 server could be running for days or weeks without being reset, just

@@ -1358,7 +1346,7 @@ terminate the server; it must not return.
 </para>

 <para>

 The sample server implementation for these routines

-is in Xserver/os/util.c.

+is in Xserver/os/log.c along with other routines for logging messages.

 </para>

 </section>

 </section>

@@ -1821,7 +1809,7 @@ printed on each keycap. (See X11/keysym.h)
 <para>

 Legal modifier keys must generate both up and down transitions.  When

 a client tries to change a modifier key (for instance, to make "A" the

-"Control" key), DIX calls the following routine, which should retuurn

+"Control" key), DIX calls the following routine, which should return

 TRUE if the key can be used as a modifier on the given device:

 <blockquote><programlisting>

 

@@ -2722,7 +2710,7 @@ Xserver/dix/colormap.c.)</para>
 

 

 </programlisting></blockquote>

-ListInstalledColormaps fills the pCMapList in with the resource ids

+ListInstalledColormaps fills the pCmapList in with the resource ids

 of the installed maps and returns a count of installed maps.

 pCmapList will point to an array of size MaxInstalledMaps that was allocated

 by the caller.</para>

@@ -3620,7 +3608,7 @@ this screen function.  The new border width is given by width.</para>
 </programlisting></blockquote>

 This function is called for windows that are being unrealized as part of

 an UnrealizeTree.  pChild is the window being unrealized, pWin is an

-ancestor, and the fromConfigure value is simply propogated from UnrealizeTree.</para>

+ancestor, and the fromConfigure value is simply propagated from UnrealizeTree.</para>

 </section>

 </section>

 </section>

@@ -5025,7 +5013,7 @@ mi and fb implementations.</para>
 <row><entry><function>ListInstalledColormaps</function></entry><entry><literal>ddx</literal></entry><entry><para>Screen</para></entry></row>

 <row><entry><function>LookupKeyboardDevice</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>

 <row><entry><function>LookupPointerDevice</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>

-<row><entry><function>ModifyPixmapheader</function></entry><entry><literal>mi</literal></entry><entry><para>Screen</para></entry></row>

+<row><entry><function>ModifyPixmapHeader</function></entry><entry><literal>mi</literal></entry><entry><para>Screen</para></entry></row>

 <row><entry><function>NextAvailableClient</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>

 <row><entry><function>OsInit</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>

 <row><entry><function>PaintWindowBackground</function></entry><entry><literal>mi</literal></entry><entry><para>Window</para></entry></row>

diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
index a00340191..14b266d38 100644
--- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c
+++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -282,21 +282,31 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
 static Bool

 copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)

 {

+    confScreenPtr nscreen;

     GDevPtr cptr = NULL;

 

-    xf86ConfigLayout.screens[i].screen = xnfcalloc(1, sizeof(confScreenRec));

-    if(!xf86ConfigLayout.screens[i].screen)

+    nscreen = malloc(sizeof(confScreenRec));

+    if (!nscreen)

         return FALSE;

-    memcpy(xf86ConfigLayout.screens[i].screen, oscreen, sizeof(confScreenRec));

+    memcpy(nscreen, oscreen, sizeof(confScreenRec));

 

-    cptr = calloc(1, sizeof(GDevRec));

-    if (!cptr)

+    cptr = malloc(sizeof(GDevRec));

+    if (!cptr) {

+        free(nscreen);

         return FALSE;

+    }

     memcpy(cptr, odev, sizeof(GDevRec));

 

     cptr->identifier = Xprintf("Autoconfigured Video Device %s", driver);

+    if (!cptr->identifier) {

+        free(cptr);

+        free(nscreen);

+        return FALSE;

+    }

     cptr->driver = driver;

 

+    xf86ConfigLayout.screens[i].screen = nscreen;

+

     /* now associate the new driver entry with the new screen entry */

     xf86ConfigLayout.screens[i].screen->device = cptr;

     cptr->myScreenSection = xf86ConfigLayout.screens[i].screen;

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index c0cba2994..c439221f9 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -1458,14 +1458,15 @@ configInputDevices(XF86ConfLayoutPtr layout, serverLayoutPtr servlayoutp)
     irp = layout->lay_input_lst;

     count = 0;

     while (irp) {

-	indp[count] = xnfalloc(sizeof(InputInfoRec));

+	indp[count] = xf86AllocateInput();

 	if (!configInput(indp[count], irp->iref_inputdev, X_CONFIG)) {

 	    while(count--)

 		free(indp[count]);

 	    free(indp);

 	    return FALSE;

 	}

-	indp[count]->options = irp->iref_option_lst;

+	indp[count]->options = xf86OptionListMerge(indp[count]->options,

+						   irp->iref_option_lst);

 	count++;

 	irp = (XF86ConfInputrefPtr)irp->list.next;

     }

diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index abb198690..9b6daaf41 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -1038,7 +1038,12 @@ xf86SetRootClip (ScreenPtr pScreen, Bool enable)
 	RegionInit(&pWin->winSize, &box, 1);

 	RegionInit(&pWin->borderSize, &box, 1);

 	if (WasViewable)

+	{

+	    PixmapPtr	pPixmap = (*pScreen->GetScreenPixmap) (pScreen);

+	    box.x2 = pPixmap->drawable.width;

+	    box.y2 = pPixmap->drawable.height;

 	    RegionReset(&pWin->borderClip, &box);

+	}

 	pWin->drawable.width = pScreen->width;

 	pWin->drawable.height = pScreen->height;

         RegionBreak(&pWin->clipList);

@@ -1116,7 +1121,6 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
 	 */

 	if (!xf86Resetting)

 	    xf86SetRootClip (pScreen, TRUE);

-

     }

     else

     {

@@ -1190,7 +1194,7 @@ xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *forma
     char *msg;

 

     msg = Xprintf("%s: %s: %s", dev->drv->driverName, dev->name, format);

-    LogVMessageVerb(type, verb, "%s", msg);

+    LogVMessageVerb(type, verb, msg, args);

     free(msg);

 }

 

diff --git a/xorg-server/hw/xfree86/common/xf86Mode.c b/xorg-server/hw/xfree86/common/xf86Mode.c
index 2ba5ea990..df0884794 100644
--- a/xorg-server/hw/xfree86/common/xf86Mode.c
+++ b/xorg-server/hw/xfree86/common/xf86Mode.c
@@ -1643,8 +1643,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 	    new = xnfcalloc(1, sizeof(DisplayModeRec));

 	    new->prev = last;

 	    new->type = M_T_USERDEF;

-	    new->name = xnfalloc(strlen(modeNames[i]) + 1);

-	    strcpy(new->name, modeNames[i]);

+	    new->name = xnfstrdup(modeNames[i]);

 	    if (new->prev)

 		new->prev->next = new;

 	    *endp = last = new;

@@ -1716,10 +1715,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 

 	    p = xnfcalloc(1, sizeof(DisplayModeRec));

 	    p->prev = last;

-	    p->name = xnfalloc(strlen(r->name) + 1);

+	    p->name = xnfstrdup(r->name);

 	    if (!userModes)

 		p->type = M_T_USERDEF;

-	    strcpy(p->name, r->name);

 	    if (p->prev)

 		p->prev->next = p;

 	    *endp = last = p;

diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 9335e116f..fb6f9673d 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)

 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)

 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 0)

-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(4, 0)

+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)

 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)

 

 #define MODINFOSTRING1	0xef23fdc5

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 3a48fe9c3..dad993ec1 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -280,7 +280,8 @@ void
 xf86ProcessCommonOptions(InputInfoPtr pInfo,

                          pointer	list)

 {

-    if (!xf86SetBoolOption(list, "AlwaysCore", 1) ||

+    if (xf86SetBoolOption(list, "Floating", 0) ||

+        !xf86SetBoolOption(list, "AlwaysCore", 1) ||

         !xf86SetBoolOption(list, "SendCoreEvents", 1) ||

         !xf86SetBoolOption(list, "CorePointer", 1) ||

         !xf86SetBoolOption(list, "CoreKeyboard", 1)) {

@@ -652,7 +653,7 @@ IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs)
     return ignore;

 }

 

-static InputInfoPtr

+InputInfoPtr

 xf86AllocateInput(void)

 {

     InputInfoPtr pInfo;

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index 15ab82421..84683168c 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -155,6 +155,7 @@ extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);

 /* not exported */

 int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);

+InputInfoPtr xf86AllocateInput(void);

 

 /* xf86Helper.c */

 extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);

diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.c b/xorg-server/hw/xfree86/common/xf86pciBus.c
index b5e8790b6..aef7d277a 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.c
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.c
@@ -1167,6 +1167,7 @@ videoPtrToDriverList(struct pci_device *dev,
     return i;	/* Number of entries added */

 }

 

+#ifdef __linux__

 static int

 xchomp(char *line)

 {

@@ -1183,7 +1184,6 @@ xchomp(char *line)
     return 0;

 }

 

-#ifdef __linux__

 /* This function is used to provide a workaround for binary drivers that

  * don't export their PCI ID's properly. If distros don't end up using this

  * feature it can and should be removed because the symbol-based resolution

diff --git a/xorg-server/hw/xfree86/doc/devel/Registry b/xorg-server/hw/xfree86/doc/devel/Registry
index 613b50c7b..89a5f10fa 100644
--- a/xorg-server/hw/xfree86/doc/devel/Registry
+++ b/xorg-server/hw/xfree86/doc/devel/Registry
@@ -243,6 +243,7 @@ DemandLoad                O     I    ??
 Device                    S     I    Device file name

 DeviceName                S     I    Input device name

 FlowControl               S     I    Serial flow control ("xon", "none")

+Floating                  B     I    Device initialised as floating

 HistorySize               I     I    ??

 MaxX                      I     I    Maximum X coordinate

 MaxY                      I     I    Maximum Y coordinate

diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
index 6547d38aa..2267a0a1a 100644
--- a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -904,30 +904,42 @@ the server. This affects implied layouts as well as explicit layouts
 specified in the configuration and/or on the command line.

 .TP 7

 .BI "Option \*qCorePointer\*q"

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qCoreKeyboard\*q"

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qAlwaysCore\*q  \*q" boolean \*q

-.B

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qSendCoreEvents\*q  \*q" boolean \*q

-Both of these options are equivalent, and when enabled cause the

-input device to report core events through the master device. They are

-enabled by default.  Any device configured to send core events will be

-attached to the virtual core pointer or keyboard and control the cursor by

-default. Devices with

-.B SendCoreEvents

-disabled will be \*qfloating\*q and only accessible by clients employing the

-X Input extension. This option controls the startup behavior only, a device

+Deprecated, see

+.B Floating

+

+.TP 7

+.BI "Option \*qFloating\*q  \*q" boolean \*q

+When enabled, the input device is set up floating and does not

+report events through any master device or control a cursor. The device is

+only available to clients using the X Input Extension API. This option is

+disabled by default.

+The options

+.B CorePointer,

+.B CoreKeyboard,

+.B AlwaysCore,

+and

+.B SendCoreEvents,

+are the inverse of option

+.B Floating

+(i.e.

+.B SendCoreEvents \*qon\*q

+is equivalent to

+.B Floating \*qoff\*q

+).

+

+This option controls the startup behavior only, a device

 may be reattached or set floating at runtime.

 .PP

 For pointing devices, the following options control how the pointer

diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 395cdf104..6fcb06df2 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -406,21 +406,21 @@ FindModuleInSubdir(const char *dirpath, const char *module)
  

         snprintf(tmpBuf, PATH_MAX, "lib%s.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

 

         snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

 

         snprintf(tmpBuf, PATH_MAX, "%s.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

diff --git a/xorg-server/hw/xfree86/loader/sdksyms.sh b/xorg-server/hw/xfree86/loader/sdksyms.sh
index e9f8eda78..d69ae769e 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.sh
+++ b/xorg-server/hw/xfree86/loader/sdksyms.sh
@@ -41,6 +41,9 @@ cat > sdksyms.c << EOF
 #include "damage.h"

 #include "damagestr.h"

 

+/* miext/sync/Makefile.am */

+#include "misync.h"

+#include "misyncstr.h"

 

 /* Xext/Makefile.am -- half is module, half is builtin */

 /*

@@ -50,6 +53,7 @@ cat > sdksyms.c << EOF
 #include "geext.h"

 #include "geint.h"

 #include "shmint.h"

+#include "syncsdk.h"

 #if XINERAMA

 # include "panoramiXsrv.h"

 # include "panoramiX.h"

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index 77f7375b1..99658e0ca 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -82,6 +82,17 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
     config->maxHeight = maxHeight;

 }

 

+void

+xf86CrtcSetScanoutFormats(ScrnInfoPtr		scrn,

+			  int			num_formats,

+			  xf86CrtcScanoutFormat	*formats)

+{

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+

+    config->num_scanout_formats = num_formats;

+    config->scanout_formats = formats;

+}

+

 /*

  * Crtc functions

  */

@@ -106,12 +117,17 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
     pixman_transform_init_identity (&crtc->crtc_to_framebuffer);

     pixman_f_transform_init_identity (&crtc->f_crtc_to_framebuffer);

     pixman_f_transform_init_identity (&crtc->f_framebuffer_to_crtc);

+    pixman_f_transform_init_identity (&crtc->f_screen_to_crtc);

+    pixman_f_transform_init_identity (&crtc->user_sprite_position_transform);

+    pixman_f_transform_init_identity (&crtc->f_crtc_to_cursor);

+    pixman_f_transform_init_identity (&crtc->user_sprite_image_transform);

     crtc->filter = NULL;

     crtc->params = NULL;

     crtc->nparams = 0;

     crtc->filter_width = 0;

     crtc->filter_height = 0;

     crtc->transform_in_use = FALSE;

+    crtc->sprite_transform_in_use = FALSE;

     crtc->transformPresent = FALSE;

     crtc->desiredTransformPresent = FALSE;

     memset (&crtc->bounds, '\0', sizeof (crtc->bounds));

@@ -247,20 +263,20 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
  * Sets the given video mode on the given crtc

  */

 Bool

-xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,

-			  RRTransformPtr transform, int x, int y)

+xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set)

 {

     ScrnInfoPtr		scrn = crtc->scrn;

     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

     int			i;

     Bool		ret = FALSE;

     Bool		didLock = FALSE;

-    DisplayModePtr	adjusted_mode;

+    DisplayModePtr	adjusted_mode = NULL;

     DisplayModeRec	saved_mode;

     int			saved_x, saved_y;

     Rotation		saved_rotation;

     RRTransformRec	saved_transform;

     Bool		saved_transform_present;

+    PixmapPtr		saved_scanout_pixmap;

 

     crtc->enabled = xf86CrtcInUse (crtc);

 

@@ -272,13 +288,15 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
 	return TRUE;

     }

 

-    adjusted_mode = xf86DuplicateMode(mode);

-

+    /* See if nothing has changed */

+    if (!set->flags)

+	return TRUE;

 

     saved_mode = crtc->mode;

     saved_x = crtc->x;

     saved_y = crtc->y;

     saved_rotation = crtc->rotation;

+    saved_scanout_pixmap = crtc->scanoutPixmap;

     if (crtc->transformPresent) {

 	RRTransformInit (&saved_transform);

 	RRTransformCopy (&saved_transform, &crtc->transform);

@@ -288,21 +306,46 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
     /* Update crtc values up front so the driver can rely on them for mode

      * setting.

      */

-    crtc->mode = *mode;

-    crtc->x = x;

-    crtc->y = y;

-    crtc->rotation = rotation;

-    if (transform) {

-	RRTransformCopy (&crtc->transform, transform);

-	crtc->transformPresent = TRUE;

-    } else

-	crtc->transformPresent = FALSE;

+    if (set->flags & XF86CrtcSetMode)

+	crtc->mode = *set->mode;

+    if (set->flags & XF86CrtcSetOrigin) {

+	crtc->x = set->x;

+	crtc->y = set->y;

+    }

+    if (set->flags & XF86CrtcSetRotation)

+	crtc->rotation = set->rotation;

+    if (set->flags & XF86CrtcSetScanoutPixmap)

+	crtc->scanoutPixmap = set->scanout_pixmap;

+

+    if (set->flags & XF86CrtcSetTransform) {

+	if (set->transform) {

+	    RRTransformCopy (&crtc->transform, set->transform);

+	    crtc->transformPresent = TRUE;

+	} else

+	    crtc->transformPresent = FALSE;

+    }

+

+    if (crtc->funcs->set) {

+	ret = crtc->funcs->set(crtc, set->flags);

+	goto done;

+    }

+

+    if (set->flags == XF86CrtcSetOrigin && crtc->funcs->set_origin) {

+	ret = xf86CrtcRotate(crtc);

+	if (ret)

+	    crtc->funcs->set_origin(crtc, crtc->x, crtc->y);

+	goto done;

+    }

 

     if (crtc->funcs->set_mode_major) {

-	ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);

+	ret = crtc->funcs->set_mode_major(crtc, &crtc->mode,

+					  crtc->rotation,

+					  crtc->x, crtc->y);

 	goto done;

     }

 

+    adjusted_mode = xf86DuplicateMode(&crtc->mode);

+

     didLock = crtc->funcs->lock (crtc);

     /* Pass our mode to the outputs and the CRTC to give them a chance to

      * adjust it according to limitations or output properties, and also

@@ -314,12 +357,12 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
 	if (output->crtc != crtc)

 	    continue;

 

-	if (!output->funcs->mode_fixup(output, mode, adjusted_mode)) {

+	if (!output->funcs->mode_fixup(output, &crtc->mode, adjusted_mode)) {

 	    goto done;

 	}

     }

 

-    if (!crtc->funcs->mode_fixup(crtc, mode, adjusted_mode)) {

+    if (!crtc->funcs->mode_fixup(crtc, &crtc->mode, adjusted_mode)) {

 	goto done;

     }

 

@@ -342,12 +385,12 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
     /* Set up the DPLL and any output state that needs to adjust or depend

      * on the DPLL.

      */

-    crtc->funcs->mode_set(crtc, mode, adjusted_mode, crtc->x, crtc->y);

+    crtc->funcs->mode_set(crtc, &crtc->mode, adjusted_mode, crtc->x, crtc->y);

     for (i = 0; i < xf86_config->num_output; i++) 

     {

 	xf86OutputPtr output = xf86_config->output[i];

 	if (output->crtc == crtc)

-	    output->funcs->mode_set(output, mode, adjusted_mode);

+	    output->funcs->mode_set(output, &crtc->mode, adjusted_mode);

     }

 

     /* Only upload when needed, to avoid unneeded delays. */

@@ -381,10 +424,13 @@ done:
 	if (saved_transform_present)

 	    RRTransformCopy (&crtc->transform, &saved_transform);

 	crtc->transformPresent = saved_transform_present;

+	crtc->scanoutPixmap = saved_scanout_pixmap;

     }

 

-    free(adjusted_mode->name);

-    free(adjusted_mode);

+    if (adjusted_mode) {

+	free(adjusted_mode->name);

+	free(adjusted_mode);

+    }

 

     if (didLock)

 	crtc->funcs->unlock (crtc);

@@ -393,35 +439,19 @@ done:
 }

 

 /**

- * Sets the given video mode on the given crtc, but without providing

- * a transform

- */

-Bool

-xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,

-		 int x, int y)

-{

-    return xf86CrtcSetModeTransform (crtc, mode, rotation, NULL, x, y);

-}

-

-/**

  * Pans the screen, does not change the mode

  */

 void

 xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)

 {

-    ScrnInfoPtr scrn = crtc->scrn;

+    xf86CrtcSetRec	set;

 

-    crtc->x = x;

-    crtc->y = y;

-    if (crtc->funcs->set_origin) {

-	if (!xf86CrtcRotate (crtc))

-	    return;

-	crtc->funcs->set_origin (crtc, x, y);

-	if (scrn->ModeSet)

-	    scrn->ModeSet(scrn);

+    if (x != crtc->x || y != crtc->y) {

+	set.x = x;

+	set.y = y;

+	set.flags = XF86CrtcSetOrigin;

+	(void) xf86CrtcSet(crtc, &set);

     }

-    else

-	xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);

 }

 

 /*

@@ -666,13 +696,11 @@ xf86OutputCreate (ScrnInfoPtr		    scrn,
 Bool

 xf86OutputRename (xf86OutputPtr output, const char *name)

 {

-    int	    len = strlen(name) + 1;

-    char    *newname = malloc(len);

+    char    *newname = strdup(name);

     

     if (!newname)

 	return FALSE;	/* so sorry... */

     

-    strcpy (newname, name);

     if (output->name && output->name != (char *) (output + 1))

 	free(output->name);

     output->name = newname;

@@ -2619,6 +2647,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
     for (c = 0; c < config->num_crtc; c++)

     {

 	xf86OutputPtr	output = NULL;

+	xf86CrtcSetRec	set;

 	int		o;

 	RRTransformPtr	transform;

 

@@ -2662,8 +2691,15 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
 	    transform = &crtc->desiredTransform;

 	else

 	    transform = NULL;

-	if (!xf86CrtcSetModeTransform (crtc, &crtc->desiredMode, crtc->desiredRotation,

-				       transform, crtc->desiredX, crtc->desiredY))

+	set.mode = &crtc->desiredMode;

+	set.rotation = crtc->desiredRotation;

+	set.transform = transform;

+	set.x = crtc->desiredX;

+	set.y = crtc->desiredY;

+	set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |

+		     XF86CrtcSetOrigin | XF86CrtcSetTransform |

+		     XF86CrtcSetRotation);

+	if (!xf86CrtcSet(crtc, &set))

 	    return FALSE;

     }

 

@@ -2767,6 +2803,7 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 	xf86CrtcPtr	crtc = config->crtc[c];

 	DisplayModePtr	crtc_mode = NULL;

 	int		o;

+	xf86CrtcSetRec	set;

 

 	if (!crtc->enabled)

 	    continue;

@@ -2794,7 +2831,15 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 	    crtc->enabled = FALSE;

 	    continue;

 	}

-	if (!xf86CrtcSetModeTransform (crtc, crtc_mode, rotation, NULL, 0, 0))

+	set.mode = crtc_mode;

+	set.rotation = rotation;

+	set.transform = NULL;

+	set.x = 0;

+	set.y = 0;

+	set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |

+		     XF86CrtcSetOrigin | XF86CrtcSetTransform |

+		     XF86CrtcSetRotation);

+	if (!xf86CrtcSet (crtc, &set))

 	    ok = FALSE;

 	else

 	{

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.h b/xorg-server/hw/xfree86/modes/xf86Crtc.h
index 68a968cc2..e4037142f 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.h
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -1,972 +1,1075 @@
-/*
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-#ifndef _XF86CRTC_H_
-#define _XF86CRTC_H_
-
-#include <edid.h>
-#include "randrstr.h"
-#if XF86_MODES_RENAME
-#include "xf86Rename.h"
-#endif
-#include "xf86Modes.h"
-#include "xf86Cursor.h"
-#include "xf86i2c.h"
-#include "damage.h"
-#include "picturestr.h"
-
-/* Compat definitions for older X Servers. */
-#ifndef M_T_PREFERRED
-#define M_T_PREFERRED	0x08
-#endif
-#ifndef M_T_DRIVER
-#define M_T_DRIVER	0x40
-#endif
-#ifndef M_T_USERPREF
-#define M_T_USERPREF	0x80
-#endif
-#ifndef HARDWARE_CURSOR_ARGB
-#define HARDWARE_CURSOR_ARGB				0x00004000
-#endif
-
-typedef struct _xf86Crtc xf86CrtcRec, *xf86CrtcPtr;
-typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;
-
-/* define a standard for connector types */
-typedef enum _xf86ConnectorType {
-   XF86ConnectorNone,
-   XF86ConnectorVGA,
-   XF86ConnectorDVI_I,
-   XF86ConnectorDVI_D,
-   XF86ConnectorDVI_A,
-   XF86ConnectorComposite,
-   XF86ConnectorSvideo,
-   XF86ConnectorComponent,
-   XF86ConnectorLFP,
-   XF86ConnectorProprietary,
-   XF86ConnectorHDMI,
-   XF86ConnectorDisplayPort,
-} xf86ConnectorType;
-
-typedef enum _xf86OutputStatus {
-   XF86OutputStatusConnected,
-   XF86OutputStatusDisconnected,
-   XF86OutputStatusUnknown
-} xf86OutputStatus;
-
-typedef struct _xf86CrtcFuncs {
-   /**
-    * Turns the crtc on/off, or sets intermediate power levels if available.
-    *
-    * Unsupported intermediate modes drop to the lower power setting.  If the
-    * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to
-    * be safe to call mode_set.
-    */
-   void
-    (*dpms)(xf86CrtcPtr		crtc,
-	    int		    	mode);
-
-   /**
-    * Saves the crtc's state for restoration on VT switch.
-    */
-   void
-    (*save)(xf86CrtcPtr		crtc);
-
-   /**
-    * Restore's the crtc's state at VT switch.
-    */
-   void
-    (*restore)(xf86CrtcPtr	crtc);
-
-    /**
-     * Lock CRTC prior to mode setting, mostly for DRI.
-     * Returns whether unlock is needed
-     */
-    Bool
-    (*lock) (xf86CrtcPtr crtc);
-    
-    /**
-     * Unlock CRTC after mode setting, mostly for DRI
-     */
-    void
-    (*unlock) (xf86CrtcPtr crtc);
-    
-    /**
-     * Callback to adjust the mode to be set in the CRTC.
-     *
-     * This allows a CRTC to adjust the clock or even the entire set of
-     * timings, which is used for panels with fixed timings or for
-     * buses with clock limitations.
-     */
-    Bool
-    (*mode_fixup)(xf86CrtcPtr crtc,
-		  DisplayModePtr mode,
-		  DisplayModePtr adjusted_mode);
-
-    /**
-     * Prepare CRTC for an upcoming mode set.
-     */
-    void
-    (*prepare)(xf86CrtcPtr crtc);
-
-    /**
-     * Callback for setting up a video mode after fixups have been made.
-     */
-    void
-    (*mode_set)(xf86CrtcPtr crtc,
-		DisplayModePtr mode,
-		DisplayModePtr adjusted_mode,
-		int x, int y);
-
-    /**
-     * Commit mode changes to a CRTC
-     */
-    void
-    (*commit)(xf86CrtcPtr crtc);
-
-    /* Set the color ramps for the CRTC to the given values. */
-    void
-    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
-		 int size);
-
-    /**
-     * Allocate the shadow area, delay the pixmap creation until needed
-     */
-    void *
-    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);
-    
-    /**
-     * Create shadow pixmap for rotation support
-     */
-    PixmapPtr
-    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);
-    
-    /**
-     * Destroy shadow pixmap
-     */
-    void
-    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);
-
-    /**
-     * Set cursor colors
-     */
-    void
-    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);
-
-    /**
-     * Set cursor position
-     */
-    void
-    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);
-
-    /**
-     * Show cursor
-     */
-    void
-    (*show_cursor) (xf86CrtcPtr crtc);
-
-    /**
-     * Hide cursor
-     */
-    void
-    (*hide_cursor) (xf86CrtcPtr crtc);
-
-    /**
-     * Load monochrome image
-     */
-    void
-    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);
-
-    /**
-     * Load ARGB image
-     */
-     void
-     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);
-     
-    /**
-     * Clean up driver-specific bits of the crtc
-     */
-    void
-    (*destroy) (xf86CrtcPtr	crtc);
-
-    /**
-     * Less fine-grained mode setting entry point for kernel modesetting
-     */
-    Bool
-    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,
-		      Rotation rotation, int x, int y);
-
-    /**
-     * Callback for panning. Doesn't change the mode.
-     * Added in ABI version 2
-     */
-    void
-    (*set_origin)(xf86CrtcPtr crtc, int x, int y);
-
-} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
-
-#define XF86_CRTC_VERSION 3
-
-struct _xf86Crtc {
-    /**
-     * ABI versioning
-     */
-    int version;
-
-    /**
-     * Associated ScrnInfo
-     */
-    ScrnInfoPtr	    scrn;
-    
-    /**
-     * Desired state of this CRTC
-     *
-     * Set when this CRTC should be driving one or more outputs 
-     */
-    Bool	    enabled;
-    
-    /**
-     * Active mode
-     *
-     * This reflects the mode as set in the CRTC currently
-     * It will be cleared when the VT is not active or
-     * during server startup
-     */
-    DisplayModeRec  mode;
-    Rotation	    rotation;
-    PixmapPtr	    rotatedPixmap;
-    void	    *rotatedData;
-    
-    /**
-     * Position on screen
-     *
-     * Locates this CRTC within the frame buffer
-     */
-    int		    x, y;
-    
-    /**
-     * Desired mode
-     *
-     * This is set to the requested mode, independent of
-     * whether the VT is active. In particular, it receives
-     * the startup configured mode and saves the active mode
-     * on VT switch.
-     */
-    DisplayModeRec  desiredMode;
-    Rotation	    desiredRotation;
-    int		    desiredX, desiredY;
-    
-    /** crtc-specific functions */
-    const xf86CrtcFuncsRec *funcs;
-
-    /**
-     * Driver private
-     *
-     * Holds driver-private information
-     */
-    void	    *driver_private;
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * RandR crtc
-     *
-     * When RandR 1.2 is available, this
-     * points at the associated crtc object
-     */
-    RRCrtcPtr	    randr_crtc;
-#else
-    void	    *randr_crtc;
-#endif
-
-    /**
-     * Current cursor is ARGB
-     */
-    Bool	    cursor_argb;
-    /**
-     * Track whether cursor is within CRTC range 
-     */
-    Bool	    cursor_in_range;
-    /**
-     * Track state of cursor associated with this CRTC
-     */
-    Bool	    cursor_shown;
-
-    /**
-     * Current transformation matrix
-     */
-    PictTransform   crtc_to_framebuffer;
-    /* framebuffer_to_crtc was removed in ABI 2 */
-    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */
-    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */
-    PictFilterPtr   filter; /* ABI 2 */
-    xFixed	    *params; /* ABI 2 */
-    int		    nparams; /* ABI 2 */
-    int		    filter_width; /* ABI 2 */
-    int		    filter_height; /* ABI 2 */
-    Bool	    transform_in_use;
-    RRTransformRec  transform; /* ABI 2 */
-    Bool	    transformPresent; /* ABI 2 */
-    RRTransformRec  desiredTransform; /* ABI 2 */
-    Bool	    desiredTransformPresent; /* ABI 2 */
-    /**
-     * Bounding box in screen space
-     */
-    BoxRec	    bounds;
-    /**
-     * Panning:
-     * TotalArea: total panning area, larger than CRTC's size
-     * TrackingArea: Area of the pointer for which the CRTC is panned
-     * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them
-     * Added in ABI version 2
-     */
-    BoxRec          panningTotalArea;
-    BoxRec          panningTrackingArea;
-    INT16           panningBorder[4];
-
-    /**
-     * Current gamma, especially useful after initial config.
-     * Added in ABI version 3
-     */
-    CARD16 *gamma_red;
-    CARD16 *gamma_green;
-    CARD16 *gamma_blue;
-    int gamma_size;
-
-    /**
-     * Actual state of this CRTC
-     *
-     * Set to TRUE after modesetting, set to FALSE if no outputs are connected
-     * Added in ABI version 3
-     */
-    Bool	    active;
-    /**
-     * Clear the shadow
-     */
-    Bool	    shadowClear;
-};
-
-typedef struct _xf86OutputFuncs {
-    /**
-     * Called to allow the output a chance to create properties after the
-     * RandR objects have been created.
-     */
-    void
-    (*create_resources)(xf86OutputPtr output);
-
-    /**
-     * Turns the output on/off, or sets intermediate power levels if available.
-     *
-     * Unsupported intermediate modes drop to the lower power setting.  If the
-     * mode is DPMSModeOff, the output must be disabled, as the DPLL may be
-     * disabled afterwards.
-     */
-    void
-    (*dpms)(xf86OutputPtr	output,
-	    int			mode);
-
-    /**
-     * Saves the output's state for restoration on VT switch.
-     */
-    void
-    (*save)(xf86OutputPtr	output);
-
-    /**
-     * Restore's the output's state at VT switch.
-     */
-    void
-    (*restore)(xf86OutputPtr	output);
-
-    /**
-     * Callback for testing a video mode for a given output.
-     *
-     * This function should only check for cases where a mode can't be supported
-     * on the output specifically, and not represent generic CRTC limitations.
-     *
-     * \return MODE_OK if the mode is valid, or another MODE_* otherwise.
-     */
-    int
-    (*mode_valid)(xf86OutputPtr	    output,
-		  DisplayModePtr    pMode);
-
-    /**
-     * Callback to adjust the mode to be set in the CRTC.
-     *
-     * This allows an output to adjust the clock or even the entire set of
-     * timings, which is used for panels with fixed timings or for
-     * buses with clock limitations.
-     */
-    Bool
-    (*mode_fixup)(xf86OutputPtr output,
-		  DisplayModePtr mode,
-		  DisplayModePtr adjusted_mode);
-
-    /**
-     * Callback for preparing mode changes on an output
-     */
-    void
-    (*prepare)(xf86OutputPtr output);
-
-    /**
-     * Callback for committing mode changes on an output
-     */
-    void
-    (*commit)(xf86OutputPtr output);
-
-    /**
-     * Callback for setting up a video mode after fixups have been made.
-     *
-     * This is only called while the output is disabled.  The dpms callback
-     * must be all that's necessary for the output, to turn the output on
-     * after this function is called.
-     */
-    void
-    (*mode_set)(xf86OutputPtr  output,
-		DisplayModePtr mode,
-		DisplayModePtr adjusted_mode);
-
-    /**
-     * Probe for a connected output, and return detect_status.
-     */
-    xf86OutputStatus
-    (*detect)(xf86OutputPtr	    output);
-
-    /**
-     * Query the device for the modes it provides.
-     *
-     * This function may also update MonInfo, mm_width, and mm_height.
-     *
-     * \return singly-linked list of modes or NULL if no modes found.
-     */
-    DisplayModePtr
-    (*get_modes)(xf86OutputPtr	    output);
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * Callback when an output's property has changed.
-     */
-    Bool
-    (*set_property)(xf86OutputPtr output,
-		    Atom property,
-		    RRPropertyValuePtr value);
-#endif
-#ifdef RANDR_13_INTERFACE
-    /**
-     * Callback to get an updated property value
-     */
-    Bool
-    (*get_property)(xf86OutputPtr output,
-		    Atom property);
-#endif
-#ifdef RANDR_GET_CRTC_INTERFACE
-    /**
-     * Callback to get current CRTC for a given output
-     */
-    xf86CrtcPtr
-    (*get_crtc)(xf86OutputPtr output);
-#endif
-    /**
-     * Clean up driver-specific bits of the output
-     */
-    void
-    (*destroy) (xf86OutputPtr	    output);
-} xf86OutputFuncsRec, *xf86OutputFuncsPtr;
-
-
-#define XF86_OUTPUT_VERSION 2
-
-struct _xf86Output {
-    /**
-     * ABI versioning
-     */
-    int version;
-
-    /**
-     * Associated ScrnInfo
-     */
-    ScrnInfoPtr		scrn;
-
-    /**
-     * Currently connected crtc (if any)
-     *
-     * If this output is not in use, this field will be NULL.
-     */
-    xf86CrtcPtr		crtc;
-
-    /**
-     * Possible CRTCs for this output as a mask of crtc indices
-     */
-    CARD32		possible_crtcs;
-
-    /**
-     * Possible outputs to share the same CRTC as a mask of output indices
-     */
-    CARD32		possible_clones;
-    
-    /**
-     * Whether this output can support interlaced modes
-     */
-    Bool		interlaceAllowed;
-
-    /**
-     * Whether this output can support double scan modes
-     */
-    Bool		doubleScanAllowed;
-
-    /**
-     * List of available modes on this output.
-     *
-     * This should be the list from get_modes(), plus perhaps additional
-     * compatible modes added later.
-     */
-    DisplayModePtr	probed_modes;
-
-    /**
-     * Options parsed from the related monitor section
-     */
-    OptionInfoPtr	options;
-    
-    /**
-     * Configured monitor section
-     */
-    XF86ConfMonitorPtr  conf_monitor;
-    
-    /**
-     * Desired initial position
-     */
-    int			initial_x, initial_y;
-
-    /**
-     * Desired initial rotation
-     */
-    Rotation		initial_rotation;
-
-    /**
-     * Current connection status
-     *
-     * This indicates whether a monitor is known to be connected
-     * to this output or not, or whether there is no way to tell
-     */
-    xf86OutputStatus	status;
-
-    /** EDID monitor information */
-    xf86MonPtr		MonInfo;
-
-    /** subpixel order */
-    int			subpixel_order;
-
-    /** Physical size of the currently attached output device. */
-    int			mm_width, mm_height;
-
-    /** Output name */
-    char		*name;
-
-    /** output-specific functions */
-    const xf86OutputFuncsRec *funcs;
-
-    /** driver private information */
-    void		*driver_private;
-    
-    /** Whether to use the old per-screen Monitor config section */
-    Bool		use_screen_monitor;
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * RandR 1.2 output structure.
-     *
-     * When RandR 1.2 is available, this points at the associated
-     * RandR output structure and is created when this output is created
-     */
-    RROutputPtr		randr_output;
-#else
-    void		*randr_output;
-#endif
-    /** 
-     * Desired initial panning
-     * Added in ABI version 2
-     */
-    BoxRec          initialTotalArea;
-    BoxRec          initialTrackingArea;
-    INT16           initialBorder[4];
-};
-
-typedef struct _xf86CrtcConfigFuncs {
-    /**
-     * Requests that the driver resize the screen.
-     *
-     * The driver is responsible for updating scrn->virtualX and scrn->virtualY.
-     * If the requested size cannot be set, the driver should leave those values
-     * alone and return FALSE.
-     *
-     * A naive driver that cannot reallocate the screen may simply change
-     * virtual[XY].  A more advanced driver will want to also change the
-     * devPrivate.ptr and devKind of the screen pixmap, update any offscreen
-     * pixmaps it may have moved, and change pScrn->displayWidth.
-     */
-    Bool
-    (*resize)(ScrnInfoPtr	scrn,
-	      int		width,
-	      int		height);
-} xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;
-
-typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);
-
-typedef struct _xf86CrtcConfig {
-    int			num_output;
-    xf86OutputPtr	*output;
-    /**
-     * compat_output is used whenever we deal
-     * with legacy code that only understands a single
-     * output. pScrn->modes will be loaded from this output,
-     * adjust frame will whack this output, etc.
-     */
-    int			compat_output;
-
-    int			num_crtc;
-    xf86CrtcPtr		*crtc;
-
-    int			minWidth, minHeight;
-    int			maxWidth, maxHeight;
-    
-    /* For crtc-based rotation */
-    DamagePtr		rotation_damage;
-    Bool		rotation_damage_registered;
-
-    /* DGA */
-    unsigned int	dga_flags;
-    unsigned long	dga_address;
-    DGAModePtr		dga_modes;
-    int			dga_nmode;
-    int			dga_width, dga_height, dga_stride;
-    DisplayModePtr	dga_save_mode;
-
-    const xf86CrtcConfigFuncsRec *funcs;
-
-    CreateScreenResourcesProcPtr    CreateScreenResources;
-
-    CloseScreenProcPtr		    CloseScreen;
-
-    /* Cursor information */
-    xf86CursorInfoPtr	cursor_info;
-    CursorPtr		cursor;
-    CARD8		*cursor_image;
-    Bool		cursor_on;
-    CARD32		cursor_fg, cursor_bg;
-
-    /**
-     * Options parsed from the related device section
-     */
-    OptionInfoPtr	options;
-
-    Bool		debug_modes;
-
-    /* wrap screen BlockHandler for rotation */
-    ScreenBlockHandlerProcPtr	BlockHandler;
-
-    /* callback when crtc configuration changes */
-    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;
-
-} xf86CrtcConfigRec, *xf86CrtcConfigPtr;
-
-extern _X_EXPORT int xf86CrtcConfigPrivateIndex;
-
-#define XF86_CRTC_CONFIG_PTR(p)	((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr))
-
-static _X_INLINE xf86OutputPtr
-xf86CompatOutput(ScrnInfoPtr pScrn)
-{
-    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-    return config->output[config->compat_output];
-}
-
-static _X_INLINE xf86CrtcPtr
-xf86CompatCrtc(ScrnInfoPtr pScrn)
-{
-    xf86OutputPtr compat_output = xf86CompatOutput(pScrn);
-    if (!compat_output)
-	return NULL;
-    return compat_output->crtc;
-}
-
-static _X_INLINE RRCrtcPtr
-xf86CompatRRCrtc(ScrnInfoPtr pScrn)
-{
-    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);
-    if (!compat_crtc)
-	return NULL;
-    return compat_crtc->randr_crtc;
-}
-
-
-/*
- * Initialize xf86CrtcConfig structure
- */
-
-extern _X_EXPORT void
-xf86CrtcConfigInit (ScrnInfoPtr				scrn,
-		    const xf86CrtcConfigFuncsRec	*funcs);
-
-extern _X_EXPORT void
-xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
-		      int minWidth, int minHeight,
-		      int maxWidth, int maxHeight);
-
-/*
- * Crtc functions
- */
-extern _X_EXPORT xf86CrtcPtr
-xf86CrtcCreate (ScrnInfoPtr		scrn,
-		const xf86CrtcFuncsRec	*funcs);
-
-extern _X_EXPORT void
-xf86CrtcDestroy (xf86CrtcPtr		crtc);
-
-
-/**
- * Sets the given video mode on the given crtc
- */
-
-extern _X_EXPORT Bool
-xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-			  RRTransformPtr transform, int x, int y);
-
-extern _X_EXPORT Bool
-xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-		 int x, int y);
-
-extern _X_EXPORT void
-xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
-
-/*
- * Assign crtc rotation during mode set
- */
-extern _X_EXPORT Bool
-xf86CrtcRotate (xf86CrtcPtr crtc);
-
-/*
- * Clean up any rotation data, used when a crtc is turned off
- * as well as when rotation is disabled.
- */
-extern _X_EXPORT void
-xf86RotateDestroy (xf86CrtcPtr crtc);
-
-/*
- * free shadow memory allocated for all crtcs
- */
-extern _X_EXPORT void
-xf86RotateFreeShadow(ScrnInfoPtr pScrn);
-
-/*
- * Clean up rotation during CloseScreen
- */
-extern _X_EXPORT void
-xf86RotateCloseScreen (ScreenPtr pScreen);
-
-/**
- * Return whether any output is assigned to the crtc
- */
-extern _X_EXPORT Bool
-xf86CrtcInUse (xf86CrtcPtr crtc);
-
-/*
- * Output functions
- */
-extern _X_EXPORT xf86OutputPtr
-xf86OutputCreate (ScrnInfoPtr		    scrn,
-		  const xf86OutputFuncsRec  *funcs,
-		  const char		    *name);
-
-extern _X_EXPORT void
-xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);
-
-extern _X_EXPORT Bool
-xf86OutputRename (xf86OutputPtr output, const char *name);
-
-extern _X_EXPORT void
-xf86OutputDestroy (xf86OutputPtr	output);
-
-extern _X_EXPORT void
-xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);
-
-extern _X_EXPORT void
-xf86SetScrnInfoModes (ScrnInfoPtr pScrn);
-
-#ifdef RANDR_13_INTERFACE
-# define ScreenInitRetType	int
-#else
-# define ScreenInitRetType	Bool
-#endif
-
-extern _X_EXPORT ScreenInitRetType
-xf86CrtcScreenInit (ScreenPtr pScreen);
-
-extern _X_EXPORT Bool
-xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);
-
-extern _X_EXPORT void
-xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
-    
-extern _X_EXPORT Bool
-xf86SaveScreen(ScreenPtr pScreen, int mode);
-
-extern _X_EXPORT void
-xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);
-
-extern _X_EXPORT DisplayModePtr
-xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);
-    
-extern _X_EXPORT Bool
-xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);
-
-/**
- * Set the EDID information for the specified output
- */
-extern _X_EXPORT void
-xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);
-
-/**
- * Return the list of modes supported by the EDID information
- * stored in 'output'
- */
-extern _X_EXPORT DisplayModePtr
-xf86OutputGetEDIDModes (xf86OutputPtr output);
-
-extern _X_EXPORT xf86MonPtr
-xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
-
-/**
- * Initialize dga for this screen
- */
-
-#ifdef XFreeXDGA
-extern _X_EXPORT Bool
-xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
-
-/* this is the real function, used only internally */
-_X_INTERNAL Bool
-_xf86_di_dga_init_internal (ScreenPtr pScreen);
-
-/**
- * Re-initialize dga for this screen (as when the set of modes changes)
- */
-
-extern _X_EXPORT Bool
-xf86DiDGAReInit (ScreenPtr pScreen);
-#endif
-
-/* This is the real function, used only internally */
-_X_INTERNAL Bool
-_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
-
-/*
- * Set the subpixel order reported for the screen using
- * the information from the outputs
- */
-
-extern _X_EXPORT void
-xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);
-
-/*
- * Get a standard string name for a connector type 
- */
-extern _X_EXPORT char *
-xf86ConnectorGetName(xf86ConnectorType connector);
-
-/*
- * Using the desired mode information in each crtc, set
- * modes (used in EnterVT functions, or at server startup)
- */
-
-extern _X_EXPORT Bool
-xf86SetDesiredModes (ScrnInfoPtr pScrn);
-
-/**
- * Initialize the CRTC-based cursor code. CRTC function vectors must
- * contain relevant cursor setting functions.
- *
- * Driver should call this from ScreenInit function
- */
-extern _X_EXPORT Bool
-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);
-
-/**
- * Called when anything on the screen is reconfigured.
- *
- * Reloads cursor images as needed, then adjusts cursor positions.
- * 
- * Driver should call this from crtc commit function.
- */
-extern _X_EXPORT void
-xf86_reload_cursors (ScreenPtr screen);
-
-/**
- * Called from EnterVT to turn the cursors back on
- */
-extern _X_EXPORT void
-xf86_show_cursors (ScrnInfoPtr scrn);
-
-/**
- * Called by the driver to turn cursors off
- */
-extern _X_EXPORT void
-xf86_hide_cursors (ScrnInfoPtr scrn);
-
-/**
- * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.
- */
-extern _X_EXPORT void
-xf86_cursors_fini (ScreenPtr screen);
-
-/*
- * For overlay video, compute the relevant CRTC and
- * clip video to that.
- * wraps xf86XVClipVideoHelper()
- */
-
-extern _X_EXPORT Bool
-xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
-			    xf86CrtcPtr *crtc_ret,
-			    xf86CrtcPtr desired_crtc,
-			    BoxPtr      dst,
-			    INT32	*xa,
-			    INT32	*xb,
-			    INT32	*ya,
-			    INT32	*yb,
-			    RegionPtr   reg,
-			    INT32	width,
-			    INT32	height);
-    
-extern _X_EXPORT xf86_crtc_notify_proc_ptr
-xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
-
-extern _X_EXPORT void
-xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);
-
-extern _X_EXPORT void
-xf86_crtc_notify(ScreenPtr pScreen);
-
-/**
- * Gamma
- */
-
-extern _X_EXPORT Bool
-xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);
-
-#endif /* _XF86CRTC_H_ */
+/*

+ * Copyright © 2006 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ */

+#ifndef _XF86CRTC_H_

+#define _XF86CRTC_H_

+

+#include <edid.h>

+#include "randrstr.h"

+#if XF86_MODES_RENAME

+#include "xf86Rename.h"

+#endif

+#include "xf86Modes.h"

+#include "xf86Cursor.h"

+#include "xf86i2c.h"

+#include "damage.h"

+#include "picturestr.h"

+

+/* Compat definitions for older X Servers. */

+#ifndef M_T_PREFERRED

+#define M_T_PREFERRED	0x08

+#endif

+#ifndef M_T_DRIVER

+#define M_T_DRIVER	0x40

+#endif

+#ifndef M_T_USERPREF

+#define M_T_USERPREF	0x80

+#endif

+#ifndef HARDWARE_CURSOR_ARGB

+#define HARDWARE_CURSOR_ARGB				0x00004000

+#endif

+

+typedef struct _xf86Crtc xf86CrtcRec, *xf86CrtcPtr;

+typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;

+

+/* define a standard for connector types */

+typedef enum _xf86ConnectorType {

+   XF86ConnectorNone,

+   XF86ConnectorVGA,

+   XF86ConnectorDVI_I,

+   XF86ConnectorDVI_D,

+   XF86ConnectorDVI_A,

+   XF86ConnectorComposite,

+   XF86ConnectorSvideo,

+   XF86ConnectorComponent,

+   XF86ConnectorLFP,

+   XF86ConnectorProprietary,

+   XF86ConnectorHDMI,

+   XF86ConnectorDisplayPort,

+} xf86ConnectorType;

+

+typedef enum _xf86OutputStatus {

+   XF86OutputStatusConnected,

+   XF86OutputStatusDisconnected,

+   XF86OutputStatusUnknown

+} xf86OutputStatus;

+

+typedef enum _xf86CrtcSetFlags {

+    XF86CrtcSetMode = 1,		/* mode */

+    XF86CrtcSetOutput = 2,		/* outputs */

+    XF86CrtcSetOrigin = 4,		/* x/y */

+    XF86CrtcSetTransform = 8,		/* transform */

+    XF86CrtcSetRotation = 16,		/* rotation */

+    XF86CrtcSetProperty = 32,		/* output property */

+    XF86CrtcSetScanoutPixmap = 64,	/* scanout pixmap */

+} xf86CrtcSetFlags;

+

+typedef struct _xf86CrtcSet {

+    xf86CrtcSetFlags	flags;

+    DisplayModePtr	mode;

+    Rotation		rotation;

+    RRTransformPtr	transform;

+    int			x, y;

+    PixmapPtr		scanout_pixmap;

+} xf86CrtcSetRec;

+

+typedef struct _xf86CrtcFuncs {

+   /**

+    * Turns the crtc on/off, or sets intermediate power levels if available.

+    *

+    * Unsupported intermediate modes drop to the lower power setting.  If the

+    * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to

+    * be safe to call mode_set.

+    */

+   void

+    (*dpms)(xf86CrtcPtr		crtc,

+	    int		    	mode);

+

+   /**

+    * Saves the crtc's state for restoration on VT switch.

+    */

+   void

+    (*save)(xf86CrtcPtr		crtc);

+

+   /**

+    * Restore's the crtc's state at VT switch.

+    */

+   void

+    (*restore)(xf86CrtcPtr	crtc);

+

+    /**

+     * Lock CRTC prior to mode setting, mostly for DRI.

+     * Returns whether unlock is needed

+     */

+    Bool

+    (*lock) (xf86CrtcPtr crtc);

+    

+    /**

+     * Unlock CRTC after mode setting, mostly for DRI

+     */

+    void

+    (*unlock) (xf86CrtcPtr crtc);

+    

+    /**

+     * Callback to adjust the mode to be set in the CRTC.

+     *

+     * This allows a CRTC to adjust the clock or even the entire set of

+     * timings, which is used for panels with fixed timings or for

+     * buses with clock limitations.

+     */

+    Bool

+    (*mode_fixup)(xf86CrtcPtr crtc,

+		  DisplayModePtr mode,

+		  DisplayModePtr adjusted_mode);

+

+    /**

+     * Prepare CRTC for an upcoming mode set.

+     */

+    void

+    (*prepare)(xf86CrtcPtr crtc);

+

+    /**

+     * Callback for setting up a video mode after fixups have been made.

+     */

+    void

+    (*mode_set)(xf86CrtcPtr crtc,

+		DisplayModePtr mode,

+		DisplayModePtr adjusted_mode,

+		int x, int y);

+

+    /**

+     * Commit mode changes to a CRTC

+     */

+    void

+    (*commit)(xf86CrtcPtr crtc);

+

+    /* Set the color ramps for the CRTC to the given values. */

+    void

+    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,

+		 int size);

+

+    /**

+     * Allocate the shadow area, delay the pixmap creation until needed

+     */

+    void *

+    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);

+    

+    /**

+     * Create shadow pixmap for rotation support

+     */

+    PixmapPtr

+    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);

+    

+    /**

+     * Destroy shadow pixmap

+     */

+    void

+    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);

+

+    /**

+     * Set cursor colors

+     */

+    void

+    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);

+

+    /**

+     * Set cursor position

+     */

+    void

+    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);

+

+    /**

+     * Show cursor

+     */

+    void

+    (*show_cursor) (xf86CrtcPtr crtc);

+

+    /**

+     * Hide cursor

+     */

+    void

+    (*hide_cursor) (xf86CrtcPtr crtc);

+

+    /**

+     * Load monochrome image

+     */

+    void

+    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);

+

+    /**

+     * Load ARGB image

+     */

+     void

+     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);

+     

+    /**

+     * Clean up driver-specific bits of the crtc

+     */

+    void

+    (*destroy) (xf86CrtcPtr	crtc);

+

+    /**

+     * Less fine-grained mode setting entry point for kernel modesetting

+     */

+    Bool

+    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,

+		      Rotation rotation, int x, int y);

+

+    /**

+     * Callback for panning. Doesn't change the mode.

+     * Added in ABI version 2

+     */

+    void

+    (*set_origin)(xf86CrtcPtr crtc, int x, int y);

+

+    /**

+     * General mode setting entry point that does everything

+     */

+    Bool

+    (*set)(xf86CrtcPtr crtc, xf86CrtcSetFlags flags);

+

+} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;

+

+#define XF86_CRTC_VERSION 3

+

+struct _xf86Crtc {

+    /**

+     * ABI versioning

+     */

+    int version;

+

+    /**

+     * Associated ScrnInfo

+     */

+    ScrnInfoPtr	    scrn;

+    

+    /**

+     * Desired state of this CRTC

+     *

+     * Set when this CRTC should be driving one or more outputs 

+     */

+    Bool	    enabled;

+    

+    /**

+     * Active mode

+     *

+     * This reflects the mode as set in the CRTC currently

+     * It will be cleared when the VT is not active or

+     * during server startup

+     */

+    DisplayModeRec  mode;

+    Rotation	    rotation;

+    PixmapPtr	    rotatedPixmap;

+    void	    *rotatedData;

+    PixmapPtr	    scanoutPixmap;

+    

+    /**

+     * Position on screen

+     *

+     * Locates this CRTC within the frame buffer

+     */

+    int		    x, y;

+    

+    /**

+     * Desired mode

+     *

+     * This is set to the requested mode, independent of

+     * whether the VT is active. In particular, it receives

+     * the startup configured mode and saves the active mode

+     * on VT switch.

+     */

+    DisplayModeRec  desiredMode;

+    Rotation	    desiredRotation;

+    int		    desiredX, desiredY;

+    

+    /** crtc-specific functions */

+    const xf86CrtcFuncsRec *funcs;

+

+    /**

+     * Driver private

+     *

+     * Holds driver-private information

+     */

+    void	    *driver_private;

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * RandR crtc

+     *

+     * When RandR 1.2 is available, this

+     * points at the associated crtc object

+     */

+    RRCrtcPtr	    randr_crtc;

+#else

+    void	    *randr_crtc;

+#endif

+

+    /**

+     * Current cursor is ARGB

+     */

+    Bool	    cursor_argb;

+    /**

+     * Track whether cursor is within CRTC range 

+     */

+    Bool	    cursor_in_range;

+    /**

+     * Track state of cursor associated with this CRTC

+     */

+    Bool	    cursor_shown;

+

+    /**

+     * Current transformation matrix

+     */

+    PictTransform   crtc_to_framebuffer;

+    /* framebuffer_to_crtc was removed in ABI 2 */

+    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */

+    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */

+    PictFilterPtr   filter; /* ABI 2 */

+    xFixed	    *params; /* ABI 2 */

+    int		    nparams; /* ABI 2 */

+    int		    filter_width; /* ABI 2 */

+    int		    filter_height; /* ABI 2 */

+    Bool	    transform_in_use;

+    Bool	    sprite_transform_in_use;

+    RRTransformRec  transform; /* ABI 2 */

+    Bool	    transformPresent; /* ABI 2 */

+    RRTransformRec  desiredTransform; /* ABI 2 */

+    Bool	    desiredTransformPresent; /* ABI 2 */

+    /**

+     * Bounding box in screen space

+     */

+    BoxRec	    bounds;

+    /**

+     * Panning:

+     * TotalArea: total panning area, larger than CRTC's size

+     * TrackingArea: Area of the pointer for which the CRTC is panned

+     * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them

+     * Added in ABI version 2

+     */

+    BoxRec          panningTotalArea;

+    BoxRec          panningTrackingArea;

+    INT16           panningBorder[4];

+

+    /**

+     * Current gamma, especially useful after initial config.

+     * Added in ABI version 3

+     */

+    CARD16 *gamma_red;

+    CARD16 *gamma_green;

+    CARD16 *gamma_blue;

+    int gamma_size;

+

+    /**

+     * Actual state of this CRTC

+     *

+     * Set to TRUE after modesetting, set to FALSE if no outputs are connected

+     * Added in ABI version 3

+     */

+    Bool	    active;

+    /**

+     * Clear the shadow

+     */

+    Bool	    shadowClear;

+

+    /**

+     * Sprite position transforms

+     */

+

+    /* Transform a screen coordinate to a crtc coordinate */

+    struct pixman_f_transform f_screen_to_crtc;

+

+    /* The user-specified portion of the screen to crtc conversion */

+    struct pixman_f_transform user_sprite_position_transform;

+

+    /* Transform a hardware cursor coordinate to a cursor coordinate */

+    struct pixman_f_transform f_crtc_to_cursor;

+

+    /* The user-specified portion of the cursor to hardware transform */

+    struct pixman_f_transform user_sprite_image_transform;

+};

+

+typedef struct _xf86OutputFuncs {

+    /**

+     * Called to allow the output a chance to create properties after the

+     * RandR objects have been created.

+     */

+    void

+    (*create_resources)(xf86OutputPtr output);

+

+    /**

+     * Turns the output on/off, or sets intermediate power levels if available.

+     *

+     * Unsupported intermediate modes drop to the lower power setting.  If the

+     * mode is DPMSModeOff, the output must be disabled, as the DPLL may be

+     * disabled afterwards.

+     */

+    void

+    (*dpms)(xf86OutputPtr	output,

+	    int			mode);

+

+    /**

+     * Saves the output's state for restoration on VT switch.

+     */

+    void

+    (*save)(xf86OutputPtr	output);

+

+    /**

+     * Restore's the output's state at VT switch.

+     */

+    void

+    (*restore)(xf86OutputPtr	output);

+

+    /**

+     * Callback for testing a video mode for a given output.

+     *

+     * This function should only check for cases where a mode can't be supported

+     * on the output specifically, and not represent generic CRTC limitations.

+     *

+     * \return MODE_OK if the mode is valid, or another MODE_* otherwise.

+     */

+    int

+    (*mode_valid)(xf86OutputPtr	    output,

+		  DisplayModePtr    pMode);

+

+    /**

+     * Callback to adjust the mode to be set in the CRTC.

+     *

+     * This allows an output to adjust the clock or even the entire set of

+     * timings, which is used for panels with fixed timings or for

+     * buses with clock limitations.

+     */

+    Bool

+    (*mode_fixup)(xf86OutputPtr output,

+		  DisplayModePtr mode,

+		  DisplayModePtr adjusted_mode);

+

+    /**

+     * Callback for preparing mode changes on an output

+     */

+    void

+    (*prepare)(xf86OutputPtr output);

+

+    /**

+     * Callback for committing mode changes on an output

+     */

+    void

+    (*commit)(xf86OutputPtr output);

+

+    /**

+     * Callback for setting up a video mode after fixups have been made.

+     *

+     * This is only called while the output is disabled.  The dpms callback

+     * must be all that's necessary for the output, to turn the output on

+     * after this function is called.

+     */

+    void

+    (*mode_set)(xf86OutputPtr  output,

+		DisplayModePtr mode,

+		DisplayModePtr adjusted_mode);

+

+    /**

+     * Probe for a connected output, and return detect_status.

+     */

+    xf86OutputStatus

+    (*detect)(xf86OutputPtr	    output);

+

+    /**

+     * Query the device for the modes it provides.

+     *

+     * This function may also update MonInfo, mm_width, and mm_height.

+     *

+     * \return singly-linked list of modes or NULL if no modes found.

+     */

+    DisplayModePtr

+    (*get_modes)(xf86OutputPtr	    output);

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * Callback when an output's property has changed.

+     */

+    Bool

+    (*set_property)(xf86OutputPtr output,

+		    Atom property,

+		    RRPropertyValuePtr value);

+#endif

+#ifdef RANDR_13_INTERFACE

+    /**

+     * Callback to get an updated property value

+     */

+    Bool

+    (*get_property)(xf86OutputPtr output,

+		    Atom property);

+#endif

+#ifdef RANDR_GET_CRTC_INTERFACE

+    /**

+     * Callback to get current CRTC for a given output

+     */

+    xf86CrtcPtr

+    (*get_crtc)(xf86OutputPtr output);

+#endif

+    /**

+     * Clean up driver-specific bits of the output

+     */

+    void

+    (*destroy) (xf86OutputPtr	    output);

+} xf86OutputFuncsRec, *xf86OutputFuncsPtr;

+

+

+#define XF86_OUTPUT_VERSION 2

+

+struct _xf86Output {

+    /**

+     * ABI versioning

+     */

+    int version;

+

+    /**

+     * Associated ScrnInfo

+     */

+    ScrnInfoPtr		scrn;

+

+    /**

+     * Currently connected crtc (if any)

+     *

+     * If this output is not in use, this field will be NULL.

+     */

+    xf86CrtcPtr		crtc;

+

+    /**

+     * Possible CRTCs for this output as a mask of crtc indices

+     */

+    CARD32		possible_crtcs;

+

+    /**

+     * Possible outputs to share the same CRTC as a mask of output indices

+     */

+    CARD32		possible_clones;

+    

+    /**

+     * Whether this output can support interlaced modes

+     */

+    Bool		interlaceAllowed;

+

+    /**

+     * Whether this output can support double scan modes

+     */

+    Bool		doubleScanAllowed;

+

+    /**

+     * List of available modes on this output.

+     *

+     * This should be the list from get_modes(), plus perhaps additional

+     * compatible modes added later.

+     */

+    DisplayModePtr	probed_modes;

+

+    /**

+     * Options parsed from the related monitor section

+     */

+    OptionInfoPtr	options;

+    

+    /**

+     * Configured monitor section

+     */

+    XF86ConfMonitorPtr  conf_monitor;

+    

+    /**

+     * Desired initial position

+     */

+    int			initial_x, initial_y;

+

+    /**

+     * Desired initial rotation

+     */

+    Rotation		initial_rotation;

+

+    /**

+     * Current connection status

+     *

+     * This indicates whether a monitor is known to be connected

+     * to this output or not, or whether there is no way to tell

+     */

+    xf86OutputStatus	status;

+

+    /** EDID monitor information */

+    xf86MonPtr		MonInfo;

+

+    /** subpixel order */

+    int			subpixel_order;

+

+    /** Physical size of the currently attached output device. */

+    int			mm_width, mm_height;

+

+    /** Output name */

+    char		*name;

+

+    /** output-specific functions */

+    const xf86OutputFuncsRec *funcs;

+

+    /** driver private information */

+    void		*driver_private;

+    

+    /** Whether to use the old per-screen Monitor config section */

+    Bool		use_screen_monitor;

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * RandR 1.2 output structure.

+     *

+     * When RandR 1.2 is available, this points at the associated

+     * RandR output structure and is created when this output is created

+     */

+    RROutputPtr		randr_output;

+#else

+    void		*randr_output;

+#endif

+    /** 

+     * Desired initial panning

+     * Added in ABI version 2

+     */

+    BoxRec          initialTotalArea;

+    BoxRec          initialTrackingArea;

+    INT16           initialBorder[4];

+};

+

+typedef enum _xf86SetConfigResponse {

+    xf86SetConfigFailed,		/* set_config failed */

+    xf86SetConfigChecked,		/* set_config validated the configuration */

+    xf86SetConfigDone,			/* set_config finished the work */

+} xf86SetConfigResponse;

+

+typedef struct _xf86CrtcSetConfig {

+    xf86CrtcPtr			crtc;

+    int				x, y;

+    DisplayModeRec		mode;

+    Rotation			rotation;

+    int				numOutputs;

+    xf86OutputPtr		*outputs;

+    struct pict_f_transform	sprite_position_transform;

+    struct pict_f_transform	sprite_image_transform;

+

+    /* Probably want some internal structure for the pixmap so that

+     * this can be set before the server is running

+     */

+    PixmapPtr			pixmap;

+    int				pixmap_x, pixmap_y;

+} xf86CrtcSetConfigRec, *xf86CrtcSetConfigPtr;

+

+typedef struct _xf86CrtcScanoutFormat {

+    int		    depth;

+    int		    bitsPerPixel;

+    int		    maxWidth, maxHeight;

+    Rotation	    rotations;

+    PictFormatShort format;

+} xf86CrtcScanoutFormat;

+

+typedef struct _xf86CrtcConfigFuncs {

+    /**

+     * Requests that the driver resize the screen.

+     *

+     * The driver is responsible for updating scrn->virtualX and scrn->virtualY.

+     * If the requested size cannot be set, the driver should leave those values

+     * alone and return FALSE.

+     *

+     * A naive driver that cannot reallocate the screen may simply change

+     * virtual[XY].  A more advanced driver will want to also change the

+     * devPrivate.ptr and devKind of the screen pixmap, update any offscreen

+     * pixmaps it may have moved, and change pScrn->displayWidth.

+     */

+    Bool

+    (*resize)(ScrnInfoPtr	scrn,

+	      int		width,

+	      int		height);

+

+    xf86SetConfigResponse

+    (*set_config) (ScrnInfoPtr		scrn,

+		   RRScreenConfigPtr	screen_config,

+		   xf86CrtcSetConfigPtr	crtc_configs,

+		   int			num_configs);

+

+    /**

+     * Create a scanout pixmap

+     */

+    PixmapPtr

+    (*create_scanout_pixmap)(ScrnInfoPtr		scrn,

+			     int			width,

+			     int			height,

+			     Rotation			rotations,

+			     xf86CrtcScanoutFormat	*format);

+

+} xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;

+

+typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);

+

+typedef struct _xf86CrtcConfig {

+    int			num_output;

+    xf86OutputPtr	*output;

+    /**

+     * compat_output is used whenever we deal

+     * with legacy code that only understands a single

+     * output. pScrn->modes will be loaded from this output,

+     * adjust frame will whack this output, etc.

+     */

+    int			compat_output;

+

+    int			num_crtc;

+    xf86CrtcPtr		*crtc;

+

+    int			minWidth, minHeight;

+    int			maxWidth, maxHeight;

+    

+    /* For crtc-based rotation */

+    DamagePtr		rotation_damage;

+    Bool		rotation_damage_registered;

+

+    /* DGA */

+    unsigned int	dga_flags;

+    unsigned long	dga_address;

+    DGAModePtr		dga_modes;

+    int			dga_nmode;

+    int			dga_width, dga_height, dga_stride;

+    DisplayModePtr	dga_save_mode;

+

+    const xf86CrtcConfigFuncsRec *funcs;

+

+    CreateScreenResourcesProcPtr    CreateScreenResources;

+

+    CloseScreenProcPtr		    CloseScreen;

+

+    /* Cursor information */

+    xf86CursorInfoPtr	cursor_info;

+    CursorPtr		cursor;

+    CARD8		*cursor_image;

+    Bool		cursor_on;

+    CARD32		cursor_fg, cursor_bg;

+

+    /**

+     * Options parsed from the related device section

+     */

+    OptionInfoPtr	options;

+

+    Bool		debug_modes;

+

+    /* wrap screen BlockHandler for rotation */

+    ScreenBlockHandlerProcPtr	BlockHandler;

+

+    /* callback when crtc configuration changes */

+    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;

+

+    /*

+     * Supported scanout pixmap formats

+     */

+    int			num_scanout_formats;

+    xf86CrtcScanoutFormat	*scanout_formats;

+} xf86CrtcConfigRec, *xf86CrtcConfigPtr;

+

+extern _X_EXPORT int xf86CrtcConfigPrivateIndex;

+

+#define XF86_CRTC_CONFIG_PTR(p)	((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr))

+

+static _X_INLINE xf86OutputPtr

+xf86CompatOutput(ScrnInfoPtr pScrn)

+{

+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);

+    return config->output[config->compat_output];

+}

+

+static _X_INLINE xf86CrtcPtr

+xf86CompatCrtc(ScrnInfoPtr pScrn)

+{

+    xf86OutputPtr compat_output = xf86CompatOutput(pScrn);

+    if (!compat_output)

+	return NULL;

+    return compat_output->crtc;

+}

+

+static _X_INLINE RRCrtcPtr

+xf86CompatRRCrtc(ScrnInfoPtr pScrn)

+{

+    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);

+    if (!compat_crtc)

+	return NULL;

+    return compat_crtc->randr_crtc;

+}

+

+

+/*

+ * Initialize xf86CrtcConfig structure

+ */

+

+extern _X_EXPORT void

+xf86CrtcConfigInit (ScrnInfoPtr				scrn,

+		    const xf86CrtcConfigFuncsRec	*funcs);

+

+extern _X_EXPORT void

+xf86CrtcSetSizeRange (ScrnInfoPtr scrn,

+		      int minWidth, int minHeight,

+		      int maxWidth, int maxHeight);

+

+extern _X_EXPORT void

+xf86CrtcSetScanoutFormats (ScrnInfoPtr			scrn,

+			   int				num_formats,

+			   xf86CrtcScanoutFormat	*formats);

+

+/*

+ * Crtc functions

+ */

+extern _X_EXPORT xf86CrtcPtr

+xf86CrtcCreate (ScrnInfoPtr		scrn,

+		const xf86CrtcFuncsRec	*funcs);

+

+extern _X_EXPORT void

+xf86CrtcDestroy (xf86CrtcPtr		crtc);

+

+/**

+ * Change a crtc configuration (modes, outputs, etc)

+ */

+

+extern _X_EXPORT Bool

+xf86CrtcSet (xf86CrtcPtr crtc, xf86CrtcSetRec *set);

+

+extern _X_EXPORT void

+xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);

+

+/*

+ * Assign crtc rotation during mode set

+ */

+extern _X_EXPORT Bool

+xf86CrtcRotate (xf86CrtcPtr crtc);

+

+

+/*

+ * Update cursor transform matrices after user changes

+ * This is just the cursor subset of xf86CrtcRotate

+ */

+extern _X_EXPORT void

+xf86CrtcRotateCursor (xf86CrtcPtr crtc);

+

+/*

+ * Clean up any rotation data, used when a crtc is turned off

+ * as well as when rotation is disabled.

+ */

+extern _X_EXPORT void

+xf86RotateDestroy (xf86CrtcPtr crtc);

+

+/*

+ * free shadow memory allocated for all crtcs

+ */

+extern _X_EXPORT void

+xf86RotateFreeShadow(ScrnInfoPtr pScrn);

+

+/*

+ * Clean up rotation during CloseScreen

+ */

+extern _X_EXPORT void

+xf86RotateCloseScreen (ScreenPtr pScreen);

+

+/**

+ * Return whether any output is assigned to the crtc

+ */

+extern _X_EXPORT Bool

+xf86CrtcInUse (xf86CrtcPtr crtc);

+

+/*

+ * Output functions

+ */

+extern _X_EXPORT xf86OutputPtr

+xf86OutputCreate (ScrnInfoPtr		    scrn,

+		  const xf86OutputFuncsRec  *funcs,

+		  const char		    *name);

+

+extern _X_EXPORT void

+xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);

+

+extern _X_EXPORT Bool

+xf86OutputRename (xf86OutputPtr output, const char *name);

+

+extern _X_EXPORT void

+xf86OutputDestroy (xf86OutputPtr	output);

+

+extern _X_EXPORT void

+xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);

+

+extern _X_EXPORT void

+xf86SetScrnInfoModes (ScrnInfoPtr pScrn);

+

+#ifdef RANDR_13_INTERFACE

+# define ScreenInitRetType	int

+#else

+# define ScreenInitRetType	Bool

+#endif

+

+extern _X_EXPORT ScreenInitRetType

+xf86CrtcScreenInit (ScreenPtr pScreen);

+

+extern _X_EXPORT Bool

+xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);

+

+extern _X_EXPORT void

+xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);

+    

+extern _X_EXPORT Bool

+xf86SaveScreen(ScreenPtr pScreen, int mode);

+

+extern _X_EXPORT void

+xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);

+

+extern _X_EXPORT DisplayModePtr

+xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);

+    

+extern _X_EXPORT Bool

+xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);

+

+/**

+ * Set the EDID information for the specified output

+ */

+extern _X_EXPORT void

+xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);

+

+/**

+ * Return the list of modes supported by the EDID information

+ * stored in 'output'

+ */

+extern _X_EXPORT DisplayModePtr

+xf86OutputGetEDIDModes (xf86OutputPtr output);

+

+extern _X_EXPORT xf86MonPtr

+xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);

+

+/**

+ * Initialize dga for this screen

+ */

+

+#ifdef XFreeXDGA

+extern _X_EXPORT Bool

+xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);

+

+/* this is the real function, used only internally */

+_X_INTERNAL Bool

+_xf86_di_dga_init_internal (ScreenPtr pScreen);

+

+/**

+ * Re-initialize dga for this screen (as when the set of modes changes)

+ */

+

+extern _X_EXPORT Bool

+xf86DiDGAReInit (ScreenPtr pScreen);

+#endif

+

+/* This is the real function, used only internally */

+_X_INTERNAL Bool

+_xf86_di_dga_reinit_internal (ScreenPtr pScreen);

+

+/*

+ * Set the subpixel order reported for the screen using

+ * the information from the outputs

+ */

+

+extern _X_EXPORT void

+xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);

+

+/*

+ * Get a standard string name for a connector type 

+ */

+extern _X_EXPORT char *

+xf86ConnectorGetName(xf86ConnectorType connector);

+

+/*

+ * Using the desired mode information in each crtc, set

+ * modes (used in EnterVT functions, or at server startup)

+ */

+

+extern _X_EXPORT Bool

+xf86SetDesiredModes (ScrnInfoPtr pScrn);

+

+/**

+ * Initialize the CRTC-based cursor code. CRTC function vectors must

+ * contain relevant cursor setting functions.

+ *

+ * Driver should call this from ScreenInit function

+ */

+extern _X_EXPORT Bool

+xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);

+

+/**

+ * Called when anything on the screen is reconfigured.

+ *

+ * Reloads cursor images as needed, then adjusts cursor positions.

+ * 

+ * Driver should call this from crtc commit function.

+ */

+extern _X_EXPORT void

+xf86_reload_cursors (ScreenPtr screen);

+

+/**

+ * Called from EnterVT to turn the cursors back on

+ */

+extern _X_EXPORT void

+xf86_show_cursors (ScrnInfoPtr scrn);

+

+/**

+ * Called by the driver to turn cursors off

+ */

+extern _X_EXPORT void

+xf86_hide_cursors (ScrnInfoPtr scrn);

+

+/**

+ * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.

+ */

+extern _X_EXPORT void

+xf86_cursors_fini (ScreenPtr screen);

+

+/*

+ * For overlay video, compute the relevant CRTC and

+ * clip video to that.

+ * wraps xf86XVClipVideoHelper()

+ */

+

+extern _X_EXPORT Bool

+xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,

+			    xf86CrtcPtr *crtc_ret,

+			    xf86CrtcPtr desired_crtc,

+			    BoxPtr      dst,

+			    INT32	*xa,

+			    INT32	*xb,

+			    INT32	*ya,

+			    INT32	*yb,

+			    RegionPtr   reg,

+			    INT32	width,

+			    INT32	height);

+    

+extern _X_EXPORT xf86_crtc_notify_proc_ptr

+xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);

+

+extern _X_EXPORT void

+xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);

+

+extern _X_EXPORT void

+xf86_crtc_notify(ScreenPtr pScreen);

+

+/**

+ * Gamma

+ */

+

+extern _X_EXPORT Bool

+xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);

+

+#endif /* _XF86CRTC_H_ */

diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index 5562f29cc..3c2958743 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -338,7 +338,7 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
     /*

      * Transform position of cursor on screen

      */

-    if (crtc->transform_in_use)

+    if (crtc->sprite_transform_in_use)

     {

 	ScreenPtr	screen = scrn->pScreen;

 	xf86CursorScreenPtr ScreenPriv =

@@ -349,7 +349,7 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
 	v.v[0] = (x + ScreenPriv->HotX) + 0.5;

 	v.v[1] = (y + ScreenPriv->HotY) + 0.5;

 	v.v[2] = 1;

-	pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);

+	pixman_f_transform_point (&crtc->f_screen_to_crtc, &v);

 	/* cursor will have 0.5 added to it already so floor is sufficent */

 	x = floor (v.v[0]);

 	y = floor (v.v[1]);

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 2b19d82ad..7bfb6fa47 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -180,14 +180,14 @@ xf86RandR13VerifyPanningArea (xf86CrtcPtr crtc, int screenWidth, int screenHeigh
  */

 

 static void

-xf86ComputeCrtcPan (Bool transform_in_use,

+xf86ComputeCrtcPan (Bool sprite_transform_in_use,

 		    struct pixman_f_transform *m,

 		    double screen_x, double screen_y,

 		    double crtc_x, double crtc_y,

 		    int old_pan_x, int old_pan_y,

 		    int *new_pan_x, int *new_pan_y)

 {

-    if (transform_in_use) {

+    if (sprite_transform_in_use) {

 	/*

 	 * Given the current transform, M, the current position

 	 * on the Screen, S, and the desired position on the CRTC,

@@ -374,8 +374,8 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
 	c.v[0] = x;

 	c.v[1] = y;

 	c.v[2] = 1.0;

-	if (crtc->transform_in_use) {

-	    pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &c);

+	if (crtc->sprite_transform_in_use) {

+	    pixman_f_transform_point(&crtc->f_screen_to_crtc, &c);

 	} else {

 	    c.v[0] -= crtc->x;

 	    c.v[1] -= crtc->y;

@@ -402,8 +402,8 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
 	    }

 	}

 	if (panned)

-	    xf86ComputeCrtcPan (crtc->transform_in_use,

-				&crtc->f_framebuffer_to_crtc,

+	    xf86ComputeCrtcPan (crtc->sprite_transform_in_use,

+				&crtc->f_screen_to_crtc,

 				x, y, c.v[0], c.v[1],

 				newX, newY, &newX, &newY);

     }

@@ -414,7 +414,7 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
      * XXX This computation only works when we do not have a transform

      * in use.

      */

-    if (!crtc->transform_in_use)

+    if (!crtc->sprite_transform_in_use)

     {

 	/* Validate against [xy]1 after [xy]2, to be sure that results are > 0 for [xy]1 > 0 */

 	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {

@@ -659,10 +659,12 @@ xf86RandR12SetConfig (ScreenPtr		pScreen,
 

 static Bool

 xf86RandR12ScreenSetSize (ScreenPtr	pScreen,

-			CARD16		width,

-			CARD16		height,

-			CARD32		mmWidth,

-			CARD32		mmHeight)

+			  CARD16	width,

+			  CARD16	height,

+			  CARD16	pixWidth,

+			  CARD16	pixHeight,

+			  CARD32	mmWidth,

+			  CARD32	mmHeight)

 {

     XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

     ScrnInfoPtr		pScrn = XF86SCRNINFO(pScreen);

@@ -670,6 +672,8 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
     WindowPtr		pRoot = pScreen->root;

     PixmapPtr		pScrnPix;

     Bool		ret = FALSE;

+    Bool		pixSizeChanged = FALSE;

+    Bool		winSizeChanged = FALSE;

     int                 c;

 

     if (xf86RandR12Key) {

@@ -677,46 +681,85 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
         {

 	    randrp->virtualX = pScrn->virtualX;

 	    randrp->virtualY = pScrn->virtualY;

+	    pixSizeChanged = TRUE;

         }

     }

-    if (pRoot && pScrn->vtSema)

-	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);

 

-    /* Let the driver update virtualX and virtualY */

-    if (!(*config->funcs->resize)(pScrn, width, height))

-	goto finish;

+    pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

+    if (pixWidth != pScrnPix->drawable.width ||

+	pixHeight != pScrnPix->drawable.height)

+	pixSizeChanged = TRUE;

+

+    if (width != pScreen->width || height != pScreen->height)

+	winSizeChanged = TRUE;

+

+    if (pixSizeChanged)

+    {

+	if (pRoot && pScrn->vtSema)

+	    (*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);

+

+	/* Let the driver update virtualX and virtualY */

+	if (!(*config->funcs->resize)(pScrn, pixWidth, pixHeight))

+	    goto finish;

+    }

 

     ret = TRUE;

-    /* Update panning information */

-    for (c = 0; c < config->num_crtc; c++) {

-	xf86CrtcPtr crtc = config->crtc[c];

-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||

-	    crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

-	    if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)

-		crtc->panningTotalArea.x2 += width  - pScreen->width;

-	    if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)

-		crtc->panningTotalArea.y2 += height - pScreen->height;

-	    if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)

-		crtc->panningTrackingArea.x2 += width  - pScreen->width;

-	    if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)

-		crtc->panningTrackingArea.y2 += height - pScreen->height;

-	    xf86RandR13VerifyPanningArea (crtc, width, height);

-	    xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

+

+    if (winSizeChanged)

+    {

+	/* Update panning information */

+	for (c = 0; c < config->num_crtc; c++) {

+	    xf86CrtcPtr crtc = config->crtc[c];

+	    if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||

+		crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

+		if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)

+		    crtc->panningTotalArea.x2 += width  - pScreen->width;

+		if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)

+		    crtc->panningTotalArea.y2 += height - pScreen->height;

+		if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)

+		    crtc->panningTrackingArea.x2 += width  - pScreen->width;

+		if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)

+		    crtc->panningTrackingArea.y2 += height - pScreen->height;

+		xf86RandR13VerifyPanningArea (crtc, width, height);

+		xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

+	    }

 	}

     }

 

     pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

-    pScreen->width = pScrnPix->drawable.width = width;

-    pScreen->height = pScrnPix->drawable.height = height;

+    pScreen->width = width;

+    pScreen->height = height;

+    if (pRoot)

+    {

+	BoxRec	box;

+

+	pRoot->drawable.width = width;

+	pRoot->drawable.height = height;

+	box.x1 = 0;

+	box.y1 = 0;

+	box.x2 = width;

+	box.y2 = height;

+	RegionInit(&pRoot->winSize, &box, 1);

+	RegionInit(&pRoot->borderSize, &box, 1);

+    }

+    pScrnPix->drawable.width = pixWidth;

+    pScrnPix->drawable.height = pixHeight;

     randrp->mmWidth = pScreen->mmWidth = mmWidth;

     randrp->mmHeight = pScreen->mmHeight = mmHeight;

 

-    xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);

-    xf86SetViewport (pScreen, 0, 0);

+    if (winSizeChanged)

+    {

+	xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);

+	xf86SetViewport (pScreen, 0, 0);

+    }

 

 finish:

-    if (pRoot && pScrn->vtSema)

-	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);

+    if (pixSizeChanged)

+    {

+	if (pRoot && pScrn->vtSema)

+	    (*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);

+    }

+

 #if RANDR_12_INTERFACE

     if (xf86RandR12Key && pScreen->root && ret)

 	RRScreenSizeNotify (pScreen);

@@ -758,7 +801,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 	xf86CrtcPtr crtc = config->crtc[c];

 	int	    crtc_width = crtc->x + xf86ModeWidth (&crtc->mode, crtc->rotation);

 	int	    crtc_height = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation);

-	

+

 	if (crtc->enabled) {

 	    if (crtc_width > width)

 		width = crtc_width;

@@ -770,13 +813,13 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 		height = crtc->panningTotalArea.y2;

 	}

     }

-    

+

     if (width && height)

     {

 	/*

 	 * Compute physical size of screen

 	 */

-	if (monitorResolution) 

+	if (monitorResolution)

 	{

 	    mmWidth = width * 25.4 / monitorResolution;

 	    mmHeight = height * 25.4 / monitorResolution;

@@ -818,6 +861,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 	xf86RandR12ScreenSetSize (pScreen,

 				  width,

 				  height,

+				  width,

+				  height,

 				  mmWidth,

 				  mmHeight);

     }

@@ -1007,7 +1052,7 @@ xf86RandRModeMatches (RRModePtr		randr_mode,
 	if (memcmp (randr_mode->name, mode->name, len) != 0)	return FALSE;

     }

 #endif

-    

+

     /* check for same timings */

     if (randr_mode->mode.dotClock / 1000 != mode->Clock)    return FALSE;

     if (randr_mode->mode.width        != mode->HDisplay)    return FALSE;

@@ -1019,11 +1064,11 @@ xf86RandRModeMatches (RRModePtr		randr_mode,
     if (randr_mode->mode.vSyncStart   != mode->VSyncStart)  return FALSE;

     if (randr_mode->mode.vSyncEnd     != mode->VSyncEnd)    return FALSE;

     if (randr_mode->mode.vTotal       != mode->VTotal)	    return FALSE;

-    

+

     /* check for same flags (using only the XF86 valid flag bits) */

     if ((randr_mode->mode.modeFlags & FLAG_BITS) != (mode->Flags & FLAG_BITS))

 	return FALSE;

-    

+

     /* everything matches */

     return TRUE;

 }

@@ -1063,7 +1108,7 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 	    randr_output = output->randr_output;

 	    randr_outputs[numOutputs++] = randr_output;

 	    /*

-	     * We make copies of modes, so pointer equality 

+	     * We make copies of modes, so pointer equality

 	     * isn't sufficient

 	     */

 	    for (j = 0; j < randr_output->numModes + randr_output->numUserModes; j++)

@@ -1071,7 +1116,7 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 		RRModePtr   m = (j < randr_output->numModes ?

 				 randr_output->modes[j] :

 				 randr_output->userModes[j-randr_output->numModes]);

-					 

+

 		if (xf86RandRModeMatches (m, mode))

 		{

 		    randr_mode = m;

@@ -1081,9 +1126,9 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 	}

     }

     ret = RRCrtcNotify (randr_crtc, randr_mode, x, y,

-			rotation, 

+			rotation,

 			crtc->transformPresent ? &crtc->transform : NULL,

-			numOutputs, randr_outputs);

+			numOutputs, randr_outputs, crtc->scanoutPixmap);

     free(randr_outputs);

     return ret;

 }

@@ -1100,13 +1145,13 @@ xf86RandRModeConvert (ScrnInfoPtr	scrn,
     mode->status = MODE_OK;

 

     mode->Clock = randr_mode->mode.dotClock / 1000;

-    

+

     mode->HDisplay = randr_mode->mode.width;

     mode->HSyncStart = randr_mode->mode.hSyncStart;

     mode->HSyncEnd = randr_mode->mode.hSyncEnd;

     mode->HTotal = randr_mode->mode.hTotal;

     mode->HSkew = randr_mode->mode.hSkew;

-    

+

     mode->VDisplay = randr_mode->mode.height;

     mode->VSyncStart = randr_mode->mode.vSyncStart;

     mode->VSyncEnd = randr_mode->mode.vSyncEnd;

@@ -1126,14 +1171,15 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 		    int		    y,

 		    Rotation	    rotation,

 		    int		    num_randr_outputs,

-		    RROutputPtr	    *randr_outputs)

+		    RROutputPtr	    *randr_outputs,

+		    PixmapPtr	    scanout_pixmap)

 {

     XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];

     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

     xf86CrtcPtr		crtc = randr_crtc->devPrivate;

     RRTransformPtr	transform;

-    Bool		changed = FALSE;

+    xf86CrtcSetFlags	flags = 0;

     int			o, ro;

     xf86CrtcPtr		*save_crtcs;

     Bool		save_enabled = crtc->enabled;

@@ -1143,34 +1189,37 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 

     save_crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));

     if ((randr_mode != NULL) != crtc->enabled)

-	changed = TRUE;

+	flags |= XF86CrtcSetMode;

     else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))

-	changed = TRUE;

-    

+	flags |= XF86CrtcSetMode;

+

     if (rotation != crtc->rotation)

-	changed = TRUE;

+	flags |= XF86CrtcSetRotation;

 

     transform = RRCrtcGetTransform (randr_crtc);

     if ((transform != NULL) != crtc->transformPresent)

-	changed = TRUE;

+	flags |= XF86CrtcSetTransform;

     else if (transform && memcmp (&transform->transform, &crtc->transform.transform,

 				  sizeof (transform->transform)) != 0)

-	changed = TRUE;

+	flags |= XF86CrtcSetTransform;

+

+    if (scanout_pixmap != crtc->scanoutPixmap)

+	flags |= XF86CrtcSetScanoutPixmap;

 

     if (x != crtc->x || y != crtc->y)

-	changed = TRUE;

-    for (o = 0; o < config->num_output; o++) 

+	flags |= XF86CrtcSetOrigin;

+    for (o = 0; o < config->num_output; o++)

     {

 	xf86OutputPtr  output = config->output[o];

 	xf86CrtcPtr    new_crtc;

 

 	save_crtcs[o] = output->crtc;

-	

+

 	if (output->crtc == crtc)

 	    new_crtc = NULL;

 	else

 	    new_crtc = output->crtc;

-	for (ro = 0; ro < num_randr_outputs; ro++) 

+	for (ro = 0; ro < num_randr_outputs; ro++)

 	    if (output->randr_output == randr_outputs[ro])

 	    {

 		new_crtc = crtc;

@@ -1178,16 +1227,16 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 	    }

 	if (new_crtc != output->crtc)

 	{

-	    changed = TRUE;

+	    flags |= XF86CrtcSetOutput;

 	    output->crtc = new_crtc;

 	}

     }

-    for (ro = 0; ro < num_randr_outputs; ro++) 

+    for (ro = 0; ro < num_randr_outputs; ro++)

         if (randr_outputs[ro]->pendingProperties)

-	    changed = TRUE;

+	    flags |= XF86CrtcSetProperty;

 

     /* XXX need device-independent mode setting code through an API */

-    if (changed)

+    if (flags)

     {

 	crtc->enabled = randr_mode != NULL;

 

@@ -1195,9 +1244,17 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 	{

 	    DisplayModeRec  mode;

 	    RRTransformPtr  transform = RRCrtcGetTransform (randr_crtc);

+	    xf86CrtcSetRec  set;

 

 	    xf86RandRModeConvert (pScrn, randr_mode, &mode);

-	    if (!xf86CrtcSetModeTransform (crtc, &mode, rotation, transform, x, y))

+	    set.mode = &mode;

+	    set.rotation = rotation;

+	    set.transform = transform;

+	    set.x = x;

+	    set.y = y;

+	    set.scanout_pixmap = scanout_pixmap;

+	    set.flags = flags;

+	    if (!xf86CrtcSet(crtc, &set))

 	    {

 		crtc->enabled = save_enabled;

 		for (o = 0; o < config->num_output; o++)

@@ -1378,7 +1435,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 

     if (nmode) {

 	rrmodes = malloc(nmode * sizeof (RRModePtr));

-	

+

 	if (!rrmodes)

 	    return FALSE;

 	nmode = 0;

@@ -1388,7 +1445,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 		if ((pref != 0) == ((mode->type & M_T_PREFERRED) != 0)) {

 		    xRRModeInfo		modeInfo;

 		    RRModePtr		rrmode;

-		    

+

 		    modeInfo.nameLength = strlen (mode->name);

 		    modeInfo.width = mode->HDisplay;

 		    modeInfo.dotClock = mode->Clock * 1000;

@@ -1412,7 +1469,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 	    }

 	}

     }

-    

+

     ret = RROutputSetModes (randr_output, rrmodes, nmode, npreferred);

     free(rrmodes);

     return ret;

@@ -1432,13 +1489,13 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
     int			o, c, l;

     RRCrtcPtr		randr_crtc;

     int			nclone;

-    

+

     clones = malloc(config->num_output * sizeof (RROutputPtr));

     crtcs = malloc(config->num_crtc * sizeof (RRCrtcPtr));

     for (o = 0; o < config->num_output; o++)

     {

 	xf86OutputPtr	output = config->output[o];

-	

+

 	ncrtc = 0;

 	for (c = 0; c < config->num_crtc; c++)

 	    if (output->possible_crtcs & (1 << c))

@@ -1456,7 +1513,7 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
 	    return FALSE;

 	}

 

-	RROutputSetPhysicalSize(output->randr_output, 

+	RROutputSetPhysicalSize(output->randr_output,

 				output->mm_width,

 				output->mm_height);

 	xf86RROutputSetModes (output->randr_output, output->probed_modes);

@@ -1482,7 +1539,7 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
 	for (l = 0; l < config->num_output; l++)

 	{

 	    xf86OutputPtr	    clone = config->output[l];

-	    

+

 	    if (l != o && (output->possible_clones & (1 << l)))

 		clones[nclone++] = clone->randr_output;

 	}

@@ -1523,7 +1580,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

     int			c;

     int			o;

-    

+

     if (!RRInit ())

 	return FALSE;

 

@@ -1533,7 +1590,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     for (c = 0; c < config->num_crtc; c++)

     {

 	xf86CrtcPtr    crtc = config->crtc[c];

-	

+

 	crtc->randr_crtc = RRCrtcCreate (pScreen, crtc);

 	RRCrtcGammaSetSize (crtc->randr_crtc, 256);

     }

@@ -1544,7 +1601,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     {

 	xf86OutputPtr	output = config->output[o];

 

-	output->randr_output = RROutputCreate (pScreen, output->name, 

+	output->randr_output = RROutputCreate (pScreen, output->name,

 					       strlen (output->name),

 					       output);

 

@@ -1567,7 +1624,7 @@ xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)
 

     for (c = 0; c < config->num_crtc; c++)

         xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);

-    

+

     RRScreenSetSizeRange (pScreen, config->minWidth, config->minHeight,

 			  config->maxWidth, config->maxHeight);

     return TRUE;

@@ -1725,6 +1782,174 @@ xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
     return Success;

 }

 

+static RRScanoutPixmapInfo *

+xf86RRQueryScanoutPixmaps(ScreenPtr screen, int *n_info)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+    RRScanoutPixmapInfo	*info;

+    int			f;

+

+    info = calloc(config->num_scanout_formats, sizeof (RRScanoutPixmapInfo));

+    if (config->num_scanout_formats && !info) {

+	*n_info = 0;

+	return NULL;

+    }

+    for (f = 0; f < config->num_scanout_formats; f++) {

+	info[f].maxWidth = config->scanout_formats[f].maxWidth;

+	info[f].maxHeight = config->scanout_formats[f].maxHeight;

+	info[f].depth = config->scanout_formats[f].depth;

+	info[f].rotations = config->scanout_formats[f].rotations;

+	info[f].format = PictureMatchFormat (screen, info[f].depth,

+					     config->scanout_formats[f].format);

+    }

+    *n_info = config->num_scanout_formats;

+    return info;

+}

+

+static PixmapPtr

+xf86RRCreateScanoutPixmap(ScreenPtr screen,

+			  int width, int height, int depth,

+			  Rotation rotations,

+			  PictFormatPtr format)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+    int			f;

+

+    if (!config->funcs->create_scanout_pixmap)

+	return NullPixmap;

+

+    for (f = 0; f < config->num_scanout_formats; f++)

+	if (config->scanout_formats[f].depth == depth &&

+	    (config->scanout_formats[f].format & 0xffffff) == format->format) {

+	    return (*config->funcs->create_scanout_pixmap) (scrn, width, height,

+							    rotations,

+							    &config->scanout_formats[f]);

+	}

+    return NullPixmap;

+}

+

+static void

+xf86RandR14SetCrtcSpriteTransform(ScreenPtr		pScreen,

+				  RRCrtcPtr		randr_crtc,

+				  struct pixman_f_transform *f_position_transform,

+				  struct pixman_f_transform *f_image_transform)

+{

+    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

+

+    crtc->user_sprite_position_transform = *f_position_transform;

+    crtc->user_sprite_image_transform = *f_image_transform;

+    xf86CrtcRotateCursor(crtc);

+    xf86_reload_cursors(pScreen);

+}

+

+static Bool

+xf86RRConvertCrtcConfig(xf86CrtcSetConfigPtr	xf86_config,

+			RRCrtcConfigPtr		rr_config)

+{

+    RRCrtcPtr		rr_crtc = rr_config->crtc;

+    xf86CrtcPtr		crtc = rr_crtc->devPrivate;

+    ScrnInfoPtr		scrn = xf86Screens[rr_crtc->pScreen->myNum];

+    int			o;

+

+    xf86_config->crtc = crtc;

+    xf86_config->x = rr_config->x;

+    xf86_config->y = rr_config->y;

+    xf86RandRModeConvert(scrn, rr_config->mode, &xf86_config->mode);

+    xf86_config->rotation = rr_config->rotation;

+    xf86_config->numOutputs = rr_config->numOutputs;

+    xf86_config->outputs = calloc(rr_config->numOutputs, sizeof (xf86OutputPtr));

+    if (!xf86_config->outputs)

+	return FALSE;

+    for (o = 0; o < rr_config->numOutputs; o++)

+	xf86_config->outputs[o] = rr_config->outputs[o]->devPrivate;

+    xf86_config->sprite_position_transform = rr_config->sprite_position_f_transform;

+    xf86_config->sprite_image_transform = rr_config->sprite_image_f_transform;

+    xf86_config->pixmap = rr_config->pixmap;

+    xf86_config->pixmap_x = rr_config->pixmap_x;

+    xf86_config->pixmap_y = rr_config->pixmap_y;

+    return TRUE;

+}

+

+static void

+xf86FreeCrtcSetConfigs(xf86CrtcSetConfigPtr xf86_crtc_configs, int num_configs)

+{

+    int	i;

+

+    for (i = 0; i < num_configs; i++)

+	free(xf86_crtc_configs[i].outputs);

+    free(xf86_crtc_configs);

+}

+

+static Bool

+xf86RRSetCrtcConfigs(ScreenPtr screen,

+		     RRScreenConfigPtr screen_config,

+		     RRCrtcConfigPtr crtc_configs,

+		     int num_configs)

+{

+    ScrnInfoPtr	     		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr		config = XF86_CRTC_CONFIG_PTR(scrn);

+

+    if (config->funcs->set_config) {

+	xf86CrtcSetConfigPtr	xf86_crtc_configs;

+	int			i;

+	xf86SetConfigResponse	response;

+

+	/*

+	 * Convert RRCrtcConfigRecs to xf86CrtcSetConfigs

+	 */

+	xf86_crtc_configs = calloc(num_configs, sizeof (xf86CrtcSetConfigRec));

+	if (!xf86_crtc_configs)

+	    return FALSE;

+	for (i = 0; i < num_configs; i++)

+	    if (!xf86RRConvertCrtcConfig(&xf86_crtc_configs[i], &crtc_configs[i])) {

+		xf86FreeCrtcSetConfigs(xf86_crtc_configs, num_configs);

+		return FALSE;

+	    }

+

+	/*

+	 * Ask the driver to set the configuration

+	 */

+	response = (*config->funcs->set_config)(scrn,

+						screen_config,

+						xf86_crtc_configs,

+						num_configs);

+	xf86FreeCrtcSetConfigs(xf86_crtc_configs, num_configs);

+

+	/*

+	 * The driver is allowed to answer with one of three

+	 * responses:

+	 */

+	switch (response) {

+	case xf86SetConfigFailed:

+

+	    /* The configuration isn't usable, or some error

+	     * occurred while setting it. Everything has been

+	     * cleaned up and we're ready to return an error

+	     * back to the client

+	     */

+	    return FALSE;

+	case xf86SetConfigDone:

+

+	    /* The configuration was acceptable, and the whole

+	     * mode setting experience is over. Nothing more to do

+	     * here.

+	     */

+	    return TRUE;

+	case xf86SetConfigChecked:

+

+	    /* The configuration was acceptable, but the driver

+	     * didn't actually do anything. Go ask the DIX code

+	     * to do the mode setting operation using the simpler

+	     * interfaces

+	     */

+	    break;

+	}

+    }

+    return miRRSetCrtcConfigs(screen, screen_config, crtc_configs, num_configs);

+}

+

 static Bool

 xf86RandR12EnterVT (int screen_index, int flags)

 {

@@ -1733,6 +1958,7 @@ xf86RandR12EnterVT (int screen_index, int flags)
     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);

     rrScrPrivPtr     rp = rrGetScrPriv(pScreen);

     Bool	     ret;

+    int i;

 

     if (randrp->orig_EnterVT) {

 	pScrn->EnterVT = randrp->orig_EnterVT;

@@ -1744,7 +1970,6 @@ xf86RandR12EnterVT (int screen_index, int flags)
     }

 

     /* reload gamma */

-    int i;

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

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

 

@@ -1766,15 +1991,17 @@ xf86RandR12Init12 (ScreenPtr pScreen)
     rp->rrCrtcGetGamma = xf86RandR12CrtcGetGamma;

     rp->rrOutputSetProperty = xf86RandR12OutputSetProperty;

     rp->rrOutputValidateMode = xf86RandR12OutputValidateMode;

-#if RANDR_13_INTERFACE

     rp->rrOutputGetProperty = xf86RandR13OutputGetProperty;

     rp->rrGetPanning = xf86RandR13GetPanning;

     rp->rrSetPanning = xf86RandR13SetPanning;

-#endif

     rp->rrModeDestroy = xf86RandR12ModeDestroy;

     rp->rrSetConfig = NULL;

     pScrn->PointerMoved = xf86RandR12PointerMoved;

     pScrn->ChangeGamma = xf86RandR12ChangeGamma;

+    rp->rrSetCrtcSpriteTransform = xf86RandR14SetCrtcSpriteTransform;

+    rp->rrSetCrtcConfigs = xf86RRSetCrtcConfigs;

+    rp->rrQueryScanoutPixmaps = xf86RRQueryScanoutPixmaps;

+    rp->rrCreateScanoutPixmap = xf86RRCreateScanoutPixmap;

 

     randrp->orig_EnterVT = pScrn->EnterVT;

     pScrn->EnterVT = xf86RandR12EnterVT;

diff --git a/xorg-server/hw/xfree86/modes/xf86Rotate.c b/xorg-server/hw/xfree86/modes/xf86Rotate.c
index 655857597..0181bc381 100644
--- a/xorg-server/hw/xfree86/modes/xf86Rotate.c
+++ b/xorg-server/hw/xfree86/modes/xf86Rotate.c
@@ -369,6 +369,39 @@ xf86CrtcFitsScreen (xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb)
 	    0 <= b.y1 && b.y2 <= pScrn->virtualY);

 }

 

+/*

+ * A subset of xf86CrtcRotate that just deals with

+ * cursor image/position transforms. Used when changing

+ * the cursor transform

+ */

+void

+xf86CrtcRotateCursor (xf86CrtcPtr crtc)

+{

+    /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */

+    RRTransformPtr	transform = NULL;

+    PictTransform	crtc_to_fb;

+    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc, f_screen_to_crtc, f_crtc_to_cursor;

+

+    if (crtc->transformPresent)

+	transform = &crtc->transform;

+

+    (void) RRTransformCompute (crtc->x, crtc->y,

+			       crtc->mode.HDisplay, crtc->mode.VDisplay,

+			       crtc->rotation,

+			       transform,

+			       &crtc->user_sprite_position_transform,

+			       &crtc->user_sprite_image_transform,

+

+			       &crtc_to_fb,

+			       &f_crtc_to_fb,

+			       &f_fb_to_crtc,

+			       &f_screen_to_crtc,

+			       &f_crtc_to_cursor,

+			       &crtc->sprite_transform_in_use);

+    crtc->f_screen_to_crtc = f_screen_to_crtc;

+    crtc->f_crtc_to_cursor = f_crtc_to_cursor;

+}

+

 Bool

 xf86CrtcRotate (xf86CrtcPtr crtc)

 {

@@ -377,7 +410,7 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
     /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */

     ScreenPtr		pScreen = screenInfo.screens[pScrn->scrnIndex];

     PictTransform	crtc_to_fb;

-    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;

+    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc, f_screen_to_crtc, f_crtc_to_cursor;

     xFixed		*new_params = NULL;

     int			new_nparams = 0;

     PictFilterPtr	new_filter = NULL;

@@ -393,10 +426,15 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
 			     crtc->mode.HDisplay, crtc->mode.VDisplay,

 			     crtc->rotation,

 			     transform,

+			     &crtc->user_sprite_position_transform,

+			     &crtc->user_sprite_image_transform,

 

 			     &crtc_to_fb,

 			     &f_crtc_to_fb,

-			     &f_fb_to_crtc) &&

+			     &f_fb_to_crtc,

+			     &f_screen_to_crtc,

+			     &f_crtc_to_cursor,

+			     &crtc->sprite_transform_in_use) &&

 	xf86CrtcFitsScreen (crtc, &f_crtc_to_fb))

     {

 	/*

@@ -505,6 +543,8 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
     crtc->crtc_to_framebuffer = crtc_to_fb;

     crtc->f_crtc_to_framebuffer = f_crtc_to_fb;

     crtc->f_framebuffer_to_crtc = f_fb_to_crtc;

+    crtc->f_screen_to_crtc = f_screen_to_crtc;

+    crtc->f_crtc_to_cursor = f_crtc_to_cursor;

     free(crtc->params);

     crtc->params = new_params;

     crtc->nparams = new_nparams;

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c b/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
index b85a3c86b..99c3abde5 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
@@ -318,7 +318,7 @@ xf86EnableAGP(int screenNum, CARD32 mode)
 	if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) {

 		xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: "

 		    "AGPIOC_SETUP with mode %x failed (%s)\n",

-		    mode, strerror(errno));

+		    (unsigned int) mode, strerror(errno));

 		return FALSE;

 	}

 

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
index 4716da93e..ae9adee4b 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
@@ -71,7 +71,6 @@ xf86OpenConsole(void)
     int fd;

     struct vt_mode VT;

     struct vt_stat vtinfo;

-    int FreeVTslot;

     MessageType from = X_PROBED;

 #endif

 

@@ -95,8 +94,8 @@ xf86OpenConsole(void)
 	    }

 	    else

 	    {

-		if ((int)mmap(0, 0x1000, PROT_NONE,

-			      MAP_FIXED | MAP_SHARED, fd, 0) == -1)

+		if (mmap(0, 0x1000, PROT_NONE,

+			 MAP_FIXED | MAP_SHARED, fd, 0) == MAP_FAILED)

 		    xf86Msg(X_WARNING,

 			"xf86OpenConsole: failed to protect page 0 (%s)\n",

 			strerror(errno));

@@ -413,7 +412,7 @@ xf86ProcessArgument(int argc, char **argv, int i)
     return 0;

 }

 

-void xf86UseMsg()

+void xf86UseMsg(void)

 {

 #ifdef HAS_USL_VTS

     ErrorF("vtX                    Use the specified VT number\n");

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c b/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
index 5089ae74d..1991289fd 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
@@ -1,259 +1,258 @@
-/*
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
- * Copyright 1993 by David Wexelblat <dwex@goblin.org>
- * Copyright 1999 by David Holland <davidh@iquest.net>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the names of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-/* Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <sys/types.h> /* get __x86 definition if not set by compiler */
-
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-# define _NEED_SYSI86
-#endif
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-#include <sys/mman.h>
-
-/***************************************************************************/
-/* Video Memory Mapping section 					   */
-/***************************************************************************/
-
-static char *apertureDevName = NULL;
-static int apertureDevFD_ro = -1;
-static int apertureDevFD_rw = -1;
-
-static Bool
-solOpenAperture(void)
-{
-    if (apertureDevName == NULL)
-    {
-	apertureDevName = "/dev/xsvc";
-	if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)
-	{
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: failed to open %s (%s)\n",
-			apertureDevName, strerror(errno));
-	    apertureDevName = "/dev/fbs/aperture";
-	    apertureDevFD_rw = open(apertureDevName, O_RDWR);
-	}
-	apertureDevFD_ro = open(apertureDevName, O_RDONLY);
-
-	if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))
-	{
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: failed to open %s (%s)\n",
-			apertureDevName, strerror(errno));
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: either /dev/fbs/aperture"
-			" or /dev/xsvc required\n");
-
-	    apertureDevName = NULL;
-
-	    if (apertureDevFD_rw >= 0)
-	    {
-		close(apertureDevFD_rw);
-	    }
-	    apertureDevFD_rw = -1;
-
-	    if (apertureDevFD_ro >= 0)
-	    {
-		close(apertureDevFD_ro);
-	    }
-	    apertureDevFD_ro = -1;
-
-	    return FALSE;
-	}
-    }
-    return TRUE;
-}
-
-static pointer
-solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
-{
-    pointer base;
-    int fd;
-    int prot;
-
-    if (Flags & VIDMEM_READONLY)
-    {
-	fd = apertureDevFD_ro;
-	prot = PROT_READ;
-    }
-    else
-    {
-	fd = apertureDevFD_rw;
-	prot = PROT_READ | PROT_WRITE;
-    }
-
-    if (fd < 0)
-    {
-	xf86DrvMsg(ScreenNum, X_ERROR,
-		   "solMapVidMem: failed to open %s (%s)\n",
-		   apertureDevName, strerror(errno));
-	return NULL;
-    }
-
-    base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);
-
-    if (base == MAP_FAILED) {
-        xf86DrvMsg(ScreenNum, X_ERROR,
-		   "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",
-		   apertureDevName, Base, Size, strerror(errno));
-	return NULL;
-    }
-
-    return base;
-}
-
-/* ARGSUSED */
-static void
-solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
-{
-    if (munmap(Base, Size) != 0) {
-	xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,
-		       "solUnMapVidMem: failed to unmap %s"
-		       " (0x%08lx,0x%lx) (%s)\n",
-		       apertureDevName, Base, Size,
-		       strerror(errno));
-    }
-}
-
-_X_HIDDEN void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
-    pVidMem->linearSupported = solOpenAperture();
-    if (pVidMem->linearSupported) {
-	pVidMem->mapMem = solMapVidMem;
-	pVidMem->unmapMem = solUnMapVidMem;
-    } else {
-	xf86MsgVerb(X_WARNING, 0,
-		    "xf86OSInitVidMem: linear memory access disabled\n");
-    }
-    pVidMem->initialised = TRUE;
-}
-
-/*
- * Read BIOS via mmap()ing physical memory.
- */
-int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
-{
-    unsigned char *ptr;
-    int psize;
-    int mlen;
-
-    psize = getpagesize();
-    Offset += Base & (psize - 1);
-    Base &= ~(psize - 1);
-    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-
-    if (solOpenAperture() == FALSE)
-    {
-	xf86Msg(X_WARNING,
-		"xf86ReadBIOS: Failed to open aperture to read BIOS\n");
-	return -1;
-    }
-
-    ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,
-				MAP_SHARED, apertureDevFD_ro, (off_t)Base);
-    if (ptr == MAP_FAILED)
-    {
-	xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",
-		apertureDevName, Base, mlen);
-	return -1;
-    }
-
-    (void)memcpy(Buf, (void *)(ptr + Offset), Len);
-    if (munmap((caddr_t)ptr, mlen) != 0) {
-	xf86MsgVerb(X_WARNING, 0,
-		    "solUnMapVidMem: failed to unmap %s"
-		    " (0x%08lx,0x%lx) (%s)\n",
-		    apertureDevName, ptr, mlen, strerror(errno));
-    }
-
-    return Len;
-}
-
-
-/***************************************************************************/
-/* I/O Permissions section						   */
-/***************************************************************************/
-
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-static Bool ExtendedEnabled = FALSE;
-#endif
-
-Bool
-xf86EnableIO(void)
-{
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-    if (ExtendedEnabled)
-	return TRUE;
-
-    if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
-	xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");
-	return FALSE;
-    }
-    ExtendedEnabled = TRUE;
-#endif /* i386 */
-    return TRUE;
-}
-
-void
-xf86DisableIO(void)
-{
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-    if(!ExtendedEnabled)
-	return;
-
-    sysi86(SI86V86, V86SC_IOPL, 0);
-
-    ExtendedEnabled = FALSE;
-#endif /* i386 */
-}
+/*

+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

+ * Copyright 1993 by David Wexelblat <dwex@goblin.org>

+ * Copyright 1999 by David Holland <davidh@iquest.net>

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the names of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT

+ * SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ *

+ */

+/* Copyright 2008 Sun Microsystems, Inc.  All rights reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <sys/types.h> /* get __x86 definition if not set by compiler */

+

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+# define _NEED_SYSI86

+#endif

+#include "xf86.h"

+#include "xf86Priv.h"

+#include "xf86_OSlib.h"

+#include "xf86OSpriv.h"

+#include <sys/mman.h>

+

+/***************************************************************************/

+/* Video Memory Mapping section 					   */

+/***************************************************************************/

+

+static char *apertureDevName = NULL;

+static int apertureDevFD_ro = -1;

+static int apertureDevFD_rw = -1;

+

+static Bool

+solOpenAperture(void)

+{

+    if (apertureDevName == NULL)

+    {

+	apertureDevName = "/dev/xsvc";

+	if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)

+	{

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: failed to open %s (%s)\n",

+			apertureDevName, strerror(errno));

+	    apertureDevName = "/dev/fbs/aperture";

+	    apertureDevFD_rw = open(apertureDevName, O_RDWR);

+	}

+	apertureDevFD_ro = open(apertureDevName, O_RDONLY);

+

+	if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))

+	{

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: failed to open %s (%s)\n",

+			apertureDevName, strerror(errno));

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: either /dev/fbs/aperture"

+			" or /dev/xsvc required\n");

+

+	    apertureDevName = NULL;

+

+	    if (apertureDevFD_rw >= 0)

+	    {

+		close(apertureDevFD_rw);

+	    }

+	    apertureDevFD_rw = -1;

+

+	    if (apertureDevFD_ro >= 0)

+	    {

+		close(apertureDevFD_ro);

+	    }

+	    apertureDevFD_ro = -1;

+

+	    return FALSE;

+	}

+    }

+    return TRUE;

+}

+

+static pointer

+solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)

+{

+    pointer base;

+    int fd;

+    int prot;

+

+    if (Flags & VIDMEM_READONLY)

+    {

+	fd = apertureDevFD_ro;

+	prot = PROT_READ;

+    }

+    else

+    {

+	fd = apertureDevFD_rw;

+	prot = PROT_READ | PROT_WRITE;

+    }

+

+    if (fd < 0)

+    {

+	xf86DrvMsg(ScreenNum, X_ERROR,

+		   "solMapVidMem: failed to open %s (%s)\n",

+		   apertureDevName, strerror(errno));

+	return NULL;

+    }

+

+    base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);

+

+    if (base == MAP_FAILED) {

+        xf86DrvMsg(ScreenNum, X_ERROR,

+		   "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",

+		   apertureDevName, Base, Size, strerror(errno));

+	return NULL;

+    }

+

+    return base;

+}

+

+/* ARGSUSED */

+static void

+solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)

+{

+    if (munmap(Base, Size) != 0) {

+	xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,

+		       "solUnMapVidMem: failed to unmap %s"

+		       " (0x%p,0x%lx) (%s)\n",

+		       apertureDevName, Base, Size,

+		       strerror(errno));

+    }

+}

+

+_X_HIDDEN void

+xf86OSInitVidMem(VidMemInfoPtr pVidMem)

+{

+    pVidMem->linearSupported = solOpenAperture();

+    if (pVidMem->linearSupported) {

+	pVidMem->mapMem = solMapVidMem;

+	pVidMem->unmapMem = solUnMapVidMem;

+    } else {

+	xf86MsgVerb(X_WARNING, 0,

+		    "xf86OSInitVidMem: linear memory access disabled\n");

+    }

+    pVidMem->initialised = TRUE;

+}

+

+/*

+ * Read BIOS via mmap()ing physical memory.

+ */

+int

+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,

+	     int Len)

+{

+    unsigned char *ptr;

+    int psize;

+    int mlen;

+

+    psize = getpagesize();

+    Offset += Base & (psize - 1);

+    Base &= ~(psize - 1);

+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);

+

+    if (solOpenAperture() == FALSE)

+    {

+	xf86Msg(X_WARNING,

+		"xf86ReadBIOS: Failed to open aperture to read BIOS\n");

+	return -1;

+    }

+

+    ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,

+				MAP_SHARED, apertureDevFD_ro, (off_t)Base);

+    if (ptr == MAP_FAILED)

+    {

+	xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",

+		apertureDevName, Base, mlen);

+	return -1;

+    }

+

+    (void)memcpy(Buf, (void *)(ptr + Offset), Len);

+    if (munmap((caddr_t)ptr, mlen) != 0) {

+	xf86MsgVerb(X_WARNING, 0,

+		    "xf86ReadBIOS: failed to unmap %s (0x%p,0x%x) (%s)\n",

+		    apertureDevName, ptr, mlen, strerror(errno));

+    }

+

+    return Len;

+}

+

+

+/***************************************************************************/

+/* I/O Permissions section						   */

+/***************************************************************************/

+

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+static Bool ExtendedEnabled = FALSE;

+#endif

+

+Bool

+xf86EnableIO(void)

+{

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+    if (ExtendedEnabled)

+	return TRUE;

+

+    if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {

+	xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");

+	return FALSE;

+    }

+    ExtendedEnabled = TRUE;

+#endif /* i386 */

+    return TRUE;

+}

+

+void

+xf86DisableIO(void)

+{

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+    if(!ExtendedEnabled)

+	return;

+

+    sysi86(SI86V86, V86SC_IOPL, 0);

+

+    ExtendedEnabled = FALSE;

+#endif /* i386 */

+}

diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 4dbe74b97..56021ed0a 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -792,7 +792,7 @@ xf86SetRootClip (ScreenPtr pScreen, int enable)
     WindowPtr	pChild;

     Bool	WasViewable = (Bool)(pWin->viewable);

     Bool	anyMarked = TRUE;

-    RegionPtr	pOldClip = NULL, bsExposed;

+    RegionPtr	pOldClip = NULL;

     WindowPtr   pLayerWin;

     BoxRec	box;

 

diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index e6386dc3a..aaff1c625 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -74,7 +74,7 @@ extern int noPanoramiXExtension;
 #endif

 

 static char __crashreporter_info_buff__[4096] = {0};

-static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];

+static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];

 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

 // This is actually a toolchain requirement, but I'm not sure the correct check,

 // but it should be fine to just only include it for Leopard and later.  This line

diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 7a92755c7..aed063489 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -62,6 +62,7 @@
 #include <sys/stat.h>

 #include <fcntl.h>

 #include <IOKit/pwr_mgt/IOPMLib.h>

+#include <pthread.h>

 

 #include <rootlessCommon.h>

 #include <Xplugin.h>

@@ -246,6 +247,40 @@ void QuartzUpdateScreens(void) {
     quartzProcs->UpdateScreen(pScreen);

 }

 

+static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {

+    UpdateSystemActivity(OverallAct);

+}

+

+static void QuartzScreenSaver(int state) {

+    static CFRunLoopTimerRef pokeActivityTimer = NULL;

+    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };

+    static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER;

+

+    pthread_mutex_lock(&pokeActivityMutex);

+    

+    if(state) {

+        if(pokeActivityTimer == NULL)

+            goto QuartzScreenSaverEnd;

+

+        CFRunLoopTimerInvalidate(pokeActivityTimer);

+        CFRelease(pokeActivityTimer);

+        pokeActivityTimer = NULL;

+    } else {

+        if(pokeActivityTimer != NULL)

+            goto QuartzScreenSaverEnd;

+        

+        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);

+        if(pokeActivityTimer == NULL) {

+            ErrorF("Unable to create pokeActivityTimer.\n");

+            goto QuartzScreenSaverEnd;

+        }

+

+        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);

+    }

+QuartzScreenSaverEnd:

+    pthread_mutex_unlock(&pokeActivityMutex);

+}

+

 void QuartzShowFullscreen(int state) {

     int i;

     

@@ -256,6 +291,8 @@ void QuartzShowFullscreen(int state) {
         return;

     }

     

+    QuartzScreenSaver(!state);

+    

     if(XQuartzFullscreenVisible == state)

         return;

     

diff --git a/xorg-server/hw/xquartz/quartzRandR.c b/xorg-server/hw/xquartz/quartzRandR.c
index bc58e2341..64ad72d84 100644
--- a/xorg-server/hw/xquartz/quartzRandR.c
+++ b/xorg-server/hw/xquartz/quartzRandR.c
@@ -438,18 +438,16 @@ static Bool QuartzRandRSetConfig (ScreenPtr           pScreen,
 static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {

     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

 

-    if (pQuartzScreen->displayCount == 1) {

-        if(pQuartzScreen->fullscreenMode.ref)

-            CFRelease(pQuartzScreen->fullscreenMode.ref);

-        if(pQuartzScreen->currentMode.ref)

-            CFRelease(pQuartzScreen->currentMode.ref);

+    if(pQuartzScreen->fullscreenMode.ref)

+        CFRelease(pQuartzScreen->fullscreenMode.ref);

+    if(pQuartzScreen->currentMode.ref)

+        CFRelease(pQuartzScreen->currentMode.ref);

         

-        if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0],

-                                            &pQuartzScreen->fullscreenMode))

-            return FALSE;

+    if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0],

+                                        &pQuartzScreen->fullscreenMode))

+        return FALSE;

 

-        CFRetain(pQuartzScreen->fullscreenMode.ref);  /* This extra retain is for currentMode's copy */

-    } else {

+    if (pQuartzScreen->displayCount > 1) {

         pQuartzScreen->fullscreenMode.width = pScreen->width;

         pQuartzScreen->fullscreenMode.height = pScreen->height;

         if(XQuartzIsRootless)

@@ -467,6 +465,11 @@ static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {
     } else {

         pQuartzScreen->currentMode = pQuartzScreen->fullscreenMode;

     }

+

+    /* This extra retain is for currentMode's copy.

+     * fullscreen and rootless share a retain.

+     */

+    CFRetain(pQuartzScreen->currentMode.ref);

     

     DEBUG_LOG("rootlessMode: %d x %d\n", (int)pQuartzScreen->rootlessMode.width, (int)pQuartzScreen->rootlessMode.height);

     DEBUG_LOG("fullscreenMode: %d x %d\n", (int)pQuartzScreen->fullscreenMode.width, (int)pQuartzScreen->fullscreenMode.height);

diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 7e0cdbd3e..59c057c44 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -526,7 +526,7 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X
 

 extern _X_EXPORT void VErrorF(const char *f, va_list args);

 extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

-extern _X_EXPORT void Error(char *str);

+extern _X_EXPORT void Error(const char *str);

 extern _X_EXPORT void LogPrintMarkers(void);

 

 extern _X_EXPORT void xorg_backtrace(void);

diff --git a/xorg-server/include/privates.h b/xorg-server/include/privates.h
index 6fb3184fe..e6c427fab 100644
--- a/xorg-server/include/privates.h
+++ b/xorg-server/include/privates.h
@@ -51,6 +51,7 @@ typedef enum {
     PRIVATE_GLYPH,

     PRIVATE_GLYPHSET,

     PRIVATE_PICTURE,

+    PRIVATE_SYNC_FENCE,

 

     /* last private type */

     PRIVATE_LAST,

diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h
index 6ea4623da..441d76788 100644
--- a/xorg-server/include/protocol-versions.h
+++ b/xorg-server/include/protocol-versions.h
@@ -65,7 +65,7 @@
 

 /* RandR */

 #define SERVER_RANDR_MAJOR_VERSION		1

-#define SERVER_RANDR_MINOR_VERSION		3

+#define SERVER_RANDR_MINOR_VERSION		4

 

 /* Record */

 #define SERVER_RECORD_MAJOR_VERSION		1

@@ -95,6 +95,10 @@
 #define SERVER_SHM_MAJOR_VERSION		1

 #define SERVER_SHM_MINOR_VERSION		1

 

+/* Sync */

+#define SERVER_SYNC_MAJOR_VERSION		3

+#define SERVER_SYNC_MINOR_VERSION		1

+

 /* Windows WM */

 #define SERVER_WINDOWSWM_MAJOR_VERSION		1

 #define SERVER_WINDOWSWM_MINOR_VERSION		0

diff --git a/xorg-server/mi/mieq.c b/xorg-server/mi/mieq.c
index 58db72968..974bec77d 100644
--- a/xorg-server/mi/mieq.c
+++ b/xorg-server/mi/mieq.c
@@ -320,6 +320,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
 {

     DeviceIntPtr mdev;

     int len = original->any.length;

+    int type = original->any.type;

 

     CHECKEVENT(original);

 

@@ -327,7 +328,12 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     if (!sdev || !sdev->u.master)

         return NULL;

 

-    switch(original->any.type)

+#if XFreeXDGA

+    if (type == ET_DGAEvent)

+        type = original->dga_event.subtype;

+#endif

+

+    switch(type)

     {

         case ET_KeyPress:

         case ET_KeyRelease:

@@ -444,6 +450,7 @@ mieqProcessInputEvents(void)
             event_size = evlen;

           }

 

+

         if (!event)

             FatalError("[mi] No memory left for event processing.\n");

 

diff --git a/xorg-server/miext/Makefile.am b/xorg-server/miext/Makefile.am
index 84ab70855..850c41c66 100644
--- a/xorg-server/miext/Makefile.am
+++ b/xorg-server/miext/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS = damage shadow
-if COMPOSITE
-SUBDIRS += cw
-endif
-if XQUARTZ
-SUBDIRS += rootless
-endif
-if XWIN_MULTIWINDOWEXTWM
-SUBDIRS += rootless
-endif
-DIST_SUBDIRS = damage shadow cw rootless
+SUBDIRS = sync damage shadow

+if COMPOSITE

+SUBDIRS += cw

+endif

+if XQUARTZ

+SUBDIRS += rootless

+endif

+if XWIN_MULTIWINDOWEXTWM

+SUBDIRS += rootless

+endif

+DIST_SUBDIRS = sync damage shadow cw rootless

diff --git a/xorg-server/miext/sync/Makefile.am b/xorg-server/miext/sync/Makefile.am
new file mode 100644
index 000000000..2bfe44da1
--- /dev/null
+++ b/xorg-server/miext/sync/Makefile.am
@@ -0,0 +1,14 @@
+noinst_LTLIBRARIES = libsync.la

+

+AM_CFLAGS = $(DIX_CFLAGS)

+

+INCLUDES = 

+

+if XORG

+sdk_HEADERS = misync.h misyncstr.h

+endif

+

+libsync_la_SOURCES =	\

+	misync.c	\

+	misync.h	\

+	misyncstr.h

diff --git a/xorg-server/miext/sync/misync.c b/xorg-server/miext/sync/misync.c
new file mode 100644
index 000000000..932376cf0
--- /dev/null
+++ b/xorg-server/miext/sync/misync.c
@@ -0,0 +1,201 @@
+/*

+ * Copyright © 2010 NVIDIA Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "scrnintstr.h"

+#include "misync.h"

+#include "misyncstr.h"

+

+static DevPrivateKeyRec syncScreenPrivateKeyRec;

+static DevPrivateKey syncScreenPrivateKey = &syncScreenPrivateKeyRec;

+

+#define SYNC_SCREEN_PRIV(pScreen) 				\

+    (SyncScreenPrivPtr) dixLookupPrivate(&pScreen->devPrivates,	\

+					 syncScreenPrivateKey)

+

+typedef struct _syncScreenPriv {

+    /* Wrappable sync-specific screen functions */

+    SyncScreenFuncsRec		funcs;

+

+    /* Wrapped screen functions */

+    CloseScreenProcPtr		CloseScreen;

+} SyncScreenPrivRec, *SyncScreenPrivPtr;

+

+/* Default implementations of the sync screen functions */

+void

+miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence* pFence,

+                        Bool initially_triggered)

+{

+    (void)pScreen;

+

+    pFence->triggered = initially_triggered;

+}

+

+void miSyncScreenDestroyFence(ScreenPtr pScreen, SyncFence* pFence)

+{

+    (void)pScreen;

+    (void)pFence;

+}

+

+/* Default implementations of the per-object functions */

+static void

+miSyncFenceSetTriggered(SyncFence* pFence)

+{

+    pFence->triggered = TRUE;

+}

+

+static void

+miSyncFenceReset(SyncFence* pFence)

+{

+    pFence->triggered = FALSE;

+}

+

+static Bool

+miSyncFenceCheckTriggered(SyncFence* pFence)

+{

+    return pFence->triggered;

+}

+

+static void

+miSyncFenceAddTrigger(SyncTrigger* pTrigger)

+{

+    (void)pTrigger;

+

+    return;

+}

+

+static void

+miSyncFenceDeleteTrigger(SyncTrigger* pTrigger)

+{

+    (void)pTrigger;

+

+    return;

+}

+

+/* Machine independent portion of the fence sync object implementation */

+void

+miSyncInitFence(ScreenPtr pScreen, SyncFence* pFence, Bool initially_triggered)

+{

+    SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+    static const SyncFenceFuncsRec miSyncFenceFuncs = {

+	&miSyncFenceSetTriggered,

+	&miSyncFenceReset,

+	&miSyncFenceCheckTriggered,

+	&miSyncFenceAddTrigger,

+	&miSyncFenceDeleteTrigger

+    };

+

+    pFence->pScreen = pScreen;

+    pFence->funcs = miSyncFenceFuncs;

+

+    pScreenPriv->funcs.CreateFence(pScreen, pFence, initially_triggered);

+}

+

+void

+miSyncDestroyFence(SyncFence* pFence)

+{

+    ScreenPtr pScreen = pFence->pScreen;

+    SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+    SyncTriggerList *ptl, *pNext;

+

+    pFence->sync.beingDestroyed = TRUE;

+    /* tell all the fence's triggers that the counter has been destroyed */

+    for (ptl = pFence->sync.pTriglist; ptl; ptl = pNext)

+    {

+	(*ptl->pTrigger->CounterDestroyed)(ptl->pTrigger);

+	pNext = ptl->next;

+	free(ptl); /* destroy the trigger list as we go */

+    }

+

+    pScreenPriv->funcs.DestroyFence(pScreen, pFence);

+

+    dixFreeObjectWithPrivates(pFence, PRIVATE_SYNC_FENCE);

+}

+

+void

+miSyncTriggerFence(SyncFence* pFence)

+{

+    SyncTriggerList *ptl, *pNext;

+    CARD64 unused;

+

+    pFence->funcs.SetTriggered(pFence);

+

+    XSyncIntToValue(&unused, 0L);

+

+    /* run through triggers to see if any fired */

+    for (ptl = pFence->sync.pTriglist; ptl; ptl = pNext)

+    {

+	pNext = ptl->next;

+	if ((*ptl->pTrigger->CheckTrigger)(ptl->pTrigger, unused))

+	    (*ptl->pTrigger->TriggerFired)(ptl->pTrigger);

+    }

+}

+

+SyncScreenFuncsPtr miSyncGetScreenFuncs(ScreenPtr pScreen)

+{

+    SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+

+    return &pScreenPriv->funcs;

+}

+

+static Bool

+SyncCloseScreen (int i, ScreenPtr pScreen)

+{

+    SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+

+    pScreen->CloseScreen = pScreenPriv->CloseScreen;

+    free(pScreenPriv);

+

+    return (*pScreen->CloseScreen) (i, pScreen);

+}

+

+Bool

+miSyncSetup(ScreenPtr pScreen)

+{

+    SyncScreenPrivPtr	pScreenPriv;

+

+    static const SyncScreenFuncsRec miSyncScreenFuncs = {

+	&miSyncScreenCreateFence,

+	&miSyncScreenDestroyFence

+    };

+

+    if (dixPrivateKeyRegistered(syncScreenPrivateKey))

+	return TRUE;

+

+    if (!dixRegisterPrivateKey(syncScreenPrivateKey, PRIVATE_SCREEN,

+			       sizeof(SyncScreenPrivRec)))

+	return FALSE;

+

+    pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+

+    pScreenPriv->funcs = miSyncScreenFuncs;

+

+    /* Wrap CloseScreen to clean up */

+    pScreenPriv->CloseScreen = pScreen->CloseScreen;

+    pScreen->CloseScreen = SyncCloseScreen;

+

+    return TRUE;

+}

diff --git a/xorg-server/miext/sync/misync.h b/xorg-server/miext/sync/misync.h
new file mode 100644
index 000000000..644309324
--- /dev/null
+++ b/xorg-server/miext/sync/misync.h
@@ -0,0 +1,77 @@
+/*

+ * Copyright © 2010 NVIDIA Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifndef _MISYNC_H_

+#define _MISYNC_H_

+

+typedef struct _SyncFence SyncFence;

+typedef struct _SyncTrigger SyncTrigger;

+

+typedef void (*SyncScreenCreateFenceFunc) (ScreenPtr pScreen,

+					   SyncFence* pFence,

+					   Bool initially_triggered);

+typedef void (*SyncScreenDestroyFenceFunc) (ScreenPtr pScreen,

+					    SyncFence* pFence);

+

+typedef struct _syncScreenFuncs {

+    SyncScreenCreateFenceFunc	CreateFence;

+    SyncScreenDestroyFenceFunc	DestroyFence;

+} SyncScreenFuncsRec, *SyncScreenFuncsPtr;

+

+extern _X_EXPORT void

+miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence* pFence,

+			Bool initially_triggered);

+extern _X_EXPORT void

+miSyncScreenDestroyFence(ScreenPtr pScreen, SyncFence* pFence);

+

+typedef void (*SyncFenceSetTriggeredFunc) (SyncFence* pFence);

+typedef void (*SyncFenceResetFunc) (SyncFence* pFence);

+typedef Bool (*SyncFenceCheckTriggeredFunc) (SyncFence* pFence);

+typedef void (*SyncFenceAddTriggerFunc) (SyncTrigger* pTrigger);

+typedef void (*SyncFenceDeleteTriggerFunc) (SyncTrigger* pTrigger);

+

+typedef struct _syncFenceFuncs {

+    SyncFenceSetTriggeredFunc	SetTriggered;

+    SyncFenceResetFunc		Reset;

+    SyncFenceCheckTriggeredFunc	CheckTriggered;

+    SyncFenceAddTriggerFunc	AddTrigger;

+    SyncFenceDeleteTriggerFunc	DeleteTrigger;

+} SyncFenceFuncsRec, *SyncFenceFuncsPtr;

+

+extern _X_EXPORT void

+miSyncInitFence(ScreenPtr pScreen, SyncFence* pFence, Bool initially_triggered);

+extern _X_EXPORT void

+miSyncDestroyFence(SyncFence* pFence);

+extern _X_EXPORT void

+miSyncTriggerFence(SyncFence* pFence);

+

+extern _X_EXPORT SyncScreenFuncsPtr

+miSyncGetScreenFuncs(ScreenPtr pScreen);

+extern _X_EXPORT Bool

+miSyncSetup(ScreenPtr pScreen);

+

+#endif /* _MISYNC_H_ */

diff --git a/xorg-server/miext/sync/misyncstr.h b/xorg-server/miext/sync/misyncstr.h
new file mode 100644
index 000000000..9b0f24365
--- /dev/null
+++ b/xorg-server/miext/sync/misyncstr.h
@@ -0,0 +1,86 @@
+/*

+ * Copyright © 2010 NVIDIA Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifndef _MISYNCSTR_H_

+#define _MISYNCSTR_H_

+

+#include "dix.h"

+#include <X11/extensions/syncconst.h>

+

+#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */

+

+/* Sync object types */

+#define SYNC_COUNTER		0

+#define SYNC_FENCE		1

+

+typedef struct _SyncObject {

+    ClientPtr		client;	/* Owning client. 0 for system counters */

+    struct _SyncTriggerList *pTriglist;	/* list of triggers */

+    XID			id;		/* resource ID */

+    unsigned char	type;		/* SYNC_* */

+    Bool		beingDestroyed;	/* in process of going away */

+} SyncObject;

+

+typedef struct _SyncCounter {

+    SyncObject		sync;		/* Common sync object data */

+    CARD64		value;		/* counter value */

+    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */

+} SyncCounter;

+

+struct _SyncFence {

+    SyncObject		sync;		/* Common sync object data */

+    ScreenPtr		pScreen;	/* Screen of this fence object */

+    SyncFenceFuncsRec	funcs;		/* Funcs for performing ops on fence */

+    Bool		triggered;	/* fence state */

+    PrivateRec		*devPrivates;	/* driver-specific per-fence data */

+};

+

+struct _SyncTrigger {

+    SyncObject *pSync;

+    CARD64	wait_value;	/* wait value */

+    unsigned int value_type;	/* Absolute or Relative */

+    unsigned int test_type;	/* transition or Comparision type */

+    CARD64	test_value;	/* trigger event threshold value */

+    Bool	(*CheckTrigger)(

+				struct _SyncTrigger * /*pTrigger*/,

+				CARD64 /*newval*/

+				);

+    void	(*TriggerFired)(

+				struct _SyncTrigger * /*pTrigger*/

+				);

+    void	(*CounterDestroyed)(

+				struct _SyncTrigger * /*pTrigger*/

+				    );

+};

+

+typedef struct _SyncTriggerList {

+    SyncTrigger *pTrigger;

+    struct _SyncTriggerList *next;

+} SyncTriggerList;

+

+#endif /* _MISYNCSTR_H_ */

+

diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index d95dd329c..2495b9066 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -121,7 +121,7 @@ static Bool needBuffer = TRUE;
 #include <AvailabilityMacros.h>

 

 static char __crashreporter_info_buff__[4096] = {0};

-static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];

+static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];

 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

 // This is actually a toolchain requirement, but I'm not sure the correct check,        

 // but it should be fine to just only include it for Leopard and later.  This line

@@ -571,21 +571,14 @@ ErrorF(const char * f, ...)
 /* A perror() workalike. */

 

 void

-Error(char *str)

+Error(const char *str)

 {

-    char *err = NULL;

-    int saveErrno = errno;

-

-    if (str) {

-	err = malloc(strlen(strerror(saveErrno)) + strlen(str) + 2 + 1);

-	if (!err)

-	    return;

-	sprintf(err, "%s: ", str);

-	strcat(err, strerror(saveErrno));

+    const char *err = strerror(errno);

+

+    if (str)

+	LogWrite(-1, "%s: %s", str, err);

+    else

 	LogWrite(-1, "%s", err);

-	free(err);

-    } else

-	LogWrite(-1, "%s", strerror(saveErrno));

 }

 

 void

diff --git a/xorg-server/randr/Makefile.am b/xorg-server/randr/Makefile.am
index 4842df89c..2b0b3a984 100644
--- a/xorg-server/randr/Makefile.am
+++ b/xorg-server/randr/Makefile.am
@@ -16,12 +16,16 @@ librandr_la_SOURCES =	\
 	rrinfo.c	\

 	rrmode.c	\

 	rroutput.c	\

+	rrpixmap.c	\

 	rrpointer.c	\

 	rrproperty.c	\

 	rrscreen.c	\

 	rrsdispatch.c	\

+	rrsprite.c	\

 	rrtransform.h	\

-	rrtransform.c

+	rrtransform.c	\

+	mirrcrtc.c

+

 

 if XINERAMA

 librandr_la_SOURCES += ${XINERAMA_SRCS}

diff --git a/xorg-server/randr/mirrcrtc.c b/xorg-server/randr/mirrcrtc.c
new file mode 100644
index 000000000..812b2b68b
--- /dev/null
+++ b/xorg-server/randr/mirrcrtc.c
@@ -0,0 +1,174 @@
+/*

+ * Copyright © 2010 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ */

+

+#include "randrstr.h"

+

+Bool

+miRRSetScreenConfig(ScreenPtr screen,

+		    RRScreenConfigPtr screen_config)

+{

+    RRScreenConfigRec	old_screen_config;

+

+    RRScreenCurrentConfig(screen, &old_screen_config);

+

+    /* Check and see if nothing has changed */

+    if (old_screen_config.screen_width == screen_config->screen_width &&

+	old_screen_config.screen_height == screen_config->screen_height &&

+	old_screen_config.screen_pixmap_width == screen_config->screen_pixmap_width &&

+	old_screen_config.screen_pixmap_height == screen_config->screen_pixmap_height &&

+	old_screen_config.mm_width == screen_config->mm_width &&

+	old_screen_config.mm_height == screen_config->mm_height)

+	return TRUE;

+

+    return RRScreenSizeSet(screen,

+			   screen_config->screen_width,

+			   screen_config->screen_height,

+			   screen_config->screen_pixmap_width,

+			   screen_config->screen_pixmap_height,

+			   screen_config->mm_width,

+			   screen_config->mm_height);

+}

+

+Bool

+miRRSetCrtcConfig(RRCrtcConfigPtr crtc_config)

+{

+    int	x = crtc_config->x, y = crtc_config->y;

+

+    if (crtc_config->pixmap) {

+	x = crtc_config->pixmap_x;

+	y = crtc_config->pixmap_y;

+    }

+    if (!RRCrtcSet(crtc_config->crtc,

+		   crtc_config->mode,

+		   x,

+		   y,

+		   crtc_config->rotation,

+		   crtc_config->numOutputs,

+		   crtc_config->outputs,

+		   crtc_config->pixmap))

+	return FALSE;

+    RRCrtcSpriteTransformSet(crtc_config->crtc,

+			     &crtc_config->sprite_position_transform,

+			     &crtc_config->sprite_image_transform,

+			     &crtc_config->sprite_position_f_transform,

+			     &crtc_config->sprite_image_f_transform);

+    return TRUE;

+}

+

+Bool

+miRRDisableCrtc(RRCrtcPtr crtc)

+{

+    RRCrtcConfigRec	off_config;

+

+    memset(&off_config, '\0', sizeof (RRCrtcConfigRec));

+    off_config.crtc = crtc;

+    return miRRSetCrtcConfig(&off_config);

+}

+

+/*

+ * If the current crtc configuration doesn't fit

+ * with the new screen config, disable it

+ */

+Bool

+miRRCheckDisableCrtc(RRScreenConfigPtr new_screen_config,

+		     RRCrtcConfigPtr old_crtc_config)

+{

+    RRCrtcPtr crtc = old_crtc_config->crtc;

+

+    /* If it's already disabled, we're done */

+    if (!old_crtc_config->mode)

+	return TRUE;

+

+    /* If the crtc isn't scanning from the screen pixmap,

+     * we're done

+     */

+    if (old_crtc_config->pixmap)

+	return TRUE;

+

+    /* If the new screen configuration covers the existing CRTC space,

+     * we're done

+     */

+    if (RRScreenCoversCrtc(new_screen_config, old_crtc_config,

+			   &crtc->client_current_transform, NULL))

+	return TRUE;

+

+    /* Disable the crtc and let it get re-enabled */

+    return miRRDisableCrtc(crtc);

+}

+

+Bool

+miRRSetCrtcConfigs(ScreenPtr screen,

+		   RRScreenConfigPtr screen_config,

+		   RRCrtcConfigPtr crtc_configs,

+		   int num_configs)

+{

+    RRScreenConfigRec	old_screen_config;

+    RRCrtcConfigPtr	old_crtc_configs;

+    int			i;

+

+    /*

+     * Save existing state

+     */

+

+    RRScreenCurrentConfig(screen, &old_screen_config);

+    old_crtc_configs = calloc(num_configs, sizeof (RRCrtcConfigRec));

+    if (!old_crtc_configs)

+	return FALSE;

+

+    for (i = 0; i < num_configs; i++)

+	if (!RRCrtcCurrentConfig(crtc_configs[i].crtc, &old_crtc_configs[i]))

+	    goto fail_save;

+    /*

+     * Set the new configuration. If anything goes wrong,

+     * bail and restore the old configuration

+     */

+    for (i = 0; i < num_configs; i++)

+	if (!miRRCheckDisableCrtc(screen_config, &old_crtc_configs[i]))

+	    goto fail_disable;

+

+    if (!miRRSetScreenConfig(screen, screen_config))

+	goto fail_set_screen;

+

+    for (i = 0; i < num_configs; i++)

+	if (!miRRSetCrtcConfig(&crtc_configs[i]))

+	    goto fail_set_crtc;

+

+    RRFreeCrtcConfigs(old_crtc_configs, num_configs);

+    return TRUE;

+

+fail_set_crtc:

+    /*

+     * Restore the previous configuration. Ignore any errors

+     * as we just need to hope that the driver can manage to

+     * get back to the previous state without trouble.

+     */

+    for (i = 0; i < num_configs; i++)

+	(void) miRRDisableCrtc(old_crtc_configs[i].crtc);

+    (void) miRRSetScreenConfig(screen, &old_screen_config);

+fail_set_screen:

+fail_disable:

+    for (i = 0; i < num_configs; i++)

+	(void) miRRSetCrtcConfig(&old_crtc_configs[i]);

+fail_save:

+    RRFreeCrtcConfigs(old_crtc_configs, num_configs);

+    return FALSE;

+}

diff --git a/xorg-server/randr/randr.c b/xorg-server/randr/randr.c
index aa1e71dcf..1346d1e9c 100644
--- a/xorg-server/randr/randr.c
+++ b/xorg-server/randr/randr.c
@@ -98,6 +98,7 @@ RRCloseScreen (int i, ScreenPtr pScreen)
     

     free(pScrPriv->crtcs);

     free(pScrPriv->outputs);

+    free(pScrPriv->scanout_info);

     free(pScrPriv);

     RRNScreens -= 1;	/* ok, one fewer screen with RandR running */

     return (*pScreen->CloseScreen) (i, pScreen);    

@@ -248,6 +249,8 @@ Bool RRScreenInit(ScreenPtr pScreen)
     pScrPriv->rrCrtcSet = NULL;

     pScrPriv->rrCrtcSetGamma = NULL;

 #endif

+    pScrPriv->scanout_info = NULL;

+    pScrPriv->n_scanout_info = 0;

 #if RANDR_10_INTERFACE    

     pScrPriv->rrSetConfig = 0;

     pScrPriv->rotations = RR_Rotate_0;

@@ -482,6 +485,18 @@ RRVerticalRefresh (xRRModeInfo *mode)
     return (CARD16) refresh;

 }

 

+RRScanoutPixmapInfo *

+RRQueryScanoutPixmapInfo(ScreenPtr screen, int *n_info)

+{

+    rrScrPriv(screen);

+

+    if (!pScrPriv->scanout_info && pScrPriv->rrQueryScanoutPixmaps)

+	pScrPriv->scanout_info = pScrPriv->rrQueryScanoutPixmaps(screen,

+								 &pScrPriv->n_scanout_info);

+    *n_info = pScrPriv->n_scanout_info;

+    return pScrPriv->scanout_info;

+}

+

 static int

 ProcRRDispatch (ClientPtr client)

 {

diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h
index b4acfe12a..ee208f569 100644
--- a/xorg-server/randr/randrstr.h
+++ b/xorg-server/randr/randrstr.h
@@ -55,9 +55,10 @@
 #define RANDR_10_INTERFACE 1

 #define RANDR_12_INTERFACE 1

 #define RANDR_13_INTERFACE 1 /* requires RANDR_12_INTERFACE */

+#define RANDR_14_INTERFACE 1 /* requires RANDR_13_INTERFACE */

 #define RANDR_GET_CRTC_INTERFACE 1

 

-#define RANDR_INTERFACE_VERSION 0x0103

+#define RANDR_INTERFACE_VERSION 0x0104

 

 typedef XID	RRMode;

 typedef XID	RROutput;

@@ -77,6 +78,8 @@ typedef struct _rrMode		RRModeRec, *RRModePtr;
 typedef struct _rrPropertyValue	RRPropertyValueRec, *RRPropertyValuePtr;

 typedef struct _rrProperty	RRPropertyRec, *RRPropertyPtr;

 typedef struct _rrCrtc		RRCrtcRec, *RRCrtcPtr;

+typedef struct _rrScreenConfig	RRScreenConfigRec, *RRScreenConfigPtr;

+typedef struct _rrCrtcConfig	RRCrtcConfigRec, *RRCrtcConfigPtr;

 typedef struct _rrOutput	RROutputRec, *RROutputPtr;

 

 struct _rrMode {

@@ -120,11 +123,43 @@ struct _rrCrtc {
     CARD16	    *gammaGreen;

     void	    *devPrivate;

     Bool	    transforms;

+    PixmapPtr	    scanoutPixmap;

     RRTransformRec  client_pending_transform;

     RRTransformRec  client_current_transform;

+    PictTransform   client_sprite_position_transform;

+    PictTransform   client_sprite_image_transform;

+    struct pict_f_transform	client_sprite_f_position_transform;

+    struct pict_f_transform	client_sprite_f_image_transform;

+

     PictTransform   transform;

     struct pict_f_transform f_transform;

     struct pict_f_transform f_inverse;

+    struct pict_f_transform f_sprite_position;		/* crtc from screen */

+    struct pict_f_transform f_sprite_image_inverse;	/* image from crtc */

+};

+

+struct _rrScreenConfig {

+    CARD16			screen_pixmap_width;

+    CARD16			screen_pixmap_height;

+    CARD16			screen_width;

+    CARD16			screen_height;

+    CARD32			mm_width;

+    CARD32			mm_height;

+};

+

+struct _rrCrtcConfig {

+    RRCrtcPtr			crtc;

+    int				x, y;

+    RRModePtr			mode;

+    Rotation			rotation;

+    int				numOutputs;

+    RROutputPtr			*outputs;

+    PictTransform		sprite_position_transform;

+    PictTransform		sprite_image_transform;

+    struct pict_f_transform	sprite_position_f_transform;

+    struct pict_f_transform	sprite_image_f_transform;

+    PixmapPtr			pixmap;

+    int				pixmap_x, pixmap_y;

 };

 

 struct _rrOutput {

@@ -156,6 +191,8 @@ struct _rrOutput {
 typedef Bool (*RRScreenSetSizeProcPtr) (ScreenPtr	pScreen,

 					CARD16		width,

 					CARD16		height,

+					CARD16		pixWidth,

+					CARD16		pixHeight,

 					CARD32		mmWidth,

 					CARD32		mmHeight);

 					

@@ -166,7 +203,8 @@ typedef Bool (*RRCrtcSetProcPtr) (ScreenPtr		pScreen,
 				  int			y,

 				  Rotation		rotation,

 				  int			numOutputs,

-				  RROutputPtr		*outputs);

+				  RROutputPtr		*outputs,

+				  PixmapPtr		scanout_pixmap);

 

 typedef Bool (*RRCrtcSetGammaProcPtr) (ScreenPtr	pScreen,

 				       RRCrtcPtr	crtc);

@@ -232,6 +270,35 @@ typedef Bool (*RRSetConfigProcPtr) (ScreenPtr		pScreen,
 

 #endif

 	

+typedef struct {

+    PictFormatPtr	format;

+    int			maxWidth, maxHeight;

+    int			depth;

+    Rotation		rotations;

+} RRScanoutPixmapInfo;

+

+typedef RRScanoutPixmapInfo *(*RRQueryScanoutPixmapsPtr) (ScreenPtr pScreen,

+							  int *num_info);

+

+typedef PixmapPtr (*RRCreateScanoutPixmapPtr) (ScreenPtr pScreen,

+					       int width, int height, int depth,

+					       Rotation rotations,

+					       PictFormatPtr format);

+

+typedef void (*RRSetCrtcSpriteTransformPtr) (ScreenPtr pScreen,

+					     RRCrtcPtr randr_crtc,

+					     struct pict_f_transform *position_transform,

+					     struct pict_f_transform *image_transform);

+

+typedef void (*RRGetCrtcSpriteTransformPtr) (ScreenPtr pScreen,

+					     RRCrtcPtr randr_crtc,

+					     struct pict_f_transform *position_transform,

+					     struct pict_f_transform *image_transform);

+

+typedef Bool (*RRSetCrtcConfigsPtr) (ScreenPtr screen,

+				     RRScreenConfigPtr screen_config,

+				     RRCrtcConfigPtr crtc_configs,

+				     int num_configs);

 

 typedef struct _rrScrPriv {

     /*

@@ -256,7 +323,12 @@ typedef struct _rrScrPriv {
     RRGetPanningProcPtr	rrGetPanning;

     RRSetPanningProcPtr	rrSetPanning;

 #endif

-    

+    RRQueryScanoutPixmapsPtr	rrQueryScanoutPixmaps;

+    RRCreateScanoutPixmapPtr	rrCreateScanoutPixmap;

+    RRSetCrtcSpriteTransformPtr	rrSetCrtcSpriteTransform;

+    RRGetCrtcSpriteTransformPtr	rrGetCrtcSpriteTransform;

+    RRSetCrtcConfigsPtr rrSetCrtcConfigs;

+

     /*

      * Private part of the structure; not considered part of the ABI

      */

@@ -283,6 +355,8 @@ typedef struct _rrScrPriv {
     /* Last known pointer position */

     RRCrtcPtr		    pointerCrtc;

 

+    RRScanoutPixmapInfo	    *scanout_info;

+    int			    n_scanout_info;

 #ifdef RANDR_10_INTERFACE

     /*

      * Configuration information

@@ -297,6 +371,7 @@ typedef struct _rrScrPriv {
     int			    rate;

     int			    size;

 #endif

+

 } rrScrPrivRec, *rrScrPrivPtr;

 

 extern _X_EXPORT DevPrivateKeyRec rrPrivKeyRec;

@@ -405,9 +480,15 @@ extern _X_EXPORT Bool
 RRScreenSizeSet (ScreenPtr  pScreen,

 		 CARD16	    width,

 		 CARD16	    height,

+		 CARD16	    pixWidth,

+		 CARD16	    pixHeight,

 		 CARD32	    mmWidth,

 		 CARD32	    mmHeight);

 

+extern _X_EXPORT void

+RRScreenCurrentConfig(ScreenPtr screen,

+		      RRScreenConfigPtr screen_config);

+

 /*

  * Send ConfigureNotify event to root window when 'something' happens

  */

@@ -467,6 +548,9 @@ RRGetRotation (ScreenPtr pScreen);
 extern _X_EXPORT CARD16

 RRVerticalRefresh (xRRModeInfo *mode);

 

+extern _X_EXPORT RRScanoutPixmapInfo *

+RRQueryScanoutPixmapInfo(ScreenPtr screen, int *n_info);

+

 #ifdef RANDR_10_INTERFACE					

 /*

  * This is the old interface, deprecated but left

@@ -545,7 +629,8 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 	      Rotation	    rotation,

 	      RRTransformPtr transform,

 	      int	    numOutputs,

-	      RROutputPtr   *outputs);

+	      RROutputPtr   *outputs,

+	      PixmapPtr	    scanoutPixmap);

 

 extern _X_EXPORT void

 RRDeliverCrtcEvent (ClientPtr client, WindowPtr pWin, RRCrtcPtr crtc);

@@ -560,7 +645,8 @@ RRCrtcSet (RRCrtcPtr    crtc,
 	   int		y,

 	   Rotation	rotation,

 	   int		numOutput,

-	   RROutputPtr  *outputs);

+	   RROutputPtr  *outputs,

+	   PixmapPtr	scanout_pixmap);

 

 /*

  * Request that the Crtc gamma be changed

@@ -589,6 +675,10 @@ RRCrtcGammaGet(RRCrtcPtr crtc);
 extern _X_EXPORT Bool

 RRCrtcGammaNotify (RRCrtcPtr	crtc);

 

+void

+RRModeGetScanoutSize (RRModePtr mode, struct pixman_f_transform *transform,

+		      int *width, int *height);

+

 /*

  * Set the size of the gamma table at server startup time

  */

@@ -606,25 +696,6 @@ extern _X_EXPORT void
 RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height);

 

 /*

- * Compute the complete transformation matrix including

- * client-specified transform, rotation/reflection values and the crtc 

- * offset.

- *

- * Return TRUE if the resulting transform is not a simple translation.

- */

-extern _X_EXPORT Bool

-RRTransformCompute (int			    x,

-		    int			    y,

-		    int			    width,

-		    int			    height,

-		    Rotation		    rotation,

-		    RRTransformPtr	    rr_transform,

-

-		    PictTransformPtr	    transform,

-		    struct pict_f_transform *f_transform,

-		    struct pict_f_transform *f_inverse);

-

-/*

  * Return crtc transform

  */

 extern _X_EXPORT RRTransformPtr

@@ -670,6 +741,38 @@ extern _X_EXPORT void
 RRCrtcInitErrorValue (void);

 

 /*

+ * Free a set of crtc configs and their attached output arrays

+ */

+void

+RRFreeCrtcConfigs(RRCrtcConfigPtr configs, int num_configs);

+

+/*

+ * Convert the current crtc configuration into an RRCrtcConfig

+ */

+extern _X_EXPORT Bool

+RRCrtcCurrentConfig(RRCrtcPtr crtc,

+		    RRCrtcConfigPtr crtc_config);

+

+/*

+ * Figure out whether the specific crtc_config can fit

+ * within the screen_config

+ */

+Bool

+RRScreenCoversCrtc(RRScreenConfigPtr screen_config,

+		   RRCrtcConfigPtr crtc_config,

+		   RRTransformPtr client_transform,

+		   XID *errorValue);

+

+/*

+ * Set a screen and set of crtc configurations in one operation

+ */

+Bool

+RRSetCrtcConfigs(ScreenPtr screen,

+		 RRScreenConfigPtr screen_config,

+		 RRCrtcConfigPtr crtc_configs,

+		 int num_configs);

+

+/*

  * Crtc dispatch

  */

 

@@ -694,12 +797,40 @@ ProcRRSetCrtcTransform (ClientPtr client);
 extern _X_EXPORT int

 ProcRRGetCrtcTransform (ClientPtr client);

 

+extern _X_EXPORT int

+ProcRRSetCrtcConfigs (ClientPtr client);

+

 int

 ProcRRGetPanning (ClientPtr client);

 

 int

 ProcRRSetPanning (ClientPtr client);

 

+void

+RRCrtcSpriteTransformSet(RRCrtcPtr crtc,

+			 PictTransform *position_transform,

+			 PictTransform *image_transform,

+			 struct pict_f_transform *f_position_transform,

+			 struct pict_f_transform *f_image_transform);

+

+int

+ProcRRQueryScanoutPixmaps (ClientPtr client);

+

+int

+ProcRRCreateScanoutPixmap (ClientPtr client);

+

+int

+ProcRRSetCrtcPixmapConfig (ClientPtr client);

+

+int

+ProcRRSetCrtcSpriteTransform (ClientPtr client);

+

+int

+ProcRRGetCrtcSpriteTransform (ClientPtr client);

+

+int

+ProcRRSetCrtcConfigs (ClientPtr client);

+

 /* rrdispatch.c */

 extern _X_EXPORT Bool

 RRClientKnowsRates (ClientPtr	pClient);

@@ -889,12 +1020,40 @@ ProcRRConfigureOutputProperty (ClientPtr client);
 extern _X_EXPORT int

 ProcRRDeleteOutputProperty (ClientPtr client);

 

+/* rrsprite.c */

+extern _X_EXPORT int

+ProcRRSetCrtcSpriteTransform (ClientPtr client);

+

+extern _X_EXPORT int

+ProcRRGetCrtcSpriteTransform (ClientPtr client);

+

 /* rrxinerama.c */

 #ifdef XINERAMA

 extern _X_EXPORT void

 RRXineramaExtensionInit(void);

 #endif

 

+/* mirrcrtc.c */

+Bool

+miRRSetScreenConfig(ScreenPtr screen,

+		    RRScreenConfigPtr screen_config);

+

+Bool

+miRRSetCrtcConfig(RRCrtcConfigPtr crtc_config);

+

+Bool

+miRRDisableCrtc(RRCrtcPtr crtc);

+

+Bool

+miRRCheckDisableCrtc(RRScreenConfigPtr new_screen_config,

+		     RRCrtcConfigPtr old_crtc_config);

+

+Bool

+miRRSetCrtcConfigs(ScreenPtr screen,

+		   RRScreenConfigPtr screen_config,

+		   RRCrtcConfigPtr crtc_configs,

+		   int num_configs);

+

 #endif /* _RANDRSTR_H_ */

 

 /*

diff --git a/xorg-server/randr/rrcrtc.c b/xorg-server/randr/rrcrtc.c
index fba9f4805..524fcd266 100644
--- a/xorg-server/randr/rrcrtc.c
+++ b/xorg-server/randr/rrcrtc.c
@@ -37,7 +37,7 @@ RRCrtcChanged (RRCrtcPtr crtc, Bool layoutChanged)
     if (pScreen)

     {

 	rrScrPriv(pScreen);

-    

+

 	pScrPriv->changed = TRUE;

 	/*

 	 * Send ConfigureNotify on any layout change

@@ -59,19 +59,19 @@ RRCrtcCreate (ScreenPtr pScreen, void *devPrivate)
 

     if (!RRInit())

 	return NULL;

-    

+

     pScrPriv = rrGetScrPriv(pScreen);

 

     /* make space for the crtc pointer */

     if (pScrPriv->numCrtcs)

-	crtcs = realloc(pScrPriv->crtcs, 

+	crtcs = realloc(pScrPriv->crtcs,

 			  (pScrPriv->numCrtcs + 1) * sizeof (RRCrtcPtr));

     else

 	crtcs = malloc(sizeof (RRCrtcPtr));

     if (!crtcs)

 	return FALSE;

     pScrPriv->crtcs = crtcs;

-    

+

     crtc = calloc(1, sizeof (RRCrtcRec));

     if (!crtc)

 	return NULL;

@@ -90,9 +90,13 @@ RRCrtcCreate (ScreenPtr pScreen, void *devPrivate)
     crtc->devPrivate = devPrivate;

     RRTransformInit (&crtc->client_pending_transform);

     RRTransformInit (&crtc->client_current_transform);

+    pixman_transform_init_identity (&crtc->client_sprite_position_transform);

+    pixman_transform_init_identity (&crtc->client_sprite_image_transform);

     pixman_transform_init_identity (&crtc->transform);

     pixman_f_transform_init_identity (&crtc->f_transform);

     pixman_f_transform_init_identity (&crtc->f_inverse);

+    pixman_f_transform_init_identity (&crtc->f_sprite_position);

+    pixman_f_transform_init_identity (&crtc->f_sprite_image_inverse);

 

     if (!AddResource (crtc->id, RRCrtcType, (pointer) crtc))

 	return NULL;

@@ -100,7 +104,7 @@ RRCrtcCreate (ScreenPtr pScreen, void *devPrivate)
     /* attach the screen and crtc together */

     crtc->pScreen = pScreen;

     pScrPriv->crtcs[pScrPriv->numCrtcs++] = crtc;

-    

+

     return crtc;

 }

 

@@ -134,10 +138,11 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 	      Rotation	    rotation,

 	      RRTransformPtr transform,

 	      int	    numOutputs,

-	      RROutputPtr   *outputs)

+	      RROutputPtr   *outputs,

+	      PixmapPtr	    scanoutPixmap)

 {

     int	    i, j;

-    

+

     /*

      * Check to see if any of the new outputs were

      * not in the old list and mark them as changed

@@ -177,7 +182,7 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
     if (numOutputs != crtc->numOutputs)

     {

 	RROutputPtr *newoutputs;

-	

+

 	if (numOutputs)

 	{

 	    if (crtc->numOutputs)

@@ -231,15 +236,30 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 	RRTransformCopy (&crtc->client_current_transform, transform);

 	RRCrtcChanged (crtc, TRUE);

     }

+

+    if (scanoutPixmap != crtc->scanoutPixmap)

+    {

+	if (scanoutPixmap)

+	    ++scanoutPixmap->refcnt;

+	if (crtc->scanoutPixmap)

+	    (*crtc->scanoutPixmap->drawable.pScreen->DestroyPixmap) (crtc->scanoutPixmap);

+	crtc->scanoutPixmap = scanoutPixmap;

+    }

+

     if (crtc->changed && mode)

     {

 	RRTransformCompute (x, y,

 			    mode->mode.width, mode->mode.height,

 			    rotation,

 			    &crtc->client_current_transform,

+			    &crtc->client_sprite_f_position_transform,

+			    &crtc->client_sprite_f_image_transform,

 			    &crtc->transform, &crtc->f_transform,

-			    &crtc->f_inverse);

+			    &crtc->f_inverse, &crtc->f_sprite_position,

+			    &crtc->f_sprite_image_inverse,

+			    NULL);

     }

+

     return TRUE;

 }

 

@@ -250,7 +270,7 @@ RRDeliverCrtcEvent (ClientPtr client, WindowPtr pWin, RRCrtcPtr crtc)
     rrScrPriv (pScreen);

     xRRCrtcChangeNotifyEvent	ce;

     RRModePtr	mode = crtc->mode;

-    

+

     ce.type = RRNotify + RREventBase;

     ce.subCode = RRNotify_CrtcChange;

     ce.timestamp = pScrPriv->lastSetTime.milliseconds;

@@ -302,7 +322,8 @@ RRCrtcSet (RRCrtcPtr    crtc,
 	   int		y,

 	   Rotation	rotation,

 	   int		numOutputs,

-	   RROutputPtr  *outputs)

+	   RROutputPtr  *outputs,

+	   PixmapPtr	scanout_pixmap)

 {

     ScreenPtr	pScreen = crtc->pScreen;

     Bool	ret = FALSE;

@@ -316,7 +337,8 @@ RRCrtcSet (RRCrtcPtr    crtc,
 	crtc->numOutputs == numOutputs &&

 	!memcmp (crtc->outputs, outputs, numOutputs * sizeof (RROutputPtr)) &&

 	!RRCrtcPendingProperties (crtc) &&

-	!RRCrtcPendingTransform (crtc))

+	!RRCrtcPendingTransform (crtc) &&

+	crtc->scanoutPixmap == scanout_pixmap)

     {

 	ret = TRUE;

     }

@@ -325,8 +347,8 @@ RRCrtcSet (RRCrtcPtr    crtc,
 #if RANDR_12_INTERFACE

 	if (pScrPriv->rrCrtcSet)

 	{

-	    ret = (*pScrPriv->rrCrtcSet) (pScreen, crtc, mode, x, y, 

-					  rotation, numOutputs, outputs);

+	    ret = (*pScrPriv->rrCrtcSet) (pScreen, crtc, mode, x, y,

+					  rotation, numOutputs, outputs, scanout_pixmap);

 	}

 	else

 #endif

@@ -339,7 +361,7 @@ RRCrtcSet (RRCrtcPtr    crtc,
 

 		if (!mode)

 		{

-		    RRCrtcNotify (crtc, NULL, x, y, rotation, NULL, 0, NULL);

+		    RRCrtcNotify (crtc, NULL, x, y, rotation, NULL, 0, NULL, scanout_pixmap);

 		    ret = TRUE;

 		}

 		else

@@ -365,7 +387,7 @@ RRCrtcSet (RRCrtcPtr    crtc,
 		     */

 		    if (ret)

 		    {

-			RRCrtcNotify (crtc, mode, x, y, rotation, NULL, 1, outputs);

+			RRCrtcNotify (crtc, mode, x, y, rotation, NULL, 1, outputs, scanout_pixmap);

 			RRScreenSizeNotify (pScreen);

 		    }

 		}

@@ -384,6 +406,60 @@ RRCrtcSet (RRCrtcPtr    crtc,
     return ret;

 }

 

+void

+RRFreeCrtcConfigs(RRCrtcConfigPtr configs, int num_configs)

+{

+    int	i;

+

+    for (i = 0; i < num_configs; i++)

+	free(configs[i].outputs);

+    free(configs);

+}

+

+Bool

+RRCrtcCurrentConfig(RRCrtcPtr crtc,

+		    RRCrtcConfigPtr crtc_config)

+{

+    crtc_config->crtc = crtc;

+    crtc_config->x = crtc->x;

+    crtc_config->y = crtc->y;

+    crtc_config->mode = crtc->mode;

+    crtc_config->rotation = crtc->rotation;

+    crtc_config->numOutputs = crtc->numOutputs;

+    crtc_config->outputs = calloc(crtc->numOutputs, sizeof (RROutputPtr));

+    if (!crtc_config->outputs)

+	return FALSE;

+    memcpy(crtc_config->outputs, crtc->outputs, crtc->numOutputs * sizeof (RROutputPtr));

+    crtc_config->sprite_position_transform = crtc->client_sprite_position_transform;

+    crtc_config->sprite_image_transform = crtc->client_sprite_image_transform;

+    crtc_config->sprite_position_f_transform = crtc->client_sprite_f_position_transform;

+    crtc_config->sprite_image_f_transform = crtc->client_sprite_f_image_transform;

+

+    crtc_config->pixmap = crtc->scanoutPixmap;

+    crtc_config->pixmap_x = crtc->x;

+    crtc_config->pixmap_y = crtc->y;

+    return TRUE;

+}

+

+

+/*

+ * Request that a set of crtcs be configured at the same

+ * time on a single screen

+ */

+

+Bool

+RRSetCrtcConfigs(ScreenPtr screen,

+		 RRScreenConfigPtr screen_config,

+		 RRCrtcConfigPtr crtc_configs,

+		 int num_configs)

+{

+    rrScrPrivPtr	scr_priv = rrGetScrPriv(screen);

+

+    if (!scr_priv)

+	return FALSE;

+    return (*scr_priv->rrSetCrtcConfigs)(screen, screen_config, crtc_configs, num_configs);

+}

+

 /*

  * Return crtc transform

  */

@@ -427,7 +503,7 @@ RRCrtcDestroyResource (pointer value, XID pid)
     {

 	rrScrPriv(pScreen);

 	int		i;

-    

+

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

 	{

 	    if (pScrPriv->crtcs[i] == crtc)

@@ -460,7 +536,7 @@ RRCrtcGammaSet (RRCrtcPtr   crtc,
 #if RANDR_12_INTERFACE

     ScreenPtr	pScreen = crtc->pScreen;

 #endif

-    

+

     memcpy (crtc->gammaRed, red, crtc->gammaSize * sizeof (CARD16));

     memcpy (crtc->gammaGreen, green, crtc->gammaSize * sizeof (CARD16));

     memcpy (crtc->gammaBlue, blue, crtc->gammaSize * sizeof (CARD16));

@@ -510,8 +586,11 @@ RRCrtcGammaNotify (RRCrtcPtr	crtc)
     return TRUE;    /* not much going on here */

 }

 

-static void

-RRModeGetScanoutSize (RRModePtr mode, PictTransformPtr transform,

+/*

+ * Compute overall scanout buffer requirements for the specified mode

+ */

+void

+RRModeGetScanoutSize (RRModePtr mode, struct pixman_f_transform *transform,

 		      int *width, int *height)

 {

     BoxRec  box;

@@ -527,7 +606,7 @@ RRModeGetScanoutSize (RRModePtr mode, PictTransformPtr transform,
     box.x2 = mode->mode.width;

     box.y2 = mode->mode.height;

 

-    pixman_transform_bounds (transform, &box);

+    pixman_f_transform_bounds (transform, &box);

     *width = box.x2 - box.x1;

     *height = box.y2 - box.y1;

 }

@@ -538,7 +617,7 @@ RRModeGetScanoutSize (RRModePtr mode, PictTransformPtr transform,
 void

 RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height)

 {

-    return RRModeGetScanoutSize (crtc->mode, &crtc->transform, width, height);

+    RRModeGetScanoutSize (crtc->mode, &crtc->f_transform, width, height);

 }

 

 /*

@@ -623,6 +702,44 @@ RRCrtcTransformSet (RRCrtcPtr		crtc,
 }

 

 /*

+ * Figure out whether the specific crtc_config can fit

+ * within the screen_config

+ */

+Bool

+RRScreenCoversCrtc(RRScreenConfigPtr screen_config,

+		   RRCrtcConfigPtr crtc_config,

+		   RRTransformPtr client_transform,

+		   XID *errorValue)

+{

+    int source_width;

+    int	source_height;

+    struct pixman_f_transform f_transform;

+

+    RRTransformCompute (crtc_config->x, crtc_config->y,

+			crtc_config->mode->mode.width, crtc_config->mode->mode.height,

+			crtc_config->rotation,

+			client_transform,

+			&crtc_config->sprite_position_f_transform,

+			&crtc_config->sprite_image_f_transform,

+			NULL, &f_transform, NULL, NULL, NULL, NULL);

+

+    RRModeGetScanoutSize (crtc_config->mode, &f_transform,

+			  &source_width, &source_height);

+    if (crtc_config->x + source_width > screen_config->screen_pixmap_width) {

+	if (errorValue)

+	    *errorValue = crtc_config->x;

+	return FALSE;

+    }

+

+    if (crtc_config->y + source_height > screen_config->screen_pixmap_height) {

+	if (errorValue)

+	    *errorValue = crtc_config->y;

+	return FALSE;

+    }

+    return TRUE;

+}

+

+/*

  * Initialize crtc type

  */

 Bool

@@ -631,7 +748,7 @@ RRCrtcInit (void)
     RRCrtcType = CreateNewResourceType (RRCrtcDestroyResource, "CRTC");

     if (!RRCrtcType)

 	return FALSE;

-    

+

     return TRUE;

 }

 

@@ -660,7 +777,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
     int				i, j, k, n;

     int				width, height;

     BoxRec			panned_area;

-    

+

     REQUEST_SIZE_MATCH(xRRGetCrtcInfoReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

 

@@ -671,7 +788,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
     pScrPriv = rrGetScrPriv(pScreen);

 

     mode = crtc->mode;

-    

+

     rep.type = X_Reply;

     rep.status = RRSetConfigSuccess;

     rep.sequenceNumber = client->sequence;

@@ -704,7 +821,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
 	    if (pScrPriv->outputs[i]->crtcs[j] == crtc)

 		k++;

     rep.nPossibleOutput = k;

-    

+

     rep.length = rep.nOutput + rep.nPossibleOutput;

 

     extraLen = rep.length << 2;

@@ -719,7 +836,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
 

     outputs = (RROutput *) extra;

     possible = (RROutput *) (outputs + rep.nOutput);

-    

+

     for (i = 0; i < crtc->numOutputs; i++)

     {

 	outputs[i] = crtc->outputs[i]->id;

@@ -736,7 +853,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
 		    swapl (&possible[k], n);

 		k++;

 	    }

-    

+

     if (client->swapped) {

 	swaps(&rep.sequenceNumber, n);

 	swapl(&rep.length, n);

@@ -757,7 +874,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
 	WriteToClient (client, extraLen, (char *) extra);

 	free(extra);

     }

-    

+

     return Success;

 }

 

@@ -777,10 +894,10 @@ ProcRRSetCrtcConfig (ClientPtr client)
     TimeStamp		    time;

     Rotation		    rotation;

     int			    rc, i, j;

-    

+

     REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigReq);

     numOutputs = (stuff->length - bytes_to_int32(SIZEOF (xRRSetCrtcConfigReq)));

-    

+

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixSetAttrAccess);

 

     if (stuff->mode == None)

@@ -803,7 +920,7 @@ ProcRRSetCrtcConfig (ClientPtr client)
     }

     else

 	outputs = NULL;

-    

+

     outputIds = (RROutput *) (stuff + 1);

     for (i = 0; i < numOutputs; i++)

     {

@@ -826,7 +943,7 @@ ProcRRSetCrtcConfig (ClientPtr client)
 	/* validate mode for this output */

 	for (j = 0; j < outputs[i]->numModes + outputs[i]->numUserModes; j++)

 	{

-	    RRModePtr	m = (j < outputs[i]->numModes ? 

+	    RRModePtr	m = (j < outputs[i]->numModes ?

 			     outputs[i]->modes[j] :

 			     outputs[i]->userModes[j - outputs[i]->numModes]);

 	    if (m == mode)

@@ -861,17 +978,17 @@ ProcRRSetCrtcConfig (ClientPtr client)
 

     pScreen = crtc->pScreen;

     pScrPriv = rrGetScrPriv(pScreen);

-    

+

     time = ClientTimeToServerTime(stuff->timestamp);

     configTime = ClientTimeToServerTime(stuff->configTimestamp);

-    

+

     if (!pScrPriv)

     {

 	time = currentTime;

 	rep.status = RRSetConfigFailed;

 	goto sendReply;

     }

-    

+

     /*

      * Validate requested rotation

      */

@@ -904,7 +1021,7 @@ ProcRRSetCrtcConfig (ClientPtr client)
 	    free(outputs);

 	    return BadMatch;

 	}

-    

+

 #ifdef RANDR_12_INTERFACE

 	/*

 	 * Check screen size bounds if the DDX provides a 1.2 interface

@@ -924,16 +1041,19 @@ ProcRRSetCrtcConfig (ClientPtr client)
 				mode->mode.width, mode->mode.height,

 				rotation,

 				&crtc->client_pending_transform,

-				&transform, &f_transform, &f_inverse);

+				&crtc->client_sprite_f_position_transform,

+				&crtc->client_sprite_f_image_transform,

+				&transform, &f_transform, &f_inverse, NULL, NULL, NULL);

 

-	    RRModeGetScanoutSize (mode, &transform, &source_width, &source_height);

+	    RRModeGetScanoutSize (mode, &f_transform,

+				  &source_width, &source_height);

 	    if (stuff->x + source_width > pScreen->width)

 	    {

 		client->errorValue = stuff->x;

 		free(outputs);

 		return BadValue;

 	    }

-	    

+

 	    if (stuff->y + source_height > pScreen->height)

 	    {

 		client->errorValue = stuff->y;

@@ -943,26 +1063,26 @@ ProcRRSetCrtcConfig (ClientPtr client)
 	}

 #endif

     }

-    

+

     if (!RRCrtcSet (crtc, mode, stuff->x, stuff->y,

-		   rotation, numOutputs, outputs))

+		    rotation, numOutputs, outputs, NULL))

     {

 	rep.status = RRSetConfigFailed;

 	goto sendReply;

     }

     rep.status = RRSetConfigSuccess;

     pScrPriv->lastSetTime = time;

-    

+

 sendReply:

     free(outputs);

-    

+

     rep.type = X_Reply;

     /* rep.status has already been filled in */

     rep.length = 0;

     rep.sequenceNumber = client->sequence;

     rep.newTimestamp = pScrPriv->lastSetTime.milliseconds;

 

-    if (client->swapped) 

+    if (client->swapped)

     {

 	int n;

     	swaps(&rep.sequenceNumber, n);

@@ -970,7 +1090,7 @@ sendReply:
 	swapl(&rep.newTimestamp, n);

     }

     WriteToClient(client, sizeof(xRRSetCrtcConfigReply), (char *)&rep);

-    

+

     return Success;

 }

 

@@ -986,7 +1106,7 @@ ProcRRGetPanning (ClientPtr client)
     BoxRec		tracking;

     INT16		border[4];

     int			n;

-    

+

     REQUEST_SIZE_MATCH(xRRGetPanningReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

 

@@ -1056,7 +1176,7 @@ ProcRRSetPanning (ClientPtr client)
     BoxRec		tracking;

     INT16		border[4];

     int			n;

-    

+

     REQUEST_SIZE_MATCH(xRRSetPanningReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

 

@@ -1071,9 +1191,9 @@ ProcRRSetPanning (ClientPtr client)
 	rep.status = RRSetConfigFailed;

 	goto sendReply;

     }

-    

+

     time = ClientTimeToServerTime(stuff->timestamp);

-    

+

     if (!pScrPriv->rrGetPanning)

 	return RRErrorBase + BadRRCrtc;

 

@@ -1149,7 +1269,7 @@ ProcRRGetCrtcGamma (ClientPtr client)
     int				n;

     unsigned long		len;

     char			*extra = NULL;

-    

+

     REQUEST_SIZE_MATCH(xRRGetCrtcGammaReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

 

@@ -1158,7 +1278,7 @@ ProcRRGetCrtcGamma (ClientPtr client)
         return RRErrorBase + BadRRCrtc;

 

     len = crtc->gammaSize * 3 * 2;

-    

+

     if (crtc->gammaSize) {

 	extra = malloc(len);

 	if (!extra)

@@ -1192,21 +1312,21 @@ ProcRRSetCrtcGamma (ClientPtr client)
     RRCrtcPtr			crtc;

     unsigned long		len;

     CARD16			*red, *green, *blue;

-    

+

     REQUEST_AT_LEAST_SIZE(xRRSetCrtcGammaReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

-    

+

     len = client->req_len - bytes_to_int32(sizeof (xRRSetCrtcGammaReq));

     if (len < (stuff->size * 3 + 1) >> 1)

 	return BadLength;

 

     if (stuff->size != crtc->gammaSize)

 	return BadMatch;

-    

+

     red = (CARD16 *) (stuff + 1);

     green = red + crtc->gammaSize;

     blue = green + crtc->gammaSize;

-    

+

     RRCrtcGammaSet (crtc, red, green, blue);

 

     return Success;

@@ -1247,7 +1367,7 @@ ProcRRSetCrtcTransform (ClientPtr client)
 

 

 #define CrtcTransformExtra	(SIZEOF(xRRGetCrtcTransformReply) - 32)

-				

+

 static int

 transform_filter_length (RRTransformPtr transform)

 {

@@ -1349,3 +1469,331 @@ ProcRRGetCrtcTransform (ClientPtr client)
     free(reply);

     return Success;

 }

+

+static int

+RRConvertCrtcConfig(ClientPtr client, ScreenPtr screen,

+		    RRScreenConfigPtr screen_config,

+		    RRCrtcConfigPtr config, xRRCrtcConfig *x,

+		    RROutput *outputIds)

+{

+    RRCrtcPtr		crtc;

+    RROutputPtr		*outputs;

+    rrScrPrivPtr	scr_priv;

+    RRModePtr		mode;

+    PixmapPtr		pixmap;

+    int			rc, i, j;

+    Rotation		rotation;

+

+    VERIFY_RR_CRTC(x->crtc, crtc, DixSetAttrAccess);

+

+    if (x->mode == None)

+    {

+	mode = NULL;

+	if (x->nOutput > 0)

+	    return BadMatch;

+    }

+    else

+    {

+	VERIFY_RR_MODE(x->mode, mode, DixSetAttrAccess);

+	if (x->nOutput == 0)

+	    return BadMatch;

+    }

+    if (x->nOutput)

+    {

+	outputs = malloc(x->nOutput * sizeof (RROutputPtr));

+	if (!outputs)

+	    return BadAlloc;

+    }

+    else

+	outputs = NULL;

+

+    if (x->pixmap == None)

+	pixmap = NULL;

+    else if (x->pixmap == RR_CurrentScanoutPixmap)

+	pixmap = crtc->scanoutPixmap;

+    else

+    {

+	rc = dixLookupResourceByType((pointer *) &pixmap, x->pixmap,

+				     RT_PIXMAP, client, DixWriteAccess);

+	if (rc != Success) {

+	    free(outputs);

+	    return rc;

+	}

+	/* XXX check to make sure this is a scanout pixmap */

+    }

+

+    for (i = 0; i < x->nOutput; i++)

+    {

+	rc = dixLookupResourceByType((pointer *)(outputs + i), outputIds[i],

+				     RROutputType, client, DixSetAttrAccess);

+	if (rc != Success)

+	{

+	    free(outputs);

+	    return rc;

+	}

+	/* validate crtc for this output */

+	for (j = 0; j < outputs[i]->numCrtcs; j++)

+	    if (outputs[i]->crtcs[j] == crtc)

+		break;

+	if (j == outputs[i]->numCrtcs)

+	{

+	    free(outputs);

+	    return BadMatch;

+	}

+	/* validate mode for this output */

+	for (j = 0; j < outputs[i]->numModes + outputs[i]->numUserModes; j++)

+	{

+	    RRModePtr	m = (j < outputs[i]->numModes ?

+			     outputs[i]->modes[j] :

+			     outputs[i]->userModes[j - outputs[i]->numModes]);

+	    if (m == mode)

+		break;

+	}

+	if (j == outputs[i]->numModes + outputs[i]->numUserModes)

+	{

+	    free(outputs);

+	    return BadMatch;

+	}

+    }

+    /* validate clones */

+    for (i = 0; i < x->nOutput; i++)

+    {

+	for (j = 0; j < x->nOutput; j++)

+	{

+	    int k;

+	    if (i == j)

+		continue;

+	    for (k = 0; k < outputs[i]->numClones; k++)

+	    {

+		if (outputs[i]->clones[k] == outputs[j])

+		    break;

+	    }

+	    if (k == outputs[i]->numClones)

+	    {

+		free(outputs);

+		return BadMatch;

+	    }

+	}

+    }

+

+    if (crtc->pScreen != screen)

+	return BadMatch;

+

+    scr_priv = rrGetScrPriv(screen);

+

+    config->crtc = crtc;

+    config->x = x->x;

+    config->y = x->y;

+    config->mode = mode;

+    config->rotation = x->rotation;

+    config->numOutputs = x->nOutput;

+    config->outputs = outputs;

+    PictTransform_from_xRenderTransform(&config->sprite_position_transform,

+					     &x->spritePositionTransform);

+    PictTransform_from_xRenderTransform(&config->sprite_image_transform,

+					     &x->spriteImageTransform);

+    pixman_f_transform_from_pixman_transform(&config->sprite_position_f_transform,

+					     &config->sprite_position_transform);

+    pixman_f_transform_from_pixman_transform(&config->sprite_image_f_transform,

+					     &config->sprite_image_transform);

+    config->pixmap = pixmap;

+    config->pixmap_x = x->xPixmap;

+    config->pixmap_y = x->yPixmap;

+

+    /*

+     * Validate requested rotation

+     */

+    rotation = (Rotation) x->rotation;

+

+    /* test the rotation bits only! */

+    switch (rotation & 0xf) {

+    case RR_Rotate_0:

+    case RR_Rotate_90:

+    case RR_Rotate_180:

+    case RR_Rotate_270:

+	break;

+    default:

+	/*

+	 * Invalid rotation

+	 */

+	client->errorValue = x->rotation;

+	free(outputs);

+	return BadValue;

+    }

+

+    if (mode)

+    {

+	if ((~crtc->rotations) & rotation)

+	{

+	    /*

+	     * requested rotation or reflection not supported by screen

+	     */

+	    client->errorValue = x->rotation;

+	    free(outputs);

+	    return BadMatch;

+	}

+

+	/*

+	 * If scanning out from another pixmap, make sure the mode

+	 * fits

+	 */

+	if (pixmap)

+	{

+	    if (x->xPixmap + mode->mode.width > pixmap->drawable.width) {

+		client->errorValue = x->xPixmap;

+		free(outputs);

+		return BadValue;

+	    }

+	    if (x->yPixmap + mode->mode.height > pixmap->drawable.height) {

+		client->errorValue = x->yPixmap;

+		free(outputs);

+		return BadValue;

+	    }

+	}

+	/*

+	 * Check screen size bounds if the DDX provides a 1.2 interface

+	 * for setting screen size. Else, assume the CrtcSet sets

+	 * the size along with the mode. If the driver supports transforms,

+	 * then it must allow crtcs to display a subset of the screen, so

+	 * only do this check for drivers without transform support.

+	 */

+	else if (scr_priv->rrScreenSetSize && !crtc->transforms)

+	{

+	    if (!RRScreenCoversCrtc(screen_config, config,

+				    &crtc->client_pending_transform,

+				    &client->errorValue))

+	    {

+		free(outputs);

+		return BadValue;

+	    }

+	}

+    }

+

+    return Success;

+}

+

+int

+ProcRRSetCrtcConfigs (ClientPtr client)

+{

+    REQUEST(xRRSetCrtcConfigsReq);

+    xRRSetCrtcConfigsReply  rep;

+    DrawablePtr		    drawable;

+    ScreenPtr		    screen;

+    rrScrPrivPtr	    scr_priv;

+    xRRCrtcConfig	    *x_configs;

+    RRScreenConfigRec	    screen_config;

+    RRCrtcConfigPtr	    configs = NULL;

+    RROutput		    *output_ids;

+    int			    num_configs = 0;

+    int			    rc, i;

+    int			    extra_len;

+    int			    num_output_ids;

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigsReq);

+

+    extra_len = client->req_len - bytes_to_int32(sizeof(xRRSetCrtcConfigsReq));

+

+    num_configs = stuff->nConfigs;

+

+    /* Check request length against number of configs specified */

+    if (num_configs * (sizeof (xRRCrtcConfig) >> 2) > extra_len)

+	return BadLength;

+

+    extra_len -= num_configs * (sizeof (xRRCrtcConfig) >> 2);

+    x_configs = (xRRCrtcConfig *) (stuff + 1);

+

+    /* Check remaining request length against number of outputs */

+    num_output_ids = 0;

+    for (i = 0; i < num_configs; i++)

+	num_output_ids += x_configs[i].nOutput;

+

+    if (extra_len != num_output_ids)

+	return BadLength;

+

+    rc = dixLookupDrawable(&drawable, stuff->drawable, client, 0, DixGetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+    screen = drawable->pScreen;

+

+    scr_priv = rrGetScrPriv(screen);

+

+    if (!scr_priv)

+    {

+	rep.status = RRSetConfigFailed;

+	goto sendReply;

+    }

+

+    if (stuff->widthInMillimeters == 0 || stuff->heightInMillimeters == 0)

+    {

+	client->errorValue = 0;

+	return BadValue;

+    }

+

+    if (stuff->screenPixmapWidth < scr_priv->minWidth ||

+	scr_priv->maxWidth < stuff->screenPixmapWidth)

+    {

+	client->errorValue = stuff->screenPixmapWidth;

+	return BadValue;

+    }

+    if (stuff->screenPixmapHeight < scr_priv->minHeight ||

+	scr_priv->maxHeight < stuff->screenPixmapHeight)

+    {

+	client->errorValue = stuff->screenPixmapHeight;

+	return BadValue;

+    }

+

+    screen_config.screen_pixmap_width = stuff->screenPixmapWidth;

+    screen_config.screen_pixmap_height = stuff->screenPixmapHeight;

+    screen_config.screen_width = stuff->screenWidth;

+    screen_config.screen_height = stuff->screenHeight;

+    screen_config.mm_width = stuff->widthInMillimeters;

+    screen_config.mm_height = stuff->heightInMillimeters;

+

+    output_ids = (RROutput *) (x_configs + num_configs);

+

+    /*

+     * Convert protocol crtc configurations into

+     * server crtc configurations

+     */

+    configs = calloc(num_configs, sizeof (RRCrtcConfigRec));

+    if (num_configs > 0 && configs == NULL)

+	return BadAlloc;

+    for (i = 0; i < num_configs; i++) {

+	rc = RRConvertCrtcConfig(client, screen, &screen_config,

+				 &configs[i],

+				 &x_configs[i], output_ids);

+	if (rc != Success) {

+	    rep.status = RRSetConfigFailed;

+	    goto sendReply;

+	}

+	output_ids += x_configs[i].nOutput;

+    }

+

+    if (num_configs &&

+	!RRSetCrtcConfigs (screen, &screen_config, configs, num_configs))

+    {

+	rep.status = RRSetConfigFailed;

+	goto sendReply;

+    }

+    rep.status = RRSetConfigSuccess;

+    scr_priv->lastSetTime = currentTime;

+

+sendReply:

+    RRFreeCrtcConfigs(configs, num_configs);

+

+    rep.type = X_Reply;

+    /* rep.status has already been filled in */

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+

+    if (client->swapped)

+    {

+	int n;

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+    }

+    WriteToClient(client, sizeof(xRRSetCrtcConfigsReply), (char *)&rep);

+

+    return Success;

+}

diff --git a/xorg-server/randr/rrdispatch.c b/xorg-server/randr/rrdispatch.c
index b54086bcb..7540b4d35 100644
--- a/xorg-server/randr/rrdispatch.c
+++ b/xorg-server/randr/rrdispatch.c
@@ -224,5 +224,11 @@ int (*ProcRandrVector[RRNumberRequests])(ClientPtr) = {
     ProcRRSetPanning,		/* 29 */

     ProcRRSetOutputPrimary,	/* 30 */

     ProcRRGetOutputPrimary,	/* 31 */

+/* V1.4 additions */

+    ProcRRQueryScanoutPixmaps,	/* 32 */

+    ProcRRCreateScanoutPixmap,	/* 33 */

+    ProcRRSetCrtcSpriteTransform,/* 34 */

+    ProcRRGetCrtcSpriteTransform,/* 35 */

+    ProcRRSetCrtcConfigs,	 /* 36 */

 };

 

diff --git a/xorg-server/randr/rrinfo.c b/xorg-server/randr/rrinfo.c
index 04c1a6c98..faac15afb 100644
--- a/xorg-server/randr/rrinfo.c
+++ b/xorg-server/randr/rrinfo.c
@@ -168,7 +168,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
     /* notice current mode */

     if (newMode)

 	RRCrtcNotify (crtc, newMode, 0, 0, pScrPriv->rotation,

-		      NULL, 1, &output);

+		      NULL, 1, &output, NULL);

 }

 #endif

 

diff --git a/xorg-server/randr/rrpixmap.c b/xorg-server/randr/rrpixmap.c
new file mode 100644
index 000000000..5949309c9
--- /dev/null
+++ b/xorg-server/randr/rrpixmap.c
@@ -0,0 +1,154 @@
+/*

+ * Copyright © 2010 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ */

+

+#include "randrstr.h"

+#include "xace.h"

+

+int

+ProcRRQueryScanoutPixmaps (ClientPtr client)

+{

+    REQUEST(xRRQueryScanoutPixmapsReq);

+    xRRQueryScanoutPixmapsReply	rep;

+    RRScanoutPixmapInfo		*info;

+    xRRScanoutPixmapInfo	*x_info;

+    int				n_info;

+    int				rc;

+    DrawablePtr			drawable;

+    ScreenPtr			screen;

+    rrScrPrivPtr		screen_priv;

+    int 			n, s;

+

+    REQUEST_SIZE_MATCH(xRRQueryScanoutPixmapsReq);

+    rc = dixLookupDrawable(&drawable, stuff->drawable, client, 0, DixGetAttrAccess);

+    if (rc != Success) {

+	client->errorValue = stuff->drawable;

+	return rc;

+    }

+

+    screen = drawable->pScreen;

+    screen_priv = rrGetScrPriv(screen);

+

+    rep.type = X_Reply;

+    /* rep.status has already been filled in */

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+

+    info = RRQueryScanoutPixmapInfo(screen, &n_info);

+    x_info = calloc(n_info, sizeof (xRRScanoutPixmapInfo));

+    if (n_info && !x_info)

+	return BadAlloc;

+    rep.length += (n_info * sizeof (xRRScanoutPixmapInfo)) >> 2;

+    if (client->swapped) {

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+    }

+

+    for (s = 0; s < n_info; s++) {

+	x_info[s].format = info[s].format->id;

+	x_info[s].maxWidth = info[s].maxWidth;

+	x_info[s].maxHeight = info[s].maxHeight;

+	x_info[s].rotations = info[s].rotations;

+	if (client->swapped) {

+	    swapl(&x_info[s].format, n);

+	    swaps(&x_info[s].maxWidth, n);

+	    swaps(&x_info[s].maxHeight, n);

+	    swaps(&x_info[s].rotations, n);

+	}

+    }

+

+    WriteToClient(client, sizeof(rep), (char *)&rep);

+    if (n_info)

+	WriteToClient(client, n_info * sizeof (xRRScanoutPixmapInfo),

+		      (char *) x_info);

+    return Success;

+}

+

+int

+ProcRRCreateScanoutPixmap (ClientPtr client)

+{

+    REQUEST(xRRCreateScanoutPixmapReq);

+    int 		rc;

+    DrawablePtr		drawable;

+    ScreenPtr		screen;

+    rrScrPrivPtr	screen_priv;

+    PixmapPtr		pixmap;

+    int			n_info;

+    RRScanoutPixmapInfo	*info;

+    int			s;

+

+    REQUEST_SIZE_MATCH(xRRCreateScanoutPixmapReq);

+    client->errorValue = stuff->pid;

+    LEGAL_NEW_RESOURCE(stuff->pid, client);

+

+    rc = dixLookupDrawable(&drawable, stuff->drawable, client, 0, DixGetAttrAccess);

+    if (rc != Success) {

+	client->errorValue = stuff->drawable;

+	return rc;

+    }

+    screen = drawable->pScreen;

+    screen_priv = rrGetScrPriv(screen);

+    if (!screen_priv)

+	return BadValue;

+

+    info = RRQueryScanoutPixmapInfo(screen, &n_info);

+    for (s = 0; s < n_info; s++) {

+	if (info[s].format->id == stuff->format)

+	    break;

+    }

+    if (s == n_info || !screen_priv->rrCreateScanoutPixmap) {

+	client->errorValue = stuff->format;

+	return BadValue;

+    }

+    info = &info[s];

+    if (!stuff->width || stuff->width > info->maxWidth) {

+	client->errorValue = stuff->width;

+	return BadValue;

+    }

+    if (!stuff->height || stuff->height > info->maxHeight) {

+	client->errorValue = stuff->height;

+	return BadValue;

+    }

+    if ((stuff->rotations & info->rotations) != stuff->rotations) {

+	client->errorValue = stuff->rotations;

+	return BadValue;

+    }

+

+    pixmap = screen_priv->rrCreateScanoutPixmap (screen,

+						 stuff->width, stuff->height,

+						 info->depth,

+						 stuff->rotations,

+						 info->format);

+    if (!pixmap)

+	return BadAlloc;

+

+    pixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

+    pixmap->drawable.id = stuff->pid;

+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,

+		  pixmap, RT_NONE, NULL, DixCreateAccess);

+    if (rc != Success) {

+	screen->DestroyPixmap(pixmap);

+	return rc;

+    }

+    if (!AddResource(stuff->pid, RT_PIXMAP, pixmap))

+	return BadAlloc;

+    return Success;

+}

diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c
index 6f842fe62..318dfaa91 100644
--- a/xorg-server/randr/rrscreen.c
+++ b/xorg-server/randr/rrscreen.c
@@ -168,6 +168,8 @@ Bool
 RRScreenSizeSet (ScreenPtr  pScreen,

 		 CARD16	    width,

 		 CARD16	    height,

+		 CARD16	    pixWidth,

+		 CARD16	    pixHeight,

 		 CARD32	    mmWidth,

 		 CARD32	    mmHeight)

 {

@@ -178,6 +180,7 @@ RRScreenSizeSet (ScreenPtr  pScreen,
     {

 	return (*pScrPriv->rrScreenSetSize) (pScreen,

 					     width, height,

+					     pixWidth, pixHeight,

 					     mmWidth, mmHeight);

     }

 #endif

@@ -191,6 +194,24 @@ RRScreenSizeSet (ScreenPtr  pScreen,
 }

 

 /*

+ * Compute an RRScreenConfig from the current screen information

+ */

+void

+RRScreenCurrentConfig(ScreenPtr screen,

+		      RRScreenConfigPtr screen_config)

+{

+    PixmapPtr		screen_pixmap = screen->GetScreenPixmap(screen);

+    WindowPtr		root = screen->root;

+

+    screen_config->screen_pixmap_width = screen_pixmap->drawable.width;

+    screen_config->screen_pixmap_height = screen_pixmap->drawable.height;

+    screen_config->screen_width = root->drawable.width;

+    screen_config->screen_height = root->drawable.height;

+    screen_config->mm_width = screen->mmWidth;

+    screen_config->mm_height = screen->mmHeight;

+}

+

+/*

  * Retrieve valid screen size range

  */

 int

@@ -300,6 +321,7 @@ ProcRRSetScreenSize (ClientPtr client)
     }

     if (!RRScreenSizeSet (pScreen, 

 			  stuff->width, stuff->height,

+			  stuff->width, stuff->height,

 			  stuff->widthInMillimeters,

 			  stuff->heightInMillimeters))

     {

@@ -776,8 +798,10 @@ ProcRRSetScreenConfig (ClientPtr client)
     }

     

     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixWriteAccess);

-    if (rc != Success)

+    if (rc != Success) {

+	client->errorValue = stuff->drawable;

 	return rc;

+    }

 

     pScreen = pDraw->pScreen;

 

@@ -922,14 +946,14 @@ ProcRRSetScreenConfig (ClientPtr client)
 	for (c = 0; c < pScrPriv->numCrtcs; c++)

 	{

 	    if (!RRCrtcSet (pScrPriv->crtcs[c], NULL, 0, 0, RR_Rotate_0,

-			    0, NULL))

+			    0, NULL, NULL))

 	    {

 		rep.status = RRSetConfigFailed;

 		/* XXX recover from failure */

 		goto sendReply;

 	    }

 	}

-	if (!RRScreenSizeSet (pScreen, width, height,

+	if (!RRScreenSizeSet (pScreen, width, height, width, height,

 			      pScreen->mmWidth, pScreen->mmHeight))

 	{

 	    rep.status = RRSetConfigFailed;

@@ -938,7 +962,7 @@ ProcRRSetScreenConfig (ClientPtr client)
 	}

     }

 

-    if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output))

+    if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output, NULL))

 	rep.status = RRSetConfigFailed;

     else {

 	pScrPriv->lastSetTime = time;

diff --git a/xorg-server/randr/rrsdispatch.c b/xorg-server/randr/rrsdispatch.c
index e16090a41..5c6978aa1 100644
--- a/xorg-server/randr/rrsdispatch.c
+++ b/xorg-server/randr/rrsdispatch.c
@@ -1,503 +1,635 @@
-/*
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "randrstr.h"
-
-static int
-SProcRRQueryVersion (ClientPtr client)
-{
-    register int n;
-    REQUEST(xRRQueryVersionReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->majorVersion, n);
-    swapl(&stuff->minorVersion, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetScreenInfo (ClientPtr client)
-{
-    register int n;
-    REQUEST(xRRGetScreenInfoReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetScreenConfig (ClientPtr client)
-{
-    register int n;
-    REQUEST(xRRSetScreenConfigReq);
-
-    if (RRClientKnowsRates (client))
-    {
-	REQUEST_SIZE_MATCH (xRRSetScreenConfigReq);
-	swaps (&stuff->rate, n);
-    }
-    else
-    {
-	REQUEST_SIZE_MATCH (xRR1_0SetScreenConfigReq);
-    }
-    
-    swaps(&stuff->length, n);
-    swapl(&stuff->drawable, n);
-    swapl(&stuff->timestamp, n);
-    swaps(&stuff->sizeID, n);
-    swaps(&stuff->rotation, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSelectInput (ClientPtr client)
-{
-    register int n;
-    REQUEST(xRRSelectInputReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    swaps(&stuff->enable, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetScreenSizeRange (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetScreenSizeRangeReq);
-
-    REQUEST_SIZE_MATCH(xRRGetScreenSizeRangeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetScreenSize (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetScreenSizeReq);
-
-    REQUEST_SIZE_MATCH(xRRSetScreenSizeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    swaps(&stuff->width, n);
-    swaps(&stuff->height, n);
-    swapl(&stuff->widthInMillimeters, n);
-    swapl(&stuff->heightInMillimeters, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetScreenResources (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetScreenResourcesReq);
-
-    REQUEST_SIZE_MATCH(xRRGetScreenResourcesReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetOutputInfo (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetOutputInfoReq);
-
-    REQUEST_SIZE_MATCH(xRRGetOutputInfoReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->configTimestamp, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRListOutputProperties (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRListOutputPropertiesReq);
-
-    REQUEST_SIZE_MATCH(xRRListOutputPropertiesReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRQueryOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRQueryOutputPropertyReq);
-
-    REQUEST_SIZE_MATCH(xRRQueryOutputPropertyReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRConfigureOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRConfigureOutputPropertyReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    SwapRestL(stuff);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRChangeOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRChangeOutputPropertyReq);
-
-    REQUEST_AT_LEAST_SIZE (xRRChangeOutputPropertyReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    swapl(&stuff->type, n);
-    swapl(&stuff->nUnits, n);
-    switch(stuff->format) {
-	case 8:
-	    break;
-	case 16:
-	    SwapRestS(stuff);
-	    break;
-	case 32:
-	    SwapRestL(stuff);
-	    break;
-	default:
-	    client->errorValue = stuff->format;
-	    return BadValue;
-    }
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRDeleteOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRDeleteOutputPropertyReq);
-    
-    REQUEST_SIZE_MATCH(xRRDeleteOutputPropertyReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetOutputPropertyReq);
-
-    REQUEST_SIZE_MATCH(xRRGetOutputPropertyReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    swapl(&stuff->type, n);
-    swapl(&stuff->longOffset, n);
-    swapl(&stuff->longLength, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRCreateMode (ClientPtr client)
-{
-    int n;
-    xRRModeInfo *modeinfo;
-    REQUEST(xRRCreateModeReq);
-
-    REQUEST_AT_LEAST_SIZE(xRRCreateModeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-
-    modeinfo = &stuff->modeInfo;
-    swapl(&modeinfo->id, n);
-    swaps(&modeinfo->width, n);
-    swaps(&modeinfo->height, n);
-    swapl(&modeinfo->dotClock, n);
-    swaps(&modeinfo->hSyncStart, n);
-    swaps(&modeinfo->hSyncEnd, n);
-    swaps(&modeinfo->hTotal, n);
-    swaps(&modeinfo->vSyncStart, n);
-    swaps(&modeinfo->vSyncEnd, n);
-    swaps(&modeinfo->vTotal, n);
-    swaps(&modeinfo->nameLength, n);
-    swapl(&modeinfo->modeFlags, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRDestroyMode (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRDestroyModeReq);
-
-    REQUEST_SIZE_MATCH(xRRDestroyModeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->mode, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRAddOutputMode (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRAddOutputModeReq);
-
-    REQUEST_SIZE_MATCH(xRRAddOutputModeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->mode, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRDeleteOutputMode (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRDeleteOutputModeReq);
-
-    REQUEST_SIZE_MATCH(xRRDeleteOutputModeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->mode, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetCrtcInfo (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetCrtcInfoReq);
-
-    REQUEST_SIZE_MATCH(xRRGetCrtcInfoReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    swapl(&stuff->configTimestamp, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetCrtcConfig (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetCrtcConfigReq);
-
-    REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    swapl(&stuff->timestamp, n);
-    swapl(&stuff->configTimestamp, n);
-    swaps(&stuff->x, n);
-    swaps(&stuff->y, n);
-    swapl(&stuff->mode, n);
-    swaps(&stuff->rotation, n);
-    SwapRestL(stuff);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetCrtcGammaSize (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetCrtcGammaSizeReq);
-
-    REQUEST_SIZE_MATCH(xRRGetCrtcGammaSizeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetCrtcGamma (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetCrtcGammaReq);
-
-    REQUEST_SIZE_MATCH(xRRGetCrtcGammaReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetCrtcGamma (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetCrtcGammaReq);
-
-    REQUEST_AT_LEAST_SIZE(xRRSetCrtcGammaReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    swaps(&stuff->size, n);
-    SwapRestS(stuff);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetCrtcTransform (ClientPtr client)
-{
-    int n, nparams;
-    char *filter;
-    CARD32 *params;
-    REQUEST(xRRSetCrtcTransformReq);
-
-    REQUEST_AT_LEAST_SIZE(xRRSetCrtcTransformReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    SwapLongs((CARD32 *)&stuff->transform, bytes_to_int32(sizeof(xRenderTransform)));
-    swaps(&stuff->nbytesFilter, n);
-    filter = (char *)(stuff + 1);
-    params = (CARD32 *) (filter + pad_to_int32(stuff->nbytesFilter));
-    nparams = ((CARD32 *) stuff + client->req_len) - params;
-    if (nparams < 0)
-	return BadLength;
-
-    SwapLongs(params, nparams);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetCrtcTransform (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetCrtcTransformReq);
-
-    REQUEST_SIZE_MATCH(xRRGetCrtcTransformReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetPanning (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetPanningReq);
-    
-    REQUEST_SIZE_MATCH(xRRGetPanningReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetPanning (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetPanningReq);
-    
-    REQUEST_SIZE_MATCH(xRRSetPanningReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    swapl(&stuff->timestamp, n);
-    swaps(&stuff->left, n);
-    swaps(&stuff->top, n);
-    swaps(&stuff->width, n);
-    swaps(&stuff->height, n);
-    swaps(&stuff->track_left, n);
-    swaps(&stuff->track_top, n);
-    swaps(&stuff->track_width, n);
-    swaps(&stuff->track_height, n);
-    swaps(&stuff->border_left, n);
-    swaps(&stuff->border_top, n);
-    swaps(&stuff->border_right, n);
-    swaps(&stuff->border_bottom, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetOutputPrimary (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetOutputPrimaryReq);
-
-    REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    swapl(&stuff->output, n);
-    return ProcRandrVector[stuff->randrReqType](client);
-}
-
-static int
-SProcRRGetOutputPrimary (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetOutputPrimaryReq);
-
-    REQUEST_SIZE_MATCH(xRRGetOutputPrimaryReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return ProcRandrVector[stuff->randrReqType](client);
-}
-
-int (*SProcRandrVector[RRNumberRequests])(ClientPtr) = {
-    SProcRRQueryVersion,	/* 0 */
-/* we skip 1 to make old clients fail pretty immediately */
-    NULL,			/* 1 SProcRandrOldGetScreenInfo */
-/* V1.0 apps share the same set screen config request id */
-    SProcRRSetScreenConfig,	/* 2 */
-    NULL,			/* 3 SProcRandrOldScreenChangeSelectInput */
-/* 3 used to be ScreenChangeSelectInput; deprecated */
-    SProcRRSelectInput,		/* 4 */
-    SProcRRGetScreenInfo,    	/* 5 */
-/* V1.2 additions */
-    SProcRRGetScreenSizeRange,	/* 6 */
-    SProcRRSetScreenSize,	/* 7 */
-    SProcRRGetScreenResources,	/* 8 */
-    SProcRRGetOutputInfo,	/* 9 */
-    SProcRRListOutputProperties,/* 10 */
-    SProcRRQueryOutputProperty,	/* 11 */
-    SProcRRConfigureOutputProperty,  /* 12 */
-    SProcRRChangeOutputProperty,/* 13 */
-    SProcRRDeleteOutputProperty,/* 14 */
-    SProcRRGetOutputProperty,	/* 15 */
-    SProcRRCreateMode,		/* 16 */
-    SProcRRDestroyMode,		/* 17 */
-    SProcRRAddOutputMode,	/* 18 */
-    SProcRRDeleteOutputMode,	/* 19 */
-    SProcRRGetCrtcInfo,		/* 20 */
-    SProcRRSetCrtcConfig,	/* 21 */
-    SProcRRGetCrtcGammaSize,	/* 22 */
-    SProcRRGetCrtcGamma,	/* 23 */
-    SProcRRSetCrtcGamma,	/* 24 */
-/* V1.3 additions */
-    SProcRRGetScreenResources,	/* 25 GetScreenResourcesCurrent */
-    SProcRRSetCrtcTransform,	/* 26 */
-    SProcRRGetCrtcTransform,	/* 27 */
-    SProcRRGetPanning,		/* 28 */
-    SProcRRSetPanning,		/* 29 */
-    SProcRRSetOutputPrimary,	/* 30 */
-    SProcRRGetOutputPrimary,	/* 31 */
-};
-
+/*

+ * Copyright © 2006 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ */

+

+#include "randrstr.h"

+

+static int

+SProcRRQueryVersion (ClientPtr client)

+{

+    register int n;

+    REQUEST(xRRQueryVersionReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->majorVersion, n);

+    swapl(&stuff->minorVersion, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetScreenInfo (ClientPtr client)

+{

+    register int n;

+    REQUEST(xRRGetScreenInfoReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetScreenConfig (ClientPtr client)

+{

+    register int n;

+    REQUEST(xRRSetScreenConfigReq);

+

+    if (RRClientKnowsRates (client))

+    {

+	REQUEST_SIZE_MATCH (xRRSetScreenConfigReq);

+	swaps (&stuff->rate, n);

+    }

+    else

+    {

+	REQUEST_SIZE_MATCH (xRR1_0SetScreenConfigReq);

+    }

+    

+    swaps(&stuff->length, n);

+    swapl(&stuff->drawable, n);

+    swapl(&stuff->timestamp, n);

+    swaps(&stuff->sizeID, n);

+    swaps(&stuff->rotation, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSelectInput (ClientPtr client)

+{

+    register int n;

+    REQUEST(xRRSelectInputReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    swaps(&stuff->enable, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetScreenSizeRange (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetScreenSizeRangeReq);

+

+    REQUEST_SIZE_MATCH(xRRGetScreenSizeRangeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetScreenSize (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetScreenSizeReq);

+

+    REQUEST_SIZE_MATCH(xRRSetScreenSizeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    swaps(&stuff->width, n);

+    swaps(&stuff->height, n);

+    swapl(&stuff->widthInMillimeters, n);

+    swapl(&stuff->heightInMillimeters, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetScreenResources (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetScreenResourcesReq);

+

+    REQUEST_SIZE_MATCH(xRRGetScreenResourcesReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetOutputInfo (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetOutputInfoReq);

+

+    REQUEST_SIZE_MATCH(xRRGetOutputInfoReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->configTimestamp, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRListOutputProperties (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRListOutputPropertiesReq);

+

+    REQUEST_SIZE_MATCH(xRRListOutputPropertiesReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRQueryOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRQueryOutputPropertyReq);

+

+    REQUEST_SIZE_MATCH(xRRQueryOutputPropertyReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRConfigureOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRConfigureOutputPropertyReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    SwapRestL(stuff);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRChangeOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRChangeOutputPropertyReq);

+

+    REQUEST_AT_LEAST_SIZE (xRRChangeOutputPropertyReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    swapl(&stuff->type, n);

+    swapl(&stuff->nUnits, n);

+    switch(stuff->format) {

+	case 8:

+	    break;

+	case 16:

+	    SwapRestS(stuff);

+	    break;

+	case 32:

+	    SwapRestL(stuff);

+	    break;

+	default:

+	    client->errorValue = stuff->format;

+	    return BadValue;

+    }

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRDeleteOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRDeleteOutputPropertyReq);

+    

+    REQUEST_SIZE_MATCH(xRRDeleteOutputPropertyReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetOutputPropertyReq);

+

+    REQUEST_SIZE_MATCH(xRRGetOutputPropertyReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    swapl(&stuff->type, n);

+    swapl(&stuff->longOffset, n);

+    swapl(&stuff->longLength, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRCreateMode (ClientPtr client)

+{

+    int n;

+    xRRModeInfo *modeinfo;

+    REQUEST(xRRCreateModeReq);

+

+    REQUEST_AT_LEAST_SIZE(xRRCreateModeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+

+    modeinfo = &stuff->modeInfo;

+    swapl(&modeinfo->id, n);

+    swaps(&modeinfo->width, n);

+    swaps(&modeinfo->height, n);

+    swapl(&modeinfo->dotClock, n);

+    swaps(&modeinfo->hSyncStart, n);

+    swaps(&modeinfo->hSyncEnd, n);

+    swaps(&modeinfo->hTotal, n);

+    swaps(&modeinfo->vSyncStart, n);

+    swaps(&modeinfo->vSyncEnd, n);

+    swaps(&modeinfo->vTotal, n);

+    swaps(&modeinfo->nameLength, n);

+    swapl(&modeinfo->modeFlags, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRDestroyMode (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRDestroyModeReq);

+

+    REQUEST_SIZE_MATCH(xRRDestroyModeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->mode, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRAddOutputMode (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRAddOutputModeReq);

+

+    REQUEST_SIZE_MATCH(xRRAddOutputModeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->mode, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRDeleteOutputMode (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRDeleteOutputModeReq);

+

+    REQUEST_SIZE_MATCH(xRRDeleteOutputModeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->mode, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetCrtcInfo (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcInfoReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcInfoReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swapl(&stuff->configTimestamp, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetCrtcConfig (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetCrtcConfigReq);

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swapl(&stuff->timestamp, n);

+    swapl(&stuff->configTimestamp, n);

+    swaps(&stuff->x, n);

+    swaps(&stuff->y, n);

+    swapl(&stuff->mode, n);

+    swaps(&stuff->rotation, n);

+    SwapRestL(stuff);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetCrtcGammaSize (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcGammaSizeReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcGammaSizeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetCrtcGamma (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcGammaReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcGammaReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetCrtcGamma (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetCrtcGammaReq);

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcGammaReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swaps(&stuff->size, n);

+    SwapRestS(stuff);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetCrtcTransform (ClientPtr client)

+{

+    int n, nparams;

+    char *filter;

+    CARD32 *params;

+    REQUEST(xRRSetCrtcTransformReq);

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcTransformReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    SwapLongs((CARD32 *)&stuff->transform, bytes_to_int32(sizeof(xRenderTransform)));

+    swaps(&stuff->nbytesFilter, n);

+    filter = (char *)(stuff + 1);

+    params = (CARD32 *) (filter + pad_to_int32(stuff->nbytesFilter));

+    nparams = ((CARD32 *) stuff + client->req_len) - params;

+    if (nparams < 0)

+	return BadLength;

+

+    SwapLongs(params, nparams);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetCrtcTransform (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcTransformReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcTransformReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetPanning (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetPanningReq);

+    

+    REQUEST_SIZE_MATCH(xRRGetPanningReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetPanning (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetPanningReq);

+    

+    REQUEST_SIZE_MATCH(xRRSetPanningReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swapl(&stuff->timestamp, n);

+    swaps(&stuff->left, n);

+    swaps(&stuff->top, n);

+    swaps(&stuff->width, n);

+    swaps(&stuff->height, n);

+    swaps(&stuff->track_left, n);

+    swaps(&stuff->track_top, n);

+    swaps(&stuff->track_width, n);

+    swaps(&stuff->track_height, n);

+    swaps(&stuff->border_left, n);

+    swaps(&stuff->border_top, n);

+    swaps(&stuff->border_right, n);

+    swaps(&stuff->border_bottom, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetOutputPrimary (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetOutputPrimaryReq);

+

+    REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    swapl(&stuff->output, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRGetOutputPrimary (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetOutputPrimaryReq);

+

+    REQUEST_SIZE_MATCH(xRRGetOutputPrimaryReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRQueryScanoutPixmaps (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRQueryScanoutPixmapsReq);

+

+    REQUEST_SIZE_MATCH(xRRQueryScanoutPixmapsReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->drawable, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRCreateScanoutPixmap (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRCreateScanoutPixmapReq);

+

+    REQUEST_SIZE_MATCH(xRRCreateScanoutPixmapReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->pid, n);

+    swapl(&stuff->drawable, n);

+    swaps(&stuff->width, n);

+    swaps(&stuff->height, n);

+    swapl(&stuff->format, n);

+    swaps(&stuff->rotations, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static void

+swap_transform(xRenderTransform *t)

+{

+    int n;

+    swapl(&t->matrix11, n);

+    swapl(&t->matrix12, n);

+    swapl(&t->matrix13, n);

+    swapl(&t->matrix21, n);

+    swapl(&t->matrix22, n);

+    swapl(&t->matrix23, n);

+    swapl(&t->matrix31, n);

+    swapl(&t->matrix32, n);

+    swapl(&t->matrix33, n);

+}

+

+static int

+SProcRRSetCrtcSpriteTransform (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetCrtcSpriteTransformReq);

+

+    REQUEST_SIZE_MATCH(xRRSetCrtcSpriteTransformReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swap_transform(&stuff->positionTransform);

+    swap_transform(&stuff->imageTransform);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRGetCrtcSpriteTransform (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcSpriteTransformReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcSpriteTransformReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRSetCrtcConfigs (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetCrtcConfigsReq);

+    int c;

+    int extra_len;

+    int num_configs;

+    int num_output_ids;

+    xRRCrtcConfig *x_configs;

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigsReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->drawable, n);

+    swaps(&stuff->screenPixmapWidth, n);

+    swaps(&stuff->screenPixmapHeight, n);

+    swaps(&stuff->screenWidth, n);

+    swaps(&stuff->screenHeight, n);

+    swapl(&stuff->widthInMillimeters, n);

+    swapl(&stuff->heightInMillimeters, n);

+    swaps(&stuff->nConfigs, n);

+

+    extra_len = client->req_len - bytes_to_int32(sizeof(xRRSetCrtcConfigsReq));

+

+    num_configs = stuff->nConfigs;

+

+    /* Check request length against number of configs specified */

+    if (num_configs * (sizeof (xRRCrtcConfig) >> 2) > extra_len)

+	return BadLength;

+

+    x_configs = (xRRCrtcConfig *) (stuff + 1);

+    for (c = 0; c < num_configs; c++) {

+	swapl(&x_configs->crtc, n);

+	swaps(&x_configs->x, n);

+	swaps(&x_configs->y, n);

+	swapl(&x_configs->mode, n);

+	swaps(&x_configs->rotation, n);

+	swaps(&x_configs->nOutput, n);

+	swap_transform(&x_configs->spritePositionTransform);

+	swap_transform(&x_configs->spriteImageTransform);

+	swapl(&x_configs->pixmap, n);

+	swaps(&x_configs->xPixmap, n);

+	swaps(&x_configs->yPixmap, n);

+	x_configs++;

+    }

+

+    /* Let the other dispatch function deal with verifying that

+     * the right number of output ids are present, just

+     * swap whatever is here

+     */

+    num_output_ids = extra_len - (num_configs * (sizeof (xRRCrtcConfig)) >> 2);

+    SwapLongs((CARD32 *) x_configs, num_output_ids);

+

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+int (*SProcRandrVector[RRNumberRequests])(ClientPtr) = {

+    SProcRRQueryVersion,	/* 0 */

+/* we skip 1 to make old clients fail pretty immediately */

+    NULL,			/* 1 SProcRandrOldGetScreenInfo */

+/* V1.0 apps share the same set screen config request id */

+    SProcRRSetScreenConfig,	/* 2 */

+    NULL,			/* 3 SProcRandrOldScreenChangeSelectInput */

+/* 3 used to be ScreenChangeSelectInput; deprecated */

+    SProcRRSelectInput,		/* 4 */

+    SProcRRGetScreenInfo,    	/* 5 */

+/* V1.2 additions */

+    SProcRRGetScreenSizeRange,	/* 6 */

+    SProcRRSetScreenSize,	/* 7 */

+    SProcRRGetScreenResources,	/* 8 */

+    SProcRRGetOutputInfo,	/* 9 */

+    SProcRRListOutputProperties,/* 10 */

+    SProcRRQueryOutputProperty,	/* 11 */

+    SProcRRConfigureOutputProperty,  /* 12 */

+    SProcRRChangeOutputProperty,/* 13 */

+    SProcRRDeleteOutputProperty,/* 14 */

+    SProcRRGetOutputProperty,	/* 15 */

+    SProcRRCreateMode,		/* 16 */

+    SProcRRDestroyMode,		/* 17 */

+    SProcRRAddOutputMode,	/* 18 */

+    SProcRRDeleteOutputMode,	/* 19 */

+    SProcRRGetCrtcInfo,		/* 20 */

+    SProcRRSetCrtcConfig,	/* 21 */

+    SProcRRGetCrtcGammaSize,	/* 22 */

+    SProcRRGetCrtcGamma,	/* 23 */

+    SProcRRSetCrtcGamma,	/* 24 */

+/* V1.3 additions */

+    SProcRRGetScreenResources,	/* 25 GetScreenResourcesCurrent */

+    SProcRRSetCrtcTransform,	/* 26 */

+    SProcRRGetCrtcTransform,	/* 27 */

+    SProcRRGetPanning,		/* 28 */

+    SProcRRSetPanning,		/* 29 */

+    SProcRRSetOutputPrimary,	/* 30 */

+    SProcRRGetOutputPrimary,	/* 31 */

+/* V1.4 additions */

+    SProcRRQueryScanoutPixmaps,	/* 32 */

+    SProcRRCreateScanoutPixmap,	/* 33 */

+    SProcRRSetCrtcSpriteTransform,/* 34 */

+    SProcRRGetCrtcSpriteTransform,/* 35 */

+    SProcRRSetCrtcConfigs,	/* 36 */

+};

+

diff --git a/xorg-server/randr/rrsprite.c b/xorg-server/randr/rrsprite.c
new file mode 100644
index 000000000..c441e0396
--- /dev/null
+++ b/xorg-server/randr/rrsprite.c
@@ -0,0 +1,104 @@
+/*

+ * Copyright © 2010 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ */

+

+#include "randrstr.h"

+#include "swaprep.h"

+

+void

+RRCrtcSpriteTransformSet(RRCrtcPtr crtc,

+			 PictTransform *position_transform,

+			 PictTransform *image_transform,

+			 struct pict_f_transform *f_position_transform,

+			 struct pict_f_transform *f_image_transform)

+{

+    ScreenPtr			pScreen;

+    rrScrPrivPtr		pScrPriv;

+

+    pScreen = crtc->pScreen;

+    pScrPriv = rrGetScrPriv(pScreen);

+    crtc->client_sprite_position_transform = *position_transform;

+    crtc->client_sprite_image_transform = *image_transform;

+    crtc->client_sprite_f_position_transform = *f_position_transform;

+    crtc->client_sprite_f_image_transform = *f_image_transform;

+    if (pScrPriv->rrSetCrtcSpriteTransform)

+	(*pScrPriv->rrSetCrtcSpriteTransform) (pScreen, crtc,

+					       &crtc->client_sprite_f_position_transform,

+					       &crtc->client_sprite_f_image_transform);

+}

+

+int

+ProcRRSetCrtcSpriteTransform (ClientPtr client)

+{

+    REQUEST(xRRSetCrtcSpriteTransformReq);

+    RRCrtcPtr		    crtc;

+    PictTransform	    position_transform, image_transform;

+    struct pixman_f_transform f_position_transform, f_image_transform;

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcSpriteTransformReq);

+    VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

+

+    PictTransform_from_xRenderTransform (&position_transform, &stuff->positionTransform);

+    PictTransform_from_xRenderTransform (&image_transform, &stuff->imageTransform);

+    pixman_f_transform_from_pixman_transform (&f_position_transform, &position_transform);

+    pixman_f_transform_from_pixman_transform (&f_image_transform, &image_transform);

+

+    RRCrtcSpriteTransformSet (crtc, &position_transform, &image_transform,

+			      &f_position_transform, &f_image_transform);

+    return Success;

+}

+

+#define CrtcSpriteTransformExtra	(SIZEOF(xRRGetCrtcSpriteTransformReply) - 32)

+

+int

+ProcRRGetCrtcSpriteTransform (ClientPtr client)

+{

+    REQUEST(xRRGetCrtcSpriteTransformReq);

+    xRRGetCrtcSpriteTransformReply	*reply;

+    RRCrtcPtr			crtc;

+    int				n;

+    char			*extra;

+

+    REQUEST_SIZE_MATCH (xRRGetCrtcSpriteTransformReq);

+    VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

+

+    reply = malloc(sizeof (xRRGetCrtcSpriteTransformReply));

+    if (!reply)

+	return BadAlloc;

+

+    extra = (char *) (reply + 1);

+    reply->type = X_Reply;

+    reply->sequenceNumber = client->sequence;

+    reply->length = bytes_to_int32(CrtcSpriteTransformExtra);

+

+    xRenderTransform_from_PictTransform(&reply->positionTransform, &crtc->client_sprite_position_transform);

+    xRenderTransform_from_PictTransform(&reply->imageTransform, &crtc->client_sprite_image_transform);

+

+    if (client->swapped) {

+	swaps (&reply->sequenceNumber, n);

+	swapl (&reply->length, n);

+	SwapLongs((CARD32 *) &reply->positionTransform, bytes_to_int32(sizeof(xRenderTransform)));

+	SwapLongs((CARD32 *) &reply->imageTransform, bytes_to_int32(sizeof(xRenderTransform)));

+    }

+    WriteToClient (client, sizeof (xRRGetCrtcSpriteTransformReply), (char *) reply);

+    free(reply);

+    return Success;

+}

diff --git a/xorg-server/randr/rrtransform.c b/xorg-server/randr/rrtransform.c
index 102a0f48e..f78d5f913 100644
--- a/xorg-server/randr/rrtransform.c
+++ b/xorg-server/randr/rrtransform.c
@@ -134,6 +134,24 @@ RRTransformRescale(struct pixman_f_transform *f_transform, double limit)
 	    f_transform->m[j][i] *= scale;

 }

 

+#define EPSILON (1e-20)

+#define IS_F_SAME(a,b)	(fabs((a)-(b)) < EPSILON)

+#define IS_F_ZERO(a)	(fabs(a) < EPSILON)

+

+static Bool

+pict_f_transform_is_identity (const struct pixman_f_transform *t)

+{

+    return (IS_F_SAME (t->m[0][0], t->m[1][1]) &&

+	    IS_F_SAME (t->m[0][0], t->m[2][2]) &&

+	    !IS_F_ZERO (t->m[0][0]) &&

+	    IS_F_ZERO (t->m[0][1]) &&

+	    IS_F_ZERO (t->m[0][2]) &&

+	    IS_F_ZERO (t->m[1][0]) &&

+	    IS_F_ZERO (t->m[1][2]) &&

+	    IS_F_ZERO (t->m[2][0]) &&

+	    IS_F_ZERO (t->m[2][1]));

+}

+

 /*

  * Compute the complete transformation matrix including

  * client-specified transform, rotation/reflection values and the crtc 

@@ -148,23 +166,39 @@ RRTransformCompute (int			    x,
 		    int			    height,

 		    Rotation		    rotation,

 		    RRTransformPtr	    rr_transform,

+		    struct pixman_f_transform *sprite_position_transform,

+		    struct pixman_f_transform *sprite_image_transform,

 

 		    PictTransformPtr	    transform,

 		    struct pixman_f_transform *f_transform,

-		    struct pixman_f_transform *f_inverse)

+		    struct pixman_f_transform *f_inverse,

+		    struct pixman_f_transform *f_fb_to_sprite,

+		    struct pixman_f_transform *f_sprite_to_image,

+		    Bool		      *sprite_transform_in_use)

 {

     PictTransform	    t_transform, inverse;

     struct pixman_f_transform tf_transform, tf_inverse;

+    struct pixman_f_transform sf_position_transform, sf_image_transform;

+    struct pixman_f_transform f_image_to_sprite;

     Bool		    overflow = FALSE;

+    Bool		    ret = TRUE;

 

     if (!transform) transform = &t_transform;

     if (!f_transform) f_transform = &tf_transform;

     if (!f_inverse) f_inverse = &tf_inverse;

+    if (!f_fb_to_sprite) f_fb_to_sprite = &sf_position_transform;

+    if (!f_sprite_to_image) f_sprite_to_image = &sf_image_transform;

+

+    /* invert the sprite image transform to have it go from dest to source */

+    if (!pixman_f_transform_invert (&f_image_to_sprite, f_sprite_to_image))

+	pixman_f_transform_init_identity(&f_image_to_sprite);

 

     pixman_transform_init_identity (transform);

     pixman_transform_init_identity (&inverse);

     pixman_f_transform_init_identity (f_transform);

     pixman_f_transform_init_identity (f_inverse);

+    pixman_f_transform_init_identity (f_fb_to_sprite);

+    pixman_f_transform_init_identity (f_sprite_to_image);

     if (rotation != RR_Rotate_0)

     {

 	double	f_rot_cos, f_rot_sin, f_rot_dx, f_rot_dy;

@@ -246,7 +280,14 @@ RRTransformCompute (int			    x,
 	pixman_f_transform_translate (f_transform, f_inverse, f_scale_dx, f_scale_dy);

     }

     

-#ifdef RANDR_12_INTERFACE

+    /*

+     * Sprite position is affected by the transform matrix,

+     * but the image is not

+     */

+    pixman_f_transform_multiply(f_sprite_to_image,

+				f_transform,

+				&f_image_to_sprite);

+

     if (rr_transform)

     {

         if (!pixman_transform_multiply (transform, &rr_transform->transform, transform))

@@ -254,7 +295,7 @@ RRTransformCompute (int			    x,
 	pixman_f_transform_multiply (f_transform, &rr_transform->f_transform, f_transform);

 	pixman_f_transform_multiply (f_inverse, f_inverse, &rr_transform->f_inverse);

     }

-#endif

+

     /*

      * Compute the class of the resulting transform

      */

@@ -264,7 +305,7 @@ RRTransformCompute (int			    x,
 

 	pixman_f_transform_init_translate (f_transform,  x,  y);

 	pixman_f_transform_init_translate (f_inverse,   -x, -y);

-	return FALSE;

+	ret = FALSE;

     }

     else

     {

@@ -278,6 +319,19 @@ RRTransformCompute (int			    x,
 	    RRTransformRescale(&f_scaled, 16384.0);

 	    pixman_transform_from_pixman_f_transform(transform, &f_scaled);

 	}

-	return TRUE;

+	ret = TRUE;

     }

+

+    /*

+     * Sprite position is affected by the transform matrix,

+     * but the image is not

+     */

+    pixman_f_transform_multiply(f_fb_to_sprite,

+				f_inverse,

+				sprite_position_transform);

+    if (sprite_transform_in_use)

+	*sprite_transform_in_use = ret || !pict_f_transform_is_identity(f_fb_to_sprite);

+    return ret;

 }

+

+

diff --git a/xorg-server/randr/rrtransform.h b/xorg-server/randr/rrtransform.h
index 561762dfe..eaced0d3e 100644
--- a/xorg-server/randr/rrtransform.h
+++ b/xorg-server/randr/rrtransform.h
@@ -1,75 +1,86 @@
-/*
- * Copyright © 2007 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _RRTRANSFORM_H_
-#define _RRTRANSFORM_H_
-
-#include <X11/extensions/randr.h>
-#include "picturestr.h"
-
-typedef struct _rrTransform	RRTransformRec, *RRTransformPtr;
-
-struct _rrTransform {
-    PictTransform   transform;
-    struct pict_f_transform f_transform;
-    struct pict_f_transform f_inverse;
-    PictFilterPtr   filter;
-    xFixed	    *params;
-    int		    nparams;
-    int		    width;
-    int		    height;
-};
-
-extern _X_EXPORT void
-RRTransformInit (RRTransformPtr transform);
-
-extern _X_EXPORT void
-RRTransformFini (RRTransformPtr transform);
-
-extern _X_EXPORT Bool
-RRTransformEqual (RRTransformPtr a, RRTransformPtr b);
-
-extern _X_EXPORT Bool
-RRTransformSetFilter (RRTransformPtr	dst,
-		      PictFilterPtr	filter,
-		      xFixed		*params,
-		      int		nparams,
-		      int		width,
-		      int		height);
-
-extern _X_EXPORT Bool
-RRTransformCopy (RRTransformPtr dst, RRTransformPtr src);
-
-extern _X_EXPORT Bool
-RRTransformCompute (int			    x,
-		    int			    y,
-		    int			    width,
-		    int			    height,
-		    Rotation		    rotation,
-		    RRTransformPtr	    rr_transform,
-
-		    PictTransformPtr	    transform,
-		    struct pict_f_transform *f_transform,
-		    struct pict_f_transform *f_inverse);
-
-
-#endif /* _RRTRANSFORM_H_ */
+/*

+ * Copyright © 2007 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ */

+

+#ifndef _RRTRANSFORM_H_

+#define _RRTRANSFORM_H_

+

+#include <X11/extensions/randr.h>

+#include "picturestr.h"

+

+typedef struct _rrTransform	RRTransformRec, *RRTransformPtr;

+

+struct _rrTransform {

+    PictTransform   transform;

+    struct pict_f_transform f_transform;

+    struct pict_f_transform f_inverse;

+    PictFilterPtr   filter;

+    xFixed	    *params;

+    int		    nparams;

+    int		    width;

+    int		    height;

+};

+

+extern _X_EXPORT void

+RRTransformInit (RRTransformPtr transform);

+

+extern _X_EXPORT void

+RRTransformFini (RRTransformPtr transform);

+

+extern _X_EXPORT Bool

+RRTransformEqual (RRTransformPtr a, RRTransformPtr b);

+

+extern _X_EXPORT Bool

+RRTransformSetFilter (RRTransformPtr	dst,

+		      PictFilterPtr	filter,

+		      xFixed		*params,

+		      int		nparams,

+		      int		width,

+		      int		height);

+

+extern _X_EXPORT Bool

+RRTransformCopy (RRTransformPtr dst, RRTransformPtr src);

+

+/*

+ * Compute the complete transformation matrix including

+ * client-specified transform, rotation/reflection values and the crtc

+ * offset.

+ *

+ * Return TRUE if the resulting transform is not a simple translation.

+ */

+extern _X_EXPORT Bool

+RRTransformCompute (int			    x,

+		    int			    y,

+		    int			    width,

+		    int			    height,

+		    Rotation		    rotation,

+		    RRTransformPtr	    rr_transform,

+		    struct pict_f_transform *sprite_position_transform,

+		    struct pict_f_transform *sprite_image_transform,

+

+		    PictTransformPtr	    transform,

+		    struct pict_f_transform *f_transform,

+		    struct pict_f_transform *f_inverse,

+		    struct pict_f_transform *f_fb_to_sprite,

+		    struct pict_f_transform *f_sprite_to_image,

+		    Bool		    *sprite_transform_in_use);

+

+#endif /* _RRTRANSFORM_H_ */