open-src/proto/KB/5077065.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Mon, 12 Jun 2006 16:04:09 -0700
changeset 32 235a80428f96
permissions -rw-r--r--
6437461: Xorg modularization: common extension protocols
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
32
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     1
# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     2
# Use subject to license terms.
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     3
#
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     4
# Permission is hereby granted, free of charge, to any person obtaining a
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     5
# copy of this software and associated documentation files (the
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     6
# "Software"), to deal in the Software without restriction, including
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     7
# without limitation the rights to use, copy, modify, merge, publish,
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     8
# distribute, and/or sell copies of the Software, and to permit persons
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     9
# to whom the Software is furnished to do so, provided that the above
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    10
# copyright notice(s) and this permission notice appear in all copies of
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    11
# the Software and that both the above copyright notice(s) and this
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    12
# permission notice appear in supporting documentation.
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    13
# 
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    14
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    15
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    16
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    17
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    18
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    19
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    20
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    21
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    22
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    23
# 
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    24
# Except as contained in this notice, the name of a copyright holder
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    25
# shall not be used in advertising or otherwise to promote the sale, use
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    26
# or other dealings in this Software without prior written authorization
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    27
# of the copyright holder.
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    28
#
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    29
# @(#)5077065.patch	1.1	06/06/12
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    30
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    31
Part of fix for bug 5077065: Events appear even if XevieSendEvent is not called
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    32
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    33
--- XKBsrv.h	Thu Sep  1 12:56:14 2005
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    34
+++ XKBsrv.h	Fri Apr 21 19:31:12 2006
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    35
@@ -293,6 +293,7 @@
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    36
 
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    37
 extern CARD32	xkbDebugFlags;
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    38
 extern CARD32	xkbDebugCtrls;
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    39
+extern int	xkbDevicePrivateIndex;
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    40
 
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    41
 #define	_XkbAlloc(s)		xalloc((s))
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    42
 #define	_XkbCalloc(n,s)		Xcalloc((n)*(s))
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    43
@@ -768,6 +769,13 @@
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    44
     int 			/* count */
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    45
 );
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    46
 
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    47
+extern void xkbUnwrapProc(
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    48
+    DeviceIntPtr		/* device */,
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    49
+    DeviceHandleProc 		/* unwrap proc */,
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    50
+    pointer 			/* data */
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    51
+);
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    52
+
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    53
+
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    54
 extern Bool XkbEnableDisableControls(
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    55
     XkbSrvInfoPtr	/* xkbi */,
235a80428f96 6437461: Xorg modularization: common extension protocols
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    56
     unsigned long	/* change */,