qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to inputproto 2.0. Tested on a bulk ports build by naddy@.

Browse Source
This commit is contained in:
matthieu 2010-05-18 19:25:28 +00:00
parent 233e342509
commit 2a64d3789d
11 changed files with 7270 additions and 1878 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1425
proto/inputproto/ChangeLog
View File

File diff suppressed because it is too large Load Diff

4
proto/inputproto/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
# $OpenBSD: Makefile,v 1.2 2010/05/18 19:25:28 matthieu Exp $
HEADERS_SUBDIR= X11/extensions/
HEADERS= XI.h XInput.h XIproto.h
HEADERS= XI.h XIproto.h XI2.h XI2proto.h
PKGCONFIG= inputproto.pc
.include <bsd.xorg.mk>

11
proto/inputproto/Makefile.am
View File

@ -1,20 +1,21 @@
inputdir = $(includedir)/X11/extensions
input_HEADERS = \
XI.h \
XInput.h \
XIproto.h
XIproto.h \
XI2.h \
XI2proto.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = inputproto.pc
EXTRA_DIST = autogen.sh inputproto.pc.in
EXTRA_DIST = inputproto.pc.in
EXTRA_DIST += ChangeLog
EXTRA_DIST += ChangeLog XI2proto.txt XIproto.txt
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
$(CHANGELOG_CMD)
dist-hook: ChangeLog

13
proto/inputproto/XI.h
View File

@ -113,7 +113,7 @@ SOFTWARE.
#define sz_xGetDevicePropertyReq 24
#define sz_xGetDevicePropertyReply 32
#define INAME "XInputExtension"
#define INAME "XInputExtension"
#define XI_KEYBOARD "KEYBOARD"
#define XI_MOUSE "MOUSE"
@ -135,6 +135,8 @@ SOFTWARE.
#define XI_FOOTMOUSE "FOOTMOUSE"
#define XI_JOYSTICK "JOYSTICK"
/* Indices into the versions[] array (XExtInt.c). Used as a index to
* retrieve the minimum version of XI from _XiCheckExtInit */
#define Dont_Check 0
#define XInput_Initial_Release 1
#define XInput_Add_XDeviceBell 2
@ -142,6 +144,7 @@ SOFTWARE.
#define XInput_Add_XChangeDeviceControl 4
#define XInput_Add_DevicePresenceNotify 5
#define XInput_Add_DeviceProperties 6
/* DO NOT ADD TO HERE -> XI2 */
#define XI_Absent 0
#define XI_Present 1
@ -236,6 +239,7 @@ SOFTWARE.
#define ProximityClass 4
#define FocusClass 5
#define OtherClass 6
#define AttachClass 7
#define KbdFeedbackClass 0
#define PtrFeedbackClass 1
@ -257,6 +261,10 @@ SOFTWARE.
#define _devicePresence 0
#define _deviceEnter 0
#define _deviceLeave 1
/* Device presence notify states */
#define DeviceAdded 0
#define DeviceRemoved 1
#define DeviceEnabled 2
@ -264,6 +272,7 @@ SOFTWARE.
#define DeviceUnrecoverable 4
#define DeviceControlChanged 5
/* XI Errors */
#define XI_BadDevice 0
#define XI_BadEvent 1
#define XI_BadMode 2
@ -279,7 +288,7 @@ SOFTWARE.
* without polluting the namespace.
*/
#ifdef _XSERVER64
typedef unsigned int XEventClass;
typedef unsigned int XEventClass;
#else
typedef unsigned long XEventClass;
#endif

181
proto/inputproto/XI2.h Normal file
View File

