svn merge ^/branches/released .

66 files changed, 874 insertions, 752 deletions

diff --git a/libX11/configure.ac b/libX11/configure.ac
index a9ee5a2aa..baff95fd4 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -3,7 +3,7 @@
 

 AC_PREREQ(2.60)

 AC_INIT([libX11],

-        [1.3.99.903],

+        [1.4.0],

         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],

         libX11)

 AC_CONFIG_SRCDIR([Makefile.am])

diff --git a/libX11/include/X11/Xlib.h b/libX11/include/X11/Xlib.h
index 4c192d883..e6cd7471b 100644
--- a/libX11/include/X11/Xlib.h
+++ b/libX11/include/X11/Xlib.h
@@ -1548,7 +1548,7 @@ extern Atom XInternAtom(
 );

 extern Status XInternAtoms(

     Display*		/* dpy */,

-    char**		/* names */,

+    _Xconst char**	/* names */,

     int			/* count */,

     Bool		/* onlyIfExists */,

     Atom*		/* atoms_return */

diff --git a/libX11/man/XInternAtom.man b/libX11/man/XInternAtom.man
index 237ed91c0..7a5ecc5b5 100644
--- a/libX11/man/XInternAtom.man
+++ b/libX11/man/XInternAtom.man
@@ -1,279 +1,279 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 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 \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
-.\" Digital Equipment Corporation
-.\"
-.\" Portions Copyright \(co 1990, 1991 by
-.\" Tektronix, Inc.
-.\"
-.\" Permission to use, copy, modify and distribute this documentation for
-.\" any purpose and without fee is hereby granted, provided that the above
-.\" copyright notice appears in all copies and that both that copyright notice
-.\" and this permission notice appear in all copies, and that the names of
-.\" Digital and Tektronix not be used in in advertising or publicity pertaining
-.\" to this documentation without specific, written prior permission.
-.\" Digital and Tektronix makes no representations about the suitability
-.\" of this documentation for any purpose.
-.\" It is provided ``as is'' without express or implied warranty.
-.\" 
-.\"
-.ds xT X Toolkit Intrinsics \- C Language Interface
-.ds xW Athena X Widgets \- C Language X Toolkit Interface
-.ds xL Xlib \- C Language X Interface
-.ds xC Inter-Client Communication Conventions Manual
-.na
-.de Ds
-.nf
-.\\$1D \\$2 \\$1
-.ft 1
-.\".ps \\n(PS
-.\".if \\n(VS>=40 .vs \\n(VSu
-.\".if \\n(VS<=39 .vs \\n(VSp
-..
-.de De
-.ce 0
-.if \\n(BD .DF
-.nr BD 0
-.in \\n(OIu
-.if \\n(TM .ls 2
-.sp \\n(DDu
-.fi
-..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
-.de IN		\" send an index entry to the stderr
-..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
-.de Pn
-.ie t \\$1\fB\^\\$2\^\fR\\$3
-.el \\$1\fI\^\\$2\^\fP\\$3
-..
-.de ZN
-.ie t \fB\^\\$1\^\fR\\$2
-.el \fI\^\\$1\^\fP\\$2
-..
-.de hN
-.ie t <\fB\\$1\fR>\\$2
-.el <\fI\\$1\fP>\\$2
-..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
-.ny0
-.TH XInternAtom __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
-.SH NAME
-XInternAtom, XInternAtoms, XGetAtomName, XGetAtomNames \- create or return atom names
-.SH SYNTAX
-.HP
-Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, char *\fIatom_name\fP\^, Bool
-\fIonly_if_exists\fP\^); 
-.HP
-Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, char **\fInames\fP\^, int
-\fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^); 
-.HP
-char *XGetAtomName\^(\^Display *\fIdisplay\fP\^, Atom \fIatom\fP\^); 
-.HP
-Status XGetAtomNames\^(\^Display *\fIdisplay\fP\^, Atom *\fIatoms\fP\^, int
-\fIcount\fP\^, char **\fInames_return\fP\^); 
-.SH ARGUMENTS
-.IP \fIatom\fP 1i
-Specifies the atom for the property name you want returned.
-.IP \fIatoms\fP 1i
-Specifies the array of atoms.
-.IP \fIatom_name\fP 1i
-Specifies the name associated with the atom you want returned.
-.IP \fIatoms_return\fP 1i
-Returns the atoms.
-.ds Cn atom names in the array
-.IP \fIcount\fP 1i
-Specifies the number of \*(Cn.
-.ds Cn atoms in the array
-.IP \fIcount\fP 1i
-Specifies the number of \*(Cn.
-.IP \fIdisplay\fP 1i
-Specifies the connection to the X server.
-.IP \fInames\fP 1i
-Specifies the array of atom names.
-.IP \fInames_return\fP 1i
-Returns the atom names.
-.IP \fIonly_if_exists\fP 1i
-Specifies a Boolean value that indicates whether the atom must be created.
-.SH DESCRIPTION
-The
-.ZN XInternAtom
-function returns the atom identifier associated with the specified atom_name
-string.
-If only_if_exists is 
-.ZN False ,
-the atom is created if it does not exist.
-Therefore,
-.ZN XInternAtom
-can return
-.ZN None .
-If the atom name is not in the Host Portable Character Encoding, 
-the result is implementation-dependent.
-Uppercase and lowercase matter;
-the strings ``thing'', ``Thing'', and ``thinG'' 
-all designate different atoms.  
-The atom will remain defined even after the client's connection closes.
-It will become undefined only when the last connection to
-the X server closes.
-.LP
-.ZN XInternAtom
-can generate
-.ZN BadAlloc 
-and
-.ZN BadValue 
-errors.
-.LP
-The
-.ZN XInternAtoms
-function returns the atom identifiers associated with the specified names.
-The atoms are stored in the atoms_return array supplied by the caller.
-Calling this function is equivalent to calling
-.ZN XInternAtom
-for each of the names in turn with the specified value of only_if_exists,
-but this function minimizes the number of round-trip protocol exchanges
-between the client and the X server.
-.LP
-This function returns a nonzero status if atoms are returned for
-all of the names;
-otherwise, it returns zero.
-.LP
-.ZN XInternAtoms
-can generate
-.ZN BadAlloc 
-and
-.ZN BadValue 
-errors.
-.LP
-The
-.ZN XGetAtomName
-function returns the name associated with the specified atom.
-If the data returned by the server is in the Latin Portable Character Encoding,
-then the returned string is in the Host Portable Character Encoding.
-Otherwise, the result is implementation-dependent.
-To free the resulting string,
-call
-.ZN XFree .
-.LP
-.ZN XGetAtomName
-can generate a
-.ZN BadAtom 
-error.
-.LP
-The
-.ZN XGetAtomNames
-function returns the names associated with the specified atoms.
-The names are stored in the names_return array supplied by the caller.
-Calling this function is equivalent to calling
-.ZN XGetAtomName
-for each of the atoms in turn,
-but this function minimizes the number of round-trip protocol exchanges
-between the client and the X server.
-.LP
-This function returns a nonzero status if names are returned for
-all of the atoms;
-otherwise, it returns zero.
-.LP
-.ZN XGetAtomNames
-can generate a
-.ZN BadAtom 
-error.
-.SH DIAGNOSTICS
-.TP 1i
-.ZN BadAlloc
-The server failed to allocate the requested resource or server memory.
-.TP 1i
-.ZN BadAtom
-A value for an Atom argument does not name a defined Atom.
-.TP 1i
-.ZN BadValue
-Some numeric value falls outside the range of values accepted by the request.
-Unless a specific range is specified for an argument, the full range defined
-by the argument's type is accepted.  Any argument defined as a set of
-alternatives can generate this error.
-.SH "SEE ALSO"
-XFree(__libmansuffix__),
-XGetWindowProperty(__libmansuffix__)
-.br
-\fI\*(xL\fP
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 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 \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

+.\" Digital Equipment Corporation

+.\"

+.\" Portions Copyright \(co 1990, 1991 by

+.\" Tektronix, Inc.

+.\"

+.\" Permission to use, copy, modify and distribute this documentation for

+.\" any purpose and without fee is hereby granted, provided that the above

+.\" copyright notice appears in all copies and that both that copyright notice

+.\" and this permission notice appear in all copies, and that the names of

+.\" Digital and Tektronix not be used in in advertising or publicity pertaining

+.\" to this documentation without specific, written prior permission.

+.\" Digital and Tektronix makes no representations about the suitability

+.\" of this documentation for any purpose.

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

+.\" 

+.\"

+.ds xT X Toolkit Intrinsics \- C Language Interface

+.ds xW Athena X Widgets \- C Language X Toolkit Interface

+.ds xL Xlib \- C Language X Interface

+.ds xC Inter-Client Communication Conventions Manual

+.na

+.de Ds

+.nf

+.\\$1D \\$2 \\$1

+.ft 1

+.\".ps \\n(PS

+.\".if \\n(VS>=40 .vs \\n(VSu

+.\".if \\n(VS<=39 .vs \\n(VSp

+..

+.de De

+.ce 0

+.if \\n(BD .DF

+.nr BD 0

+.in \\n(OIu

+.if \\n(TM .ls 2

+.sp \\n(DDu

+.fi

+..

+.de FD

+.LP

+.KS

+.TA .5i 3i

+.ta .5i 3i

+.nf

+..

+.de FN

+.fi

+.KE

+.LP

+..

+.de IN		\" send an index entry to the stderr

+..

+.de C{

+.KS

+.nf

+.D

+.\"

+.\"	choose appropriate monospace font

+.\"	the imagen conditional, 480,

+.\"	may be changed to L if LB is too

+.\"	heavy for your eyes...

+.\"

+.ie "\\*(.T"480" .ft L

+.el .ie "\\*(.T"300" .ft L

+.el .ie "\\*(.T"202" .ft PO

+.el .ie "\\*(.T"aps" .ft CW

+.el .ft R

+.ps \\n(PS

+.ie \\n(VS>40 .vs \\n(VSu

+.el .vs \\n(VSp

+..

+.de C}

+.DE

+.R

+..

+.de Pn

+.ie t \\$1\fB\^\\$2\^\fR\\$3

+.el \\$1\fI\^\\$2\^\fP\\$3

+..

+.de ZN

+.ie t \fB\^\\$1\^\fR\\$2

+.el \fI\^\\$1\^\fP\\$2

+..

+.de hN

+.ie t <\fB\\$1\fR>\\$2

+.el <\fI\\$1\fP>\\$2

+..

+.de NT

+.ne 7

+.ds NO Note

+.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

+.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

+.ie n .sp

+.el .sp 10p

+.TB

+.ce

+\\*(NO

+.ie n .sp

+.el .sp 5p

+.if '\\$1'C' .ce 99

+.if '\\$2'C' .ce 99

+.in +5n

+.ll -5n

+.R

+..

+.		\" Note End -- doug kraft 3/85

+.de NE

+.ce 0

+.in -5n

+.ll +5n

+.ie n .sp

+.el .sp 10p

+..

+.ny0

+.TH XInternAtom __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

+.SH NAME

+XInternAtom, XInternAtoms, XGetAtomName, XGetAtomNames \- create or return atom names

+.SH SYNTAX

+.HP

+Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, const char *\fIatom_name\fP\^,

+Bool \fIonly_if_exists\fP\^);

+.HP

+Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, const char **\fInames\fP\^,

+int \fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^);

+.HP

+char *XGetAtomName\^(\^Display *\fIdisplay\fP\^, Atom \fIatom\fP\^); 

+.HP

+Status XGetAtomNames\^(\^Display *\fIdisplay\fP\^, Atom *\fIatoms\fP\^, int

+\fIcount\fP\^, char **\fInames_return\fP\^); 

+.SH ARGUMENTS

+.IP \fIatom\fP 1i

+Specifies the atom for the property name you want returned.

+.IP \fIatoms\fP 1i

+Specifies the array of atoms.

+.IP \fIatom_name\fP 1i

+Specifies the name associated with the atom you want returned.

+.IP \fIatoms_return\fP 1i

+Returns the atoms.

+.ds Cn atom names in the array

+.IP \fIcount\fP 1i

+Specifies the number of \*(Cn.

+.ds Cn atoms in the array

+.IP \fIcount\fP 1i

+Specifies the number of \*(Cn.

+.IP \fIdisplay\fP 1i

+Specifies the connection to the X server.

+.IP \fInames\fP 1i

+Specifies the array of atom names.

+.IP \fInames_return\fP 1i

+Returns the atom names.

+.IP \fIonly_if_exists\fP 1i

+Specifies a Boolean value that indicates whether the atom must be created.

+.SH DESCRIPTION

+The

+.ZN XInternAtom

+function returns the atom identifier associated with the specified atom_name

+string.

+If only_if_exists is 

+.ZN False ,

+the atom is created if it does not exist.

+Therefore,

+.ZN XInternAtom

+can return

+.ZN None .

+If the atom name is not in the Host Portable Character Encoding, 

+the result is implementation-dependent.

+Uppercase and lowercase matter;

+the strings ``thing'', ``Thing'', and ``thinG'' 

+all designate different atoms.  

+The atom will remain defined even after the client's connection closes.

+It will become undefined only when the last connection to

+the X server closes.

+.LP

+.ZN XInternAtom

+can generate

+.ZN BadAlloc 

+and

+.ZN BadValue 

+errors.

+.LP

+The

+.ZN XInternAtoms

+function returns the atom identifiers associated with the specified names.

+The atoms are stored in the atoms_return array supplied by the caller.

+Calling this function is equivalent to calling

+.ZN XInternAtom

+for each of the names in turn with the specified value of only_if_exists,

+but this function minimizes the number of round-trip protocol exchanges

+between the client and the X server.

+.LP

+This function returns a nonzero status if atoms are returned for

+all of the names;

+otherwise, it returns zero.

+.LP

+.ZN XInternAtoms

+can generate

+.ZN BadAlloc 

+and

+.ZN BadValue 

+errors.

+.LP

+The

+.ZN XGetAtomName

+function returns the name associated with the specified atom.

+If the data returned by the server is in the Latin Portable Character Encoding,

+then the returned string is in the Host Portable Character Encoding.

+Otherwise, the result is implementation-dependent.

+To free the resulting string,

+call

+.ZN XFree .

+.LP

+.ZN XGetAtomName

+can generate a

+.ZN BadAtom 

+error.

+.LP

+The

+.ZN XGetAtomNames

+function returns the names associated with the specified atoms.

+The names are stored in the names_return array supplied by the caller.

+Calling this function is equivalent to calling

+.ZN XGetAtomName

+for each of the atoms in turn,

+but this function minimizes the number of round-trip protocol exchanges

+between the client and the X server.

+.LP

+This function returns a nonzero status if names are returned for

+all of the atoms;

+otherwise, it returns zero.

+.LP

+.ZN XGetAtomNames

+can generate a

+.ZN BadAtom 

+error.

+.SH DIAGNOSTICS

+.TP 1i

+.ZN BadAlloc

+The server failed to allocate the requested resource or server memory.

+.TP 1i

+.ZN BadAtom

+A value for an Atom argument does not name a defined Atom.

+.TP 1i

+.ZN BadValue

+Some numeric value falls outside the range of values accepted by the request.

+Unless a specific range is specified for an argument, the full range defined

+by the argument's type is accepted.  Any argument defined as a set of

+alternatives can generate this error.

+.SH "SEE ALSO"

+XFree(__libmansuffix__),

+XGetWindowProperty(__libmansuffix__)

+.br

+\fI\*(xL\fP

diff --git a/libX11/specs/libX11/CH04.xml b/libX11/specs/libX11/CH04.xml
index 119e86a2e..0469b2cde 100644
--- a/libX11/specs/libX11/CH04.xml
+++ b/libX11/specs/libX11/CH04.xml
@@ -1054,7 +1054,7 @@ To return an atom for a given name, use
 <funcprototype>

   <funcdef>Atom <function>XInternAtom</function></funcdef>

   <paramdef>Display<parameter> *display</parameter></paramdef>

-  <paramdef>char<parameter> *atom_name</parameter></paramdef>

+  <paramdef>const char<parameter> *atom_name</parameter></paramdef>

   <paramdef>Bool<parameter> only_if_exists</parameter></paramdef>

 </funcprototype>

 </funcsynopsis>

@@ -1136,7 +1136,7 @@ To return atoms for an array of names, use
 <funcprototype>

   <funcdef>Status <function>XInternAtoms</function></funcdef>

   <paramdef>Display<parameter> *display</parameter></paramdef>

-  <paramdef>char<parameter> **names</parameter></paramdef>

+  <paramdef>const char<parameter> **names</parameter></paramdef>

   <paramdef>int<parameter> count</parameter></paramdef>

   <paramdef>Bool<parameter> only_if_exists</parameter></paramdef>

   <paramdef>Atom<parameter> *atoms_return</parameter></paramdef>

diff --git a/libX11/src/IntAtom.c b/libX11/src/IntAtom.c
index 61a7f6d2f..a06689950 100644
--- a/libX11/src/IntAtom.c
+++ b/libX11/src/IntAtom.c
@@ -190,7 +190,7 @@ XInternAtom (
 typedef struct {

     unsigned long start_seq;

     unsigned long stop_seq;

-    char **names;

+    const char **names;

     Atom *atoms;

     int count;

     Status status;

@@ -239,7 +239,7 @@ Bool _XIntAtomHandler(
 Status

 XInternAtoms (

     Display *dpy,

-    char **names,

+    const char **names,

     int count,

     Bool onlyIfExists,

     Atom *atoms_return)

diff --git a/libXext/COPYING b/libXext/COPYING
index 315b93317..e8ba287bb 100644
--- a/libXext/COPYING
+++ b/libXext/COPYING
@@ -160,7 +160,7 @@ makes no representations about the suitability for any purpose
 of the information in this document.  This documentation is

 provided ``as is'' without express or implied warranty.

 

-Copyright 1999, 2005, 2006 Sun Microsystems, Inc.  All rights reserved.

+Copyright (c) 1999, 2005, 2006, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSCapable.man b/libXext/man/DPMSCapable.man
index b2563b9b0..62861a6fd 100644
--- a/libXext/man/DPMSCapable.man
+++ b/libXext/man/DPMSCapable.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSDisable.man b/libXext/man/DPMSDisable.man
index be0a7ed81..eeca6cbd2 100644
--- a/libXext/man/DPMSDisable.man
+++ b/libXext/man/DPMSDisable.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSEnable.man b/libXext/man/DPMSEnable.man
index ec4d9edf2..14f5f35af 100644
--- a/libXext/man/DPMSEnable.man
+++ b/libXext/man/DPMSEnable.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSForceLevel.man b/libXext/man/DPMSForceLevel.man
index 293218857..62610be98 100644
--- a/libXext/man/DPMSForceLevel.man
+++ b/libXext/man/DPMSForceLevel.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSGetTimeouts.man b/libXext/man/DPMSGetTimeouts.man
index 7f225238f..3f64eccb4 100644
--- a/libXext/man/DPMSGetTimeouts.man
+++ b/libXext/man/DPMSGetTimeouts.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSGetVersion.man b/libXext/man/DPMSGetVersion.man
index ef4a9b05c..c9db0e079 100644
--- a/libXext/man/DPMSGetVersion.man
+++ b/libXext/man/DPMSGetVersion.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSInfo.man b/libXext/man/DPMSInfo.man
index c0d780559..b1272eaca 100644
--- a/libXext/man/DPMSInfo.man
+++ b/libXext/man/DPMSInfo.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSQueryExtension.man b/libXext/man/DPMSQueryExtension.man
index 815f18a3e..ca8457757 100644
--- a/libXext/man/DPMSQueryExtension.man
+++ b/libXext/man/DPMSQueryExtension.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/DPMSSetTimeouts.man b/libXext/man/DPMSSetTimeouts.man
index 53606cfec..740b24761 100644
--- a/libXext/man/DPMSSetTimeouts.man
+++ b/libXext/man/DPMSSetTimeouts.man
@@ -8,7 +8,7 @@
 .\" of the information in this document.  This documentation is

 .\" provided ``as is'' without express or implied warranty.

 .\"

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/XShm.man b/libXext/man/XShm.man
index da5150701..793680090 100644
--- a/libXext/man/XShm.man
+++ b/libXext/man/XShm.man
@@ -23,7 +23,7 @@
 .\" dealing in this Software without prior written authorization from the 

 .\" X Consortium.

 .\"

-.\" Copyright 2006 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 2006, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/XcupGetReservedColormapEntries.man b/libXext/man/XcupGetReservedColormapEntries.man
index acd834a4b..7ba10d23c 100644
--- a/libXext/man/XcupGetReservedColormapEntries.man
+++ b/libXext/man/XcupGetReservedColormapEntries.man
@@ -1,5 +1,5 @@
 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/XcupQueryVersion.man b/libXext/man/XcupQueryVersion.man
index 43141fc56..bbbbc945c 100644
--- a/libXext/man/XcupQueryVersion.man
+++ b/libXext/man/XcupQueryVersion.man
@@ -1,5 +1,5 @@
 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libXext/man/XcupStoreColors.man b/libXext/man/XcupStoreColors.man
index e08b4be67..335afb858 100644
--- a/libXext/man/XcupStoreColors.man
+++ b/libXext/man/XcupStoreColors.man
@@ -1,5 +1,5 @@
 .\" Copyright \(co 1986-1997   The Open Group    All Rights Reserved

-.\" Copyright 1999, 2005 Sun Microsystems, Inc.  All rights reserved.

+.\" Copyright (c) 1999, 2005, Oracle and/or its affiliates. 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"),

diff --git a/libfontenc/configure.ac b/libfontenc/configure.ac
index 282167c71..78dbf9ac9 100644
--- a/libfontenc/configure.ac
+++ b/libfontenc/configure.ac
@@ -48,8 +48,10 @@ XORG_FONT_MACROS_VERSION(1.1)
 XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])

 

 # zlib

-

-AC_CHECK_LIB(z, gzclose) 

+AC_CHECK_HEADER([zlib.h], [],

+                AC_MSG_FAILURE([zlib.h is required to compile libfontenc]))

+AC_CHECK_LIB(z, gzclose, [],

+             AC_MSG_FAILURE([zlib is required to compile libfontenc]))

 

 # Check for dependencies

 PKG_CHECK_MODULES(FONTENC, xproto)

diff --git a/libxcb/src/xcb_auth.c b/libxcb/src/xcb_auth.c
index 327e8acab..8a868a4a1 100644
--- a/libxcb/src/xcb_auth.c
+++ b/libxcb/src/xcb_auth.c
@@ -328,10 +328,15 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display)
     if (!info->namelen)

         goto no_auth;   /* out of memory */

 

-    if (!gotsockname && (sockname = get_peer_sock_name(getsockname, fd)) == NULL)

+    if (!gotsockname)

     {

-        free(info->name);

-        goto no_auth;   /* can only authenticate sockets */

+        free(sockname);

+

+        if ((sockname = get_peer_sock_name(getsockname, fd)) == NULL)

+        {

+            free(info->name);

+            goto no_auth;   /* can only authenticate sockets */

+        }

     }

 

     ret = compute_auth(info, authptr, sockname);

diff --git a/pixman/COPYING b/pixman/COPYING
index 48ea58bdd..47c22c370 100644
--- a/pixman/COPYING
+++ b/pixman/COPYING
@@ -18,7 +18,7 @@ possible. They may also add themselves to the list below.
  * Copyright 2008 André Tupinambá

  * Copyright 2008 Mozilla Corporation

  * Copyright 2008 Frederic Plourde

- * Copyright 2009 Sun Microsystems, Inc.

+ * Copyright 2009, Oracle and/or its affiliates. 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"),

diff --git a/pixman/configure.ac b/pixman/configure.ac
index ca09534f5..683e6aabe 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -58,7 +58,7 @@ m4_define([pixman_micro], 3)
 

 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])

 

-AC_INIT(pixman, pixman_version, "pixman@lists.freedesktop.org", pixman)

+AC_INIT(pixman, pixman_version, [pixman@lists.freedesktop.org], pixman)

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 

 # Suppress verbose compile lines

diff --git a/pixman/pixman/pixman-fast-path.c b/pixman/pixman/pixman-fast-path.c
index dc8fad06d..01a3017c7 100644
--- a/pixman/pixman/pixman-fast-path.c
+++ b/pixman/pixman/pixman-fast-path.c
@@ -1334,7 +1334,11 @@ fast_composite_solid_fill (pixman_implementation_t *imp,
 

     src = _pixman_image_get_solid (src_image, dst_image->bits.format);

 

-    if (dst_image->bits.format == PIXMAN_a8)

+    if (dst_image->bits.format == PIXMAN_a1)

+    {

+	src = src >> 31;

+    }

+    else if (dst_image->bits.format == PIXMAN_a8)

     {

 	src = src >> 24;

     }

@@ -1655,6 +1659,7 @@ static const pixman_fast_path_t c_fast_paths[] =
     PIXMAN_STD_FAST_PATH (SRC, solid, null, x8r8g8b8, fast_composite_solid_fill),

     PIXMAN_STD_FAST_PATH (SRC, solid, null, a8b8g8r8, fast_composite_solid_fill),

     PIXMAN_STD_FAST_PATH (SRC, solid, null, x8b8g8r8, fast_composite_solid_fill),

+    PIXMAN_STD_FAST_PATH (SRC, solid, null, a1, fast_composite_solid_fill),

     PIXMAN_STD_FAST_PATH (SRC, solid, null, a8, fast_composite_solid_fill),

     PIXMAN_STD_FAST_PATH (SRC, solid, null, r5g6b5, fast_composite_solid_fill),

     PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, fast_composite_src_x888_8888),

@@ -1733,6 +1738,82 @@ static const pixman_fast_path_t c_fast_paths[] =
     {   PIXMAN_OP_NONE	},

 };

 

+#ifdef WORDS_BIGENDIAN

+#define A1_FILL_MASK(n, offs) (((1 << (n)) - 1) << (32 - (offs) - (n)))

+#else

+#define A1_FILL_MASK(n, offs) (((1 << (n)) - 1) << (offs))

+#endif

+

+static force_inline void

+pixman_fill1_line (uint32_t *dst, int offs, int width, int v)

+{

+    if (offs)

+    {

+	int leading_pixels = 32 - offs;

+	if (leading_pixels >= width)

+	{

+	    if (v)

+		*dst |= A1_FILL_MASK (width, offs);

+	    else

+		*dst &= ~A1_FILL_MASK (width, offs);

+	    return;

+	}

+	else

+	{

+	    if (v)

+		*dst++ |= A1_FILL_MASK (leading_pixels, offs);

+	    else

+		*dst++ &= ~A1_FILL_MASK (leading_pixels, offs);

+	    width -= leading_pixels;

+	}

+    }

+    while (width >= 32)

+    {

+	if (v)

+	    *dst++ = 0xFFFFFFFF;

+	else

+	    *dst++ = 0;

+	width -= 32;

+    }

+    if (width > 0)

+    {

+	if (v)

+	    *dst |= A1_FILL_MASK (width, 0);

+	else

+	    *dst &= ~A1_FILL_MASK (width, 0);

+    }

+}

+

+static void

+pixman_fill1 (uint32_t *bits,

+              int       stride,

+              int       x,

+              int       y,

+              int       width,

+              int       height,

+              uint32_t  xor)

+{

+    uint32_t *dst = bits + y * stride + (x >> 5);

+    int offs = x & 31;

+

+    if (xor & 1)

+    {

+	while (height--)

+	{

+	    pixman_fill1_line (dst, offs, width, 1);

+	    dst += stride;

+	}

+    }

+    else

+    {

+	while (height--)

+	{

+	    pixman_fill1_line (dst, offs, width, 0);

+	    dst += stride;

+	}

+    }

+}

+

 static void

 pixman_fill8 (uint32_t *bits,

               int       stride,

@@ -1819,6 +1900,10 @@ fast_path_fill (pixman_implementation_t *imp,
 {

     switch (bpp)

     {

+    case 1:

+	pixman_fill1 (bits, stride, x, y, width, height, xor);

+	break;

+

     case 8:

 	pixman_fill8 (bits, stride, x, y, width, height, xor);

 	break;

diff --git a/pixman/pixman/pixman.c b/pixman/pixman/pixman.c
index d41e7bd26..8b24849af 100644
--- a/pixman/pixman/pixman.c
+++ b/pixman/pixman/pixman.c
@@ -875,7 +875,8 @@ color_to_pixel (pixman_color_t *     color,
           format == PIXMAN_b8g8r8x8     ||

           format == PIXMAN_r5g6b5       ||

           format == PIXMAN_b5g6r5       ||

-          format == PIXMAN_a8))

+          format == PIXMAN_a8           ||

+          format == PIXMAN_a1))

     {

 	return FALSE;

     }

@@ -895,7 +896,9 @@ color_to_pixel (pixman_color_t *     color,
 	    ((c & 0x000000ff) << 24);

     }

 

-    if (format == PIXMAN_a8)

+    if (format == PIXMAN_a1)

+	c = c >> 31;

+    else if (format == PIXMAN_a8)

 	c = c >> 24;

     else if (format == PIXMAN_r5g6b5 ||

              format == PIXMAN_b5g6r5)

diff --git a/pixman/pixman/solaris-hwcap.mapfile b/pixman/pixman/solaris-hwcap.mapfile
index 3605ca79f..e49d4f1ec 100644
--- a/pixman/pixman/solaris-hwcap.mapfile
+++ b/pixman/pixman/solaris-hwcap.mapfile
@@ -1,30 +1,30 @@
-###############################################################################
-#
-# Copyright 2009 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.
-#
-###############################################################################
-#
-# Override the linker's detection of CMOV/MMX/SSE instructions so this
-# library isn't flagged as only usable on CPU's with those ISA's, since it
-# checks at runtime for availability before calling them
-
-hwcap_1 = V0x0 FPU OVERRIDE;
+###############################################################################

+#

+# Copyright 2009, Oracle and/or its affiliates. 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.

+#

+###############################################################################

+#

+# Override the linker's detection of CMOV/MMX/SSE instructions so this

+# library isn't flagged as only usable on CPU's with those ISA's, since it

+# checks at runtime for availability before calling them

+

+hwcap_1 = V0x0 FPU OVERRIDE;

diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am
index d8a7b45f6..72d22346b 100644
--- a/xorg-server/config/Makefile.am
+++ b/xorg-server/config/Makefile.am
@@ -9,8 +9,10 @@ AM_CFLAGS += $(UDEV_CFLAGS)
 libconfig_la_SOURCES += udev.c

 libconfig_la_LIBADD = $(UDEV_LIBS)

 

+if XORG

 xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR)

 xorgconfd_DATA = 10-evdev.conf

+endif

 

 else

 

diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c
index e45878a90..e9297149c 100644
--- a/xorg-server/dix/eventconvert.c
+++ b/xorg-server/dix/eventconvert.c
@@ -324,14 +324,16 @@ countValuators(DeviceEvent *ev, int *first)
 

     for (i = 0; i < sizeof(ev->valuators.mask) * 8; i++)

     {

-        /* Assume mode of 0th valuator matches XI1 device mode. Stop when the

-         * event mode changes since XI1 can't handle mixed mode devices.

-         */

-        if (ev->valuators.mode[i] != ev->valuators.mode[0])

-            break;

-

         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/getevents.c b/xorg-server/dix/getevents.c
index 3dceeb7ae..8435d0411 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -130,9 +130,9 @@ button_is_down(DeviceIntPtr pDev, int button, int type)
     int ret = 0;

 

     if (type & BUTTON_PROCESSED)

-        ret |= !!BitIsOn(pDev->button->down, button);

+        ret |= BitIsOn(pDev->button->down, button);

     if (type & BUTTON_POSTED)

-        ret |= !!BitIsOn(pDev->button->postdown, button);

+        ret |= BitIsOn(pDev->button->postdown, button);

 

     return ret;

 }

@@ -161,9 +161,9 @@ key_is_down(DeviceIntPtr pDev, int key_code, int type)
     int ret = 0;

 

     if (type & KEY_PROCESSED)

-        ret |= !!BitIsOn(pDev->key->down, key_code);

+        ret |= BitIsOn(pDev->key->down, key_code);

     if (type & KEY_POSTED)

-        ret |= !!BitIsOn(pDev->key->postdown, key_code);

+        ret |= BitIsOn(pDev->key->postdown, key_code);

 

     return ret;

 }

@@ -225,7 +225,7 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)
         if (valuator_mask_isset(mask, i))

         {

             SetBit(event->valuators.mask, i);

-            if (dev->valuator->axes[i].mode == Absolute)

+            if (valuator_get_mode(dev, i) == Absolute)

                 SetBit(event->valuators.mode, i);

             event->valuators.data[i] = valuator_mask_get(mask, i);

             event->valuators.data_frac[i] =

@@ -1072,14 +1072,18 @@ transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
     struct pixman_f_vector p;

 

     /* p' = M * p in homogeneous coordinates */

-    p.v[0] = valuator_mask_get(mask, 0);

-    p.v[1] = valuator_mask_get(mask, 1);

+    p.v[0] = (valuator_mask_isset(mask, 0) ? valuator_mask_get(mask, 0) :

+              dev->last.valuators[0]);

+    p.v[1] = (valuator_mask_isset(mask, 1) ? valuator_mask_get(mask, 1) :

+              dev->last.valuators[1]);

     p.v[2] = 1.0;

 

     pixman_f_transform_point(&dev->transform, &p);

 

-    valuator_mask_set(mask, 0, lround(p.v[0]));

-    valuator_mask_set(mask, 1, lround(p.v[1]));

+    if (lround(p.v[0]) != dev->last.valuators[0])

+        valuator_mask_set(mask, 0, lround(p.v[0]));

+    if (lround(p.v[1]) != dev->last.valuators[1])

+        valuator_mask_set(mask, 1, lround(p.v[1]));

 }

 

 /**

@@ -1170,11 +1174,16 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
              * should be converted to masked valuators. */

             int vals[2];

             vals[0] = valuator_mask_isset(&mask, 0) ?

-                      valuator_mask_get(&mask, 0) : pDev->last.valuators[0];

+                      valuator_mask_get(&mask, 0) : 0;

             vals[1] = valuator_mask_isset(&mask, 1) ?

-                      valuator_mask_get(&mask, 1) : pDev->last.valuators[1];

+                      valuator_mask_get(&mask, 1) : 0;

             accelPointer(pDev, 0, 2, vals, ms);

 

+            if (valuator_mask_isset(&mask, 0))

+                valuator_mask_set(&mask, 0, vals[0]);

+            if (valuator_mask_isset(&mask, 1))

+                valuator_mask_set(&mask, 1, vals[1]);

+

             /* The pointer acceleration code modifies the fractional part

              * in-place, so we need to extract this information first */

             x_frac = pDev->last.remainder[0];

@@ -1192,7 +1201,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
     if (valuator_mask_isset(&mask, 0))

         valuator_mask_set(&mask, 0, x);

     if (valuator_mask_isset(&mask, 1))

-        valuator_mask_set(&mask, 0, y);

+        valuator_mask_set(&mask, 1, y);

 

     clipValuators(pDev, &mask);

 

@@ -1254,13 +1263,17 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, const Valuato
     valuator_mask_copy(&mask, mask_in);

 

     /* ignore relative axes for proximity. */

-    for (i = 0; i < valuator_mask_num_valuators(&mask); i++)

+    for (i = 0; i < valuator_mask_size(&mask); i++)

     {

         if (valuator_mask_isset(&mask, i) &&

             valuator_get_mode(pDev, i) == Relative)

             valuator_mask_unset(&mask, i);

     }

 

+    /* FIXME: posting proximity events with relative valuators only results

+     * in an empty event, EventToXI() will fail to convert → no event sent

+     * to client. */

+

     events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);

 

     event = (DeviceEvent *) events->event;

diff --git a/xorg-server/doc/xml/Makefile.am b/xorg-server/doc/xml/Makefile.am
index 2913eff55..9feb1f03d 100644
--- a/xorg-server/doc/xml/Makefile.am
+++ b/xorg-server/doc/xml/Makefile.am
@@ -22,14 +22,9 @@
 #

 

 SUBDIRS = dtrace

+doc_sources =  Xserver-spec.xml

 

-XML_FILES = Xserver-spec.xml

-

-include xmlrules.in

-

+# Developer's documentation is not installed

 if ENABLE_DEVEL_DOCS

-noinst_DATA = $(BUILT_DOC_FILES)

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

 endif

-CLEANFILES = $(CLEAN_DOC_FILES)

-

-EXTRA_DIST = $(XML_FILES)

diff --git a/xorg-server/doc/xml/dtrace/Makefile.am b/xorg-server/doc/xml/dtrace/Makefile.am
index dc6127416..8bbe040d8 100644
--- a/xorg-server/doc/xml/dtrace/Makefile.am
+++ b/xorg-server/doc/xml/dtrace/Makefile.am
@@ -21,18 +21,16 @@
 # DEALINGS IN THE SOFTWARE.

 #

 

-XML_FILES = Xserver-DTrace.xml

-

-include ../xmlrules.in

+doc_sources =  Xserver-DTrace.xml

 

 if ENABLE_DOCS

+

+# This user's documentation is installed only if tracing is available

 if XSERVER_DTRACE

-doc_DATA = $(BUILT_DOC_FILES)

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

 else

-noinst_DATA = $(BUILT_DOC_FILES)

-endif

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

 endif

 

-CLEANFILES = $(CLEAN_DOC_FILES)

+endif

 

-EXTRA_DIST = $(XML_FILES)

diff --git a/xorg-server/doc/xml/xmlrules-inst.in b/xorg-server/doc/xml/xmlrules-inst.in
new file mode 100644
index 000000000..d6965ff05
--- /dev/null
+++ b/xorg-server/doc/xml/xmlrules-inst.in
@@ -0,0 +1,23 @@
+

+# The doc_sources variable contains one or more DocBook/XML source file.

+# The generated documents will be installed in $(docdir),

+# The DocBook/XML files will always be included in the tarball

+

+dist_doc_DATA = $(doc_sources)

+

+if HAVE_XMLTO

+doc_DATA = $(doc_sources:.xml=.html)

+

+if HAVE_FOP

+doc_DATA += $(doc_sources:.xml=.pdf)

+endif

+

+if HAVE_XMLTO_TEXT

+doc_DATA += $(doc_sources:.xml=.txt)

+endif

+

+CLEANFILES = $(doc_DATA)

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

+

+endif HAVE_XMLTO

+

diff --git a/xorg-server/doc/xml/xmlrules-noinst.in b/xorg-server/doc/xml/xmlrules-noinst.in
new file mode 100644
index 000000000..d582c2efd
--- /dev/null
+++ b/xorg-server/doc/xml/xmlrules-noinst.in
@@ -0,0 +1,22 @@
+

+# The doc_sources variable contains one or more DocBook/XML source file.

+# The generated documents will NOT be installed in $(docdir),

+# The DocBook/XML files will always be included in the tarball

+

+dist_noinst_DATA = $(doc_sources)

+

+if HAVE_XMLTO

+noinst_DATA = $(doc_sources:.xml=.html)

+

+if HAVE_FOP

+noinst_DATA += $(doc_sources:.xml=.pdf)

+endif

+

+if HAVE_XMLTO_TEXT

+noinst_DATA += $(doc_sources:.xml=.txt)

+endif

+

+CLEANFILES = $(noinst_DATA)

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

+

+endif HAVE_XMLTO

diff --git a/xorg-server/doc/xml/xmlrules.in b/xorg-server/doc/xml/xmlrules.in
index 1222bb5af..cc77ffc25 100644
--- a/xorg-server/doc/xml/xmlrules.in
+++ b/xorg-server/doc/xml/xmlrules.in
@@ -21,58 +21,27 @@
 # DEALINGS IN THE SOFTWARE.

 #

 

-# This file is included by Makefile.am in subdirectories that have

-# DocBook XML documentation files.

-#

-# No files are automatically distributed or installed by this subset of rules

-# Any files to be distributed or installed would be listed in the including

-# Makefile.am

-

-TXT_FILES  = $(XML_FILES:%.xml=%.txt)

-HTML_FILES = $(XML_FILES:%.xml=%.html)

-PDF_FILES  = $(XML_FILES:%.xml=%.pdf)

-

-BUILT_DOC_FILES =

+# This file provides pattern rules to generate html/pdf/txt from DocBook/XML

+# A stylesheet is used if xorg-sgml-doctools is installed

+# This file is included by xmlrules-inst.in for installable user's documentation

+# It is included by xmlrules-noinst for non installable developer's documentation

+# If the server version or release date changes, autogen && make

 

+XML_ENT_DIR = $(abs_top_builddir)/doc/xml

 SUFFIXES = .xml .txt .html .pdf

 

-XML_ENT_DIR = $(abs_top_builddir)/doc/xml

 XMLTO_FLAGS = --searchpath $(XML_ENT_DIR)

 

 if HAVE_STYLESHEETS

-XMLTO_FLAGS += -m $(XSL_STYLESHEET)

-BUILT_DOC_FILES += xorg.css

-

-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css

-	$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@

+XMLTO_FLAGS += -m $(XSL_STYLESHEET) \

+	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css

 endif

 

-if HAVE_XMLTO

-if HAVE_XMLTO_TEXT

-BUILT_DOC_FILES += $(TXT_FILES)

-.xml.txt:

-	@rm -f $@

+%.txt: %.xml $(XML_ENT_DIR)/xserver.ent

 	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<

-endif

 

-BUILT_DOC_FILES += $(HTML_FILES)

-.xml.html:

-	@rm -f $@

+%.html: %.xml $(XML_ENT_DIR)/xserver.ent

 	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<

 

-if HAVE_FOP

-BUILT_DOC_FILES += $(PDF_FILES)

-.xml.pdf:

-	@rm -f $@

+%.pdf: %.xml $(XML_ENT_DIR)/xserver.ent

 	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<

-endif

-

-endif

-

-CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES) xorg.css

-

-# All the files we build depend on the entities

-$(BUILT_DOC_FILES): $(XML_ENT_DIR)/xserver.ent

-

-$(XML_ENT_DIR)/xserver.ent:

-	(cd $(XML_ENT_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@F))

diff --git a/xorg-server/hw/dmx/doc/Makefile.am b/xorg-server/hw/dmx/doc/Makefile.am
index 58cb27c17..5f845763e 100644
--- a/xorg-server/hw/dmx/doc/Makefile.am
+++ b/xorg-server/hw/dmx/doc/Makefile.am
@@ -19,14 +19,12 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 

-XML_FILES = dmx.xml scaled.xml

-

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

+doc_sources = dmx.xml scaled.xml

 

+# Developer's documentation is not installed

 if ENABLE_DEVEL_DOCS

-noinst_DATA = $(BUILT_DOC_FILES)

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

 endif

-CLEANFILES = $(CLEAN_DOC_FILES)

 

 if HAVE_DOXYGEN

 

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

     else {

 	X = 0;

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

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

     }

     

     if (X > to_max)

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

 OpenBSD, and Solaris.  Commercial UNIX operating systems such as

 UnixWare are also supported.  Other supported operating systems include

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

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

+GNU Hurd.  Mac OS X is supported with the

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

 XWin(__appmansuffix__) X server.

 .PP

 .SH "NETWORK CONNECTIONS"

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

 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 

-XML_FILES = DESIGN.xml

-

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

+doc_sources = DESIGN.xml

 

+# Developer's documentation is not installed

 if ENABLE_DEVEL_DOCS

-noinst_DATA = $(BUILT_DOC_FILES)

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

 endif

-CLEANFILES = $(CLEAN_DOC_FILES)

-

-EXTRA_DIST = $(XML_FILES)

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

     ScrnInfoPtr	     pScrn = xf86Screens[screen_index];

     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);

+    rrScrPrivPtr     rp = rrGetScrPriv(pScreen);

     Bool	     ret;

 

     if (randrp->orig_EnterVT) {

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

     }

 

+    /* reload gamma */

+    int i;

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

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

+

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

 }

 

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

     rrScrPrivPtr	rp = rrGetScrPriv(pScreen);

     XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);

+    int i;

 

     rp->rrGetInfo = xf86RandR12GetInfo12;

     rp->rrScreenSetSize = xf86RandR12ScreenSetSize;

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

     if (!xf86RandR12SetInfo12 (pScreen))

 	return FALSE;

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

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

+    }

     return TRUE;

 }

 

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

 drain_console(int fd, void *closure)

 {

-    tcflush(fd, TCIOFLUSH);

+    errno = 0;

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

+	xf86RemoveGeneralHandler(console_handler);

+	console_handler = NULL;

+    }

 }

 

 void

diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index 3d972cf2c..264c1fbea 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -1023,6 +1023,34 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
 }

 #endif

 

+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

+static const char *untrusted_str(NSEvent *e) {

+    switch([e type]) {

+        case NSScrollWheel:

+            return "NSScrollWheel";

+        case NSTabletPoint:

+            return "NSTabletPoint";

+        case NSOtherMouseDown:

+            return "NSOtherMouseDown";

+        case NSOtherMouseUp:

+            return "NSOtherMouseUp";

+        case NSLeftMouseDown:

+            return "NSLeftMouseDown";

+        case NSLeftMouseUp:

+            return "NSLeftMouseUp";

+        default:

+            switch([e subtype]) {

+                case NSTabletPointEventSubtype:

+                    return "NSTabletPointEventSubtype";

+                case NSTabletProximityEventSubtype:

+                    return "NSTabletProximityEventSubtype";

+                default:

+                    return "Other";

+            }

+    }

+}

+#endif

+

 - (void) sendX11NSEvent:(NSEvent *)e {

     NSPoint location = NSZeroPoint, tilt = NSZeroPoint;

     int ev_button, ev_type;

@@ -1060,6 +1088,10 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
         // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta

         // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement

         hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel;

+

+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp;

+#endif

         

         if (window != nil)	{

             NSRect frame = [window frame];

@@ -1068,8 +1100,22 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
             location.y += frame.origin.y;

             lastpt = location;

         } else if(hasUntrustedPointerDelta) {

+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

+            ErrorF("--- Begin Event Debug ---\n");

+            ErrorF("Event type: %s\n", untrusted_str(e));

+            ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);

+            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);

+            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]);

