diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-07 15:00:40 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-09 10:56:35 +1000 |
| commit | 05531681e5175b823935e6bdfc53c9b5f63efc9d (patch) | |
| tree | 58ecba2b01933135a91c02fc46af55862c8848b9 | |
| parent | 45d35bcfbe2acd4dd2b560dbc21266e915cbb1e6 (diff) | |
Remove CamelCase use from XIChangeHierarchy.
Everything else uses underscore notation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/X11/extensions/XInput2.h | 10 | ||||
| -rw-r--r-- | man/XIChangeHierarchy.txt | 10 | ||||
| -rw-r--r-- | src/XIHierarchy.c | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index 6b40a6c..6d0f5a0 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -37,22 +37,22 @@ typedef struct { int type; char* name; - Bool sendCore; + Bool send_core; Bool enable; } XICreateMasterInfo; typedef struct { int type; int deviceid; - int returnMode; /* AttachToMaster, Floating */ - int returnPointer; - int returnKeyboard; + int return_mode; /* AttachToMaster, Floating */ + int return_pointer; + int return_keyboard; } XIRemoveMasterInfo; typedef struct { int type; int deviceid; - int newMaster; + int new_master; } XIAttachSlaveInfo; typedef struct { diff --git a/man/XIChangeHierarchy.txt b/man/XIChangeHierarchy.txt index 595da50..95811c6 100644 --- a/man/XIChangeHierarchy.txt +++ b/man/XIChangeHierarchy.txt @@ -52,22 +52,22 @@ DESCRIPTION typedef struct { int type; /* XICreateMaster */ char* name; - Bool sendCore; + Bool send_core; Bool enable; } XICreateMasterInfo; typedef struct { int type; /* XIRemoveMaster */ int deviceid; - int returnMode; - int returnPointer; - int returnKeyboard; + int return_mode; + int return_pointer; + int return_keyboard; } XIRemoveMasterInfo; typedef struct { int type; /* XIAttachSlave */ int deviceid; - int newMaster; + int new_master; } XIAttachSlaveInfo; typedef struct { diff --git a/src/XIHierarchy.c b/src/XIHierarchy.c index 83a7b99..ad0882b 100644 --- a/src/XIHierarchy.c +++ b/src/XIHierarchy.c @@ -98,7 +98,7 @@ XIChangeHierarchy(Display* dpy, XICreateMasterInfo* C = &any->create; xXICreateMasterInfo* c = (xXICreateMasterInfo*)dptr; c->type = C->type; - c->send_core = C->sendCore; + 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; @@ -111,13 +111,13 @@ XIChangeHierarchy(Display* dpy, XIRemoveMasterInfo* R = &any->remove; xXIRemoveMasterInfo* r = (xXIRemoveMasterInfo*)dptr; r->type = R->type; - r->return_mode = R->returnMode; + r->return_mode = R->return_mode; r->deviceid = R->deviceid; r->length = sizeof(xXIRemoveMasterInfo)/4; if (r->return_mode == XIAttachToMaster) { - r->return_pointer = R->returnPointer; - r->return_keyboard = R->returnKeyboard; + r->return_pointer = R->return_pointer; + r->return_keyboard = R->return_keyboard; } dptr += sizeof(xXIRemoveMasterInfo); } @@ -130,7 +130,7 @@ XIChangeHierarchy(Display* dpy, c->type = C->type; c->deviceid = C->deviceid; c->length = sizeof(xXIAttachSlaveInfo)/4; - c->new_master = C->newMaster; + c->new_master = C->new_master; dptr += sizeof(xXIAttachSlaveInfo); } |