@ -0,0 +1,181 @@
/*
* Copyright © 2009 Red Hat, Inc.
*
* 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.
*
*/
#ifndef _XI2_H_
#define _XI2_H_
/* Indices into the versions[] array (XExtInt.c). Used as a index to
* retrieve the minimum version of XI from _XiCheckExtInit.
* For indices 0 to 6 see XI.h */
#ifndef Dont_Check /* defined in XI.h */
#define Dont_Check 0
#endif
#define XInput_2_0 7
#define XI_2_Major 2
#define XI_2_Minor 0
/* Property event flags */
#define XIPropertyDeleted 0
#define XIPropertyCreated 1
#define XIPropertyModified 2
/* Enter/Leave and Focus In/Out modes */
#define XINotifyNormal 0
#define XINotifyGrab 1
#define XINotifyUngrab 2
#define XINotifyWhileGrabbed 3
#define XINotifyPassiveGrab 4
#define XINotifyPassiveUngrab 5
/* Enter/Leave and focus In/out detail */
#define XINotifyAncestor 0
#define XINotifyVirtual 1
#define XINotifyInferior 2
#define XINotifyNonlinear 3
#define XINotifyNonlinearVirtual 4
#define XINotifyPointer 5
#define XINotifyPointerRoot 6
#define XINotifyDetailNone 7
/* Passive grab types */
#define XIGrabtypeButton 0
#define XIGrabtypeKeycode 1
#define XIGrabtypeEnter 2
#define XIGrabtypeFocusIn 3
/* Passive grab modifier */
#define XIAnyModifier (1U << 31)
#define XIAnyButton 0
#define XIAnyKeycode 0
/* XIAllowEvents event-modes */
#define XIAsyncDevice 0
#define XISyncDevice 1
#define XIReplayDevice 2
#define XIAsyncPairedDevice 3
#define XIAsyncPair 4
#define XISyncPair 5
/* DeviceChangedEvent change reasons */
#define XISlaveSwitch 1
#define XIDeviceChange 2
/* Hierarchy flags */
#define XIMasterAdded (1 << 0)
#define XIMasterRemoved (1 << 1)
#define XISlaveAdded (1 << 2)
#define XISlaveRemoved (1 << 3)
#define XISlaveAttached (1 << 4)
#define XISlaveDetached (1 << 5)
#define XIDeviceEnabled (1 << 6)
#define XIDeviceDisabled (1 << 7)
/* ChangeHierarchy constants */
#define XIAddMaster 1
#define XIRemoveMaster 2
#define XIAttachSlave 3
#define XIDetachSlave 4
#define XIAttachToMaster 1
#define XIFloating 2
/* Valuator modes */
#define XIModeRelative 0
#define XIModeAbsolute 1
/* Device types */
#define XIMasterPointer 1
#define XIMasterKeyboard 2
#define XISlavePointer 3
#define XISlaveKeyboard 4
#define XIFloatingSlave 5
/* Device classes */
#define XIKeyClass 0
#define XIButtonClass 1
#define XIValuatorClass 2
/* Device event flags (common) */
/* Device event flags (key events only) */
#define XIKeyRepeat (1 << 16)
/* Device event flags (pointer events only) */
/* XI2 event mask macros */
#define XISetMask(ptr, event) (((unsigned char*)(ptr))[(event)>>3] |= (1 << ((event) & 7)))
#define XIClearMask(ptr, event) (((unsigned char*)(ptr))[(event)>>3] &= ~(1 << ((event) & 7)))
#define XIMaskIsSet(ptr, event) (((unsigned char*)(ptr))[(event)>>3] & (1 << ((event) & 7)))
#define XIMaskLen(event) (((event + 7) >> 3))
/* Fake device ID's for event selection */
#define XIAllDevices 0
#define XIAllMasterDevices 1
/* Event types */
#define XI_DeviceChanged 1
#define XI_KeyPress 2
#define XI_KeyRelease 3
#define XI_ButtonPress 4
#define XI_ButtonRelease 5
#define XI_Motion 6
#define XI_Enter 7
#define XI_Leave 8
#define XI_FocusIn 9
#define XI_FocusOut 10
#define XI_HierarchyChanged 11
#define XI_PropertyEvent 12
#define XI_RawKeyPress 13
#define XI_RawKeyRelease 14
#define XI_RawButtonPress 15
#define XI_RawButtonRelease 16
#define XI_RawMotion 17
#define XI_LASTEVENT XI_RawMotion
/* NOTE: XI2LASTEVENT in xserver/include/inputstr.h must be the same value
* as XI_LASTEVENT if the server is supposed to handle masks etc. for this
* type of event. */
/* Event masks.
* Note: the protocol spec defines a mask to be of (1 << type). Clients are
* free to create masks by bitshifting instead of using these defines.
*/
#define XI_DeviceChangedMask (1 << XI_DeviceChanged)
#define XI_KeyPressMask (1 << XI_KeyPress)
#define XI_KeyReleaseMask (1 << XI_KeyRelease)
#define XI_ButtonPressMask (1 << XI_ButtonPress)
#define XI_ButtonReleaseMask (1 << XI_ButtonRelease)
#define XI_MotionMask (1 << XI_Motion)
#define XI_EnterMask (1 << XI_Enter)
#define XI_LeaveMask (1 << XI_Leave)
#define XI_FocusInMask (1 << XI_FocusIn)
#define XI_FocusOutMask (1 << XI_FocusOut)
#define XI_HierarchyChangedMask (1 << XI_HierarchyChanged)
#define XI_PropertyEventMask (1 << XI_PropertyEvent)
#define XI_RawKeyPressMask (1 << XI_RawKeyPress)
#define XI_RawKeyReleaseMask (1 << XI_RawKeyRelease)
#define XI_RawButtonPressMask (1 << XI_RawButtonPress)
#define XI_RawButtonReleaseMask (1 << XI_RawButtonRelease)
#define XI_RawMotionMask (1 << XI_RawMotion)
#endif /* _XI2_H_ */