+            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y);

+            ErrorF("--- End Event Debug ---\n");

+

+            location.x = lastpt.x + [e deltaX];

+            location.y = lastpt.y - [e deltaY];

+            lastpt = [e locationInWindow];

+#else

             location = [e locationInWindow];

             lastpt = location;

+#endif

         } else {

             location.x = lastpt.x + [e deltaX];

             location.y = lastpt.y - [e deltaY];

diff --git a/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist
index d6c492152..469caad4a 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">

 <dict>

 	<key>LprojCompatibleVersion</key>

-	<string>97</string>

+	<string>99</string>

 	<key>LprojLocale</key>

 	<string>es</string>

 	<key>LprojRevisionLevel</key>

 	<string>1</string>

 	<key>LprojVersion</key>

-	<string>97</string>

+	<string>99</string>

 </dict>

 </plist>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib
index 4a26e33ec..ebf843c50 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib
@@ -2,15 +2,18 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">

 	<data>

 		<int key="IBDocument.SystemTarget">1040</int>

-		<string key="IBDocument.SystemVersion">11A79a</string>

-		<string key="IBDocument.InterfaceBuilderVersion">784</string>

-		<string key="IBDocument.AppKitVersion">1059</string>

-		<string key="IBDocument.HIToolboxVersion">478.00</string>

+		<string key="IBDocument.SystemVersion">11A194b</string>

+		<string key="IBDocument.InterfaceBuilderVersion">787</string>

+		<string key="IBDocument.AppKitVersion">1079</string>

+		<string key="IBDocument.HIToolboxVersion">502.00</string>

 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">

 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>

-			<string key="NS.object.0">784</string>

+			<string key="NS.object.0">787</string>

 		</object>

-		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>

+		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs">

+			<integer value="286"/>

+			<integer value="244"/>

+		</array>

 		<array key="IBDocument.PluginDependencies">

 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>

 		</array>

@@ -366,7 +369,8 @@
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

+				<nil key="NSUserInterfaceItemIdentifier"/>

+				<string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="941366957">

 					<reference key="NSNextResponder"/>

@@ -377,7 +381,6 @@
 							<int key="NSvFlags">256</int>

 							<string key="NSFrame">{{13, 10}, {593, 292}}</string>

 							<reference key="NSSuperview" ref="941366957"/>

-							<reference key="NSWindow"/>

 							<array class="NSMutableArray" key="NSTabViewItems">

 								<object class="NSTabViewItem" id="287591690">

 									<object class="NSMutableString" key="NSIdentifier">

@@ -392,7 +395,6 @@
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 215}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="990762273">

 													<int key="NSCellFlags">67239424</int>

