diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-08 13:34:50 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-09 10:56:35 +1000 |
| commit | 0254852c8fb0793401368c7afc6041f807ee1d87 (patch) | |
| tree | bda4d4ada550238b969cdb04936d837aae3e73d5 | |
| parent | 4a61fe9f05b8e7214303722dd12195488df9c599 (diff) | |
Rename XICreateMaster to XIAddMaster for consistency.
add/remove is used for slave devices and for flags, so we should use it in
XIChangeHierarchy as well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/X11/extensions/XInput2.h | 4 | ||||
| -rw-r--r-- | man/XIChangeHierarchy.txt | 12 | ||||
| -rw-r--r-- | src/XIHierarchy.c | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index 6d0f5a0..686783a 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -39,7 +39,7 @@ typedef struct { char* name; Bool send_core; Bool enable; -} XICreateMasterInfo; +} XIAddMasterInfo; typedef struct { int type; @@ -62,7 +62,7 @@ typedef struct { typedef union { int type; /* must be first element */ - XICreateMasterInfo create; + XIAddMasterInfo add; XIRemoveMasterInfo remove; XIAttachSlaveInfo attach; XIDetachSlaveInfo detach; diff --git a/man/XIChangeHierarchy.txt b/man/XIChangeHierarchy.txt index 95811c6..ac667bc 100644 --- a/man/XIChangeHierarchy.txt +++ b/man/XIChangeHierarchy.txt @@ -39,22 +39,22 @@ DESCRIPTION The list of changes is any combination of XIAnyHierarchyChangeInfo. The type of a hierarchy change can be - XICreateMaster, XIRemoveMaster, XIAttachSlave or XIDetachSlave. + XIAddMaster, XIRemoveMaster, XIAttachSlave or XIDetachSlave. typedef union { int type; - XICreateMasterInfo create; + XIAddMasterInfo add; XIRemoveMasterInfo remove; XIAttachSlave attach; XIDetachSlave detach; } XIAnyHierarchyChangeInfo; typedef struct { - int type; /* XICreateMaster */ + int type; /* XIAddMaster */ char* name; Bool send_core; Bool enable; - } XICreateMasterInfo; + } XIAddMasterInfo; typedef struct { int type; /* XIRemoveMaster */ @@ -75,12 +75,12 @@ DESCRIPTION int deviceid; } XIDetachSlaveInfo; - XICreateMasterInfo creates a new master pointer and a new + XIAddMasterInfo creates a new master pointer and a new master keyboard labelled "name pointer" and "name keyboard" respectively. If sendCore is True, the devices will send core events. If enable is True, the device is enabled immediately. - XICreateMasterInfo can generate a BadValue error. + XIAddMasterInfo can generate a BadValue error. XIRemoveMasterInfo removes device and its paired master device. If returnMode is XIAttachToMaster, all pointers attached to diff --git a/src/XIHierarchy.c b/src/XIHierarchy.c index ad0882b..9b267bf 100644 --- a/src/XIHierarchy.c +++ b/src/XIHierarchy.c @@ -62,10 +62,10 @@ XIChangeHierarchy(Display* dpy, { switch(any->type) { - case XICreateMaster: + case XIAddMaster: { - int slen = (strlen(any->create.name)); - dlen += sizeof(xXICreateMasterInfo) + + int slen = (strlen(any->add.name)); + dlen += sizeof(xXIAddMasterInfo) + slen + (4 - (slen % 4)); } break; @@ -93,15 +93,15 @@ XIChangeHierarchy(Display* dpy, { switch(any->type) { - case XICreateMaster: + case XIAddMaster: { - XICreateMasterInfo* C = &any->create; - xXICreateMasterInfo* c = (xXICreateMasterInfo*)dptr; + XIAddMasterInfo* C = &any->add; + xXIAddMasterInfo* c = (xXIAddMasterInfo*)dptr; c->type = C->type; c->send_core = C->send_core; c->enable = C->enable; c->name_len = strlen(C->name); - c->length = (sizeof(xXICreateMasterInfo) + c->name_len + 3)/4; + c->length = (sizeof(xXIAddMasterInfo) + c->name_len + 3)/4; strncpy((char*)&c[1], C->name, c->name_len); dptr += c->length; } |