| diff -ru xcbproto/src/glx.xml src/src/glx.xml |
| --- xcbproto/src/glx.xml 2020-09-04 10:01:19.893846873 -0700 |
| +++ src/src/glx.xml 2020-09-04 10:00:42.997648219 -0700 |
| @@ -214,27 +214,27 @@ |
| |
| <!-- Enum for CopyContext: mask --> |
| <enum name="GC"> |
| - <item name="GL_CURRENT_BIT"><bit>0</bit></item> |
| - <item name="GL_POINT_BIT"><bit>1</bit></item> |
| - <item name="GL_LINE_BIT"><bit>2</bit></item> |
| - <item name="GL_POLYGON_BIT"><bit>3</bit></item> |
| - <item name="GL_POLYGON_STIPPLE_BIT"><bit>4</bit></item> |
| - <item name="GL_PIXEL_MODE_BIT"><bit>5</bit></item> |
| - <item name="GL_LIGHTING_BIT"><bit>6</bit></item> |
| - <item name="GL_FOG_BIT"><bit>7</bit></item> |
| - <item name="GL_DEPTH_BUFFER_BIT"><bit>8</bit></item> |
| - <item name="GL_ACCUM_BUFFER_BIT"><bit>9</bit></item> |
| - <item name="GL_STENCIL_BUFFER_BIT"><bit>10</bit></item> |
| - <item name="GL_VIEWPORT_BIT"><bit>11</bit></item> |
| - <item name="GL_TRANSFORM_BIT"><bit>12</bit></item> |
| - <item name="GL_ENABLE_BIT"><bit>13</bit></item> |
| - <item name="GL_COLOR_BUFFER_BIT"><bit>14</bit></item> |
| - <item name="GL_HINT_BIT"><bit>15</bit></item> |
| - <item name="GL_EVAL_BIT"><bit>16</bit></item> |
| - <item name="GL_LIST_BIT"><bit>17</bit></item> |
| - <item name="GL_TEXTURE_BIT"><bit>18</bit></item> |
| - <item name="GL_SCISSOR_BIT"><bit>19</bit></item> |
| - <item name="GL_ALL_ATTRIB_BITS"><value>16777215<!--0x000ffffff--></value></item> |
| + <item name="XPROTO_GL_CURRENT_BIT"><bit>0</bit></item> |
| + <item name="XPROTO_GL_POINT_BIT"><bit>1</bit></item> |
| + <item name="XPROTO_GL_LINE_BIT"><bit>2</bit></item> |
| + <item name="XPROTO_GL_POLYGON_BIT"><bit>3</bit></item> |
| + <item name="XPROTO_GL_POLYGON_STIPPLE_BIT"><bit>4</bit></item> |
| + <item name="XPROTO_GL_PIXEL_MODE_BIT"><bit>5</bit></item> |
| + <item name="XPROTO_GL_LIGHTING_BIT"><bit>6</bit></item> |
| + <item name="XPROTO_GL_FOG_BIT"><bit>7</bit></item> |
| + <item name="XPROTO_GL_DEPTH_BUFFER_BIT"><bit>8</bit></item> |
| + <item name="XPROTO_GL_ACCUM_BUFFER_BIT"><bit>9</bit></item> |
| + <item name="XPROTO_GL_STENCIL_BUFFER_BIT"><bit>10</bit></item> |
| + <item name="XPROTO_GL_VIEWPORT_BIT"><bit>11</bit></item> |
| + <item name="XPROTO_GL_TRANSFORM_BIT"><bit>12</bit></item> |
| + <item name="XPROTO_GL_ENABLE_BIT"><bit>13</bit></item> |
| + <item name="XPROTO_GL_COLOR_BUFFER_BIT"><bit>14</bit></item> |
| + <item name="XPROTO_GL_HINT_BIT"><bit>15</bit></item> |
| + <item name="XPROTO_GL_EVAL_BIT"><bit>16</bit></item> |
| + <item name="XPROTO_GL_LIST_BIT"><bit>17</bit></item> |
| + <item name="XPROTO_GL_TEXTURE_BIT"><bit>18</bit></item> |
| + <item name="XPROTO_GL_SCISSOR_BIT"><bit>19</bit></item> |
| + <item name="XPROTO_GL_ALL_ATTRIB_BITS"><value>16777215<!--0x000ffffff--></value></item> |
| </enum> |
| |
| <request name="SwapBuffers" opcode="11"> |
| @@ -594,9 +594,9 @@ |
| </request> |
| |
| <enum name="RM"> |
| - <item name="GL_RENDER"><value>7168</value></item> |
| - <item name="GL_FEEDBACK"><value>7169</value></item> |
| - <item name="GL_SELECT"><value>7170</value></item> |
| + <item name="XPROTO_GL_RENDER"><value>7168</value></item> |
| + <item name="XPROTO_GL_FEEDBACK"><value>7169</value></item> |
| + <item name="XPROTO_GL_SELECT"><value>7170</value></item> |
| </enum> |
| |
| <request name="Finish" opcode="108"> |
| diff -ru xcbproto/src/randr.xml src/src/randr.xml |
| --- xcbproto/src/randr.xml 2020-09-04 10:01:19.893846873 -0700 |
| +++ src/src/randr.xml 2020-07-07 18:37:12.793121218 -0700 |
| @@ -803,64 +803,6 @@ |
| <item name="Lease"> <value>6</value></item> |
| </enum> |
| |
| - <struct name="CrtcChange"> |
| - <field type="TIMESTAMP" name="timestamp" /> |
| - <field type="WINDOW" name="window" /> |
| - <field type="CRTC" name="crtc" /> |
| - <field type="MODE" name="mode" /> |
| - <field type="CARD16" name="rotation" mask="Rotation" /> |
| - <pad bytes="2" /> |
| - <field type="INT16" name="x" /> |
| - <field type="INT16" name="y" /> |
| - <field type="CARD16" name="width" /> |
| - <field type="CARD16" name="height" /> |
| - </struct> |
| - |
| - <struct name="OutputChange"> |
| - <field type="TIMESTAMP" name="timestamp" /> |
| - <field type="TIMESTAMP" name="config_timestamp" /> |
| - <field type="WINDOW" name="window" /> |
| - <field type="OUTPUT" name="output" /> |
| - <field type="CRTC" name="crtc" /> |
| - <field type="MODE" name="mode" /> |
| - <field type="CARD16" name="rotation" mask="Rotation" /> |
| - <field type="CARD8" name="connection" enum="Connection" /> |
| - <field type="CARD8" name="subpixel_order" enum="SubPixel" /> |
| - </struct> |
| - |
| - <struct name="OutputProperty"> |
| - <field type="WINDOW" name="window" /> |
| - <field type="OUTPUT" name="output" /> |
| - <field type="ATOM" name="atom" /> |
| - <field type="TIMESTAMP" name="timestamp" /> |
| - <field type="CARD8" name="status" enum="Property" /> |
| - <pad bytes="11" /> |
| - </struct> |
| - |
| - <!-- New in version 1.4 --> |
| - |
| - <struct name="ProviderChange"> |
| - <field type="TIMESTAMP" name="timestamp" /> |
| - <field type="WINDOW" name="window" /> |
| - <field type="PROVIDER" name="provider" /> |
| - <pad bytes="16" /> |
| - </struct> |
| - |
| - <struct name="ProviderProperty"> |
| - <field type="WINDOW" name="window" /> |
| - <field type="PROVIDER" name="provider" /> |
| - <field type="ATOM" name="atom" /> |
| - <field type="TIMESTAMP" name="timestamp" /> |
| - <field type="CARD8" name="state" /> |
| - <pad bytes="11" /> |
| - </struct> |
| - |
| - <struct name="ResourceChange"> |
| - <field type="TIMESTAMP" name="timestamp" /> |
| - <field type="WINDOW" name="window" /> |
| - <pad bytes="20" /> |
| - </struct> |
| - |
| <!-- New in version 1.5 --> |
| |
| <struct name="MonitorInfo"> |
| @@ -929,26 +871,87 @@ |
| <field type="BYTE" name="terminate" /> |
| </request> |
| |
| - <struct name="LeaseNotify"> |
| - <field type="TIMESTAMP" name="timestamp" /> |
| - <field type="WINDOW" name="window" /> |
| - <field type="LEASE" name="lease" /> |
| - <field type="CARD8" name="created" /> |
| - <pad bytes="15" /> |
| - </struct> |
| - |
| - <union name="NotifyData"> |
| - <field type="CrtcChange" name="cc" /> |
| - <field type="OutputChange" name="oc" /> |
| - <field type="OutputProperty" name="op" /> |
| - <field type="ProviderChange" name="pc" /> |
| - <field type="ProviderProperty" name="pp" /> |
| - <field type="ResourceChange" name="rc" /> |
| - <field type="LeaseNotify" name="lc" /> |
| - </union> |
| - |
| <event name="Notify" number="1"> |
| <field type="CARD8" name="subCode" enum="Notify" /> |
| - <field type="NotifyData" name="u" /> |
| + <switch name="data"> |
| + <fieldref>subCode</fieldref> |
| + |
| + <!-- New in version 1.2 --> |
| + |
| + <case name="cc"> |
| + <enumref ref="Notify">CrtcChange</enumref> |
| + <field type="TIMESTAMP" name="timestamp" /> |
| + <field type="WINDOW" name="window" /> |
| + <field type="CRTC" name="crtc" /> |
| + <field type="MODE" name="mode" /> |
| + <field type="CARD16" name="rotation" mask="Rotation" /> |
| + <pad bytes="2" /> |
| + <field type="INT16" name="x" /> |
| + <field type="INT16" name="y" /> |
| + <field type="CARD16" name="width" /> |
| + <field type="CARD16" name="height" /> |
| + </case> |
| + |
| + <case name="oc"> |
| + <enumref ref="Notify">OutputChange</enumref> |
| + <field type="TIMESTAMP" name="timestamp" /> |
| + <field type="TIMESTAMP" name="config_timestamp" /> |
| + <field type="WINDOW" name="window" /> |
| + <field type="OUTPUT" name="output" /> |
| + <field type="CRTC" name="crtc" /> |
| + <field type="MODE" name="mode" /> |
| + <field type="CARD16" name="rotation" mask="Rotation" /> |
| + <field type="CARD8" name="connection" enum="Connection" /> |
| + <field type="CARD8" name="subpixel_order" enum="SubPixel" /> |
| + </case> |
| + |
| + <case name="op"> |
| + <enumref ref="Notify">OutputProperty</enumref> |
| + <field type="WINDOW" name="window" /> |
| + <field type="OUTPUT" name="output" /> |
| + <field type="ATOM" name="atom" /> |
| + <field type="TIMESTAMP" name="timestamp" /> |
| + <field type="CARD8" name="status" enum="Property" /> |
| + <pad bytes="11" /> |
| + </case> |
| + |
| + <!-- New in version 1.4 --> |
| + |
| + <case name="pc"> |
| + <enumref ref="Notify">ProviderChange</enumref> |
| + <field type="TIMESTAMP" name="timestamp" /> |
| + <field type="WINDOW" name="window" /> |
| + <field type="PROVIDER" name="provider" /> |
| + <pad bytes="16" /> |
| + </case> |
| + |
| + <case name="pp"> |
| + <enumref ref="Notify">ProviderProperty</enumref> |
| + <field type="WINDOW" name="window" /> |
| + <field type="PROVIDER" name="provider" /> |
| + <field type="ATOM" name="atom" /> |
| + <field type="TIMESTAMP" name="timestamp" /> |
| + <field type="CARD8" name="state" /> |
| + <pad bytes="11" /> |
| + </case> |
| + |
| + <case name="rc"> |
| + <enumref ref="Notify">ResourceChange</enumref> |
| + <field type="TIMESTAMP" name="timestamp" /> |
| + <field type="WINDOW" name="window" /> |
| + <pad bytes="20" /> |
| + </case> |
| + |
| + <!-- new in 1.6 --> |
| + |
| + <case name="lc"> |
| + <enumref ref="Notify">Lease</enumref> |
| + <field type="TIMESTAMP" name="timestamp" /> |
| + <field type="WINDOW" name="window" /> |
| + <field type="LEASE" name="lease" /> |
| + <field type="CARD8" name="created" /> |
| + <pad bytes="15" /> |
| + </case> |
| + </switch> |
| </event> |
| </xcb> |
| diff -ru xcbproto/src/shm.xml src/src/shm.xml |
| --- xcbproto/src/shm.xml 2020-09-04 10:01:19.897846895 -0700 |
| +++ src/src/shm.xml 2020-08-24 11:14:24.865499307 -0700 |
| @@ -78,7 +78,7 @@ |
| <field type="INT16" name="dst_x" /> |
| <field type="INT16" name="dst_y" /> |
| <field type="CARD8" name="depth" /> |
| - <field type="CARD8" name="format" /> |
| + <field type="CARD8" name="format" enum="ImageFormat" /> |
| <field type="BOOL" name="send_event" /> |
| <pad bytes="1" /> |
| <field type="SEG" name="shmseg" /> |
| diff -ru xcbproto/src/xinput.xml src/src/xinput.xml |
| --- xcbproto/src/xinput.xml 2020-09-04 10:01:19.897846895 -0700 |
| +++ src/src/xinput.xml 2020-08-24 11:14:24.865499307 -0700 |
| @@ -200,7 +200,12 @@ |
| <list type="STR" name="names"> |
| <fieldref>devices_len</fieldref> |
| </list> |
| - <pad align="4" /> |
| + <!-- Chromium patch: xcbproto had this as 4 bytes of padding, but |
| + replies are always padded to 4 bytes. At least on x.org, |
| + the padding is always at least one byte, so we add a byte of |
| + padding and (implicitly) align to 4 bytes. |
| + --> |
| + <pad bytes="1" /> |
| </reply> |
| </request> |
| |
| @@ -1347,7 +1352,8 @@ |
| |
| <!-- XIQueryPointer --> |
| |
| - <enum name="Device"> |
| + <!-- Chromium patch: Rename so that this will get merged with DeviceId --> |
| + <enum name="DEVICE_ID"> |
| <item name="All"> <value>0</value> </item> |
| <item name="AllMaster"> <value>1</value> </item> |
| </enum> |
| diff -ru xcbproto/src/xproto.xml src/src/xproto.xml |
| --- xcbproto/src/xproto.xml 2020-09-04 10:01:19.897846895 -0700 |
| +++ src/src/xproto.xml 2020-07-30 12:03:48.681938397 -0700 |
| @@ -4686,7 +4686,7 @@ |
| <field type="CARD8" name="left_pad" /> |
| <field type="CARD8" name="depth" /> |
| <pad bytes="2" /> |
| - <list type="BYTE" name="data" /> |
| + <list type="void" name="data" /> |
| </request> |
| |
| <!-- FIXME: data array in reply will include padding, but ought not to. --> |
| @@ -4702,7 +4702,7 @@ |
| <field type="CARD8" name="depth" /> |
| <field type="VISUALID" name="visual" /> |
| <pad bytes="20" /> |
| - <list type="BYTE" name="data"> |
| + <list type="void" name="data"> |
| <op op="*"> |
| <fieldref>length</fieldref> |
| <value>4</value> |
| Only in src/xcbgen: align.pyc |
| Only in src/xcbgen: error.pyc |
| Only in src/xcbgen: expr.pyc |
| Only in src/xcbgen: __init__.pyc |
| Only in src/xcbgen: matcher.pyc |
| Only in src/xcbgen: state.pyc |
| Only in src/xcbgen: xtypes.pyc |