@@ -424,7 +426,6 @@
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 65}, {501, 28}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="391919450">

 													<int key="NSCellFlags">67239424</int>

@@ -443,7 +444,7 @@
 														<string key="NSColorName">controlColor</string>

 														<object class="NSColor" key="NSColor" id="590688762">

 															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>

+															<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>

 														</object>

 													</object>

 													<object class="NSColor" key="NSTextColor" id="930815747">

@@ -462,7 +463,6 @@
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 181}, {501, 28}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="649334366">

 													<int key="NSCellFlags">67239424</int>

@@ -481,7 +481,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 99}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="940564599">

 													<int key="NSCellFlags">67239424</int>

@@ -504,7 +503,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 123}, {501, 28}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="666057093">

 													<int key="NSCellFlags">67239424</int>

@@ -522,7 +520,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 157}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="967619578">

 													<int key="NSCellFlags">67239424</int>

@@ -545,7 +542,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 7}, {501, 28}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="617441821">

 													<int key="NSCellFlags">67239424</int>

@@ -562,7 +558,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 41}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="67728988">

 													<int key="NSCellFlags">67239424</int>

@@ -583,7 +578,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 										</array>

 										<string key="NSFrame">{{10, 33}, {573, 246}}</string>

 										<reference key="NSSuperview" ref="448510093"/>

