From 37847f9ffa1d8b16608fe081cc559c04cea860ad Mon Sep 17 00:00:00 2001 From: matthieu Date: Thu, 11 Jul 2024 08:03:01 +0000 Subject: [PATCH] Update to xcb-proto 1.17.0 --- proto/xcb-proto/autogen.sh | 11 +- proto/xcb-proto/configure.ac | 2 +- proto/xcb-proto/src/bigreq.xml | 14 ++ proto/xcb-proto/src/composite.xml | 122 ++++++++++++++++ proto/xcb-proto/src/damage.xml | 106 ++++++++++++++ proto/xcb-proto/src/dpms.xml | 19 ++- proto/xcb-proto/src/dri3.xml | 14 +- proto/xcb-proto/src/present.xml | 30 +++- proto/xcb-proto/src/screensaver.xml | 30 ++-- proto/xcb-proto/src/shm.xml | 214 ++++++++++++++++++++++++++++ proto/xcb-proto/src/xfixes.xml | 25 +++- 11 files changed, 563 insertions(+), 24 deletions(-) diff --git a/proto/xcb-proto/autogen.sh b/proto/xcb-proto/autogen.sh index fc34bd55c..72cba586c 100644 --- a/proto/xcb-proto/autogen.sh +++ b/proto/xcb-proto/autogen.sh @@ -1,14 +1,17 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xcbproto" if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi diff --git a/proto/xcb-proto/configure.ac b/proto/xcb-proto/configure.ac index 27a85da30..60a1b783e 100644 --- a/proto/xcb-proto/configure.ac +++ b/proto/xcb-proto/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([XCB Proto], - 1.15.2, + 1.17.0, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-xz]) diff --git a/proto/xcb-proto/src/bigreq.xml b/proto/xcb-proto/src/bigreq.xml index 3cca2f77f..ddd1e210e 100644 --- a/proto/xcb-proto/src/bigreq.xml +++ b/proto/xcb-proto/src/bigreq.xml @@ -33,6 +33,20 @@ authorization from the authors. + + +The maximum length of requests supported by the server, in 4-byte units. + + + + Enable the BIG-REQUESTS extension + +This enables the BIG-REQUESTS extension, which allows for requests larger than +262140 bytes in length. When enabled, if the 16-bit length field is zero, it +is immediately followed by a 32-bit length field specifying the length of the +request in 4-byte units. + + diff --git a/proto/xcb-proto/src/composite.xml b/proto/xcb-proto/src/composite.xml index 86de14629..dcbf9a6d8 100644 --- a/proto/xcb-proto/src/composite.xml +++ b/proto/xcb-proto/src/composite.xml @@ -23,6 +23,48 @@ Except as contained in this notice, the names of the authors or their institutions shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the authors. + +Copyright (c) 2006, Oracle and/or its affiliates. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +Copyright © 2003 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + --> + + The negotiated version of Composite + +This indicates the version of Composite chosen by the server. It will always be +less than or equal to the version offered by the client. + + The major version chosen by the server. + The minor version chosen by the server. + + + Negotiate the version of Composite + +This negotiates the version of the Composite extension. It must be precede all +other requests using Composite. Failure to do so will cause a BadRequest error. + + The major version supported by the client. + The minor version supported by the client. + + + Redirect the hierarchy starting at "window" to off-screen storage. + + The hierarchy starting at 'window' is directed to off-screen + storage. When all clients enabling redirection terminate, + the redirection will automatically be disabled. + + The root window may not be redirected. Doing so results in a Match + error. + + The root of the hierarchy to redirect to off-screen storage. + + Whether contents are automatically mirrored to the parent window. If one client + already specifies an update type of Manual, any attempt by another to specify a + mode of Manual so will result in an Access error. + + + + Redirect all current and future children of ‘window’ + + Hierarchies starting at all current and future children of window + will be redirected as in RedirectWindow. If update is Manual, + then painting of the window background during window manipulation + and ClearArea requests is inhibited. + + The root of the hierarchy to redirect to off-screen storage. + + Whether contents are automatically mirrored to the parent window. If one client + already specifies an update type of Manual, any attempt by another to specify a + mode of Manual so will result in an Access error. + + + + Terminate redirection of the specified window. + + Redirection of the specified window will be terminated. This cannot be + used if the window was redirected with RedirectSubwindows. + + + The window to terminate redirection of. Must be redirected by the + current client, or a Value error results. + + + The update type passed to RedirectWindows. If this does not match the + previously requested update type, a Value error results. + + + + Terminate redirection of the specified window’s children + + Redirection of all children of window will be terminated. + + + The window to terminate redirection of. Must have previously been + selected for sub-redirection by the current client, or a Value error + results. + + + The update type passed to RedirectSubWindows. If this does not match + the previously requested update type, a Value error results. + + diff --git a/proto/xcb-proto/src/damage.xml b/proto/xcb-proto/src/damage.xml index c04721d1e..930090a36 100644 --- a/proto/xcb-proto/src/damage.xml +++ b/proto/xcb-proto/src/damage.xml @@ -51,7 +51,26 @@ authorization from the authors. + + The negotiated version of the DAMAGE extension + +This indicates the version of the DAMAGE extension chosen by the server. +It will always be less than or equal to the version offered by the client. + + The major version chosen by the server. + The minor version chosen by the server. + + + Negotiate the version of the DAMAGE extension + +This negotiates the version of the DAMAGE extension. It must precede any other +request using the DAMAGE extension. Failure to do so will cause a BadRequest +error for those requests. + + The major version supported by the client. + The minor version supported by the client. + @@ -59,21 +78,84 @@ authorization from the authors. + + Creates a Damage object to monitor changes to a drawable. + + + The ID of the drawable to be monitored. + The level of detail to be provided in Damage events. + + + Destroys a previously created Damage object. + +This destroys a Damage object and requests the X server stop reporting +the changes it was tracking. + + + + + Remove regions from a previously created Damage object. + +This updates the regions of damage recorded in a a Damage object. +See https://www.x.org/releases/current/doc/damageproto/damageproto.txt +for details. + + The ID you provided to `xcb_create_damage`. + + + Add a region to a previously created Damage object. + +This updates the regions of damage recorded in a a Damage object. +See https://www.x.org/releases/current/doc/damageproto/damageproto.txt +for details. + + The ID you provided to `xcb_create_damage`. + @@ -83,5 +165,29 @@ authorization from the authors. + + the contents of the monitored drawable have changed + + + + + + + + diff --git a/proto/xcb-proto/src/dpms.xml b/proto/xcb-proto/src/dpms.xml index 55812845f..814a14ec6 100644 --- a/proto/xcb-proto/src/dpms.xml +++ b/proto/xcb-proto/src/dpms.xml @@ -26,7 +26,8 @@ sale, use or other dealings in this Software without prior written authorization from the authors. --> + major-version="1" minor-version="2"> + xproto @@ -84,4 +85,20 @@ authorization from the authors. + + + 0 + + + + + + + + + + + + + diff --git a/proto/xcb-proto/src/dri3.xml b/proto/xcb-proto/src/dri3.xml index 9549fd4b3..d681aae88 100644 --- a/proto/xcb-proto/src/dri3.xml +++ b/proto/xcb-proto/src/dri3.xml @@ -23,10 +23,11 @@ OF THIS SOFTWARE. --> + major-version="1" minor-version="4"> xproto + @@ -170,4 +171,15 @@ OF THIS SOFTWARE. + + + + + + + + + + + diff --git a/proto/xcb-proto/src/present.xml b/proto/xcb-proto/src/present.xml index fb06e73f0..bae445f52 100644 --- a/proto/xcb-proto/src/present.xml +++ b/proto/xcb-proto/src/present.xml @@ -23,11 +23,12 @@ OF THIS SOFTWARE. --> + major-version="1" minor-version="4"> xproto randr xfixes sync + dri3 @@ -52,6 +53,7 @@ OF THIS SOFTWARE. 1 2 3 + 4 @@ -59,6 +61,9 @@ OF THIS SOFTWARE. 0 1 2 + 3 + + 4 @@ -135,6 +140,29 @@ OF THIS SOFTWARE. + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proto/xcb-proto/src/screensaver.xml b/proto/xcb-proto/src/screensaver.xml index c546f9446..2c43b4dbb 100644 --- a/proto/xcb-proto/src/screensaver.xml +++ b/proto/xcb-proto/src/screensaver.xml @@ -99,63 +99,63 @@ Draft Standard Version 1.1 value_mask - BackPixmap + BackPixmap - BackPixel + BackPixel - BorderPixmap + BorderPixmap - BorderPixel + BorderPixel - BitGravity + BitGravity - WinGravity + WinGravity - BackingStore + BackingStore - BackingPlanes + BackingPlanes - BackingPixel + BackingPixel - OverrideRedirect + OverrideRedirect - SaveUnder + SaveUnder - EventMask + EventMask - DontPropagate + DontPropagate - Colormap + Colormap - Cursor + Cursor diff --git a/proto/xcb-proto/src/shm.xml b/proto/xcb-proto/src/shm.xml index c2605da0e..0f93a2cd0 100644 --- a/proto/xcb-proto/src/shm.xml +++ b/proto/xcb-proto/src/shm.xml @@ -39,6 +39,29 @@ authorization from the authors. + + Report that an XCB_SHM_PUT_IMAGE request has completed + + + + + + + @@ -52,7 +75,39 @@ authorization from the authors. + + The version of the MIT-SHM extension supported by the server + + + + + The UID of the server. + The GID of the server. + + + Query the version of the MIT-SHM extension. + + @@ -60,10 +115,36 @@ authorization from the authors. + + Attach a System V shared memory segment. + + + + + + + Destroys the specified shared memory segment. + + The segment to be destroyed. + @@ -83,6 +164,49 @@ authorization from the authors. + + Copy data from the shared memory to the specified drawable. + + The drawable to draw to. + The graphics context to use. + The total width of the source image. + The total height of the source image. + The source X coordinate of the sub-image to copy. + The source Y coordinate of the sub-image to copy. + + + + + The depth to use. + + + The offset that the source image starts at. + @@ -100,7 +224,33 @@ authorization from the authors. + + Indicates the result of the copy. + + The depth of the source drawable. + The visual ID of the source drawable. + The number of bytes copied. + + + Copies data from the specified drawable to the shared memory segment. + + The drawable to copy the image out of. + The X coordinate in the drawable to begin copying at. + The Y coordinate in the drawable to begin copying at. + The width of the image to copy. + The height of the image to copy. + A mask that determines which planes are used. + The format to use for the copy (???). + The destination shared memory segment. + The offset in the shared memory segment to copy data to. + @@ -112,6 +262,31 @@ authorization from the authors. + + Create a pixmap backed by shared memory. + +Create a pixmap backed by shared memory. Writes to the shared memory will be +reflected in the contents of the pixmap, and writes to the pixmap will be +reflected in the contents of the shared memory. + + A pixmap ID created with xcb_generate_id(). + The drawable to create the pixmap in. + + + + + + @@ -119,6 +294,21 @@ authorization from the authors. + + Create a shared memory segment + + + The file descriptor the server should mmap(). + + @@ -130,6 +320,30 @@ authorization from the authors. + + The returned file descriptor. + + + + + Asks the server to allocate a shared memory segment. + + + The size of the segment to create. + + diff --git a/proto/xcb-proto/src/xfixes.xml b/proto/xcb-proto/src/xfixes.xml index a01cd7b0c..442bc02e1 100644 --- a/proto/xcb-proto/src/xfixes.xml +++ b/proto/xcb-proto/src/xfixes.xml @@ -365,10 +365,28 @@ authorization from the authors. 0 0 + + + + + + Sets the disconnect mode for the client. + + @@ -376,7 +394,12 @@ authorization from the authors. + + Gets the disconnect mode for the client. + + -