[Xcb-commit] xcb xcb-proto
Ian Osgood
iano at kemper.freedesktop.org
Wed Mar 15 22:44:36 PST 2006
xcb-proto/src/xcb.xsd | 6 -
xcb-proto/src/xproto.xml | 232 ++++++++++++++++++++++++++++++++---------------
xcb/src/c-client.xsl | 2
3 files changed, 164 insertions(+), 76 deletions(-)
New commits:
diff-tree 02c0430a4da0769e0311cd4da401c0698e83c6be (from 0d0a38bb97c5c9bdbe106f1a1027b79a4806eb47)
Author: Ian Osgood <iano at quirkster.com>
Date: Wed Mar 15 22:41:08 2006 -0800
Change <bit> syntax to <bit>n</bit> as Jamey and Josh suggested
and add more button, key, and graphics enumerations.
diff --git a/xcb-proto/src/xcb.xsd b/xcb-proto/src/xcb.xsd
index 8b3e1fd..4fa1fad 100644
--- a/xcb-proto/src/xcb.xsd
+++ b/xcb-proto/src/xcb.xsd
@@ -88,11 +88,7 @@ authorization from the authors.
</xsd:element>
<xsd:element name="fieldref" type="xsd:string" />
<xsd:element name="value" type="dec-or-hex-integer" />
- <xsd:element name="bit">
- <xsd:complexType>
- <xsd:attribute name="bit" type="xsd:integer" use="required" />
- </xsd:complexType>
- </xsd:element>
+ <xsd:element name="bit" type="xsd:integer" />
</xsd:choice>
</xsd:group>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 3571ae1..7b6f4d5 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -27,6 +27,17 @@ authorization from the authors.
-->
<xcb header="xproto">
<!-- Core event and error types -->
+
+ <enum name="ModMask">
+ <item name="Shift"> <bit>0</bit></item>
+ <item name="Lock"> <bit>1</bit></item>
+ <item name="Control"><bit>2</bit></item>
+ <item name="1"> <bit>3</bit></item>
+ <item name="2"> <bit>4</bit></item>
+ <item name="3"> <bit>5</bit></item>
+ <item name="4"> <bit>6</bit></item>
+ <item name="5"> <bit>7</bit></item>
+ </enum>
<event name="KeyPress" number="2">
<field type="KEYCODE" name="detail" />
@@ -44,6 +55,15 @@ authorization from the authors.
<eventcopy name="KeyRelease" number="3" ref="KeyPress" />
+ <enum name="ButtonMask">
+ <item name="1"> <bit>8</bit></item>
+ <item name="2"> <bit>9</bit></item>
+ <item name="3"> <bit>10</bit></item>
+ <item name="4"> <bit>11</bit></item>
+ <item name="5"> <bit>12</bit></item>
+ <item name="Any"> <bit>15</bit></item>
+ </enum>
+
<event name="ButtonPress" number="4">
<field type="BUTTON" name="detail" />
<field type="TIMESTAMP" name="time" />
@@ -353,21 +373,21 @@ authorization from the authors.
<!-- Window attributes for CreateWindow and ChangeWindowAttributes. -->
<enum name="CW">
- <item name="BackPixmap"> <bit bit="0" /></item>
- <item name="BackPixel"> <bit bit="1" /></item>
- <item name="BorderPixmap"> <bit bit="2" /></item>
- <item name="BorderPixel"> <bit bit="3" /></item>
- <item name="BitGravity"> <bit bit="4" /></item>
- <item name="WinGravity"> <bit bit="5" /></item>
- <item name="BackingStore"> <bit bit="6" /></item>
- <item name="BackingPlanes"> <bit bit="7" /></item>
- <item name="BackingPixel"> <bit bit="8" /></item>
- <item name="OverrideRedirect"><bit bit="9" /></item>
- <item name="SaveUnder"> <bit bit="10" /></item>
- <item name="EventMask"> <bit bit="11" /></item>
- <item name="DontPropagate"> <bit bit="12" /></item>
- <item name="Colormap"> <bit bit="13" /></item>
- <item name="Cursor"> <bit bit="14" /></item>
+ <item name="BackPixmap"> <bit>0</bit></item>
+ <item name="BackPixel"> <bit>1</bit></item>
+ <item name="BorderPixmap"> <bit>2</bit></item>
+ <item name="BorderPixel"> <bit>3</bit></item>
+ <item name="BitGravity"> <bit>4</bit></item>
+ <item name="WinGravity"> <bit>5</bit></item>
+ <item name="BackingStore"> <bit>6</bit></item>
+ <item name="BackingPlanes"> <bit>7</bit></item>
+ <item name="BackingPixel"> <bit>8</bit></item>
+ <item name="OverrideRedirect"><bit>9</bit></item>
+ <item name="SaveUnder"> <bit>10</bit></item>
+ <item name="EventMask"> <bit>11</bit></item>
+ <item name="DontPropagate"> <bit>12</bit></item>
+ <item name="Colormap"> <bit>13</bit></item>
+ <item name="Cursor"> <bit>14</bit></item>
</enum>
<enum name="BackingStore">
@@ -378,31 +398,31 @@ authorization from the authors.
<enum name="EventMask">
<item name="NoEvent"> <value>0</value></item>
- <item name="KeyPress"> <bit bit="0" /></item>
- <item name="KeyRelease"> <bit bit="1" /></item>
- <item name="ButtonPress"> <bit bit="2" /></item>
- <item name="ButtonRelease"> <bit bit="3" /></item>
- <item name="EnterWindow"> <bit bit="4" /></item>
- <item name="LeaveWindow"> <bit bit="5" /></item>
- <item name="PointerMotion"> <bit bit="6" /></item>
- <item name="PointerMotionHint"> <bit bit="7" /></item>
- <item name="Button1Motion"> <bit bit="8" /></item>
- <item name="Button2Motion"> <bit bit="9" /></item>
- <item name="Button3Motion"> <bit bit="10" /></item>
- <item name="Button4Motion"> <bit bit="11" /></item>
- <item name="Button5Motion"> <bit bit="12" /></item>
- <item name="ButtonMotion"> <bit bit="13" /></item>
- <item name="KeymapState"> <bit bit="14" /></item>
- <item name="Exposure"> <bit bit="15" /></item>
- <item name="VisibilityChange"> <bit bit="16" /></item>
- <item name="StructureNotify"> <bit bit="17" /></item>
- <item name="ResizeRedirect"> <bit bit="18" /></item>
- <item name="SubstructureNotify"> <bit bit="19" /></item>
- <item name="SubstructureRedirect"><bit bit="20" /></item>
- <item name="FocusChange"> <bit bit="21" /></item>
- <item name="PropertyChange"> <bit bit="22" /></item>
- <item name="ColorMapChange"> <bit bit="23" /></item>
- <item name="OwnerGrabButton"> <bit bit="24" /></item>
+ <item name="KeyPress"> <bit>0</bit></item>
+ <item name="KeyRelease"> <bit>1</bit></item>
+ <item name="ButtonPress"> <bit>2</bit></item>
+ <item name="ButtonRelease"> <bit>3</bit></item>
+ <item name="EnterWindow"> <bit>4</bit></item>
+ <item name="LeaveWindow"> <bit>5</bit></item>
+ <item name="PointerMotion"> <bit>6</bit></item>
+ <item name="PointerMotionHint"> <bit>7</bit></item>
+ <item name="Button1Motion"> <bit>8</bit></item>
+ <item name="Button2Motion"> <bit>9</bit></item>
+ <item name="Button3Motion"> <bit>10</bit></item>
+ <item name="Button4Motion"> <bit>11</bit></item>
+ <item name="Button5Motion"> <bit>12</bit></item>
+ <item name="ButtonMotion"> <bit>13</bit></item>
+ <item name="KeymapState"> <bit>14</bit></item>
+ <item name="Exposure"> <bit>15</bit></item>
+ <item name="VisibilityChange"> <bit>16</bit></item>
+ <item name="StructureNotify"> <bit>17</bit></item>
+ <item name="ResizeRedirect"> <bit>18</bit></item>
+ <item name="SubstructureNotify"> <bit>19</bit></item>
+ <item name="SubstructureRedirect"><bit>20</bit></item>
+ <item name="FocusChange"> <bit>21</bit></item>
+ <item name="PropertyChange"> <bit>22</bit></item>
+ <item name="ColorMapChange"> <bit>23</bit></item>
+ <item name="OwnerGrabButton"> <bit>24</bit></item>
</enum>
<request name="CreateWindow" opcode="1">
@@ -506,13 +526,13 @@ authorization from the authors.
</request>
<enum name="ConfigWindow">
- <item name="X"> <bit bit="0" /></item>
- <item name="Y"> <bit bit="1" /></item>
- <item name="Width"> <bit bit="2" /></item>
- <item name="Height"> <bit bit="3" /></item>
- <item name="BorderWidth"><bit bit="4" /></item>
- <item name="Sibling"> <bit bit="5" /></item>
- <item name="StackMode"> <bit bit="6" /></item>
+ <item name="X"> <bit>0</bit></item>
+ <item name="Y"> <bit>1</bit></item>
+ <item name="Width"> <bit>2</bit></item>
+ <item name="Height"> <bit>3</bit></item>
+ <item name="BorderWidth"><bit>4</bit></item>
+ <item name="Sibling"> <bit>5</bit></item>
+ <item name="StackMode"> <bit>6</bit></item>
</enum>
<request name="ConfigureWindow" opcode="12">
@@ -1022,29 +1042,90 @@ authorization from the authors.
</request>
<enum name="GC">
- <item name="Function"> <bit bit="0" /> </item>
- <item name="PlaneMask"> <bit bit="1" /> </item>
- <item name="Foreground"> <bit bit="2" /> </item>
- <item name="Background"> <bit bit="3" /> </item>
- <item name="LineWidth"> <bit bit="4" /> </item>
- <item name="LineStyle"> <bit bit="5" /> </item>
- <item name="CapStyle"> <bit bit="6" /> </item>
- <item name="JoinStyle"> <bit bit="7" /> </item>
- <item name="FillStyle"> <bit bit="8" /> </item>
- <item name="FillRule"> <bit bit="9" /> </item>
- <item name="Tile"> <bit bit="10" /> </item>
- <item name="Stipple"> <bit bit="11" /> </item>
- <item name="TileStippleOriginX"><bit bit="12" /> </item>
- <item name="TileStippleOriginY"><bit bit="13" /> </item>
- <item name="Font"> <bit bit="14" /> </item>
- <item name="SubwindowMode"> <bit bit="15" /> </item>
- <item name="GraphicsExposures"> <bit bit="16" /> </item>
- <item name="ClipOriginX"> <bit bit="17" /> </item>
- <item name="ClipOriginY"> <bit bit="18" /> </item>
- <item name="Mask"> <bit bit="19" /> </item>
- <item name="DashOffset"> <bit bit="20" /> </item>
- <item name="DashList"> <bit bit="21" /> </item>
- <item name="ArcMode"> <bit bit="22" /> </item>
+ <item name="Function"> <bit>0</bit></item>
+ <item name="PlaneMask"> <bit>1</bit></item>
+ <item name="Foreground"> <bit>2</bit></item>
+ <item name="Background"> <bit>3</bit></item>
+ <item name="LineWidth"> <bit>4</bit></item>
+ <item name="LineStyle"> <bit>5</bit></item>
+ <item name="CapStyle"> <bit>6</bit></item>
+ <item name="JoinStyle"> <bit>7</bit></item>
+ <item name="FillStyle"> <bit>8</bit></item>
+ <item name="FillRule"> <bit>9</bit></item>
+ <item name="Tile"> <bit>10</bit></item>
+ <item name="Stipple"> <bit>11</bit></item>
+ <item name="TileStippleOriginX"><bit>12</bit></item>
+ <item name="TileStippleOriginY"><bit>13</bit></item>
+ <item name="Font"> <bit>14</bit></item>
+ <item name="SubwindowMode"> <bit>15</bit></item>
+ <item name="GraphicsExposures"> <bit>16</bit></item>
+ <item name="ClipOriginX"> <bit>17</bit></item>
+ <item name="ClipOriginY"> <bit>18</bit></item>
+ <item name="Mask"> <bit>19</bit></item>
+ <item name="DashOffset"> <bit>20</bit></item>
+ <item name="DashList"> <bit>21</bit></item>
+ <item name="ArcMode"> <bit>22</bit></item>
+ </enum>
+
+ <!-- GC Function values -->
+ <enum name="GX">
+ <item name="clear"> <value>0x0</value></item>
+ <item name="and"> <value>0x1</value></item>
+ <item name="andReverse"> <value>0x2</value></item>
+ <item name="copy"> <value>0x3</value></item>
+ <item name="andInverted"> <value>0x4</value></item>
+ <item name="noop"> <value>0x5</value></item>
+ <item name="xor"> <value>0x6</value></item>
+ <item name="or"> <value>0x7</value></item>
+ <item name="nor"> <value>0x8</value></item>
+ <item name="equiv"> <value>0x9</value></item>
+ <item name="invert"> <value>0xa</value></item>
+ <item name="orReverse"> <value>0xb</value></item>
+ <item name="copyInverted"><value>0xc</value></item>
+ <item name="orInverted"> <value>0xd</value></item>
+ <item name="nand"> <value>0xe</value></item>
+ <item name="set"> <value>0xf</value></item>
+ </enum>
+
+ <enum name="LineStyle">
+ <item name="Solid"> <value>0</value></item>
+ <item name="OnOffDash"> <value>1</value></item>
+ <item name="DoubleDash"><value>2</value></item>
+ </enum>
+
+ <enum name="CapStyle">
+ <item name="NotLast"> <value>0</value></item>
+ <item name="Cap"> <value>1</value></item>
+ <item name="Butt"> <value>2</value></item>
+ <item name="Projecting"><value>3</value></item>
+ </enum>
+
+ <enum name="JoinStyle">
+ <item name="Mitre"> <value>0</value></item>
+ <item name="Round"> <value>1</value></item>
+ <item name="Bevel"> <value>2</value></item>
+ </enum>
+
+ <enum name="FillStyle">
+ <item name="Solid"> <value>0</value></item>
+ <item name="Tiled"> <value>1</value></item>
+ <item name="Stippled"> <value>2</value></item>
+ <item name="OpaqueStippled"><value>3</value></item>
+ </enum>
+
+ <enum name="FillRule">
+ <item name="EvenOdd"><value>0</value></item>
+ <item name="Winding"><value>1</value></item>
+ </enum>
+
+ <enum name="SubwindowMode">
+ <item name="ClipByChildren"> <value>0</value></item>
+ <item name="IncludeInferiors"><value>1</value></item>
+ </enum>
+
+ <enum name="ArcMode">
+ <item name="Chord"> <value>0</value></item>
+ <item name="PieSlice"><value>1</value></item>
</enum>
<request name="CreateGC" opcode="55">
@@ -1724,6 +1805,17 @@ authorization from the authors.
</list>
</reply>
</request>
+
+ <enum name="MapIndex">
+ <item name="Shift"> <value>0</value></item>
+ <item name="Lock"> <value>1</value></item>
+ <item name="Control"><value>2</value></item>
+ <item name="1"> <value>3</value></item>
+ <item name="2"> <value>4</value></item>
+ <item name="3"> <value>5</value></item>
+ <item name="4"> <value>6</value></item>
+ <item name="5"> <value>7</value></item>
+ </enum>
<request name="SetModifierMapping" opcode="118">
<field type="CARD8" name="keycodes_per_modifier" />
diff --git a/xcb/src/c-client.xsl b/xcb/src/c-client.xsl
index 6306a5c..56dbaac 100644
--- a/xcb/src/c-client.xsl
+++ b/xcb/src/c-client.xsl
@@ -1091,7 +1091,7 @@ authorization from the authors.
<xsl:template match="bit" mode="output-expression">
<xsl:text>(1 << </xsl:text>
- <xsl:value-of select="@bit" />
+ <xsl:value-of select="." />
<xsl:text>)</xsl:text>
</xsl:template>
More information about the xcb-commit
mailing list