-										<reference key="NSWindow"/>

 									</object>

 									<string key="NSLabel">Entrada</string>

 									<reference key="NSColor" ref="57160303"/>

@@ -1248,11 +1242,10 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 					</array>

 					<string key="NSFrameSize">{619, 308}</string>

 					<reference key="NSSuperview"/>

-					<reference key="NSWindow"/>

 				</object>

 				<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>

 				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

+				<string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

 				<string key="NSFrameAutosaveName">x11_prefs</string>

 			</object>

 			<object class="NSWindowTemplate" id="604417141">

@@ -1265,10 +1258,11 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

+				<nil key="NSUserInterfaceItemIdentifier"/>

+				<string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="85544634">

-					<nil key="NSNextResponder"/>

+					<reference key="NSNextResponder"/>

 					<int key="NSvFlags">256</int>

 					<array class="NSMutableArray" key="NSSubviews">

 						<object class="NSButton" id="671954382">

@@ -1350,7 +1344,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 											</object>

 											<array class="NSMutableArray" key="NSTableColumns">

 												<object class="NSTableColumn" id="938444323">

-													<double key="NSWidth">121.73100280761719</double>

+													<double key="NSWidth">105</double>

 													<double key="NSMinWidth">62.730998992919922</double>

 													<double key="NSMaxWidth">1000</double>

 													<object class="NSTableHeaderCell" key="NSHeaderCell">

@@ -1360,7 +1354,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 														<reference key="NSSupport" ref="26"/>

 														<object class="NSColor" key="NSBackgroundColor" id="113872566">

 															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>

+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>

 														</object>

 														<object class="NSColor" key="NSTextColor" id="249576247">

 															<int key="NSColorSpace">6</int>

@@ -1417,7 +1411,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 													<string key="NSHeaderToolTip"/>

 												</object>

 												<object class="NSTableColumn" id="242608782">

-													<double key="NSWidth">82</double>

+													<double key="NSWidth">99</double>

 													<double key="NSMinWidth">10</double>

 													<double key="NSMaxWidth">1000</double>

 													<object class="NSTableHeaderCell" key="NSHeaderCell">

@@ -1497,7 +1491,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 									<reference key="NSSuperview" ref="1063387772"/>

 									<reference key="NSTarget" ref="1063387772"/>

 									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.99492380000000002</double>

+									<double key="NSPercent">0.99492377042770386</double>

 								</object>

 								<object class="NSScroller" id="17278747">

 									<reference key="NSNextResponder" ref="1063387772"/>

@@ -1507,7 +1501,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 									<int key="NSsFlags">1</int>

 									<reference key="NSTarget" ref="1063387772"/>

 									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.96474358974358976</double>

+									<double key="NSPercent">0.96474361419677734</double>

 								</object>

 								<object class="NSClipView" id="672307654">

 									<reference key="NSNextResponder" ref="1063387772"/>

@@ -1532,6 +1526,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 							<reference key="NSHScroller" ref="17278747"/>

 							<reference key="NSContentView" ref="580565898"/>

 							<reference key="NSHeaderClipView" ref="672307654"/>

+							<reference key="NSCornerView" ref="898633680"/>

 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>

 						</object>

 						<object class="NSButton" id="758204686">

@@ -1559,10 +1554,11 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
 						</object>

 					</array>

 					<string key="NSFrameSize">{454, 271}</string>

+					<reference key="NSSuperview"/>

 				</object>

 				<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>

 				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

+				<string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

 				<string key="NSFrameAutosaveName">x11_apps</string>

 			</object>

 			<object class="NSMenu" id="294137138">

diff --git a/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib
index 806c0e84a..4626ac776 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist
index 4be9fe030..30ee9ca2d 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">

 <dict>

 	<key>LprojCompatibleVersion</key>

-	<string>98</string>

+	<string>100</string>

 	<key>LprojLocale</key>

 	<string>ar</string>

 	<key>LprojRevisionLevel</key>

 	<string>1</string>

 	<key>LprojVersion</key>

-	<string>98</string>

+	<string>100</string>

 </dict>

 </plist>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib
