diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-04 13:44:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-04 13:44:39 +0200 |
| commit | 2433c3693663c0ace48aee718c10a6b78207b7cf (patch) | |
| tree | 8c569c4af28c0e365d64d432957b20c9aa0b4953 /libxcb | |
| parent | fadba36545cbab5859bf346921bf416d0160a5b2 (diff) | |
| parent | 2ecad38adbeaa652daaab8f2a6d112921b7e74eb (diff) | |
| download | vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.tar.gz vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.tar.bz2 vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa libxcb git update 4 jul 2013
Diffstat (limited to 'libxcb')
| -rw-r--r-- | libxcb/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | libxcb/xcb-proto/src/sync.xml | 62 |
2 files changed, 56 insertions, 9 deletions
diff --git a/libxcb/tests/Makefile.am b/libxcb/tests/Makefile.am index 077681e51..20bdc7217 100644 --- a/libxcb/tests/Makefile.am +++ b/libxcb/tests/Makefile.am @@ -12,9 +12,6 @@ TESTS = check_all check_PROGRAMS = check_all check_all_SOURCES = check_all.c check_suites.h check_public.c -all-local:: - $(RM) CheckLog*.xml - check-local: check-TESTS $(RM) CheckLog.html if test x$(HTML_CHECK_RESULT) = xtrue; then \ diff --git a/libxcb/xcb-proto/src/sync.xml b/libxcb/xcb-proto/src/sync.xml index 516d149ab..8a5194752 100644 --- a/libxcb/xcb-proto/src/sync.xml +++ b/libxcb/xcb-proto/src/sync.xml @@ -134,16 +134,66 @@ for licensing information. <request name="CreateAlarm" opcode="8"> <field type="ALARM" name="id" /> - <valueparam value-mask-type="CARD32" - value-mask-name="value_mask" - value-list-name="value_list" /> + <field type="CARD32" name="value_mask" mask="CA" /> + <switch name="value_list"> + <fieldref>value_mask</fieldref> + <bitcase> + <enumref ref="CA">Counter</enumref> + <field type="COUNTER" name="counter" /> + </bitcase> + <bitcase> + <enumref ref="CA">ValueType</enumref> + <field type="CARD32" name="valueType" mask="VALUETYPE" /> + </bitcase> + <bitcase> + <enumref ref="CA">Value</enumref> + <field type="INT64" name="value" /> + </bitcase> + <bitcase> + <enumref ref="CA">TestType</enumref> + <field type="CARD32" name="testType" mask="TESTTYPE" /> + </bitcase> + <bitcase> + <enumref ref="CA">Delta</enumref> + <field type="INT64" name="delta" /> + </bitcase> + <bitcase> + <enumref ref="CA">Events</enumref> + <field type="CARD32" name="events" /> + </bitcase> + </switch> </request> <request name="ChangeAlarm" opcode="9"> <field type="ALARM" name="id" /> - <valueparam value-mask-type="CARD32" - value-mask-name="value_mask" - value-list-name="value_list" /> + <field type="CARD32" name="value_mask" mask="CA" /> + <switch name="value_list"> + <fieldref>value_mask</fieldref> + <bitcase> + <enumref ref="CA">Counter</enumref> + <field type="COUNTER" name="counter" /> + </bitcase> + <bitcase> + <enumref ref="CA">ValueType</enumref> + <field type="CARD32" name="valueType" mask="VALUETYPE" /> + </bitcase> + <bitcase> + <enumref ref="CA">Value</enumref> + <field type="INT64" name="value" /> + </bitcase> + <bitcase> + <enumref ref="CA">TestType</enumref> + <field type="CARD32" name="testType" mask="TESTTYPE" /> + </bitcase> + <bitcase> + <enumref ref="CA">Delta</enumref> + <field type="INT64" name="delta" /> + </bitcase> + <bitcase> + <enumref ref="CA">Events</enumref> + <field type="CARD32" name="events" /> + </bitcase> + </switch> </request> <request name="DestroyAlarm" opcode="11"> |