summaryrefslogtreecommitdiff
path: root/XKB.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:42 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:42 +0000
commitbae998431a7285432eb5d1f519246e41832754d0 (patch)
tree895cbb677014dc825c146cab62e8158673ec97c0 /XKB.h
parent209ae2d4c9cd739e91f8c00184dc6f2f48e21100 (diff)
downloadxorg-proto-kbproto-bae998431a7285432eb5d1f519246e41832754d0.tar.gz
Diffstat (limited to 'XKB.h')
-rw-r--r--XKB.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/XKB.h b/XKB.h
index da7c374..8867c47 100644
--- a/XKB.h
+++ b/XKB.h
@@ -24,6 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/include/extensions/XKB.h,v 1.5 2002/11/20 04:49:01 dawes Exp $ */
#ifndef _XKB_H_
#define _XKB_H_
@@ -257,6 +258,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbPerKeyRepeatMask (1L << 30)
#define XkbControlsEnabledMask (1L << 31)
+#define XkbAccessXOptionsMask (XkbStickyKeysMask|XkbAccessXFeedbackMask)
+
#define XkbAllBooleanCtrlsMask (0x00001FFF)
#define XkbAllControlsMask (0xF8001FFF)
#define XkbAllControlEventsMask XkbAllControlsMask
@@ -499,6 +502,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbSA_LastAction XkbSA_DeviceValuator
#define XkbSA_NumActions (XkbSA_LastAction+1)
+#if defined(XF86DDXACTIONS) || defined(XFree86Server)
+#define XkbSA_XFree86Private 0x86
+#endif
+
/*
* Specifies the key actions that clear latched groups or modifiers.
*/
@@ -675,8 +682,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbIM_UseCompat (1L << 4)
#define XkbIM_UseNone 0
-#define XkbIM_UseAnyGroup (XkbIM_UseLatched|XkbIM_UseLocked|XkbIM_UseEffective)
-#define XkbIM_UseAnyMods (XkbIM_UseAnyGroup|XkbIM_UseCompat|XkbIM_UseBase)
+#define XkbIM_UseAnyGroup (XkbIM_UseBase|XkbIM_UseLatched|XkbIM_UseLocked\
+ |XkbIM_UseEffective)
+#define XkbIM_UseAnyMods (XkbIM_UseAnyGroup|XkbIM_UseCompat)
/*
* Compatibility Map Compontents: