summaryrefslogtreecommitdiff
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
parent209ae2d4c9cd739e91f8c00184dc6f2f48e21100 (diff)
XFree86 4.3.0.1
-rw-r--r--XKB.h12
-rw-r--r--XKBgeom.h20
-rw-r--r--XKBsrv.h176
3 files changed, 178 insertions, 30 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:
diff --git a/XKBgeom.h b/XKBgeom.h
index 6538e9e..aff8917 100644
--- a/XKBgeom.h
+++ b/XKBgeom.h
@@ -24,10 +24,13 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.9 2002/09/18 17:11:40 tsi Exp $ */
#ifndef _XKBGEOM_H_
#define _XKBGEOM_H_
+#include <X11/extensions/XKBstr.h>
+
#ifdef XKB_IN_SERVER
#define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias
#define XkbAddGeomColor SrvXkbAddGeomColor
@@ -63,8 +66,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbFreeGeomOverlayKeys SrvXkbFreeGeomOverlayKeys
#define XkbFreeGeomOverlayRows SrvXkbFreeGeomOverlayRows
#define XkbFreeGeomOverlays SrvXkbFreeGeomOverlays
-#define XkbFreeGeomKeys SrvXKbFreeGeomKeys
-#define XkbFreeGeomRows SrvXKbFreeGeomRows
+#define XkbFreeGeomKeys SrvXkbFreeGeomKeys
+#define XkbFreeGeomRows SrvXkbFreeGeomRows
#define XkbFreeGeomSections SrvXkbFreeGeomSections
#define XkbFreeGeomPoints SrvXkbFreeGeomPoints
#define XkbFreeGeomOutlines SrvXkbFreeGeomOutlines
@@ -110,7 +113,7 @@ typedef struct _XkbShape {
XkbOutlinePtr primary;
XkbBoundsRec bounds;
} XkbShapeRec, *XkbShapePtr;
-#define XkbOutlineIndex(s,o) ((o)-&(s)->outlines[0])
+#define XkbOutlineIndex(s,o) ((int)((o)-&(s)->outlines[0]))
typedef struct _XkbShapeDoodad {
Atom name;
@@ -292,7 +295,7 @@ typedef struct _XkbGeometry {
XkbDoodadPtr doodads;
XkbKeyAliasPtr key_aliases;
} XkbGeometryRec;
-#define XkbGeomColorIndex(g,c) ((c)-&(g)->colors[0])
+#define XkbGeomColorIndex(g,c) ((int)((c)-&(g)->colors[0]))
#define XkbGeomPropertiesMask (1<<0)
#define XkbGeomColorsMask (1<<1)
@@ -682,6 +685,15 @@ XkbAllocGeometry(
#endif
);
+extern Status
+XkbSetGeometry(
+#if NeedFunctionPrototypes
+ Display * /* dpy */,
+ unsigned /* deviceSpec */,
+ XkbGeometryPtr /* geom */
+#endif
+);
+
extern Bool
XkbComputeShapeTop(
#if NeedFunctionPrototypes
diff --git a/XKBsrv.h b/XKBsrv.h
index 16c04ed..fe05df3 100644
--- a/XKBsrv.h
+++ b/XKBsrv.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/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */
#ifndef _XKBSRV_H_
#define _XKBSRV_H_
@@ -69,6 +70,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XKBstr.h>
#include <X11/extensions/XKBproto.h>
+#include "inputstr.h"
typedef struct _XkbInterest {
DeviceIntPtr dev;
@@ -233,7 +235,7 @@ typedef struct _XkbSrvLedInfo {
#define XkbAX_KRGMask (XkbSlowKeysMask|XkbBounceKeysMask)
#define XkbAllFilteredEventsMask \
- (XkbAccessXKeysMask|XkbRepeatKeysMask|XkbAX_KRGMask)
+ (XkbAccessXKeysMask|XkbRepeatKeysMask|XkbMouseKeysAccelMask|XkbAX_KRGMask)
/***====================================================================***/
@@ -289,6 +291,7 @@ extern int DeviceButtonPress,DeviceButtonRelease;
(c)->curKeySyms.minKeyCode+1)
#define XConvertCase(s,l,u) XkbConvertCase(s,l,u)
+#undef IsKeypadKey
#define IsKeypadKey(s) XkbKSIsKeypad(s)
#define Status int
@@ -310,6 +313,20 @@ extern int DeviceButtonPress,DeviceButtonRelease;
_XFUNCPROTOBEGIN
+extern void XkbUseMsg(
+#if NeedFunctionPrototypes
+ void
+#endif
+);
+
+extern int XkbProcessArguments(
+#if NeedFunctionPrototypes
+ int /* argc */,
+ char ** /* argv */,
+ int /* i */
+#endif
+);
+
extern void XkbFreeCompatMap(
#if NeedFunctionPrototypes
XkbDescPtr /* xkb */,
@@ -1050,6 +1067,14 @@ extern int XkbDDXSwitchScreen(
#endif
);
+extern int XkbDDXPrivate(
+#if NeedFunctionPrototypes
+ DeviceIntPtr /* dev */,
+ KeyCode /* key */,
+ XkbAction * /* act */
+#endif
+);
+
extern void XkbDisableComputedAutoRepeats(
#if NeedFunctionPrototypes
DeviceIntPtr /* pXDev */,
@@ -1116,12 +1141,6 @@ extern Bool XkbInitKeyboardDeviceStruct(
#endif
);
-extern void XkbInitDevice(
-#if NeedFunctionPrototypes
- DeviceIntPtr /* pXDev */
-#endif
-);
-
extern int SProcXkbDispatch(
#if NeedFunctionPrototypes
ClientPtr /* client */
@@ -1159,11 +1178,134 @@ extern Status XkbChangeKeycodeRange(
#endif
);
+extern int XkbFinishDeviceInit(
+#if NeedFunctionPrototypes
+ DeviceIntPtr /* pXDev */
+#endif
+);
+
+extern void XkbFreeSrvLedInfo(
+#if NeedFunctionPrototypes
+ XkbSrvLedInfoPtr /* sli */
+#endif
+);
+
+extern void XkbFreeInfo(
+#if NeedFunctionPrototypes
+ XkbSrvInfoPtr /* xkbi */
+#endif
+);
+
+extern Status XkbChangeTypesOfKey(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ int /* key */,
+ int /* nGroups */,
+ unsigned int /* groups */,
+ int * /* newTypesIn */,
+ XkbMapChangesPtr /* changes */
+#endif
+);
+
+extern XkbKeyTypePtr XkbAddKeyType(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ Atom /* name */,
+ int /* map_count */,
+ Bool /* want_preserve */,
+ int /* num_lvls */
+#endif
+);
+
+extern Status XkbInitCanonicalKeyTypes(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ unsigned int /* which */,
+ int /* keypadVMod */
+#endif
+);
+
+extern int XkbKeyTypesForCoreSymbols(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ int /* map_width */,
+ KeySym * /* core_syms */,
+ unsigned int /* protected */,
+ int * /* types_inout */,
+ KeySym * /* xkb_syms_rtrn */
+#endif
+);
+
+extern Bool XkbApplyCompatMapToKey(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ KeyCode /* key */,
+ XkbChangesPtr /* changes */
+#endif
+);
+
+extern Bool XkbUpdateMapFromCore(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ KeyCode /* first_key */,
+ int /* num_keys */,
+ int /* map_width */,
+ KeySym * /* core_keysyms */,
+ XkbChangesPtr /* changes */
+#endif
+);
+
+extern void XkbFreeControls(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ unsigned int /* which */,
+ Bool /* freeMap */
+#endif
+);
+
+extern void XkbFreeIndicatorMaps(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */
+#endif
+);
+
+extern Bool XkbApplyVirtualModChanges(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ unsigned int /* changed */,
+ XkbChangesPtr /* changes */
+#endif
+);
+
+extern Bool XkbUpdateActionVirtualMods(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ XkbAction * /* act */,
+ unsigned int /* changed */
+#endif
+);
+
+extern void XkbUpdateKeyTypeVirtualMods(
+#if NeedFunctionPrototypes
+ XkbDescPtr /* xkb */,
+ XkbKeyTypePtr /* type */,
+ unsigned int /* changed */,
+ XkbChangesPtr /* changes */
+#endif
+);
+
+extern void XkbSendNewKeyboardNotify(
+#if NeedFunctionPrototypes
+ DeviceIntPtr /* kbd */,
+ xkbNewKeyboardNotify * /* pNKN */
+#endif
+);
+
#ifdef XKBSRV_NEED_FILE_FUNCS
-#include "extensions/XKMformat.h"
-#include "extensions/XKBfile.h"
-#include "extensions/XKBrules.h"
+#include <X11/extensions/XKMformat.h>
+#include <X11/extensions/XKBfile.h>
+#include <X11/extensions/XKBrules.h>
#define _XkbListKeymaps 0
#define _XkbListKeycodes 1
@@ -1252,20 +1394,6 @@ extern XPointer XkbDDXPreloadConfig(
#endif
);
-extern int XkbDDXUsesSoftRepeat(
-#if NeedFunctionPrototypes
- DeviceIntPtr /* pXDev */
-#endif
-);
-
-extern void XkbDDXFakePointerMotion(
-#if NeedFunctionPrototypes
- unsigned int /* flags */,
- int /* x */,
- int /* y */
-#endif
-);
-
extern int _XkbStrCaseCmp(
#if NeedFunctionPrototypes
char * /* str1 */,