summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-14xkb: Add struct Property as per spec (commented out)HEADmasterRan Benita1-0/+8
The specification says that Property is a struct of two CountedString16 (name and value). This form can't be handled atm. correctly too. But, add it as a comment so we've it at hand when we know what to do with it. All credits go to Ran Benita, as he found this. Signed-off-by: Daniel Martin <consume.noise@gmail.com>
2013-11-14xkb: Comment out intermixed fixed size fields and listsDaniel Martin1-0/+4
c_client.py doesn't handle such intermixed fixed size fields and lists correctly. Therefor comment them out. With that change the size of the generated request structure for ListComponents has 8 Bytes which is the same as xkbListComponentsReq has and the server checks REQUEST_AT_LEAST_SIZE(xkbListComponentsReq). The same goes for GetKbdByName, which results in a structure of 12 Bytes. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-11-14xkb: Comment out the struct Property and {Get, Set}GeometryDaniel Martin1-4/+8
This struct has intermixed fixed size fields and lists, which c_client.py doesn't handle properly. Therefor comment out the struct and the fields type-referencing it. As doodads are commented out already and with Property gone the requests GetGeomtry and SetGeometry become pretty much useless. Therefor comment them out completly. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-11-14xkb: Comment out DoodadsDaniel Martin1-0/+8
Doodads are known to be broken (*). Comment them out until they can be handled properly. (*) One problem is that TextDoodad and LogoDoodad have variadic lists at the end. But, they're within a union with other fixed size Doodads. A union doesn't have a hint which field is in use and therefor the code generator (at least c_client.py) just creates a generic iterator for the Doodad union, which fails for TextDoodad and LogoDoodad. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-11-14Add note on pretty patches and src/.gitattributesDaniel Martin2-0/+21
Add a file HACKING describing howto to prettify patches (their hunk headers) and add src/.gitattributes, which is necessary for that. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-11-14xv: Remove obsolete comments in EncodingInfo and QueryEncodingsDaniel Martin1-8/+0
The padding in EncodingInfo (struct) and QueryEncodings (reply) has been fixed upstream: Xvproto: fix xvEncodingInfo to match actual wire protocol http://cgit.freedesktop.org/xorg/proto/videoproto/commit/?id=d970512 and Xvproto.h: fix xvQueryEncodingsReply to match actual wire protocol http://cgit.freedesktop.org/xorg/proto/videoproto/commit/?id=1a96222 So, we can remove the comments. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Arnaud Fontaine <arnau@debian.org>
2013-11-14xinput: Add XI2 event enum. for event selectionDaniel Martin1-1/+33
This adds an enumeration 'XIEventMask', which is necessary to select for XI2 events via the SelectEvent request. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-11-14xcbgen: Remove tab from xtypes.py.Matt Turner1-1/+1
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71418
2013-11-07Update to version 1.9xcb-proto-1.9Keith Packard1-1/+1
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-07Add 'fd' element to fields group, fix present Generic event to validateKeith Packard2-1/+5
This fixes 'make check' Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-07Add Present protocol specificationKeith Packard2-0/+206
Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Harris <pharris@opentext.com>
2013-11-07Add DRI3Keith Packard2-0/+98
Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Harris <pharris@opentext.com>
2013-11-07Add MIT-SHM AttachFd and CreateSegment requestsKeith Packard1-1/+20
Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Harris <pharris@opentext.com>
2013-11-07Add support for file descriptor request fieldsKeith Packard2-2/+21
These are present in the API, but not present on the wire. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-11-06Define X generic event structureKeith Packard1-1/+15
This is used by libxcb, and was defined explicitly there but it's cleaner to use the XML specification. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Harris <pharris@opentext.com>
2013-11-06Add CARD64/INT64 protocol typesKeith Packard2-0/+4
No reason to make people use two 32-bit values when every modern compiler has native 64-bit objects. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-11-06Move the INT64 types in sync.xml to the sync: namespaceKeith Packard1-12/+12
This makes sure we use the crazy sync-specific 64-bit datatype instead of the global INT64 type Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Harris <pharris@opentext.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-11-05XKB: Rewrite AXOptionPeter Harris1-17/+9
AXOption can be an <enum> instead of a <union>, which is a much simpler construct. Signed-off-by: Peter Harris <pharris@opentext.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-11-05XKB: Fix values of AXFBOpt enumPeter Harris1-4/+4
Signed-off-by: Peter Harris <pharris@opentext.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-10-11xkb: Fix struct ExtensionDeviceNotifyDaniel Martin1-1/+1
The field ledId is of type CARD16, not CARD8, see XKBproto.h. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-10-11xkb: Pad structs CommonDoodad and SALockDeviceBtnDaniel Martin1-0/+2
* CommonDoodad is xkbAnyDoodadWireDesc in XKBproto.h. There it has a size of 20 like all Doodads: #define sz_xkbAnyDoodadWireDesc 20 Add the necessary 8 bytes of padding. * SALockDeviceBtn is an Action. All Actions are handled by the server and libX11 with sizeof(xkbActionWireDesc) or SIZEOF(xkbActionWireDesc). Which results in a size of 8: #define sz_xkbActionWireDesc 8 /* in XKBproto.h */ Add the necessary 3 bytes of padding. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com>
2013-10-11randr: Fix GetProviderProperty replyDaniel Martin1-2/+1
The first field has to be 'format' not a pad and 'num_items' is of type CARD32. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Arnaud Fontaine <arnau@debian.org>
2013-08-25Enforce a bit or value in enum itemsDaniel Martin1-1/+4
Do not allow enum items without an explicit bit or value. The value of an enum item is known when adding the enum to the xml specification. There's no reason why this information shouldn't be where it belongs to. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25xv: Use explicit enum valueDaniel Martin1-17/+17
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25xproto: Use explicit enum valueDaniel Martin1-68/+68
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25xinput: Use explicit enum valueDaniel Martin1-56/+56
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25xfixes: Use explicit enum valueDaniel Martin1-11/+11
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25xevie: Use explicit enum valueDaniel Martin1-2/+2
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25sync: Use explicit enum valueDaniel Martin1-9/+9
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25shape: Use explicit enum valueDaniel Martin1-8/+8
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25screensaver: Use explicit enum valueDaniel Martin1-7/+7
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25render: Use explicit enum valueDaniel Martin1-70/+70
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25dri2: Use explicit enum valueDaniel Martin1-13/+13
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25randr: Use explicit enum valueDaniel Martin1-3/+3
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25dpms: Use explicit enum valueDaniel Martin1-4/+4
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25damage: Use explicit enum valueDaniel Martin1-4/+4
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-25composite: Use explicit enum valueDaniel Martin1-2/+2
Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Ran Benita <ran234@gmail.com> (and tested) Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2013-08-15xkb: Add missing LedClass and BellClass enum valuesRan Benita1-3/+7
The protocol encoding says: http://www.x.org/releases/current/doc/kbproto/xkbproto.html#appD::Common_Types KB_LEDCLASSRESULT 0 KbdFeedbackClass 4 LedFeedbackClass KB_LEDCLASSSPEC Encoding same as KB_LEDCLASSRESULT, with the addition of: #x0300 XkbDfltXIClass #x0500 XkbAllXIClasses KB_BELLCLASSRESULT 0 KbdFeedbackClass 5 BellFeedbackClass KB_BELLCLASSSPEC Encoding same as KB_BELLCLASSRESULT, with the addition of: #x0300 XkbDfltXIClass Note that the spec says something slightly different in another section: http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Common_Types KB_LEDCLASSSPEC { KbdFeedbackClass , LedFeedbackClass , DfltXIClass , AllXIClasses , XINone } KB_BELLCLASSSPEC { KbdFeedbackClass , BellFeedbackClass , DfltXIClass , AllXIClasses }} From what I could gather, the encoding is the correct one (but I'm not sure). Signed-off-by: Ran Benita <ran234@gmail.com> Reviewed-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15xkb: Add missing 'supported' field to GetNamedIndicator replyRan Benita1-0/+1
The protocol encoding has it: http://www.x.org/releases/current/doc/kbproto/xkbproto.html#appD::Requests 1 CARD8 opcode 1 15 xkb-opcode [...] 1 1 Reply 1 CARD8 deviceID 2 CARD16 sequence number [...] 4 SETofKB_BOOLCTRL map.ctrls 1 BOOL supported 3 unused And xkbGetNamedIndicatorReply in XKBproto.h also. Finally, the server does send it, though it's always TRUE. Signed-off-by: Ran Benita <ran234@gmail.com> Reviewed-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15xkb: Unify Overlay1Behavior and Overlay2BehaviorRan Benita1-12/+6
These two structs are used by the server in the exact same way, and are handled together (see xkb/xkbPrKeyEv.c, XkbKB_Overlay{1,2} handling). There is no need to use different (and for some reason slightly different) types for them. Reviewed-by: Daniel Martin <consume.noise@gmail.com> Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15xkb: Change DfltBtnAbsolute to the value used by the serverRan Benita1-1/+2
The spec says: #x02 XkbSA_DfltBtnAbsolute But /usr/include/X11/extensions/XKB.h has: #define XkbSA_DfltBtnAbsolute (1L << 2) which is what the server sends. Note: the XKB spec was changed by Daniel Martin to match the Xlib value. See kbproto commit db07706cb268d5fe1bc38ef5c0a9f49309068b2c. Reviewed-by: Daniel Martin <consume.noise@gmail.com> Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15xkb: Fix key type map entry field orderRan Benita1-4/+0
In fact, unlike the deleted comment says, both Xlib and the server use the order as specified in the protocol spec: http://www.x.org/releases/current/doc/kbproto/xkbproto.html#appD::Requests (Search for KB_KTMAPENTRY). Also see struct xkbKTMapEntryWireDesc in /usr/include/X11/extensions/XKBproto.h Reviewed-by: Peter Harris <pharris@opentext.com> Reviewed-by: Daniel Martin <consume.noise@gmail.com> Signed-off-by: Ran Benita <ran234@gmail.com>
2013-08-15xkb: Work around alignment problems in GetNames and GetMap repliesRan Benita1-0/+70
The basic situation is this: a list of CARD8/CARD16s followed by a list of CARD16/CARD32s. In the current code, the second list is aligned to 1/2 bytes according the size of the first list. However, in some cases the second list needs to be aligned to 4 bytes per the xkbproto spec: http://www.x.org/releases/current/doc/kbproto/xkbproto.html#appD::Requests XkbGetMap reply (xkb-opcode 8): [...] a LISTofCARD8 actsRtrn.count p unused,p=pad(a) 8A LISTofKB_ACTION actsRtrn.acts 4B LISTofKB_SETBEHAVIOR behaviorsRtrn v LISTofSETofKEYMASK vmodsRtrn p unused, p=pad(v) 2E LISTofKB_SETEXPLICIT explicitRtrn p unused,p=pad(2E) 2M LISTofKB_KEYMODMAP modmapRtrn p unused, p=pad(2M) [...] XkbGetNames reply (xkb-opcode 17): [...] l LISTofCARD8 nLevelsPerType, sum of all elements=L p unused, p=pad(l) [...] The server and Xlib handle this with calls to XkbPaddedSize(), which is a good way to see where the extra padding is needed. Signed-off-by: Ran Benita <ran234@gmail.com> Reviewed-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15xproto: Fix GContext error references in documentationDaniel Martin1-9/+9
The name of the error is GContext, not GC. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-By: Ran Benita <ran234@gmail.com>
2013-08-15xinput: Use BARRIER from xfixesDaniel Martin1-6/+3
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15xinput: Unlock uninterpreted listsDaniel Martin1-7/+64
The 'uninterpreted_data' lists have been added to pad the structure at runtime and thereby making lists of such structures iterable. This is a temporary solution until it is possible to nest a <switch> in a <struct> correctly. Signed-off-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15xinput: Add XI v2.3Daniel Martin1-1/+46
Introduced with v2.3 has been Pointer Barrier support, including a new request (XIBarrierReleasePointer) and 2 events (Barrier{Hit,Leave}). Signed-off-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15xinput: Add XI v2.2Daniel Martin1-1/+83
Introduced with v2.2 has been Multitouch support and therefor 7 new events: (Raw)Touch{Begin,Update,End} and TouchOwnership. Signed-off-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15xinput: Add XI v2.1Daniel Martin1-1/+46
Introduced with v2.1 has been Raw event support and therefor 5 new events: Raw{Key,Button}{Press,Release} and RawMotion. Signed-off-by: Daniel Martin <consume.noise@gmail.com>
2013-08-15xinput: Add XI v2.0Daniel Martin1-2/+797
Introduced with v2.0 have been various new types, structures, 21 requests and 12 XGE events. All new requests have the "XI" prefix in the name. This prefix can be found in the spec too and avoids name clashes with requests found in prior versions of XI (at least that's (Un)GrabDevice). All new events are X Generic Events. They've a different header then "normal" events. Therefor we've to mark them with the attribute 'xge' set to 'true'. To prevent another name clash one new structure had to be prefixed, too: XIDeviceInfo. Signed-off-by: Daniel Martin <consume.noise@gmail.com>