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 /src | |
| 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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/XIHierarchy.c | 14 |
1 files changed, 7 insertions, 7 deletions
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; } |