index d71d7addc..1fac447f3 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib
@@ -367,7 +367,7 @@
 					<characters key="NS.bytes">View</characters>

 				</object>

 				<nil key="NSUserInterfaceItemIdentifier"/>

-				<string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="941366957">

 					<nil key="NSNextResponder"/>

@@ -459,7 +459,7 @@
 														<string key="NSColorName">controlColor</string>

 														<object class="NSColor" key="NSColor" id="590688762">

 															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>

+															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>

 														</object>

 													</object>

 													<object class="NSColor" key="NSTextColor" id="930815747">

@@ -508,7 +508,7 @@
 										</array>

 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>

 									</object>

-									<string key="NSLabel">أمان</string>

+									<string key="NSLabel">الأمان</string>

 									<reference key="NSColor" ref="57160303"/>

 									<reference key="NSTabView" ref="448510093"/>

 								</object>

@@ -637,7 +637,7 @@
 										</array>

 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>

 									</object>

-									<string key="NSLabel">Windows</string>

+									<string key="NSLabel">نوافذ</string>

 									<reference key="NSColor" ref="57160303"/>

 									<reference key="NSTabView" ref="448510093"/>

 								</object>

@@ -853,7 +853,7 @@
 												<object class="NSTextFieldCell" key="NSCell" id="624655599">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">71303296</int>

-													<string key="NSContents">تستخدم إشارات X11 الصوتية تنبيه النظام القياسي، كما هو محدد في لوحة تفضيلات النظام لمؤثرات الصوت.</string>

+													<string key="NSContents">تستخدم إشارات X11 الصوتية التنبيه القياسي للنظام، كما هو محدد في لوحة تفضيلات النظام لمؤثرات الصوت.</string>

 													<reference key="NSSupport" ref="26"/>

 													<reference key="NSControlView" ref="1039016593"/>

 													<reference key="NSBackgroundColor" ref="57160303"/>

@@ -908,7 +908,7 @@
 															<reference ref="616492372"/>

 															<object class="NSMenuItem" id="759499526">

 																<reference key="NSMenu" ref="341113515"/>

-																<string key="NSTitle">256 لونًا</string>

+																<string key="NSTitle">٢٥٦ لونًا</string>

 																<string key="NSKeyEquiv"/>

 																<int key="NSKeyEquivModMask">1048576</int>

 																<int key="NSMnemonicLoc">2147483647</int>

@@ -1035,7 +1035,7 @@
 												<object class="NSTextFieldCell" key="NSCell" id="761107402">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">71303296</int>

-													<string key="NSContents">تمكين نافذة X11 الجذري. استخدم ضغط مفاتيح الأوامر-الاختيار-A لدخول ومغادرة وضع ملء الشاشة.</string>

+													<string key="NSContents">تمكين نافذة X11 root. استخدم ضغط مفاتيح الأوامر-الاختيار-A لدخول ومغادرة وضع ملء الشاشة.</string>

 													<reference key="NSSupport" ref="26"/>

 													<reference key="NSControlView" ref="298603383"/>

 													<reference key="NSBackgroundColor" ref="57160303"/>

@@ -1145,7 +1145,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 												<object class="NSTextFieldCell" key="NSCell" id="666057093">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">71303296</int>

-													<string key="NSContents">السماح بكتابة تغييرات قائمة الإدخال فوق مخطط مفاتيح X11 الحالي.</string>

+													<string key="NSContents">السماح لتغييرات قائمة الإدخال بالكتابة فوق مخطط مفاتيح X11 الحالي.</string>

 													<reference key="NSSupport" ref="26"/>

 													<reference key="NSControlView" ref="31160162"/>

 													<reference key="NSBackgroundColor" ref="57160303"/>

@@ -1183,7 +1183,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 												<object class="NSTextFieldCell" key="NSCell" id="617441821">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">71303296</int>

-													<string key="NSContents">عند التمكين، مفاتيح الخيار إرسال Alt_L و Alt_R X11 علامات المفتاح بدلًا من Mode_switch.</string>

+													<string key="NSContents">عند تمكينها، تقوم مفاتيح الاختيار بإرسال علامات المفتاح Alt_L و Alt_R X11 بدلًا من Mode_switch.</string>

 													<reference key="NSSupport" ref="26"/>

 													<reference key="NSControlView" ref="278155937"/>

 													<reference key="NSBackgroundColor" ref="57160303"/>

@@ -1199,7 +1199,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 												<object class="NSButtonCell" key="NSCell" id="67728988">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">67108992</int>

-													<string key="NSContents">مفاتيح الخيار إرسال Alt_L و Alt_R</string>

+													<string key="NSContents">مفاتيح الاختيار تقوم بإرسال Alt_L و Alt_R</string>

 													<reference key="NSSupport" ref="463863101"/>

 													<reference key="NSControlView" ref="406291430"/>

 													<int key="NSButtonFlags">1210864127</int>

@@ -1216,7 +1216,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>

 										<reference key="NSSuperview" ref="448510093"/>

 									</object>

-									<string key="NSLabel">إدخال</string>

+									<string key="NSLabel">الإدخال</string>

 									<reference key="NSColor" ref="57160303"/>

 									<reference key="NSTabView" ref="448510093"/>

 								</object>

@@ -1235,7 +1235,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 				</object>

 				<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>

 				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSFrameAutosaveName">x11_prefs</string>

 			</object>

 			<object class="NSWindowTemplate" id="604417141">

@@ -1249,10 +1249,10 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 					<characters key="NS.bytes">View</characters>

 				</object>

 				<nil key="NSUserInterfaceItemIdentifier"/>

-				<string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="85544634">

-					<reference key="NSNextResponder"/>

+					<nil key="NSNextResponder"/>

 					<int key="NSvFlags">256</int>

 					<array class="NSMutableArray" key="NSSubviews">

 						<object class="NSButton" id="671954382">

