fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2026-05-08 12:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename XICreateMaster to XIAddMaster for consistency.

Browse source 
We use add/remove for slave devices, add/remove for the hierarchy changed
flags, so let's use add/remove to create a new device as well.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-06-08 13:31:28 +10:00
parent 44f2419e56
commit 751f2d6c0f
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
XI2.h
View file

@ -84,7 +84,7 @@
#define XIDeviceDisabled (1 << 7)
/* ChangeHierarchy constants */
#define XICreateMaster 1
#define XIAddMaster 1
#define XIRemoveMaster 2
#define XIAttachSlave 3
#define XIDetachSlave 4

4
XI2proto.h
View file

@ -456,12 +456,12 @@ typedef struct {
* Name of new master follows struct (4-byte padded)
*/
typedef struct {
uint16_t type; /**< Always ::XICreateMaster */
uint16_t type; /**< Always ::XIAddMaster */
uint16_t length; /**< 2 + (namelen + padding)/4 */
uint16_t name_len;
uint8_t send_core;
uint8_t enable;
} xXICreateMasterInfo;
} xXIAddMasterInfo;
/**
* Delete a master device. Will automatically delete the master device paired

20
XI2proto.txt
View file

@ -510,18 +510,18 @@ XI2. Clients should ignore this data.
changes: LISTofHIERARCHYCHANGES
└───
HIERARCHYCHANGE { CREATEMASTER, REMOVEMASTER, ATTACHSLAVE, DETACHSLAVE }
HIERARCHYCHANGE { ADDMASTER, REMOVEMASTER, ATTACHSLAVE, DETACHSLAVE }
HIERARCHYCHANGETYPE { CreateMaster, RemoveMaster, AttachSlave, DetachSlave }
HIERARCHYCHANGETYPE { AddMaster, RemoveMaster, AttachSlave, DetachSlave }
CHANGEMODE { Float, Attach }
CREATEMASTER { type: HIERARCHYCHANGETYPE
length: CARD16
name_len: CARD16
send_core: BOOL
enable: BOOL
name: LISTofCHAR8 }
ADDMASTER { type: HIERARCHYCHANGETYPE
length: CARD16
name_len: CARD16
send_core: BOOL
enable: BOOL
name: LISTofCHAR8 }
REMOVEMASTER { type: HIERARCHYCHANGETYPE
length: CARD16
@ -551,9 +551,9 @@ XI2. Clients should ignore this data.
immediately. If an error occurs, processing stops at the current change
and returns the number of successfully applied changes in the error.
CREATEMASTER creates a pair of master devices.
ADDMASTER creates a pair of master devices.
type
Always CreateMaster.
Always AddMaster.
length
Length in 4 byte units.
name_len