Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 312 insertions, 312 deletions

diff --git a/libX11/man/XGrabButton.man b/libX11/man/XGrabButton.man
index 9a7f0c210..30701d95e 100644
--- a/libX11/man/XGrabButton.man
+++ b/libX11/man/XGrabButton.man
@@ -1,312 +1,312 @@
-.\" 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 XGrabButton __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
-.SH NAME
-XGrabButton, XUngrabButton \- grab pointer buttons
-.SH SYNTAX
-.HP 
-int XGrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,
-unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^, Bool
-\fIowner_events\fP\^, unsigned int \fIevent_mask\fP\^, int
-\fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^, Window \fIconfine_to\fP\^, Cursor
-\fIcursor\fP\^); 
-.HP
-int XUngrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,
-unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^); 
-.SH ARGUMENTS
-.ds Bu grabbed or released
-.IP \fIbutton\fP 1i
-Specifies the pointer button that is to be \*(Bu or
-.ZN AnyButton .
-.IP \fIconfine_to\fP 1i
-Specifies the window to confine the pointer in or
-.ZN None .
-.IP \fIcursor\fP 1i
-Specifies the cursor that is to be displayed or
-.ZN None .
-.IP \fIdisplay\fP 1i
-Specifies the connection to the X server.
-.IP \fIevent_mask\fP 1i
-Specifies which pointer events are reported to the client.
-The mask is the bitwise inclusive OR of the valid pointer event mask bits.
-.IP \fIgrab_window\fP 1i
-Specifies the grab window.
-.IP \fIkeyboard_mode\fP 1i
-Specifies further processing of keyboard events.
-You can pass 
-.ZN GrabModeSync 
-or
-.ZN GrabModeAsync .
-.IP \fImodifiers\fP 1i
-Specifies the set of keymasks or
-.ZN AnyModifier .
-The mask is the bitwise inclusive OR of the valid keymask bits.
-.IP \fIowner_events\fP 1i
-Specifies a Boolean value that indicates whether the pointer 
-events are to be reported as usual or reported with respect to the grab window 
-if selected by the event mask.
-.IP \fIpointer_mode\fP 1i
-Specifies further processing of pointer events.
-You can pass 
-.ZN GrabModeSync 
-or
-.ZN GrabModeAsync .
-.SH DESCRIPTION
-The
-.ZN XGrabButton
-function establishes a passive grab.
-In the future,
-the pointer is actively grabbed (as for
-.ZN XGrabPointer ),
-the last-pointer-grab time is set to the time at which the button was pressed
-(as transmitted in the
-.ZN ButtonPress
-event), and the
-.ZN ButtonPress
-event is reported if all of the following conditions are true:
-.IP \(bu 5
-The pointer is not grabbed, and the specified button is logically pressed
-when the specified modifier keys are logically down,
-and no other buttons or modifier keys are logically down.
-.IP \(bu 5
-The grab_window contains the pointer.
-.IP \(bu 5
-The confine_to window (if any) is viewable.
-.IP \(bu 5
-A passive grab on the same button/key combination does not exist
-on any ancestor of grab_window.
-.LP
-The interpretation of the remaining arguments is as for
-.ZN XGrabPointer .
-The active grab is terminated automatically when the logical state of the
-pointer has all buttons released
-(independent of the state of the logical modifier keys),
-at which point a 
-.ZN ButtonRelease
-event is reported to the grabbing window.
-.LP
-Note that the logical state of a device (as seen by client applications)
-may lag the physical state if device event processing is frozen.
-.LP
-This request overrides all previous grabs by the same client on the same
-button/key combinations on the same window.
-A modifiers of 
-.ZN AnyModifier 
-is equivalent to issuing the grab request for all
-possible modifier combinations (including the combination of no modifiers).  
-It is not required that all modifiers specified have currently assigned 
-KeyCodes.
-A button of 
-.ZN AnyButton 
-is equivalent to
-issuing the request for all possible buttons.
-Otherwise, it is not required that the specified button currently be assigned
-to a physical button.
-.LP
-If some other client has already issued a 
-.ZN XGrabButton
-with the same button/key combination on the same window, a
-.ZN BadAccess 
-error results.
-When using 
-.ZN AnyModifier 
-or 
-.ZN AnyButton , 
-the request fails completely,
-and a
-.ZN BadAccess
-error results (no grabs are
-established) if there is a conflicting grab for any combination.
-.ZN XGrabButton
-has no effect on an active grab.
-.LP
-.ZN XGrabButton
-can generate
-.ZN BadCursor ,
-.ZN BadValue ,
-and
-.ZN BadWindow 
-errors.
-.LP
-The
-.ZN XUngrabButton
-function releases the passive button/key combination on the specified window if
-it was grabbed by this client.
-A modifiers of 
-.ZN AnyModifier 
-is
-equivalent to issuing 
-the ungrab request for all possible modifier combinations, including 
-the combination of no modifiers.
-A button of 
-.ZN AnyButton 
-is equivalent to issuing the
-request for all possible buttons.
-.ZN XUngrabButton
-has no effect on an active grab.
-.LP
-.ZN XUngrabButton
-can generate
-.ZN BadValue
-and
-.ZN BadWindow 
-errors.
-.SH DIAGNOSTICS
-.TP 1i
-.ZN BadCursor
-A value for a Cursor argument does not name a defined Cursor.
-.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.
-.TP 1i
-.ZN BadWindow
-A value for a Window argument does not name a defined Window.
-.SH "SEE ALSO"
-XAllowEvents(__libmansuffix__),
-XGrabPointer(__libmansuffix__),
-XGrabKey(__libmansuffix__),
-XGrabKeyboard(__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 XGrabButton __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

+.SH NAME

+XGrabButton, XUngrabButton \- grab pointer buttons

+.SH SYNTAX

+.HP 

+int XGrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,

+unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^, Bool

+\fIowner_events\fP\^, unsigned int \fIevent_mask\fP\^, int

+\fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^, Window \fIconfine_to\fP\^, Cursor

+\fIcursor\fP\^); 

+.HP

+int XUngrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,

+unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^); 

+.SH ARGUMENTS

+.ds Bu grabbed or released

+.IP \fIbutton\fP 1i

+Specifies the pointer button that is to be \*(Bu or

+.ZN AnyButton .

+.IP \fIconfine_to\fP 1i

+Specifies the window to confine the pointer in or

+.ZN None .

+.IP \fIcursor\fP 1i

+Specifies the cursor that is to be displayed or

+.ZN None .

+.IP \fIdisplay\fP 1i

+Specifies the connection to the X server.

+.IP \fIevent_mask\fP 1i

+Specifies which pointer events are reported to the client.

+The mask is the bitwise inclusive OR of the valid pointer event mask bits.

+.IP \fIgrab_window\fP 1i

+Specifies the grab window.

+.IP \fIkeyboard_mode\fP 1i

+Specifies further processing of keyboard events.

+You can pass 

+.ZN GrabModeSync 

+or

+.ZN GrabModeAsync .

+.IP \fImodifiers\fP 1i

+Specifies the set of keymasks or

+.ZN AnyModifier .

+The mask is the bitwise inclusive OR of the valid keymask bits.

+.IP \fIowner_events\fP 1i

+Specifies a Boolean value that indicates whether the pointer 

+events are to be reported as usual or reported with respect to the grab window 

+if selected by the event mask.

+.IP \fIpointer_mode\fP 1i

+Specifies further processing of pointer events.

+You can pass 

+.ZN GrabModeSync 

+or

+.ZN GrabModeAsync .

+.SH DESCRIPTION

+The

+.ZN XGrabButton

+function establishes a passive grab.

+In the future,

+the pointer is actively grabbed (as for

+.ZN XGrabPointer ),

+the last-pointer-grab time is set to the time at which the button was pressed

+(as transmitted in the

+.ZN ButtonPress

+event), and the

+.ZN ButtonPress

+event is reported if all of the following conditions are true:

+.IP \(bu 5

+The pointer is not grabbed, and the specified button is logically pressed

+when the specified modifier keys are logically down,

+and no other buttons or modifier keys are logically down.

+.IP \(bu 5

+The grab_window contains the pointer.

+.IP \(bu 5

+The confine_to window (if any) is viewable.

+.IP \(bu 5

+A passive grab on the same button/key combination does not exist

+on any ancestor of grab_window.

+.LP

+The interpretation of the remaining arguments is as for

+.ZN XGrabPointer .

+The active grab is terminated automatically when the logical state of the

+pointer has all buttons released

+(independent of the state of the logical modifier keys),

+at which point a 

+.ZN ButtonRelease

+event is reported to the grabbing window.

+.LP

+Note that the logical state of a device (as seen by client applications)

+may lag the physical state if device event processing is frozen.

+.LP

+This request overrides all previous grabs by the same client on the same

+button/key combinations on the same window.

+A modifiers of 

+.ZN AnyModifier 

+is equivalent to issuing the grab request for all

+possible modifier combinations (including the combination of no modifiers).  

+It is not required that all modifiers specified have currently assigned 

+KeyCodes.

+A button of 

+.ZN AnyButton 

+is equivalent to

+issuing the request for all possible buttons.

+Otherwise, it is not required that the specified button currently be assigned

+to a physical button.

+.LP

+If some other client has already issued a 

+.ZN XGrabButton

+with the same button/key combination on the same window, a

+.ZN BadAccess 

+error results.

+When using 

+.ZN AnyModifier 

+or 

+.ZN AnyButton , 

+the request fails completely,

+and a

+.ZN BadAccess

+error results (no grabs are

+established) if there is a conflicting grab for any combination.

+.ZN XGrabButton

+has no effect on an active grab.

+.LP

+.ZN XGrabButton

+can generate

+.ZN BadCursor ,

+.ZN BadValue ,

+and

+.ZN BadWindow 

+errors.

+.LP

+The

+.ZN XUngrabButton

+function releases the passive button/key combination on the specified window if

+it was grabbed by this client.

+A modifiers of 

+.ZN AnyModifier 

+is

+equivalent to issuing 

+the ungrab request for all possible modifier combinations, including 

+the combination of no modifiers.

+A button of 

+.ZN AnyButton 

+is equivalent to issuing the

+request for all possible buttons.

+.ZN XUngrabButton

+has no effect on an active grab.

+.LP

+.ZN XUngrabButton

+can generate

+.ZN BadValue

+and

+.ZN BadWindow 

+errors.

+.SH DIAGNOSTICS

+.TP 1i

+.ZN BadCursor

+A value for a Cursor argument does not name a defined Cursor.

+.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.

+.TP 1i

+.ZN BadWindow

+A value for a Window argument does not name a defined Window.

+.SH "SEE ALSO"

+XAllowEvents(__libmansuffix__),

+XGrabPointer(__libmansuffix__),

+XGrabKey(__libmansuffix__),

+XGrabKeyboard(__libmansuffix__),

+.br

+\fI\*(xL\fP