@@ -1260,7 +1260,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 							<int key="NSvFlags">268</int>

 							<string key="NSFrame">{{14, 191}, {100, 32}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

-							<reference key="NSWindow"/>

 							<bool key="NSEnabled">YES</bool>

 							<object class="NSButtonCell" key="NSCell" id="143554520">

 								<int key="NSCellFlags">67239424</int>

@@ -1288,7 +1287,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 							<int key="NSvFlags">268</int>

 							<string key="NSFrame">{{14, 159}, {100, 32}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

-							<reference key="NSWindow"/>

 							<bool key="NSEnabled">YES</bool>

 							<object class="NSButtonCell" key="NSCell" id="8201128">

 								<int key="NSCellFlags">67239424</int>

@@ -1320,14 +1318,12 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 											<int key="NSvFlags">256</int>

 											<string key="NSFrameSize">{301, 198}</string>

 											<reference key="NSSuperview" ref="580565898"/>

-											<reference key="NSWindow"/>

 											<bool key="NSEnabled">YES</bool>

 											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">

 												<reference key="NSNextResponder" ref="672307654"/>

 												<int key="NSvFlags">256</int>

 												<string key="NSFrameSize">{301, 17}</string>

 												<reference key="NSSuperview" ref="672307654"/>

-												<reference key="NSWindow"/>

 												<reference key="NSTableView" ref="905092943"/>

 											</object>

 											<object class="_NSCornerView" key="NSCornerView" id="898633680">

@@ -1335,7 +1331,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{302, 0}, {16, 17}}</string>

 												<reference key="NSSuperview" ref="1063387772"/>

-												<reference key="NSWindow"/>

 											</object>

 											<array class="NSMutableArray" key="NSTableColumns">

 												<object class="NSTableColumn" id="242608782">

@@ -1468,7 +1463,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 									</array>

 									<string key="NSFrame">{{1, 17}, {301, 198}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSWindow"/>

 									<reference key="NSNextKeyView" ref="905092943"/>

 									<reference key="NSDocView" ref="905092943"/>

 									<reference key="NSBGColor" ref="812484075"/>

@@ -1479,7 +1473,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 									<int key="NSvFlags">256</int>

 									<string key="NSFrame">{{302, 17}, {15, 198}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSWindow"/>

 									<reference key="NSTarget" ref="1063387772"/>

 									<string key="NSAction">_doScroller:</string>

 									<double key="NSPercent">0.99492377042770386</double>

@@ -1489,7 +1482,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 									<int key="NSvFlags">256</int>

 									<string key="NSFrame">{{1, 215}, {301, 15}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSWindow"/>

 									<int key="NSsFlags">1</int>

 									<reference key="NSTarget" ref="1063387772"/>

 									<string key="NSAction">_doScroller:</string>

@@ -1503,7 +1495,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 									</array>

 									<string key="NSFrame">{{1, 0}, {301, 17}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

-									<reference key="NSWindow"/>

 									<reference key="NSNextKeyView" ref="792419186"/>

 									<reference key="NSDocView" ref="792419186"/>

 									<reference key="NSBGColor" ref="812484075"/>

@@ -1513,14 +1504,12 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 							</array>

 							<string key="NSFrame">{{116, 20}, {318, 231}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

-							<reference key="NSWindow"/>

 							<reference key="NSNextKeyView" ref="580565898"/>

 							<int key="NSsFlags">50</int>

 							<reference key="NSVScroller" ref="842897584"/>

 							<reference key="NSHScroller" ref="17278747"/>

 							<reference key="NSContentView" ref="580565898"/>

 							<reference key="NSHeaderClipView" ref="672307654"/>

-							<reference key="NSCornerView" ref="898633680"/>

 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>

 						</object>

 						<object class="NSButton" id="758204686">

@@ -1528,7 +1517,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 							<int key="NSvFlags">268</int>

 							<string key="NSFrame">{{14, 223}, {100, 32}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

-							<reference key="NSWindow"/>

 							<bool key="NSEnabled">YES</bool>

 							<object class="NSButtonCell" key="NSCell" id="1025474039">

 								<int key="NSCellFlags">-2080244224</int>

@@ -1549,12 +1537,10 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF
 						</object>

 					</array>

 					<string key="NSFrameSize">{454, 271}</string>

-					<reference key="NSSuperview"/>

-					<reference key="NSWindow"/>

 				</object>

 				<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>

 				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSFrameAutosaveName">x11_apps</string>

 			</object>

 			<object class="NSMenu" id="294137138">

diff --git a/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib
index f86a5b9f2..97032d978 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/locversion.plist
index ed1210184..3cba12a62 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/locversion.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">

 <dict>

 	<key>LprojCompatibleVersion</key>

-	<string>97</string>

+	<string>100</string>

 	<key>LprojLocale</key>

 	<string>da</string>

 	<key>LprojRevisionLevel</key>

 	<string>1</string>

 	<key>LprojVersion</key>

-	<string>97</string>

+	<string>100</string>

 </dict>

 </plist>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib
index d081118d1..430a58303 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">

 	<data>

 		<int key="IBDocument.SystemTarget">1040</int>

-		<string key="IBDocument.SystemVersion">11A79a</string>

-		<string key="IBDocument.InterfaceBuilderVersion">732</string>

-		<string key="IBDocument.AppKitVersion">1059</string>

-		<string key="IBDocument.HIToolboxVersion">478.00</string>

+		<string key="IBDocument.SystemVersion">11A194b</string>

+		<string key="IBDocument.InterfaceBuilderVersion">787</string>

+		<string key="IBDocument.AppKitVersion">1079</string>

+		<string key="IBDocument.HIToolboxVersion">502.00</string>

 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">

 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>

-			<string key="NS.object.0">732</string>

+			<string key="NS.object.0">787</string>

 		</object>

 		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>

 		<array key="IBDocument.PluginDependencies">

@@ -366,6 +366,7 @@
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

+				<nil key="NSUserInterfaceItemIdentifier"/>

 				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="941366957">

@@ -1067,7 +1068,7 @@ ZW4uCg</string>
 												<object class="NSTextFieldCell" key="NSCell" id="183409141">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Fokus i X11-vinduet følger markøren</string>

+													<string key="NSContents">Fokus i X11-vinduet følger markøren.</string>

 													<reference key="NSSupport" ref="26"/>

 													<reference key="NSControlView" ref="138261120"/>

 													<reference key="NSBackgroundColor" ref="57160303"/>

@@ -1254,6 +1255,7 @@ ZW4uCg</string>
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

+				<nil key="NSUserInterfaceItemIdentifier"/>

 				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="85544634">

@@ -1518,7 +1520,6 @@ ZW4uCg</string>
 							<reference key="NSHScroller" ref="17278747"/>

 							<reference key="NSContentView" ref="580565898"/>

 							<reference key="NSHeaderClipView" ref="672307654"/>

-							<reference key="NSCornerView" ref="898633680"/>

 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>

 						</object>

 						<object class="NSButton" id="758204686">

@@ -3572,6 +3573,7 @@ ZW4uCg</string>
 			</array>

 		</object>

 		<int key="IBDocument.localizationMode">0</int>

+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>

 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>

 			<integer value="1040" key="NS.object.0"/>

@@ -3579,5 +3581,10 @@ ZW4uCg</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

 		<string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string>

 		<int key="IBDocument.defaultPropertyAccessControl">3</int>

+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

+			<string key="NSMenuCheckmark">{9, 8}</string>

+			<string key="NSMenuMixedState">{7, 2}</string>

+			<string key="NSSwitch">{15, 15}</string>

+		</dictionary>

 	</data>

 </archive>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib
index e5f27d575..918cbc465 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist
index 0acbad7ac..64befbabd 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">

 <dict>

 	<key>LprojCompatibleVersion</key>

-	<string>97</string>

+	<string>100</string>

 	<key>LprojLocale</key>

 	<string>pl</string>

 	<key>LprojRevisionLevel</key>

 	<string>1</string>

 	<key>LprojVersion</key>

-	<string>97</string>

+	<string>100</string>

 </dict>

 </plist>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib
index aacaa76ae..082a39e19 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">

 	<data>

 		<int key="IBDocument.SystemTarget">1040</int>

-		<string key="IBDocument.SystemVersion">11A79a</string>

-		<string key="IBDocument.InterfaceBuilderVersion">732</string>

-		<string key="IBDocument.AppKitVersion">1059</string>

-		<string key="IBDocument.HIToolboxVersion">478.00</string>

+		<string key="IBDocument.SystemVersion">11A194b</string>

+		<string key="IBDocument.InterfaceBuilderVersion">787</string>

+		<string key="IBDocument.AppKitVersion">1079</string>

+		<string key="IBDocument.HIToolboxVersion">502.00</string>

 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">

 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>

-			<string key="NS.object.0">732</string>

+			<string key="NS.object.0">787</string>

 		</object>

 		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>

 		<array key="IBDocument.PluginDependencies">

@@ -257,7 +257,7 @@
 								</object>

 								<object class="NSMenuItem" id="677652931">

 									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Miniaturka</string>

+									<string key="NSTitle">Minimalizuj okno</string>

 									<string key="NSKeyEquiv">m</string>

 									<int key="NSKeyEquivModMask">1048576</int>

 									<int key="NSMnemonicLoc">2147483647</int>

@@ -366,6 +366,7 @@
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

+				<nil key="NSUserInterfaceItemIdentifier"/>

 				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="941366957">

@@ -1028,7 +1029,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string>
 												<object class="NSTextFieldCell" key="NSCell" id="399127858">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Lliknięcie nieaktywnego okna będzie powodowało jego uaktywnienie i przeniesienie do niego fokusu.</string>

+													<string key="NSContents">Kliknięcie nieaktywnego okna będzie powodowało jego uaktywnienie i przeniesienie do niego fokusu.</string>

 													<reference key="NSSupport" ref="26"/>

 													<string key="NSPlaceholderString"/>

 													<reference key="NSControlView" ref="290578835"/>

@@ -1256,6 +1257,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string>
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

+				<nil key="NSUserInterfaceItemIdentifier"/>

 				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="85544634">

@@ -1523,7 +1525,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string>
 							<reference key="NSHScroller" ref="17278747"/>

 							<reference key="NSContentView" ref="580565898"/>

 							<reference key="NSHeaderClipView" ref="672307654"/>

-							<reference key="NSCornerView" ref="898633680"/>

 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>

 						</object>

 						<object class="NSButton" id="758204686">

@@ -3583,6 +3584,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string>
 			</array>

 		</object>

 		<int key="IBDocument.localizationMode">0</int>

+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>

 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>

 			<integer value="1040" key="NS.object.0"/>

@@ -3590,5 +3592,10 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

 		<string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string>

 		<int key="IBDocument.defaultPropertyAccessControl">3</int>

+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

+			<string key="NSMenuCheckmark">{9, 8}</string>

+			<string key="NSMenuMixedState">{7, 2}</string>

+			<string key="NSSwitch">{15, 15}</string>

+		</dictionary>

 	</data>

 </archive>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib
index d9672ee6a..62f4065f6 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist
index 052f2a9e3..443fca6e3 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">

 <dict>

 	<key>LprojCompatibleVersion</key>

-	<string>97</string>

+	<string>100</string>

 	<key>LprojLocale</key>

 	<string>pt</string>

 	<key>LprojRevisionLevel</key>

 	<string>1</string>

 	<key>LprojVersion</key>

-	<string>97</string>

+	<string>100</string>

 </dict>

 </plist>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib
index d28bfb48e..2c386a880 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">

 	<data>

 		<int key="IBDocument.SystemTarget">1040</int>

-		<string key="IBDocument.SystemVersion">11A79a</string>

-		<string key="IBDocument.InterfaceBuilderVersion">732</string>

-		<string key="IBDocument.AppKitVersion">1059</string>

-		<string key="IBDocument.HIToolboxVersion">478.00</string>

+		<string key="IBDocument.SystemVersion">11A194b</string>

+		<string key="IBDocument.InterfaceBuilderVersion">787</string>

+		<string key="IBDocument.AppKitVersion">1079</string>

+		<string key="IBDocument.HIToolboxVersion">502.00</string>

 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">

 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>

-			<string key="NS.object.0">732</string>

+			<string key="NS.object.0">787</string>

 		</object>

 		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>

 		<array key="IBDocument.PluginDependencies">

@@ -296,8 +296,8 @@
 								<object class="NSMenuItem" id="369641893">

 									<reference key="NSMenu" ref="96874957"/>

 									<string key="NSTitle">Percorrer Janelas no Sentido Inverso</string>

-									<string key="NSKeyEquiv">~</string>

-									<int key="NSKeyEquivModMask">1179914</int>

+									<string key="NSKeyEquiv">`</string>

+									<int key="NSKeyEquivModMask">1179648</int>

 									<int key="NSMnemonicLoc">2147483647</int>

 									<reference key="NSOnImage" ref="531645050"/>

 									<reference key="NSMixedImage" ref="351811234"/>

@@ -315,7 +315,7 @@
 								</object>

 								<object class="NSMenuItem" id="276216762">

 									<reference key="NSMenu" ref="96874957"/>

-									<string key="NSTitle">Trazer Tudo para Frente</string>

+									<string key="NSTitle">Trazer Todas Para a Frente</string>

 									<string key="NSKeyEquiv"/>

 									<int key="NSKeyEquivModMask">1048576</int>

 									<int key="NSMnemonicLoc">2147483647</int>

@@ -366,10 +366,11 @@
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

+				<nil key="NSUserInterfaceItemIdentifier"/>

+				<string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="941366957">

-					<nil key="NSNextResponder"/>

+					<reference key="NSNextResponder"/>

 					<int key="NSvFlags">256</int>

 					<array class="NSMutableArray" key="NSSubviews">

 						<object class="NSTabView" id="448510093">

@@ -377,6 +378,7 @@
 							<int key="NSvFlags">256</int>

 							<string key="NSFrame">{{13, 10}, {618, 292}}</string>

 							<reference key="NSSuperview" ref="941366957"/>

+							<reference key="NSWindow"/>

 							<array class="NSMutableArray" key="NSTabViewItems">

 								<object class="NSTabViewItem" id="287591690">

 									<object class="NSMutableString" key="NSIdentifier">

@@ -389,8 +391,9 @@
 											<object class="NSButton" id="119157981">

 												<reference key="NSNextResponder" ref="596750588"/>

 												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 210}, {402, 18}}</string>

+												<string key="NSFrame">{{18, 214}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

+												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="990762273">

 													<int key="NSCellFlags">67239424</int>

@@ -422,6 +425,7 @@
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 60}, {548, 31}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

+												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="391919450">

 													<int key="NSCellFlags">67239424</int>

@@ -440,7 +444,7 @@
 														<string key="NSColorName">controlColor</string>

 														<object class="NSColor" key="NSColor" id="590688762">

 															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>

+															<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>

 														</object>

 													</object>

 													<object class="NSColor" key="NSTextColor" id="930815747">

@@ -457,8 +461,9 @@
 											<object class="NSTextField" id="282885445">

 												<reference key="NSNextResponder" ref="596750588"/>

 												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 162}, {548, 42}}</string>

+												<string key="NSFrame">{{36, 166}, {548, 42}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

+												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="649334366">

 													<int key="NSCellFlags">67239424</int>

@@ -478,6 +483,7 @@ ZS4KA</string>
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 97}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

+												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="940564599">

 													<int key="NSCellFlags">67239424</int>

@@ -498,13 +504,14 @@ ZS4KA</string>
 											<object class="NSTextField" id="31160162">

 												<reference key="NSNextResponder" ref="596750588"/>

 												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, 126}, {548, 14}}</string>

+												<string key="NSFrame">{{36, 121}, {548, 28}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

+												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="666057093">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Permitir que as mudanças no menu de entrada sobreescrevam o mapa do teclado atual do X11.</string>

+													<string key="NSContents">Permite que as alterações feitas no menu de leiautes de teclado sobrescrevam o mapa de teclado atual do X11.</string>

 													<reference key="NSSupport" ref="26"/>

 													<string key="NSPlaceholderString"/>

 													<reference key="NSControlView" ref="31160162"/>

@@ -515,8 +522,9 @@ ZS4KA</string>
 											<object class="NSButton" id="179949713">

 												<reference key="NSNextResponder" ref="596750588"/>

 												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{18, 146}, {402, 18}}</string>

+												<string key="NSFrame">{{18, 153}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

+												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="967619578">

 													<int key="NSCellFlags">67239424</int>

@@ -537,8 +545,9 @@ ZS4KA</string>
 											<object class="NSTextField" id="278155937">

 												<reference key="NSNextResponder" ref="596750588"/>

 												<int key="NSvFlags">256</int>

-												<string key="NSFrame">{{36, -1}, {385, 31}}</string>

+												<string key="NSFrame">{{36, -1}, {548, 31}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

+												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="617441821">

 													<int key="NSCellFlags">67239424</int>

@@ -555,6 +564,7 @@ ZS4KA</string>
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 36}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

+												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="67728988">

 													<int key="NSCellFlags">67239424</int>

@@ -575,6 +585,7 @@ ZS4KA</string>
 										</array>

 										<string key="NSFrame">{{10, 33}, {598, 246}}</string>

 										<reference key="NSSuperview" ref="448510093"/>

+										<reference key="NSWindow"/>

 									</object>

 									<string key="NSLabel">Entrada</string>

 									<reference key="NSColor" ref="57160303"/>

@@ -1238,10 +1249,12 @@ ZS4KA</string>
 						</object>

 					</array>

 					<string key="NSFrameSize">{644, 308}</string>

+					<reference key="NSSuperview"/>

+					<reference key="NSWindow"/>

 				</object>

 				<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>

 				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

+				<string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

 				<string key="NSFrameAutosaveName">x11_prefs</string>

 			</object>

 			<object class="NSWindowTemplate" id="604417141">

@@ -1254,10 +1267,11 @@ ZS4KA</string>
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

-				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

+				<nil key="NSUserInterfaceItemIdentifier"/>

+				<string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="85544634">

-					<nil key="NSNextResponder"/>

+					<reference key="NSNextResponder"/>

 					<int key="NSvFlags">256</int>

 					<array class="NSMutableArray" key="NSSubviews">

 						<object class="NSButton" id="671954382">

@@ -1265,6 +1279,7 @@ ZS4KA</string>
 							<int key="NSvFlags">265</int>

 							<string key="NSFrame">{{372, 191}, {132, 32}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

+							<reference key="NSWindow"/>

 							<bool key="NSEnabled">YES</bool>

 							<object class="NSButtonCell" key="NSCell" id="143554520">

 								<int key="NSCellFlags">67239424</int>

@@ -1292,6 +1307,7 @@ ZS4KA</string>
 							<int key="NSvFlags">265</int>

 							<string key="NSFrame">{{372, 159}, {132, 32}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

+							<reference key="NSWindow"/>

 							<bool key="NSEnabled">YES</bool>

 							<object class="NSButtonCell" key="NSCell" id="8201128">

 								<int key="NSCellFlags">67239424</int>

@@ -1323,12 +1339,14 @@ ZS4KA</string>
 											<int key="NSvFlags">256</int>

 											<string key="NSFrameSize">{333, 198}</string>

 											<reference key="NSSuperview" ref="580565898"/>

+											<reference key="NSWindow"/>

 											<bool key="NSEnabled">YES</bool>

 											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">

 												<reference key="NSNextResponder" ref="672307654"/>

 												<int key="NSvFlags">256</int>

 												<string key="NSFrameSize">{333, 17}</string>

 												<reference key="NSSuperview" ref="672307654"/>

+												<reference key="NSWindow"/>

 												<reference key="NSTableView" ref="905092943"/>

 											</object>

 											<object class="_NSCornerView" key="NSCornerView" id="898633680">

@@ -1336,11 +1354,12 @@ ZS4KA</string>
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{334, 0}, {16, 17}}</string>

 												<reference key="NSSuperview" ref="1063387772"/>

+												<reference key="NSWindow"/>

 											</object>

 											<array class="NSMutableArray" key="NSTableColumns">

 												<object class="NSTableColumn" id="938444323">

-													<double key="NSWidth">132.73099999999999</double>

-													<double key="NSMinWidth">62.731000000000002</double>

+													<double key="NSWidth">132.73100280761719</double>

+													<double key="NSMinWidth">62.730998992919922</double>

 													<double key="NSMaxWidth">1000</double>

 													<object class="NSTableHeaderCell" key="NSHeaderCell">

 														<int key="NSCellFlags">75628096</int>

@@ -1349,7 +1368,7 @@ ZS4KA</string>
 														<reference key="NSSupport" ref="26"/>

 														<object class="NSColor" key="NSBackgroundColor" id="113872566">

 															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>

+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>

 														</object>

 														<object class="NSColor" key="NSTextColor" id="249576247">

 															<int key="NSColorSpace">6</int>

@@ -1471,6 +1490,7 @@ ZS4KA</string>
 									</array>

 									<string key="NSFrame">{{1, 17}, {333, 198}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

+									<reference key="NSWindow"/>

 									<reference key="NSNextKeyView" ref="905092943"/>

 									<reference key="NSDocView" ref="905092943"/>

 									<reference key="NSBGColor" ref="812484075"/>

@@ -1481,19 +1501,21 @@ ZS4KA</string>
 									<int key="NSvFlags">256</int>

 									<string key="NSFrame">{{334, 17}, {15, 198}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

+									<reference key="NSWindow"/>

 									<reference key="NSTarget" ref="1063387772"/>

 									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.99492380000000002</double>

+									<double key="NSPercent">0.99492377042770386</double>

 								</object>

 								<object class="NSScroller" id="17278747">

 									<reference key="NSNextResponder" ref="1063387772"/>

 									<int key="NSvFlags">256</int>

 									<string key="NSFrame">{{1, 215}, {333, 15}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

+									<reference key="NSWindow"/>

 									<int key="NSsFlags">1</int>

 									<reference key="NSTarget" ref="1063387772"/>

 									<string key="NSAction">_doScroller:</string>

-									<double key="NSPercent">0.68852460000000004</double>

+									<double key="NSPercent">0.68852460384368896</double>

 								</object>

 								<object class="NSClipView" id="672307654">

 									<reference key="NSNextResponder" ref="1063387772"/>

@@ -1503,6 +1525,7 @@ ZS4KA</string>
 									</array>

 									<string key="NSFrame">{{1, 0}, {333, 17}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

+									<reference key="NSWindow"/>

 									<reference key="NSNextKeyView" ref="792419186"/>

 									<reference key="NSDocView" ref="792419186"/>

 									<reference key="NSBGColor" ref="812484075"/>

@@ -1512,6 +1535,7 @@ ZS4KA</string>
 							</array>

 							<string key="NSFrame">{{20, 20}, {350, 231}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

+							<reference key="NSWindow"/>

 							<reference key="NSNextKeyView" ref="580565898"/>

 							<int key="NSsFlags">50</int>

 							<reference key="NSVScroller" ref="842897584"/>

@@ -1526,6 +1550,7 @@ ZS4KA</string>
 							<int key="NSvFlags">265</int>

 							<string key="NSFrame">{{372, 223}, {132, 32}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

+							<reference key="NSWindow"/>

 							<bool key="NSEnabled">YES</bool>

 							<object class="NSButtonCell" key="NSCell" id="1025474039">

 								<int key="NSCellFlags">-2080244224</int>

@@ -1546,10 +1571,12 @@ ZS4KA</string>
 						</object>

 					</array>

 					<string key="NSFrameSize">{519, 271}</string>

+					<reference key="NSSuperview"/>

+					<reference key="NSWindow"/>

 				</object>

 				<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>

 				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

+				<string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

 				<string key="NSFrameAutosaveName">x11_apps</string>

 			</object>

 			<object class="NSMenu" id="294137138">

@@ -3259,6 +3286,7 @@ ZS4KA</string>
 				<string key="100365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

+				<string key="100369.object.labelIdentifier">IBBuiltInLabel-Red</string>

 				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<string key="100371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<string key="100372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

@@ -3315,9 +3343,9 @@ ZS4KA</string>
 				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<integer value="1" key="24.ImportedFromIB2"/>

 				<string key="24.editorWindowContentRectSynchronizationRect">{{271, 666}, {301, 153}}</string>

-				<string key="244.IBEditorWindowLastContentRect">{{507, 565}, {484, 308}}</string>

+				<string key="244.IBEditorWindowLastContentRect">{{507, 548}, {644, 308}}</string>

 				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

-				<string key="244.IBWindowTemplateEditedContentRect">{{507, 565}, {484, 308}}</string>

+				<string key="244.IBWindowTemplateEditedContentRect">{{507, 548}, {644, 308}}</string>

 				<integer value="1" key="244.ImportedFromIB2"/>

 				<string key="244.editorWindowContentRectSynchronizationRect">{{184, 290}, {481, 345}}</string>

 				<integer value="0" key="244.windowTemplate.hasMaxSize"/>

@@ -3334,11 +3362,11 @@ ZS4KA</string>
 				<string key="270.editorWindowContentRectSynchronizationRect">{{100, 746}, {155, 33}}</string>

 				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<integer value="1" key="272.ImportedFromIB2"/>

-				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {454, 271}}</string>

+				<string key="285.IBEditorWindowLastContentRect">{{68, 585}, {519, 271}}</string>

 				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<integer value="1" key="285.IBViewEditorWindowController.showingBoundsRectangles"/>

 				<integer value="1" key="285.IBViewEditorWindowController.showingLayoutRectangles"/>

-				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {454, 271}}</string>

+				<string key="285.IBWindowTemplateEditedContentRect">{{68, 585}, {519, 271}}</string>

 				<integer value="1" key="285.ImportedFromIB2"/>

 				<string key="285.editorWindowContentRectSynchronizationRect">{{433, 406}, {486, 327}}</string>

 				<integer value="0" key="285.windowTemplate.hasMaxSize"/>

@@ -3347,7 +3375,7 @@ ZS4KA</string>
 				<string key="285.windowTemplate.minSize">{320, 240}</string>

 				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<integer value="1" key="286.ImportedFromIB2"/>

-				<string key="29.IBEditorWindowLastContentRect">{{145, 1011}, {336, 20}}</string>

+				<string key="29.IBEditorWindowLastContentRect">{{145, 836}, {337, 20}}</string>

 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<integer value="1" key="29.ImportedFromIB2"/>

 				<string key="29.editorWindowContentRectSynchronizationRect">{{67, 819}, {336, 20}}</string>

@@ -3452,6 +3480,7 @@ ZS4KA</string>
 				<integer value="1" key="368.ImportedFromIB2"/>

 				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<integer value="1" key="369.ImportedFromIB2"/>

+				<string key="369.object.labelIdentifier">IBBuiltInLabel-Red</string>

 				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

 				<integer value="1" key="370.ImportedFromIB2"/>

 				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

@@ -3572,6 +3601,7 @@ ZS4KA</string>
 			</array>

 		</object>

 		<int key="IBDocument.localizationMode">0</int>

+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>

 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">

 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>

 			<integer value="1040" key="NS.object.0"/>

@@ -3579,5 +3609,10 @@ ZS4KA</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

 		<string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string>

 		<int key="IBDocument.defaultPropertyAccessControl">3</int>

+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

+			<string key="NSMenuCheckmark">{9, 8}</string>

+			<string key="NSMenuMixedState">{7, 2}</string>

+			<string key="NSSwitch">{15, 15}</string>

+		</dictionary>

 	</data>

 </archive>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib
index 1b68c4588..d84701f2e 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist b/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist
index b4f44a14d..b86ec7136 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist
+++ b/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist
@@ -3,12 +3,12 @@
 <plist version="1.0">

 <dict>

 	<key>LprojCompatibleVersion</key>

-	<string>97</string>

+	<string>99</string>

 	<key>LprojLocale</key>

 	<string>sv</string>

 	<key>LprojRevisionLevel</key>

 	<string>1</string>

 	<key>LprojVersion</key>

-	<string>97</string>

+	<string>99</string>

 </dict>

 </plist>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib
index d662aa362..16b01eb79 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">

 	<data>

 		<int key="IBDocument.SystemTarget">1040</int>

-		<string key="IBDocument.SystemVersion">11A79a</string>

-		<string key="IBDocument.InterfaceBuilderVersion">784</string>

-		<string key="IBDocument.AppKitVersion">1059</string>

-		<string key="IBDocument.HIToolboxVersion">478.00</string>

+		<string key="IBDocument.SystemVersion">11A194b</string>

+		<string key="IBDocument.InterfaceBuilderVersion">787</string>

+		<string key="IBDocument.AppKitVersion">1079</string>

+		<string key="IBDocument.HIToolboxVersion">502.00</string>

 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">

 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>

-			<string key="NS.object.0">784</string>

+			<string key="NS.object.0">787</string>

 		</object>

 		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>

 		<array key="IBDocument.PluginDependencies">

@@ -366,10 +366,11 @@
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

-				<string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

+				<nil key="NSUserInterfaceItemIdentifier"/>

+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="941366957">

-					<reference key="NSNextResponder"/>

+					<nil key="NSNextResponder"/>

 					<int key="NSvFlags">256</int>

 					<array class="NSMutableArray" key="NSSubviews">

 						<object class="NSTabView" id="448510093">

@@ -377,7 +378,6 @@
 							<int key="NSvFlags">256</int>

 							<string key="NSFrame">{{13, 10}, {458, 292}}</string>

 							<reference key="NSSuperview" ref="941366957"/>

-							<reference key="NSWindow"/>

 							<array class="NSMutableArray" key="NSTabViewItems">

 								<object class="NSTabViewItem" id="287591690">

 									<object class="NSMutableString" key="NSIdentifier">

@@ -392,7 +392,6 @@
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 210}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="990762273">

 													<int key="NSCellFlags">67239424</int>

@@ -424,7 +423,6 @@
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 56}, {385, 31}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="391919450">

 													<int key="NSCellFlags">67239424</int>

@@ -443,7 +441,7 @@
 														<string key="NSColorName">controlColor</string>

 														<object class="NSColor" key="NSColor" id="590688762">

 															<int key="NSColorSpace">3</int>

-															<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>

+															<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>

 														</object>

 													</object>

 													<object class="NSColor" key="NSTextColor" id="930815747">

@@ -462,7 +460,6 @@
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 164}, {385, 42}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="649334366">

 													<int key="NSCellFlags">67239424</int>

@@ -481,7 +478,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string>
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 91}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="940564599">

 													<int key="NSCellFlags">67239424</int>

@@ -504,12 +500,11 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string>
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 116}, {400, 29}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="666057093">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">Tillåter att ändringar i indatamenyn skriver över de befintliga X11-tangentkopplingarna.</string>

+													<string key="NSContents">Tillåter att ändringar i inmatningsmenyn skriver över de befintliga X11-tangentkopplingarna.</string>

 													<reference key="NSSupport" ref="26"/>

 													<string key="NSPlaceholderString"/>

 													<reference key="NSControlView" ref="31160162"/>

@@ -522,7 +517,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string>
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 149}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="967619578">

 													<int key="NSCellFlags">67239424</int>

@@ -545,7 +539,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string>
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{36, 1}, {385, 31}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSTextFieldCell" key="NSCell" id="617441821">

 													<int key="NSCellFlags">67239424</int>

@@ -562,7 +555,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string>
 												<int key="NSvFlags">256</int>

 												<string key="NSFrame">{{18, 36}, {402, 18}}</string>

 												<reference key="NSSuperview" ref="596750588"/>

-												<reference key="NSWindow"/>

 												<bool key="NSEnabled">YES</bool>

 												<object class="NSButtonCell" key="NSCell" id="67728988">

 													<int key="NSCellFlags">67239424</int>

@@ -583,7 +575,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo</string>
 										</array>

 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>

 										<reference key="NSSuperview" ref="448510093"/>

-										<reference key="NSWindow"/>

 									</object>

 									<string key="NSLabel">Indata</string>

 									<reference key="NSColor" ref="57160303"/>

@@ -1252,12 +1243,10 @@ cmthIGlubmVow6VsbGV0Lgo</string>
 						</object>

 					</array>

 					<string key="NSFrameSize">{484, 308}</string>

-					<reference key="NSSuperview"/>

-					<reference key="NSWindow"/>

 				</object>

 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>

 				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSFrameAutosaveName">x11_prefs</string>

 			</object>

 			<object class="NSWindowTemplate" id="604417141">

@@ -1270,7 +1259,8 @@ cmthIGlubmVow6VsbGV0Lgo</string>
 				<object class="NSMutableString" key="NSViewClass">

 					<characters key="NS.bytes">View</characters>

 				</object>

-				<string key="NSWindowContentMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

+				<nil key="NSUserInterfaceItemIdentifier"/>

+				<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSWindowContentMinSize">{320, 240}</string>

 				<object class="NSView" key="NSWindowView" id="85544634">

 					<nil key="NSNextResponder"/>

@@ -1490,6 +1480,7 @@ cmthIGlubmVow6VsbGV0Lgo</string>
 									</array>

 									<string key="NSFrame">{{1, 17}, {301, 198}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

+									<reference key="NSNextKeyView" ref="905092943"/>

 									<reference key="NSDocView" ref="905092943"/>

 									<reference key="NSBGColor" ref="812484075"/>

 									<int key="NScvFlags">4</int>

@@ -1521,6 +1512,7 @@ cmthIGlubmVow6VsbGV0Lgo</string>
 									</array>

 									<string key="NSFrame">{{1, 0}, {301, 17}}</string>

 									<reference key="NSSuperview" ref="1063387772"/>

+									<reference key="NSNextKeyView" ref="792419186"/>

 									<reference key="NSDocView" ref="792419186"/>

 									<reference key="NSBGColor" ref="812484075"/>

 									<int key="NScvFlags">4</int>

@@ -1529,12 +1521,12 @@ cmthIGlubmVow6VsbGV0Lgo</string>
 							</array>

 							<string key="NSFrame">{{20, 20}, {318, 231}}</string>

 							<reference key="NSSuperview" ref="85544634"/>

+							<reference key="NSNextKeyView" ref="580565898"/>

 							<int key="NSsFlags">50</int>

 							<reference key="NSVScroller" ref="842897584"/>

 							<reference key="NSHScroller" ref="17278747"/>

 							<reference key="NSContentView" ref="580565898"/>

 							<reference key="NSHeaderClipView" ref="672307654"/>

-							<reference key="NSCornerView" ref="898633680"/>

 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>

 						</object>

 						<object class="NSButton" id="758204686">

@@ -1565,7 +1557,7 @@ cmthIGlubmVow6VsbGV0Lgo</string>
 				</object>

 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>

 				<string key="NSMinSize">{320, 262}</string>

-				<string key="NSMaxSize">{3.4028235e+38, 3.4028235e+38}</string>

+				<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>

 				<string key="NSFrameAutosaveName">x11_apps</string>

 			</object>

 			<object class="NSMenu" id="294137138">

diff --git a/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib
index c623b1ad8..5b17831b9 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib
index d6b32a1fc..423872f15 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib
@@ -960,7 +960,7 @@ moTpvKDmoIfmjInplK7jgIIKA</string>
 												<object class="NSTextFieldCell" key="NSCell" id="461823902">

 													<int key="NSCellFlags">67239424</int>

 													<int key="NSCellFlags2">4194304</int>

-													<string key="NSContents">如果您想要使用 xclipboard、klipper 或其他任何 X11 夹纸板管理程序，请停用此选项。</string>

+													<string key="NSContents">如果您想要使用 xclipboard、klipper 或其他任何 X11 剪切板管理程序，请停用此选项。</string>

 													<reference key="NSSupport" ref="26"/>

 													<reference key="NSControlView" ref="620944856"/>

 													<reference key="NSBackgroundColor" ref="57160303"/>

diff --git a/xorg-server/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib
index d8f5f8b75..e422e43f7 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/bundle/mk_bundke.sh b/xorg-server/hw/xquartz/bundle/mk_bundke.sh
index c85b21765..37e555f9e 100644
--- a/xorg-server/hw/xquartz/bundle/mk_bundke.sh
+++ b/xorg-server/hw/xquartz/bundle/mk_bundke.sh
@@ -1,30 +1,31 @@
-#!/bin/sh
-#
-# 'Cause xcodebuild is hard to deal with
-
-SRCDIR=$1
-BUILDDIR=$2
-BUNDLE_ROOT=$3
-
-localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW"
-for lang in ${localities} ; do
-    mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib
-    [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1
-
-    for f in InfoPlist.strings Localizable.strings main.nib/keyedobjects.nib ; do
-        install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}
-    done
-done
-
-install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib
-install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources
-
-install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents
-install -m 644 ${SRCDIR}/PkgInfo ${BUNDLE_ROOT}/Contents
-
-mkdir -p ${BUNDLE_ROOT}/Contents/MacOS
-install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11
-
-if [[ $(id -u) == 0 ]] ; then
-	chown -R root:admin ${BUNDLE_ROOT}
-fi
+#!/bin/sh

+#

+# 'Cause xcodebuild is hard to deal with

+

+SRCDIR=$1

+BUILDDIR=$2

+BUNDLE_ROOT=$3

+

+localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW"

+for lang in ${localities} ; do

+    [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj ] && rm -rf ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj

+    mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib

+    [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1

+

+    for f in InfoPlist.strings Localizable.strings main.nib/keyedobjects.nib ; do

+        install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}

+    done

+done

+

+install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib/designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib

+install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources

+

+install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents

+install -m 644 ${SRCDIR}/PkgInfo ${BUNDLE_ROOT}/Contents

+

+mkdir -p ${BUNDLE_ROOT}/Contents/MacOS

+install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11

+

+if [[ $(id -u) == 0 ]] ; then

+	chown -R root:admin ${BUNDLE_ROOT}

+fi

diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 85ce9d608..527c5bcff 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -63,25 +63,6 @@ SOFTWARE.
 #include "XIstubs.h"

 #include "darwin.h"

 

-/***********************************************************************

- *

- * Caller:	ProcXCloseDevice

- *

- * Take care of implementation-dependent details of closing a device.

- * Some implementations may actually close the device, others may just

- * remove this clients interest in that device.

- *

- * The default implementation is to do nothing (assume all input devices

- * are initialized during X server initialization and kept open).

- *

- */

-

-void

-CloseInputDevice(DeviceIntPtr d, ClientPtr client)

-{

-  DEBUG_LOG("CloseInputDevice(%p, %p)\n", d, client);

-}

-

 /****************************************************************************

  *

  * Caller:	ProcXSetDeviceMode

diff --git a/xorg-server/hw/xquartz/xpr/dri.c b/xorg-server/hw/xquartz/xpr/dri.c
index 252c2bb4c..7b730df8e 100644
--- a/xorg-server/hw/xquartz/xpr/dri.c
+++ b/xorg-server/hw/xquartz/xpr/dri.c
@@ -89,14 +89,6 @@ static x_hash_table *surface_hash;      /* maps surface ids -> drawablePrivs */
 

 static Bool DRIFreePixmapImp(DrawablePtr pDrawable);

 

-/* FIXME: don't hardcode this? */

-#define CG_INFO_FILE "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/Info-macos.plist"

-

-/* Corresponds to SU Jaguar Green */

-#define CG_REQUIRED_MAJOR 1

-#define CG_REQUIRED_MINOR 157

-#define CG_REQUIRED_MICRO 11

-

 typedef struct {

     DrawablePtr pDrawable;

     int refCount;

@@ -109,96 +101,6 @@ typedef struct {
     void *buffer;       

 } DRIPixmapBuffer, *DRIPixmapBufferPtr;

 

-/* Returns version as major.minor.micro in 10.10.10 fixed form */

-static unsigned int

-get_cg_version (void)

-{

-    static unsigned int version;

-

-    FILE *fh;

-    char *ptr;

-

-    if (version != 0)

-        return version;

-

-    /* I tried CFBundleGetVersion, but it returns zero, so.. */

-

-    fh = fopen (CG_INFO_FILE, "r");

-    if (fh != NULL)

-    {

-        char buf[256];

-

-        while (fgets (buf, sizeof (buf), fh) != NULL)

-        {

-            unsigned char c;

-

-            if (!strstr (buf, "<key>CFBundleShortVersionString</key>")

-                || fgets (buf, sizeof (buf), fh) == NULL)

-            {

-                continue;

-            }

-

-            ptr = strstr (buf, "<string>");

-            if (ptr == NULL)

-                continue;

-

-            ptr += strlen ("<string>");

-

-            /* Now PTR points to "MAJOR.MINOR.MICRO". */

-

-            version = 0;

-

-        again:

-            switch ((c = *ptr++))

-            {

-            case '.':

-                version = version * 1024;

-                goto again;

-

-            case '0': case '1': case '2': case '3': case '4':

-            case '5': case '6': case '7': case '8': case '9':

-                version = ((version & ~0x3ff)

-                          + (version & 0x3ff) * 10 + (c - '0'));

-                goto again;

-            }

-            break;

-        }

-

-        fclose (fh);

-    }

-

-    return version;

-}

-

-static Bool

-test_cg_version (unsigned int major, unsigned int minor, unsigned int micro)

-{

-    unsigned int cg_ver = get_cg_version ();

-

-    unsigned int cg_major = (cg_ver >> 20) & 0x3ff;

-    unsigned int cg_minor = (cg_ver >> 10) & 0x3ff;

-    unsigned int cg_micro =  cg_ver        & 0x3ff;

-

-    if (cg_major > major)

-        return TRUE;

-    else if (cg_major < major)

-        return FALSE;

-

-    /* cg_major == major */

-

-    if (cg_minor > minor)

-        return TRUE;

-    else if (cg_minor < minor)

-        return FALSE;

-

-    /* cg_minor == minor */

-

-    if (cg_micro < micro)

-        return FALSE;

-

-    return TRUE;

-}

-

 Bool

 DRIScreenInit(ScreenPtr pScreen)

 {

@@ -224,20 +126,6 @@ DRIScreenInit(ScreenPtr pScreen)
     pDRIPriv->directRenderingSupport = TRUE;

     pDRIPriv->nrWindows = 0;

 

-    /* Need recent cg for window access update */

-    if (!test_cg_version (CG_REQUIRED_MAJOR,

-                          CG_REQUIRED_MINOR,

-                          CG_REQUIRED_MICRO))

-    {

-        ErrorF ("[DRI] disabled direct rendering; requires CoreGraphics %d.%d.%d\n",

-                CG_REQUIRED_MAJOR, CG_REQUIRED_MINOR, CG_REQUIRED_MICRO);

-

-        pDRIPriv->directRenderingSupport = FALSE;

-

-        /* Note we don't nuke the dri private, since we need it for

-           managing indirect surfaces. */

-    }

-

     /* Initialize drawable tables */

     for (i = 0; i < DRI_MAX_DRAWABLES; i++) {

         pDRIPriv->DRIDrawables[i] = NULL;

diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h
index edb7988c3..325d5934f 100644
--- a/xorg-server/include/inputstr.h
+++ b/xorg-server/include/inputstr.h
@@ -57,7 +57,7 @@ SOFTWARE.
 #include "geext.h"

 #include "privates.h"

 

-#define BitIsOn(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))

+#define BitIsOn(ptr, bit) (!!(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))

 #define SetBit(ptr, bit)  (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))

 #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))

 extern _X_EXPORT int CountBits(const uint8_t *mask, int len);

diff --git a/xorg-server/test/input.c b/xorg-server/test/input.c
index abcc8926b..877e9776b 100644
--- a/xorg-server/test/input.c
+++ b/xorg-server/test/input.c
@@ -683,42 +683,82 @@ static void dix_grab_matching(void)
     g_assert(rc == TRUE);

 }

 

-static void include_byte_padding_macros(void)

+static void test_bits_to_byte(int i)

 {

-    int i;

-    g_test_message("Testing bits_to_bytes()");

-

-    /* the macros don't provide overflow protection */

-    for (i = 0; i < INT_MAX - 7; i++)

-    {

         int expected_bytes;

         expected_bytes = (i + 7)/8;

 

         g_assert(bits_to_bytes(i) >= i/8);

         g_assert((bits_to_bytes(i) * 8) - i <= 7);

-    }

+        g_assert(expected_bytes == bits_to_bytes(i));

+}

 

-    g_test_message("Testing bytes_to_int32()");

-    for (i = 0; i < INT_MAX - 3; i++)

-    {

+static void test_bytes_to_int32(int i)

+{

         int expected_4byte;

         expected_4byte = (i + 3)/4;

 

         g_assert(bytes_to_int32(i) <= i);

         g_assert((bytes_to_int32(i) * 4) - i <= 3);

-    }

-

-    g_test_message("Testing pad_to_int32");

+        g_assert(expected_4byte == bytes_to_int32(i));

+}

 

-    for (i = 0; i < INT_MAX - 3; i++)

-    {

+static void test_pad_to_int32(int i)

+{

         int expected_bytes;

         expected_bytes = ((i + 3)/4) * 4;

 

         g_assert(pad_to_int32(i) >= i);

         g_assert(pad_to_int32(i) - i <= 3);

-    }

+        g_assert(expected_bytes == pad_to_int32(i));

+}

+static void include_byte_padding_macros(void)

+{

+    g_test_message("Testing bits_to_bytes()");

+

+    /* the macros don't provide overflow protection */

+    test_bits_to_byte(0);

+    test_bits_to_byte(1);

+    test_bits_to_byte(2);

+    test_bits_to_byte(7);

+    test_bits_to_byte(8);

+    test_bits_to_byte(0xFF);

+    test_bits_to_byte(0x100);

+    test_bits_to_byte(INT_MAX - 9);

+    test_bits_to_byte(INT_MAX - 8);

+

+    g_test_message("Testing bytes_to_int32()");

 

+    test_bytes_to_int32(0);

+    test_bytes_to_int32(1);

+    test_bytes_to_int32(2);

+    test_bytes_to_int32(7);

+    test_bytes_to_int32(8);

+    test_bytes_to_int32(0xFF);

+    test_bytes_to_int32(0x100);

+    test_bytes_to_int32(0xFFFF);

+    test_bytes_to_int32(0x10000);

+    test_bytes_to_int32(0xFFFFFF);

+    test_bytes_to_int32(0x1000000);

+    test_bytes_to_int32(INT_MAX - 4);

+    test_bytes_to_int32(INT_MAX - 3);

+

+    g_test_message("Testing pad_to_int32");

+

+    test_pad_to_int32(0);

+    test_pad_to_int32(0);

+    test_pad_to_int32(1);

+    test_pad_to_int32(2);

+    test_pad_to_int32(7);

+    test_pad_to_int32(8);

+    test_pad_to_int32(0xFF);

+    test_pad_to_int32(0x100);

+    test_pad_to_int32(0xFFFF);

+    test_pad_to_int32(0x10000);

+    test_pad_to_int32(0xFFFFFF);

+    test_pad_to_int32(0x1000000);

+    test_pad_to_int32(INT_MAX - 4);

+    test_pad_to_int32(INT_MAX - 3);

 }

 

 static void xi_unregister_handlers(void)

@@ -1010,7 +1050,22 @@ static void dix_valuator_mode(void)
         g_assert(valuator_get_mode(&dev, i) == Relative);

 }

 

+static void include_bit_test_macros(void)

+{

+    uint8_t mask[9] = { 0 };

+    int i;

 

+    for (i = 0; i < sizeof(mask)/sizeof(mask[0]); i++)

+    {

+        g_assert(BitIsOn(mask, i) == 0);

+        SetBit(mask, i);

+        g_assert(BitIsOn(mask, i) == 1);

+        g_assert(!!(mask[i/8] & (1 << (i % 8))));

+        g_assert(CountBits(mask, sizeof(mask)) == 1);

+        ClearBit(mask, i);

+        g_assert(BitIsOn(mask, i) == 0);

+    }

+}

 

 int main(int argc, char** argv)

 {

@@ -1026,6 +1081,7 @@ int main(int argc, char** argv)
     g_test_add_func("/dix/input/grab_matching", dix_grab_matching);

     g_test_add_func("/dix/input/valuator_mode", dix_valuator_mode);

     g_test_add_func("/include/byte_padding_macros", include_byte_padding_macros);

+    g_test_add_func("/include/bit_test_macros", include_bit_test_macros);

     g_test_add_func("/Xi/xiproperty/register-unregister", xi_unregister_handlers);