[Xcb-commit] 2 commits - src

[Peter Harris]

 src/screensaver.xml |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 879c119ff6ddba4d58d2f173629c908c9296a81c
Author: Daniel Martin <consume.noise at gmail.com>
Date:   Thu May 23 22:35:03 2013 +0200

    screensaver: Use enum and mask attributes
    
    Signed-off-by: Daniel Martin <consume.noise at gmail.com>
    Signed-off-by: Peter Harris <pharris at opentext.com>

diff --git a/src/screensaver.xml b/src/screensaver.xml
index 74d4ba7..7449c0a 100644
--- a/src/screensaver.xml
+++ b/src/screensaver.xml
@@ -75,14 +75,14 @@ Draft Standard Version 1.1
       <field type="CARD32" name="ms_until_server"/>
       <field type="CARD32" name="ms_since_user_input"/>
       <field type="CARD32" name="event_mask" />
-      <field type="BYTE" name="kind"/>  <!-- enum Kind -->
+      <field type="BYTE" name="kind" enum="Kind"/>
       <pad bytes="7"/>
     </reply>
   </request>
 
   <request name="SelectInput" opcode="2">
     <field type="DRAWABLE" name="drawable"/>
-    <field type="CARD32" name="event_mask" />   <!-- enum Event -->
+    <field type="CARD32" name="event_mask" mask="Event"/>
   </request>
 
   <request name="SetAttributes" opcode="3">
@@ -92,7 +92,7 @@ Draft Standard Version 1.1
     <field type="CARD16" name="width"/>
     <field type="CARD16" name="height"/>
     <field type="CARD16" name="border_width"/>
-    <field type="BYTE" name="class"/>   <!-- enum XCBWindowClass -->
+    <field type="BYTE" name="class" enum="WindowClass"/>
     <field type="CARD8" name="depth"/>
     <field type="VISUALID" name="visual"/>
     <valueparam value-mask-type="CARD32"
@@ -113,11 +113,11 @@ Draft Standard Version 1.1
   <!-- Events -->
 
   <event name="Notify" number="0">
-    <field type="BYTE" name="state"/>    <!-- enum State -->
+    <field type="BYTE" name="state" enum="State"/>
     <field type="TIMESTAMP" name="time"/>
     <field type="WINDOW" name="root"/>
     <field type="WINDOW" name="window"/>
-    <field type="BYTE" name="kind"/>     <!-- enum Kind -->
+    <field type="BYTE" name="kind" enum="Kind"/>
     <field type="BOOL" name="forced"/>
     <pad bytes="14"/>
   </event>
commit a50670c49e0c4aa7ec4faf5356c88bd94ef47dff
Author: Daniel Martin <consume.noise at gmail.com>
Date:   Thu May 23 22:35:02 2013 +0200

    screensaver: Remove wrong fields from Notify event
    
    This fixes bug #63158:
        screensaver notify event specification is incorrect
        https://bugs.freedesktop.org/show_bug.cgi?id=63158
    
    As stated in the bug report the response_type and sequence field will be
    added automatically while parsing the specification. Additionally, the
    pad field is wrong.
    
    Signed-off-by: Daniel Martin <consume.noise at gmail.com>
    Signed-off-by: Peter Harris <pharris at opentext.com>

diff --git a/src/screensaver.xml b/src/screensaver.xml
index 9c7bccb..74d4ba7 100644
--- a/src/screensaver.xml
+++ b/src/screensaver.xml
@@ -113,10 +113,7 @@ Draft Standard Version 1.1
   <!-- Events -->
 
   <event name="Notify" number="0">
-    <field type="CARD8" name="code"/>
     <field type="BYTE" name="state"/>    <!-- enum State -->
-    <pad bytes="1" />
-    <field type="CARD16" name="sequence_number"/>
     <field type="TIMESTAMP" name="time"/>
     <field type="WINDOW" name="root"/>
     <field type="WINDOW" name="window"/>