976
proto/inputproto/XI2proto.h Normal file
View File

@ -0,0 +1,976 @@
/*
* Copyright © 2009 Red Hat, Inc.
*
* 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.
*
*/
/* Conventions for this file:
* Names:
* structs: always typedef'd, prefixed with xXI, CamelCase
* struct members: lower_case_with_underscores
* Exceptions: reqType, ReqType, repType, RepType, sequenceNumber are
* named as such for historical reasons.
* request opcodes: X_XIRequestName as CamelCase
* defines: defines used in client applications must go in XI2.h
* defines used only in protocol handling: XISOMENAME
*
* Data types: unless there is a historical name for a datatype (e.g.
* Window), use stdint types specifying the size of the datatype.
* historical data type names must be defined and undefined at the top and
* end of the file.
*
* General:
* spaces, not tabs.
* structs specific to a request or reply added before the request
* definition. structs used in more than one request, reply or event
* appended to the common structs section before the definition of the
* first request.
* members of structs vertically aligned on column 16 if datatypes permit.
* otherwise alingned on next available 8n column.
*/
/**
* Protocol definitions for the XI2 protocol.
* This file should not be included by clients that merely use XI2, but do not
* need the wire protocol. Such clients should include XI2.h, or the matching
* header from the library.
*
*/
#ifndef _XI2PROTO_H_
#define _XI2PROTO_H_
#include <X11/Xproto.h>
#include <X11/X.h>
#include <X11/extensions/XI2.h>
/* make sure types have right sizes for protocol structures. */
#define Window uint32_t
#define Time uint32_t
#define Atom uint32_t
#define Cursor uint32_t
/**
* XI2 Request opcodes
*/
#define X_XIQueryPointer 40
#define X_XIWarpPointer 41
#define X_XIChangeCursor 42
#define X_XIChangeHierarchy 43
#define X_XISetClientPointer 44
#define X_XIGetClientPointer 45
#define X_XISelectEvents 46
#define X_XIQueryVersion 47
#define X_XIQueryDevice 48
#define X_XISetFocus 49
#define X_XIGetFocus 50
#define X_XIGrabDevice 51
#define X_XIUngrabDevice 52
#define X_XIAllowEvents 53
#define X_XIPassiveGrabDevice 54
#define X_XIPassiveUngrabDevice 55
#define X_XIListProperties 56
#define X_XIChangeProperty 57
#define X_XIDeleteProperty 58
#define X_XIGetProperty 59
#define X_XIGetSelectedEvents 60
/** Number of XI requests */
#define XI2REQUESTS (X_XIGetSelectedEvents - X_XIQueryPointer + 1)
/** Number of XI2 events */
#define XI2EVENTS (XI_LASTEVENT + 1)
/*************************************************************************************
* *
* COMMON STRUCTS *
* *
*************************************************************************************/
/** Fixed point 16.16 */
typedef int32_t FP1616;
/** Fixed point 32.32 */
typedef struct {
int32_t integral;
uint32_t frac;
} FP3232;
/**
* Struct to describe a device.
*
* For a MasterPointer or a MasterKeyboard, 'attachment' specifies the
* paired master device.
* For a SlaveKeyboard or SlavePointer, 'attachment' specifies the master
* device this device is attached to.
* For a FloatingSlave, 'attachment' is undefined.
*/
typedef struct {
uint16_t deviceid;
uint16_t use; /**< ::XIMasterPointer, ::XIMasterKeyboard,
::XISlavePointer, ::XISlaveKeyboard,
::XIFloatingSlave */
uint16_t attachment; /**< Current attachment or pairing.*/
uint16_t num_classes; /**< Number of classes following this struct. */
uint16_t name_len; /**< Length of name in bytes. */
uint8_t enabled; /**< TRUE if device is enabled. */
uint8_t pad;
} xXIDeviceInfo;
/**
* Default template for a device class.
* A device class is equivalent to a device's capabilities. Multiple classes
* are supported per device.
*/
typedef struct {
uint16_t type; /**< One of *class */
uint16_t length; /**< Length in 4 byte units */
uint16_t sourceid; /**< source device for this class */
uint16_t pad;
} xXIAnyInfo;
/**
* Denotes button capability on a device.
* Struct is followed by num_buttons * Atom that names the buttons in the
* device-native setup (i.e. ignoring button mappings).
*/
typedef struct {
uint16_t type; /**< Always ButtonClass */
uint16_t length; /**< Length in 4 byte units */
uint16_t sourceid; /**< source device for this class */
uint16_t num_buttons; /**< Number of buttons provide */
} xXIButtonInfo;
/**
* Denotes key capability on a device.
* Struct is followed by num_keys * CARD32 that lists the keycodes available
* on the device.
*/
typedef struct {
uint16_t type; /**< Always KeyClass */
uint16_t length; /**< Length in 4 byte units */
uint16_t sourceid; /**< source device for this class */
uint16_t num_keycodes; /**< Number of keys provided */
} xXIKeyInfo;
/**
* Denotes an valuator capability on a device.
* One XIValuatorInfo describes exactly one valuator (axis) on the device.
*/
typedef struct {
uint16_t type; /**< Always ValuatorClass */
uint16_t length; /**< Length in 4 byte units */
uint16_t sourceid; /**< source device for this class */
uint16_t number; /**< Valuator number */
Atom label; /**< Axis label */
FP3232 min; /**< Min value */
FP3232 max; /**< Max value */
FP3232 value; /**< Last published value */
uint32_t resolution; /**< Resolutions in units/m */
uint8_t mode; /**< ModeRelative or ModeAbsolute */
uint8_t pad1;
uint16_t pad2;
} xXIValuatorInfo;
/**
* Used to select for events on a given window.
* Struct is followed by (mask_len * CARD8), with each bit set representing
* the event mask for the given type. A mask bit represents an event type if
* (mask == (1 << type)).
*/
typedef struct {
uint16_t deviceid; /**< Device id to select for */
uint16_t mask_len; /**< Length of mask in 4 byte units */
} xXIEventMask;
/**
* XKB modifier information.
* The effective modifier is a binary mask of base, latched, and locked
* modifiers.
*/
typedef struct
{
uint32_t base_mods; /**< Logically pressed modifiers */
uint32_t latched_mods; /**< Logically latched modifiers */
uint32_t locked_mods; /**< Logically locked modifiers */
uint32_t effective_mods; /**< Effective modifiers */
} xXIModifierInfo;
/**
* XKB group information.
* The effective group is the mathematical sum of base, latched, and locked
* group after group wrapping is taken into account.
*/
typedef struct
{
uint8_t base_group; /**< Logically "pressed" group */
uint8_t latched_group; /**< Logically latched group */
uint8_t locked_group; /**< Logically locked group */
uint8_t effective_group; /**< Effective group */
} xXIGroupInfo;
/*************************************************************************************
* *
* REQUESTS *
* *
*************************************************************************************/
/**
* Query the server for the supported X Input extension version.
*/
typedef struct {
uint8_t reqType; /**< Input extension major code */
uint8_t ReqType; /**< Always ::X_XIQueryVersion */
uint16_t length; /**< Length in 4 byte units */
uint16_t major_version;
uint16_t minor_version;
} xXIQueryVersionReq;
#define sz_xXIQueryVersionReq 8
typedef struct {
uint8_t repType; /**< ::X_Reply */
uint8_t RepType; /**< Always ::X_XIQueryVersion */
uint16_t sequenceNumber;
uint32_t length;
uint16_t major_version;
uint16_t minor_version;
uint32_t pad1;
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
uint32_t pad5;
} xXIQueryVersionReply;
#define sz_xXIQueryVersionReply 32
/**
* Query the server for information about a specific device or all input
* devices.
*/
typedef struct {
uint8_t reqType; /**< Input extension major code */
uint8_t ReqType; /**< Always ::X_XIQueryDevice */
uint16_t length; /**< Length in 4 byte units */
uint16_t deviceid;
uint16_t pad;
} xXIQueryDeviceReq;
#define sz_xXIQueryDeviceReq 8
typedef struct {
uint8_t repType; /**< ::X_Reply */
uint8_t RepType; /**< Always ::X_XIQueryDevice */
uint16_t sequenceNumber;
uint32_t length;
uint16_t num_devices;
uint16_t pad0;
uint32_t pad1;
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
uint32_t pad5;
} xXIQueryDeviceReply;
#define sz_xXIQueryDeviceReply 32
/**
* Select for events on a given window.
*/
typedef struct {
uint8_t reqType; /**< Input extension major code */
uint8_t ReqType; /**< Always ::X_XISelectEvents */
uint16_t length; /**< Length in 4 byte units */
Window win;
uint16_t num_masks;
uint16_t pad;
} xXISelectEventsReq;
#define sz_xXISelectEventsReq 12
/**
* Query for selected events on a given window.
*/
typedef struct {
uint8_t reqType; /**< Input extension major code */
uint8_t ReqType; /**< Always ::X_XIGetSelectedEvents */
uint16_t length; /**< Length in 4 byte units */
Window win;
} xXIGetSelectedEventsReq;
#define sz_xXIGetSelectedEventsReq 8
typedef struct {
uint8_t repType; /**< Input extension major opcode */
uint8_t RepType; /**< Always ::X_XIGetSelectedEvents */
uint16_t sequenceNumber;
uint32_t length;
uint16_t num_masks; /**< Number of xXIEventMask structs
trailing the reply */
uint16_t pad0;
uint32_t pad1;
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
uint32_t pad5;
} xXIGetSelectedEventsReply;
#define sz_xXIGetSelectedEventsReply 32
/**
* Query the given device's screen/window coordinates.
*/
typedef struct {
uint8_t reqType; /**< Input extension major code */
uint8_t ReqType; /**< Always ::X_XIQueryPointer */
uint16_t length; /**< Length in 4 byte units */
Window win;
uint16_t deviceid;
uint16_t pad1;
} xXIQueryPointerReq;
#define sz_xXIQueryPointerReq 12
typedef struct {
uint8_t repType; /**< Input extension major opcode */
uint8_t RepType; /**< Always ::X_XIQueryPointer */
uint16_t sequenceNumber;
uint32_t length;
Window root;
Window child;
FP1616 root_x;
FP1616 root_y;
FP1616 win_x;
FP1616 win_y;
uint8_t same_screen;
uint8_t pad0;
uint16_t buttons_len;
xXIModifierInfo mods;
xXIGroupInfo group;
} xXIQueryPointerReply;
#define sz_xXIQueryPointerReply 56
/**
* Warp the given device's pointer to the specified position.
*/
typedef struct {
uint8_t reqType; /**< Input extension major code */
uint8_t ReqType; /**< Always ::X_XIWarpPointer */
uint16_t length; /**< Length in 4 byte units */
Window src_win;
Window dst_win;
FP1616 src_x;
FP1616 src_y;
uint16_t src_width;
uint16_t src_height;
FP1616 dst_x;
FP1616 dst_y;
uint16_t deviceid;
uint16_t pad1;
} xXIWarpPointerReq;
#define sz_xXIWarpPointerReq 36
/**
* Change the given device's sprite to the given cursor.
*/
typedef struct {
uint8_t reqType; /**< Input extension major code */
uint8_t ReqType; /**< Always ::X_XIChangeCursor */
uint16_t length; /**< Length in 4 byte units */
Window win;
Cursor cursor;
uint16_t deviceid;
uint16_t pad1;
} xXIChangeCursorReq;
#define sz_xXIChangeCursorReq 16
/**
* Modify the device hierarchy.
*/
typedef struct {
uint8_t reqType; /**< Input extension major code */
uint8_t ReqType; /**< Always ::X_XIChangeHierarchy */
uint16_t length; /**< Length in 4 byte units */
uint8_t num_changes;
uint8_t pad0;
uint16_t pad1;
} xXIChangeHierarchyReq;
#define sz_xXIChangeHierarchyReq 8
/**
* Generic header for any hierarchy change.
*/
typedef struct {
uint16_t type;
uint16_t length; /**< Length in 4 byte units */
} xXIAnyHierarchyChangeInfo;
/**
* Create a new master device.
* Name of new master follows struct (4-byte padded)
*/
typedef struct {
uint16_t type; /**< Always ::XIAddMaster */
uint16_t length; /**< 2 + (namelen + padding)/4 */
uint16_t name_len;
uint8_t send_core;
uint8_t enable;
} xXIAddMasterInfo;
/**
* Delete a master device. Will automatically delete the master device paired
* with the given master device.
*/
typedef struct {
uint16_t type; /**< Always ::XIRemoveMaster */
uint16_t length; /**< 3 */
uint16_t deviceid;
uint8_t return_mode; /**< ::XIAttachToMaster, ::XIFloating */
uint8_t pad;
uint16_t return_pointer; /**< Pointer to attach slave ptr devices to */
uint16_t return_keyboard; /**< keyboard to attach slave keybd devices to*/
} xXIRemoveMasterInfo;
/**
* Attach an SD to a new device.
* NewMaster has to be of same type (pointer->pointer, keyboard->keyboard);
*/
typedef struct {
uint16_t type; /**< Always ::XIAttachSlave */
uint16_t length; /**< 2 */
uint16_t deviceid;
uint16_t new_master; /**< id of new master device */
} xXIAttachSlaveInfo;
/**
* Detach an SD from its current master device.
*/
typedef struct {
uint16_t type; /**< Always ::XIDetachSlave */
uint16_t length; /**< 2 */
uint16_t deviceid;
uint16_t pad;
} xXIDetachSlaveInfo;
/**
* Set the window/client's ClientPointer.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XISetClientPointer */
uint16_t length; /**< Length in 4 byte units */
Window win;
uint16_t deviceid;
uint16_t pad1;
} xXISetClientPointerReq;
#define sz_xXISetClientPointerReq 12
/**
* Query the given window/client's ClientPointer setting.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_GetClientPointer */
uint16_t length; /**< Length in 4 byte units */
Window win;
} xXIGetClientPointerReq;
#define sz_xXIGetClientPointerReq 8
typedef struct {
uint8_t repType; /**< Input extension major opcode */
uint8_t RepType; /**< Always ::X_GetClientPointer */
uint16_t sequenceNumber;
uint32_t length;
BOOL set; /**< client pointer is set? */
uint8_t pad0;
uint16_t deviceid;
uint32_t pad1;
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
uint32_t pad5;
} xXIGetClientPointerReply;
#define sz_xXIGetClientPointerReply 32
/**
* Set the input focus to the specified window.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XISetFocus */
uint16_t length; /**< Length in 4 byte units */
Window focus;
Time time;
uint16_t deviceid;
uint16_t pad0;
} xXISetFocusReq;
#define sz_xXISetFocusReq 16
/**
* Query the current input focus.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XIGetDeviceFocus */
uint16_t length; /**< Length in 4 byte units */
uint16_t deviceid;
uint16_t pad0;
} xXIGetFocusReq;
#define sz_xXIGetFocusReq 8
typedef struct {
uint8_t repType; /**< Input extension major opcode */
uint8_t RepType; /**< Always ::X_XIGetFocus */
uint16_t sequenceNumber;
uint32_t length;
Window focus;
uint32_t pad1;
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
uint32_t pad5;
} xXIGetFocusReply;
#define sz_xXIGetFocusReply 32
/**
* Grab the given device.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XIGrabDevice */
uint16_t length; /**< Length in 4 byte units */
Window grab_window;
Time time;
Cursor cursor;
uint16_t deviceid;
uint8_t grab_mode;
uint8_t paired_device_mode;
uint8_t owner_events;
uint8_t pad;
uint16_t mask_len;
} xXIGrabDeviceReq;
#define sz_xXIGrabDeviceReq 24
/**
* Return codes from a XIPassiveGrabDevice request.
*/
typedef struct {
uint32_t modifiers; /**< Modifier state */
uint8_t status; /**< Grab status code */
uint8_t pad0;
uint16_t pad1;
} xXIGrabModifierInfo;
typedef struct {
uint8_t repType; /**< Input extension major opcode */
uint8_t RepType; /**< Always ::X_XIGrabDevice */
uint16_t sequenceNumber;
uint32_t length;
uint8_t status;
uint8_t pad0;
uint16_t pad1;
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
uint32_t pad5;
uint32_t pad6;
} xXIGrabDeviceReply;
#define sz_xXIGrabDeviceReply 32
/**
* Ungrab the specified device.
*
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XIUngrabDevice */
uint16_t length; /**< Length in 4 byte units */
Time time;
uint16_t deviceid;
uint16_t pad;
} xXIUngrabDeviceReq;
#define sz_xXIUngrabDeviceReq 12
/**
* Allow or replay events on the specified grabbed device.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XIAllowEvents */
uint16_t length; /**< Length in 4 byte units */
Time time;
uint16_t deviceid;
uint8_t mode;
uint8_t pad;
} xXIAllowEventsReq;
#define sz_xXIAllowEventsReq 12
/**
* Passively grab the device.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XIPassiveGrabDevice */
uint16_t length; /**< Length in 4 byte units */
Time time;
Window grab_window;
Cursor cursor;
uint32_t detail;
uint16_t deviceid;
uint16_t num_modifiers;
uint16_t mask_len;
uint8_t grab_type;
uint8_t grab_mode;
uint8_t paired_device_mode;
uint8_t owner_events;
uint16_t pad1;
} xXIPassiveGrabDeviceReq;
#define sz_xXIPassiveGrabDeviceReq 32
typedef struct {
uint8_t repType; /**< Input extension major opcode */
uint8_t RepType; /**< Always ::X_XIPassiveGrabDevice */
uint16_t sequenceNumber;
uint32_t length;
uint16_t num_modifiers;
uint16_t pad1;
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
uint32_t pad5;
uint32_t pad6;
} xXIPassiveGrabDeviceReply;
#define sz_xXIPassiveGrabDeviceReply 32
/**
* Delete a passive grab for the given device.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XIPassiveUngrabDevice */
uint16_t length; /**< Length in 4 byte units */
Window grab_window;
uint32_t detail;
uint16_t deviceid;
uint16_t num_modifiers;
uint8_t grab_type;
uint8_t pad0;
uint16_t pad1;
} xXIPassiveUngrabDeviceReq;
#define sz_xXIPassiveUngrabDeviceReq 20
/**
* List all device properties on the specified device.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XIListProperties */
uint16_t length; /**< Length in 4 byte units */
uint16_t deviceid;
uint16_t pad;
} xXIListPropertiesReq;
#define sz_xXIListPropertiesReq 8
typedef struct {
uint8_t repType; /**< Input extension major opcode */
uint8_t RepType; /**< Always ::X_XIListProperties */
uint16_t sequenceNumber;
uint32_t length;
uint16_t num_properties;
uint16_t pad0;
uint32_t pad1;
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
uint32_t pad5;
} xXIListPropertiesReply;
#define sz_xXIListPropertiesReply 32
/**
* Change a property on the specified device.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always ::X_XIChangeProperty */
uint16_t length; /**< Length in 4 byte units */
uint16_t deviceid;
uint8_t mode;
uint8_t format;
Atom property;
Atom type;
uint32_t num_items;
} xXIChangePropertyReq;
#define sz_xXIChangePropertyReq 20
/**
* Delete the specified property.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always X_XIDeleteProperty */
uint16_t length; /**< Length in 4 byte units */
uint16_t deviceid;
uint16_t pad0;
Atom property;
} xXIDeletePropertyReq;
#define sz_xXIDeletePropertyReq 12
/**
* Query the specified property's values.
*/
typedef struct {
uint8_t reqType;
uint8_t ReqType; /**< Always X_XIGetProperty */
uint16_t length; /**< Length in 4 byte units */
uint16_t deviceid;
#if defined(__cplusplus) || defined(c_plusplus)
uint8_t c_delete;
#else
uint8_t delete;
#endif
uint8_t pad0;
Atom property;
Atom type;
uint32_t offset;
uint32_t len;
} xXIGetPropertyReq;
#define sz_xXIGetPropertyReq 24
typedef struct {
uint8_t repType; /**< Input extension major opcode */
uint8_t RepType; /**< Always X_XIGetProperty */
uint16_t sequenceNumber;
uint32_t length;
Atom type;
uint32_t bytes_after;
uint32_t num_items;
uint8_t format;
uint8_t pad0;
uint16_t pad1;
uint32_t pad2;
uint32_t pad3;
} xXIGetPropertyReply;
#define sz_xXIGetPropertyReply 32
/*************************************************************************************
* *
* EVENTS *
* *
*************************************************************************************/
/**
* Generic XI2 event header. All XI2 events use the same header.
*/
typedef struct
{
uint8_t type;
uint8_t extension; /**< XI extension offset */
uint16_t sequenceNumber;
uint32_t length;
uint16_t evtype;
uint16_t deviceid;
Time time;
} xXIGenericDeviceEvent;
/**
* Device hierarchy information.
*/
typedef struct
{
uint16_t deviceid;
uint16_t attachment; /**< ID of master or paired device */
uint8_t use; /**< ::XIMasterKeyboard,
::XIMasterPointer,
::XISlaveKeyboard,
::XISlavePointer,
::XIFloatingSlave */
BOOL enabled; /**< TRUE if the device is enabled */
uint16_t pad;
uint32_t flags; /**< ::XIMasterAdded, ::XIMasterRemoved,
::XISlaveAttached, ::XISlaveDetached,
::XISlaveAdded, ::XISlaveRemoved,
::XIDeviceEnabled, ::XIDeviceDisabled */
} xXIHierarchyInfo;
/**
* The device hierarchy has been modified. This event includes the device
* hierarchy after the modification has been applied.
*/
typedef struct
{
uint8_t type; /**< Always GenericEvent */
uint8_t extension; /**< XI extension offset */
uint16_t sequenceNumber;
uint32_t length; /**< Length in 4 byte units */
uint16_t evtype; /**< ::XI_Hierarchy */
uint16_t deviceid;
Time time;
uint32_t flags; /**< ::XIMasterAdded, ::XIMasterDeleted,
::XISlaveAttached, ::XISlaveDetached,
::XISlaveAdded, ::XISlaveRemoved,
::XIDeviceEnabled, ::XIDeviceDisabled */
uint16_t num_info;
uint16_t pad0;
uint32_t pad1;
uint32_t pad2;
} xXIHierarchyEvent;
/**
* A device has changed capabilities.
*/
typedef struct
{
uint8_t type; /**< Always GenericEvent */
uint8_t extension; /**< XI extension offset */
uint16_t sequenceNumber;
uint32_t length; /**< Length in 4 byte units */
uint16_t evtype; /**< XI_DeviceChanged */
uint16_t deviceid; /**< Device that has changed */
Time time;
uint16_t num_classes; /**< Number of classes that have changed */
uint16_t sourceid; /**< Source of the new classes */
uint8_t reason; /**< ::XISlaveSwitch, ::XIDeviceChange */
uint8_t pad0;
uint16_t pad1;
uint32_t pad2;
uint32_t pad3;
} xXIDeviceChangedEvent;
/**
* Default input event for pointer or keyboard input.
*/
typedef struct
{
uint8_t type; /**< Always GenericEvent */
uint8_t extension; /**< XI extension offset */
uint16_t sequenceNumber;
uint32_t length; /**< Length in 4 byte uints */
uint16_t evtype;
uint16_t deviceid;
Time time;
uint32_t detail; /**< Keycode or button */
Window root;
Window event;
Window child;
/* └──────── 32 byte boundary ────────┘ */
FP1616 root_x; /**< Always screen coords, 16.16 fixed point */
FP1616 root_y;
FP1616 event_x; /**< Always screen coords, 16.16 fixed point */
FP1616 event_y;
uint16_t buttons_len; /**< Len of button flags in 4 b units */
uint16_t valuators_len; /**< Len of val. flags in 4 b units */
uint16_t sourceid; /**< The source device */
uint16_t pad0;
uint32_t flags; /**< ::XIKeyRepeat */
xXIModifierInfo mods;
xXIGroupInfo group;
} xXIDeviceEvent;
/**
* Sent when an input event is generated. RawEvents include valuator
* information in both device-specific data (i.e. unaccelerated) and
* processed data (i.e. accelerated, if applicable).
*/
typedef struct
{
uint8_t type; /**< Always GenericEvent */
uint8_t extension; /**< XI extension offset */
uint16_t sequenceNumber;
uint32_t length; /**< Length in 4 byte uints */
uint16_t evtype; /**< ::XI_RawEvent */
uint16_t deviceid;
Time time;
uint32_t detail;
uint16_t pad0;
uint16_t valuators_len; /**< Length of trailing valuator
mask in 4 byte units */
uint32_t flags; /**< ::XIKeyRepeat */
uint32_t pad2;
} xXIRawEvent;
/**
* Note that the layout of root, event, child, root_x, root_y, event_x,
* event_y must be identical to the xXIDeviceEvent.
*/
typedef struct
{
uint8_t type; /**< Always GenericEvent */
uint8_t extension; /**< XI extension offset */
uint16_t sequenceNumber;
uint32_t length; /**< Length in 4 byte uints */
uint16_t evtype; /**< ::XI_Enter */
uint16_t deviceid;
Time time;
uint16_t sourceid;
uint8_t mode;
uint8_t detail;
Window root;
Window event;
Window child;
/* └──────── 32 byte boundary ────────┘ */
FP1616 root_x;
FP1616 root_y;
FP1616 event_x;
FP1616 event_y;
BOOL same_screen;
BOOL focus;
uint16_t buttons_len; /**< Length of trailing button mask
in 4 byte units */
xXIModifierInfo mods;
xXIGroupInfo group;
} xXIEnterEvent;
typedef xXIEnterEvent xXILeaveEvent;
typedef xXIEnterEvent xXIFocusInEvent;
typedef xXIEnterEvent xXIFocusOutEvent;
/**
* Sent when a device property is created, modified or deleted. Does not
* include property data, the client is required to query the data.
*/
typedef struct
{
uint8_t type; /**< Always GenericEvent */
uint8_t extension; /**< XI extension offset */
uint16_t sequenceNumber;
uint32_t length; /**< Length in 4 byte uints */
uint16_t evtype; /**< ::XI_PropertyEvent */
uint16_t deviceid;
Time time;
Atom property;
uint8_t what; /**< ::XIPropertyDeleted,
::XIPropertyCreated,
::XIPropertyMotified */
uint8_t pad0;
uint16_t pad1;
uint32_t pad2;
uint32_t pad3;
} xXIPropertyEvent;
#undef Window
#undef Time
#undef Atom
#undef Cursor
#endif /* _XI2PROTO_H_ */

1677
proto/inputproto/XI2proto.txt Normal file
View File

File diff suppressed because it is too large Load Diff

1273
proto/inputproto/XInput.h
View File

File diff suppressed because it is too large Load Diff

1038
proto/inputproto/XIproto.h
View File

File diff suppressed because it is too large Load Diff

2542
proto/inputproto/XIproto.txt Normal file
View File

File diff suppressed because it is too large Load Diff

8
proto/inputproto/configure.ac
View File

@ -1,8 +1,12 @@
AC_PREREQ([2.57])
AC_INIT([InputProto], [1.5.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_INIT([InputProto], [2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
inputproto.pc])