Merge branch 'X11Libre:master' into master
This commit is contained in:
Xgui4 Studio
GitHub
commit
8545e50bb5
|
|
@ -0,0 +1,66 @@
|
|||
name: 🐞 Bug report
|
||||
description: Create a report to help us improve
|
||||
|
||||
labels: [bug, needs-triage]
|
||||
#type: bug
|
||||
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please fill out the sections below to help everyone identify and fix the bug. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
|
||||
- type: dropdown
|
||||
id: affected-version
|
||||
attributes:
|
||||
label: Select the version
|
||||
options:
|
||||
- 25.0.0.0
|
||||
- 25.0.0.1
|
||||
- Git master branch
|
||||
- other or don't know
|
||||
default: 1
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: Describe your issue
|
||||
placeholder: When I did X then Y happened.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: steps
|
||||
attributes:
|
||||
label: Steps to reproduce
|
||||
placeholder: |
|
||||
1. Start ...
|
||||
2. Do this
|
||||
3. Do that
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: expected
|
||||
attributes:
|
||||
label: What did you expect?
|
||||
placeholder: I expected this to happen.
|
||||
- type: textarea
|
||||
id: environment
|
||||
attributes:
|
||||
label: Additional Information
|
||||
description: Additional information you want to provide such as logs, system info, environment, screenshots, etc.
|
||||
placeholder: |
|
||||
Add any other context about the bug here.
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Extra fields
|
||||
options:
|
||||
- label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
|
||||
required: true
|
||||
- label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
|
||||
required: true
|
||||
- label: I'd like to work on this issue
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for reporting this issue! We will get back to you as soon as possible.
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
name: ✨ Feature request
|
||||
description: Suggest a feature for this software
|
||||
labels: [enhancement, needs-triage]
|
||||
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please fill out the sections below to properly describe the new software feature you are suggesting. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: "Describe the feature"
|
||||
placeholder: A thing in X that allows to do Y.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: rationale
|
||||
attributes:
|
||||
label: "It should be implemented because"
|
||||
placeholder: Doing Y is needed for Z.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: alternative
|
||||
attributes:
|
||||
label: "What are the alternatives?"
|
||||
placeholder: We could do A or B instead.
|
||||
- type: textarea
|
||||
id: context
|
||||
attributes:
|
||||
label: Additional context
|
||||
description: Additional information you want to provide such as references to related issues or protocols, the implications on existing use cases, etc.
|
||||
placeholder: |
|
||||
Add any other context about the feature request here.
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Extra fields
|
||||
options:
|
||||
- label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
|
||||
required: true
|
||||
- label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
|
||||
required: true
|
||||
- label: I'd like to work on this issue
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for your suggestion! Let's see together if it can be implemented.
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
name: 🔧 Code cleanup
|
||||
description: Level up the source code
|
||||
labels: [code-cleanup, needs-triage]
|
||||
#type: codecleanup
|
||||
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please fill out the sections below to properly describe the code cleanup you are suggesting. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: "Describe the cleanup"
|
||||
placeholder: C in X needs to be changed into D.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: rationale
|
||||
attributes:
|
||||
label: "It should be done because"
|
||||
placeholder: Having D is needed for E.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: alternative
|
||||
attributes:
|
||||
label: "What are the alternatives?"
|
||||
placeholder: We could do A or B instead.
|
||||
- type: textarea
|
||||
id: context
|
||||
attributes:
|
||||
label: Additional context
|
||||
description: Additional information you want to provide such as implications on existing code, how to ensure API/ABI stability, which tests are needed or to be run, related issues, etc.
|
||||
placeholder: |
|
||||
Add any other context about the cleanup here.
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Extra fields
|
||||
options:
|
||||
- label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
|
||||
required: true
|
||||
- label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
|
||||
required: true
|
||||
- label: I'd like to work on this issue
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for looking at the source code! Let's see together how it can be improved.
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
name: 🔖 Documentation update
|
||||
description: Make your mark for better documentation
|
||||
|
||||
labels: [documentation, needs-triage]
|
||||
#type: docchange
|
||||
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please fill out the sections below to help others understand our software. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: Describe the update
|
||||
placeholder: These things need to be better documented.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: environment
|
||||
attributes:
|
||||
label: Additional Information
|
||||
description: Additional information you want to provide such as tickets related to changes in the software, affected files, screenshots, etc.
|
||||
placeholder: |
|
||||
Add any other context about the update here.
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Extra fields
|
||||
options:
|
||||
- label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
|
||||
required: true
|
||||
- label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
|
||||
required: true
|
||||
- label: I'd like to work on this issue
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for requesting this update! We will get back to you as soon as possible.
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
name: ✅ Organizational task
|
||||
description: Create a task for project organization
|
||||
|
||||
labels: [needs-triage, organization]
|
||||
#type: task
|
||||
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please fill out the sections below to get organizational things done. If you have a general idea or question then please use the [discussions](https://github.com/orgs/X11Libre/discussions).
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: Describe the task
|
||||
placeholder: These things need to be done.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: rationale
|
||||
attributes:
|
||||
label: "It should be done because"
|
||||
placeholder: Doing Y is needed for Z.
|
||||
- type: textarea
|
||||
id: environment
|
||||
attributes:
|
||||
label: Additional Information
|
||||
description: Additional information you want to provide such as the context for bigger tasks, the implicatons on existing workflows, related issues, etc.
|
||||
placeholder: |
|
||||
Add any other context about the task here.
|
||||
- type: checkboxes
|
||||
id: checks
|
||||
attributes:
|
||||
label: Extra fields
|
||||
options:
|
||||
- label: I have checked the existing [issues](https://github.com/X11Libre/xserver/issues)
|
||||
required: true
|
||||
- label: I have read the [Contributing Guidelines](https://github.com/X11Libre/xserver/blob/master/CONTRIBUTING.md)
|
||||
required: true
|
||||
- label: I'd like to work on this issue
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for adding this task! We will get back to you as soon as possible.
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: XLibre Community Support
|
||||
url: https://github.com/orgs/X11Libre/discussions
|
||||
about: Please ask and answer questions here.
|
||||
- name: Mailing List
|
||||
url: https://www.freelists.org/list/xlibre
|
||||
about: You can join the discussions on our mailing list.
|
||||
|
|
@ -1,6 +1,13 @@
|
|||
export X11_PREFIX=/home/runner/x11
|
||||
export X11_OS=`uname -s`
|
||||
|
||||
export X11_PREFIX="${X11_PREFIX:-$HOME/x11}"
|
||||
export X11_BUILD_DIR="${X11_BUILD_DIR:-$HOME/build-deps}"
|
||||
export DRV_BUILD_DIR="${DRV_BUILD_DIR:-$HOME/build-drivers}"
|
||||
|
||||
case "$X11_OS" in
|
||||
Darwin) export FDO_CI_CONCURRENT=`sysctl -n hw.logicalcpu` ;;
|
||||
Linux) export FDO_CI_CONCURRENT=`nproc` ;;
|
||||
esac
|
||||
|
||||
export PATH="$X11_PREFIX/bin:$PATH"
|
||||
export PKG_CONFIG_PATH="$X11_PREFIX/lib/x86_64-linux-gnu/pkgconfig:$X11_PREFIX/lib/pkgconfig:$X11_PREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
|
||||
export FDO_CI_CONCURRENT=`nproc`
|
||||
export X11_BUILD_DIR=/home/runner/build-deps
|
||||
export DRV_BUILD_DIR=/home/runner/build-drivers
|
||||
|
|
|
|||
|
|
@ -8,10 +8,13 @@ mkdir -p $X11_BUILD_DIR
|
|||
cd $X11_BUILD_DIR
|
||||
|
||||
build_meson rendercheck https://gitlab.freedesktop.org/xorg/test/rendercheck rendercheck-1.6
|
||||
if [ "$X11_OS" = "Linux" ]; then
|
||||
build_meson drm https://gitlab.freedesktop.org/mesa/drm libdrm-2.4.121 \
|
||||
-Domap=enabled
|
||||
fi
|
||||
build_meson libxcvt https://gitlab.freedesktop.org/xorg/lib/libxcvt libxcvt-0.1.0
|
||||
build_ac xorgproto https://gitlab.freedesktop.org/xorg/proto/xorgproto xorgproto-2024.1
|
||||
if [ "$X11_OS" = "Linux" ]; then
|
||||
build_meson wayland https://gitlab.freedesktop.org/wayland/wayland 1.21.0 \
|
||||
-Dtests=false -Ddocumentation=false -Ddtd_validation=false
|
||||
build_meson wayland-protocols https://gitlab.freedesktop.org/wayland/wayland-protocols 1.38
|
||||
|
|
@ -19,6 +22,10 @@ build_meson libdecor https://gitlab.freedesktop.org/libdecor/libdecor
|
|||
-D{demo,install_demo}=false
|
||||
build_meson libei https://gitlab.freedesktop.org/libinput/libei 1.0.0 \
|
||||
-Dtests=disabled -Ddocumentation=[] -Dliboeffis=enabled
|
||||
fi
|
||||
if [ "$X11_OS" = "Darwin" ]; then
|
||||
build_ac xset https://gitlab.freedesktop.org/xorg/app/xset xset-1.2.5
|
||||
fi
|
||||
build_ac_xts xts https://gitlab.freedesktop.org/xorg/test/xts master # dbbfa96c036e596346147081cbceda136e7c86c1
|
||||
|
||||
clone_source piglit https://gitlab.freedesktop.org/mesa/piglit main # 265896c86f90cb72e8f218ba6a3617fca8b9a1e3
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
brew update
|
||||
|
||||
brew install \
|
||||
autoconf \
|
||||
automake \
|
||||
bdftopcf \
|
||||
libapplewm \
|
||||
libtool \
|
||||
libx11 \
|
||||
libxau \
|
||||
libxaw \
|
||||
libxcb \
|
||||
libxdmcp \
|
||||
libxext \
|
||||
libxfixes \
|
||||
libxfont2 \
|
||||
libxkbfile \
|
||||
libxi \
|
||||
libxmu \
|
||||
libxrender \
|
||||
libxt \
|
||||
libxtst \
|
||||
meson \
|
||||
mkfontscale \
|
||||
pkgconf \
|
||||
pixman \
|
||||
util-macros \
|
||||
xdpyinfo \
|
||||
xkbcomp \
|
||||
xkeyboard-config \
|
||||
xtrans
|
||||
|
||||
pip3 install --break-system-packages \
|
||||
mako
|
||||
|
|
@ -82,8 +82,28 @@ build_ac_xts() {
|
|||
clone_source "$pkgname" "$url" "$ref"
|
||||
(
|
||||
cd $pkgname
|
||||
CFLAGS=-fcommon ./autogen.sh --prefix=$X11_PREFIX
|
||||
xvfb-run make -j${FDO_CI_CONCURRENT:-4} install
|
||||
CFLAGS='-fcommon'
|
||||
if [ "$X11_OS" = "Darwin" ]; then
|
||||
# xts5/include/XtTest.h includes <X11/Intrinsic.h> => needs xt
|
||||
# xts5/src/libXtaw/*.c include <X11/Xaw/*.h> and <X11/Xmu/*.h> => need xmu and xaw7
|
||||
sed -E -i~ 's|(\[XTS\], \[)|\1xt xmu xaw7 |' configure.ac
|
||||
# xts5/Xlib14/X{mb,wc}TextListToTextProperty.m define a function accepting `XTextProperty` but call it passing
|
||||
#`XTextProperty*`; since the parameter is seemingly meant for output, accept it as pointer
|
||||
sed -E -i~ -e 's|(XTextProperty)[[:space:]]+(text_prop_good)|\1 *\2|' -e 's|(style_good),[[:space:]]*&(text_prop_good)|\1,\2|' -e 's|text_prop_good\.|text_prop_good->|' xts5/Xlib14/X{mb,wc}TextListToTextProperty.m
|
||||
# xts5/Xlib*/*.m forward-declare `strcpy()` which is incompatible with _FORTIFY_SOURCE > 0 where `strcpy` is
|
||||
# a macro; set _FORTIFY_SOURCE to 0 as we don't care much about security in this test code
|
||||
CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
|
||||
# declarations for `XtAppSetError{,Msg}Handler()` in <X11/Intrinsic.h> (libXt) make it hard to write warning-
|
||||
# free code: they want a noreturn-annotated handler as input but return old handler without noreturn annotation,
|
||||
# so e.g. `XtAppSetErrorHandler(XtAppSetErrorHandler(NULL))` (similar to xts5/Xt13/XtAppSetError*Handler.m)
|
||||
# doesn't compile complaining about incompatible function pointers, at least with Apple Clang 16 (not sure why
|
||||
# it treats this warning as error by default though)
|
||||
if cc -Werror=unknown-warning-option -Wincompatible-function-pointer-types -c -xc -o /dev/null /dev/null 2>/dev/null; then
|
||||
CFLAGS="$CFLAGS -Wno-error=incompatible-function-pointer-types"
|
||||
fi
|
||||
fi
|
||||
./autogen.sh --prefix=$X11_PREFIX CFLAGS="$CFLAGS"
|
||||
make -j${FDO_CI_CONCURRENT:-4} install
|
||||
)
|
||||
touch $X11_PREFIX/$pkgname.DONE
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@ jobs:
|
|||
|
||||
- name: prepare build environment
|
||||
run: |
|
||||
export MACHINE=`gcc -dumpmachine`
|
||||
MACHINE=`gcc -dumpmachine`
|
||||
echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
|
||||
echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
|
||||
sudo chown root /bin/tar && sudo chmod u+s /bin/tar
|
||||
|
||||
|
|
@ -41,11 +42,11 @@ jobs:
|
|||
${{ env.X11_PREFIX }}
|
||||
${{ env.X11_BUILD_DIR }}/xts
|
||||
${{ env.X11_BUILD_DIR }}/piglit
|
||||
key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
||||
restore-keys: ${{ runner.os }}-x11-deps-
|
||||
key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
||||
restore-keys: ${{ runner.name }}-x11-deps-
|
||||
|
||||
- name: generic prereq
|
||||
run: sudo .github/scripts/install-prereq.sh
|
||||
run: .github/scripts/install-prereq.sh
|
||||
|
||||
- name: build
|
||||
run: .gitlab-ci/meson-build.sh
|
||||
|
|
@ -78,7 +79,8 @@ jobs:
|
|||
|
||||
- name: prepare build environment
|
||||
run: |
|
||||
export MACHINE=`gcc -dumpmachine`
|
||||
MACHINE=`gcc -dumpmachine`
|
||||
echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
|
||||
echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
|
||||
sudo chown root /bin/tar && sudo chmod u+s /bin/tar
|
||||
|
||||
|
|
@ -99,11 +101,11 @@ jobs:
|
|||
${{ env.X11_PREFIX }}
|
||||
${{ env.X11_BUILD_DIR }}/xts
|
||||
${{ env.X11_BUILD_DIR }}/piglit
|
||||
key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
||||
restore-keys: ${{ runner.os }}-x11-deps-
|
||||
key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
||||
restore-keys: ${{ runner.name }}-x11-deps-
|
||||
|
||||
- name: generic prereq
|
||||
run: sudo .github/scripts/install-prereq.sh
|
||||
run: .github/scripts/install-prereq.sh
|
||||
|
||||
- name: build xserver sdk
|
||||
run: |
|
||||
|
|
@ -117,3 +119,61 @@ jobs:
|
|||
|
||||
- name: compile drivers
|
||||
run: .github/scripts/compile-drivers.sh
|
||||
|
||||
xserver-build-macos:
|
||||
env:
|
||||
MESON_ARGS: -Dprefix=/tmp -Dglx=false -Dxnest=false
|
||||
X11_PREFIX: /Users/runner/x11
|
||||
X11_BUILD_DIR: /Users/runner/build-deps
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: prepare build environment
|
||||
run: |
|
||||
echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
|
||||
|
||||
- name: homebrew cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: /Users/runner/Library/Caches/Homebrew
|
||||
key: ${{ runner.os }}-homebrew-cache-${{ hashFiles('.github/scripts/macos/install-pkg.sh') }}
|
||||
restore-keys: ${{ runner.os }}-homebrew-cache-
|
||||
|
||||
- name: pkg install
|
||||
run: .github/scripts/macos/install-pkg.sh
|
||||
|
||||
- name: X11 prereq cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
${{ env.X11_PREFIX }}
|
||||
${{ env.X11_BUILD_DIR }}/xts
|
||||
${{ env.X11_BUILD_DIR }}/piglit
|
||||
key: ${{ runner.os }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
|
||||
restore-keys: ${{ runner.os }}-x11-deps-
|
||||
|
||||
- name: generic prereq
|
||||
run: .github/scripts/install-prereq.sh
|
||||
|
||||
- name: build
|
||||
run: .gitlab-ci/meson-build.sh
|
||||
|
||||
- name: tests (may fail)
|
||||
continue-on-error: true
|
||||
run: meson test -C "${{ env.MESON_BUILDDIR }}" --print-errorlogs -j1 || true
|
||||
env:
|
||||
XTEST_DIR: ${{ env.X11_BUILD_DIR }}/xts
|
||||
PIGLIT_DIR: ${{ env.X11_BUILD_DIR }}/piglit
|
||||
|
||||
- name: archive build logs
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: build-logs-macos
|
||||
path: |
|
||||
build/meson-logs/*
|
||||
- name: ddx build check
|
||||
run: .gitlab-ci/check-ddx-build.sh
|
||||
- name: manpage check
|
||||
run: .gitlab-ci/manpages-check
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ fi
|
|||
[[ "$BUILD_XEPHYR" == true ]] && check_executable "hw/kdrive/ephyr/Xephyr"
|
||||
[[ "$BUILD_XNEST" == true ]] && check_executable "hw/xnest/Xnest"
|
||||
[[ "$BUILD_XORG" == true ]] && check_executable "hw/xfree86/Xorg"
|
||||
[[ "$BUILD_XQUARTZ" == true ]] && check_executable "hw/xquartz/mach-startup/Xquartz"
|
||||
[[ "$BUILD_XVFB" == true ]] && check_executable "hw/vfb/Xvfb"
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
find build/ -regex ".*\.[1-9]$" -exec grep -E \
|
||||
find build/ -type f -regex ".*\.[1-9]$" -exec grep -E \
|
||||
@vendorversion@\|\
|
||||
@xorgversion@\|\
|
||||
@xservername@\|\
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
Keep in mind that history is also a piece of documentation.
|
||||
|
||||
3. Once release is out, bugfixes should be submitted separately, against
|
||||
the affected release branch(es) as well as master (so multiple MRs)
|
||||
the affected release branch(es) as well as master (so multiple pull requests)
|
||||
|
||||
4. If new functions or types are introduced, these should be documented
|
||||
in-code, so we can generate docs directly from the code :)
|
||||
|
||||
5. Use MR tags if you can - if we need some more, just ask.
|
||||
5. Use pull request tags if you can - if we need some more, just ask.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
*
|
||||
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
|
||||
*/
|
||||
|
||||
#ifndef _XORG_GEEXT_PRIV_H
|
||||
#define _XORG_GEEXT_PRIV_H
|
||||
|
||||
#include <X11/Xproto.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
|
||||
/*
|
||||
* Server dispatcher function replacements
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_PANORAMIXH_H
|
||||
#define XSERVER_PANORAMIXH_H
|
||||
|
||||
extern int PanoramiXCreateWindow(ClientPtr client);
|
||||
extern int PanoramiXChangeWindowAttributes(ClientPtr client);
|
||||
extern int PanoramiXDestroyWindow(ClientPtr client);
|
||||
|
|
@ -71,3 +73,5 @@ extern int connBlockScreenStart;
|
|||
extern xConnSetupPrefix connSetupPrefix;
|
||||
|
||||
extern int (*SavedProcVector[256]) (ClientPtr client);
|
||||
|
||||
#endif /* XSERVER_PANORAMIXH_H */
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp,
|
|||
Mask access_mode);
|
||||
int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel, Mask access_mode);
|
||||
|
||||
/* needs to be exported for in-tree modsetting, but not part of public API */
|
||||
/* needs to be exported for in-tree modesetting, but not part of public API */
|
||||
_X_EXPORT int XaceHookResourceAccess(ClientPtr client, XID id, RESTYPE rtype, void *res,
|
||||
RESTYPE ptype, void *parent, Mask access_mode);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,7 @@
|
|||
#ifndef XSERVER_XVDISP_H
|
||||
#define XSERVER_XVDISP_H
|
||||
|
||||
extern void XineramifyXv(void);
|
||||
extern int xvUseXinerama;
|
||||
|
||||
#endif /* XSERVER_XVDISP_H */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
*
|
||||
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
|
||||
*/
|
||||
|
||||
#ifndef _XORG_XVDIX_PRIV_H
|
||||
#define _XORG_XVDIX_PRIV_H
|
||||
|
||||
#include <X11/Xdefs.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@
|
|||
* Author: Daniel Stone <daniel@fooishbar.org>
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_CONFIG_BACKENDS_H
|
||||
#define XSERVER_CONFIG_BACKENDS_H
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
#endif
|
||||
|
|
@ -44,3 +47,5 @@ void config_hal_fini(void);
|
|||
int config_wscons_init(void);
|
||||
void config_wscons_fini(void);
|
||||
#endif
|
||||
|
||||
#endif /* XSERVER_CONFIG_BACKENDS_H */
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
#ifndef XSERVER_WFBRENAME_H
|
||||
#define XSERVER_WFBRENAME_H
|
||||
|
||||
#define fbAddTraps wfbAddTraps
|
||||
#define fbAddTriangles wfbAddTriangles
|
||||
#define fbAllocatePrivates wfbAllocatePrivates
|
||||
|
|
@ -118,3 +121,5 @@
|
|||
#define fbWinPrivateKeyRec wfbWinPrivateKeyRec
|
||||
#define free_pixman_pict wfb_free_pixman_pict
|
||||
#define image_from_pict wfb_image_from_pict
|
||||
|
||||
#endif /* XSERVER_WFBRENAME_H */
|
||||
|
|
|
|||
|
|
@ -1192,6 +1192,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
|
|||
"dmabuf_capable");
|
||||
else if (strstr((const char *)renderer, "Intel"))
|
||||
glamor_egl->dmabuf_capable = TRUE;
|
||||
else if (strstr((const char *)renderer, "zink"))
|
||||
glamor_egl->dmabuf_capable = TRUE;
|
||||
else
|
||||
glamor_egl->dmabuf_capable = FALSE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,9 @@
|
|||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_KDRIVE_EPHYR_GLAMOR_H
|
||||
#define XSERVER_KDRIVE_EPHYR_GLAMOR_H
|
||||
|
||||
#include <xcb/xcb.h>
|
||||
#include "dix-config.h"
|
||||
|
||||
|
|
@ -63,3 +66,5 @@ ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
|
|||
}
|
||||
|
||||
#endif /* !GLAMOR */
|
||||
|
||||
#endif /* XSERVER_KDRIVE_EPHYR_GLAMOR_H */
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_XFREE86_XF86VGAARBITERPRIV_H
|
||||
#define XSERVER_XFREE86_XF86VGAARBITERPRIV_H
|
||||
|
||||
#ifdef HAVE_XORG_CONFIG_H
|
||||
#include <xorg-config.h>
|
||||
#endif
|
||||
|
|
@ -273,3 +276,5 @@ static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
|
|||
static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst,
|
||||
xRenderColor * color, int nRect,
|
||||
xRectangle *rects);
|
||||
|
||||
#endif /* XSERVER_XFREE86_XF86VGAARBITERPRIV_H */
|
||||
|
|
|
|||
|
|
@ -23,4 +23,9 @@
|
|||
* Author: Daniel Stone <daniel@fooishbar.org>
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_XFREE86_DRI2INT_H
|
||||
#define XSERVER_XFREE86_DRI2INT_H
|
||||
|
||||
extern Bool DRI2ModuleSetup(void);
|
||||
|
||||
#endif /* XSERVER_XFREE86_DRI2INT_H */
|
||||
|
|
|
|||
|
|
@ -1306,7 +1306,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
|
|||
ms->atomic_modeset_capable = (ret == 0);
|
||||
|
||||
if (xf86ReturnOptValBool(ms->drmmode.Options, OPTION_ATOMIC, FALSE)) {
|
||||
ret = drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 1);
|
||||
ret = drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 2);
|
||||
ms->atomic_modeset = (ret == 0);
|
||||
if (!ms->atomic_modeset)
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Atomic modesetting not supported\n");
|
||||
|
|
@ -1631,7 +1631,7 @@ msStopFlippingPixmapTracking(DrawablePtr src,
|
|||
}
|
||||
|
||||
static Bool
|
||||
modsetCreateScreenResources(ScreenPtr pScreen)
|
||||
modesetCreateScreenResources(ScreenPtr pScreen)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||
modesettingPtr ms = modesettingPTR(pScrn);
|
||||
|
|
@ -1941,7 +1941,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
pScreen->CreateScreenResources = modsetCreateScreenResources;
|
||||
pScreen->CreateScreenResources = modesetCreateScreenResources;
|
||||
|
||||
xf86SetBlackWhitePixels(pScreen);
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@
|
|||
* Aaron Plattner <aplattner@nvidia.com>
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_XFREE86_DRIVER_H
|
||||
#define XSERVER_XFREE86_DRIVER_H
|
||||
|
||||
#include <errno.h>
|
||||
#include <drm.h>
|
||||
#include <xf86drm.h>
|
||||
|
|
@ -261,3 +264,5 @@ void ms_drain_drm_events(ScreenPtr screen);
|
|||
Bool ms_window_has_variable_refresh(modesettingPtr ms, WindowPtr win);
|
||||
void ms_present_set_screen_vrr(ScrnInfoPtr scrn, Bool vrr_enabled);
|
||||
Bool ms_tearfree_is_active_on_crtc(xf86CrtcPtr crtc);
|
||||
|
||||
#endif /* XSERVER_XFREE86_DRIVER_H */
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
*/
|
||||
|
||||
#ifndef _VBE_MODES_H
|
||||
#define _VBE_MODES_H
|
||||
|
||||
/*
|
||||
* This is intended to be stored in the DisplayModeRec's private area.
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@
|
|||
|
||||
/* exported functions are/were used by the X Server */
|
||||
|
||||
#ifndef XSERVER_XFREE86_CONFIGPROCS_H
|
||||
#define XSERVER_XFREE86_CONFIGPROCS_H
|
||||
|
||||
#include <X11/Xfuncproto.h>
|
||||
|
||||
/* Device.c */
|
||||
|
|
@ -146,3 +149,5 @@ xf86freeExtensions(XF86ConfExtensionsPtr ptr);
|
|||
void
|
||||
ErrorF(const char *f, ...);
|
||||
#endif
|
||||
|
||||
#endif /* XSERVER_XFREE86_CONFIGPROCS_H */
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@
|
|||
// Copyright (c) 2021 Apple Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#ifndef XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H
|
||||
#define XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
extern NSString * const XQuartzPrefKeyAppsMenu;
|
||||
|
|
@ -47,3 +50,5 @@ extern NSString * const XQuartzPrefKeySyncPrimaryOnSelect;
|
|||
+ (NSUserDefaults *)xquartzDefaults;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H */
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
#include "os/ddx_priv.h"
|
||||
#include "os/log_priv.h"
|
||||
#include "os/osdep.h"
|
||||
#include "xkb/xkbsrv_priv.h"
|
||||
|
||||
#include "os.h"
|
||||
#include "servermd.h"
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ x11_bin = executable('X11.bin',
|
|||
mach_startup[3], # mach_startupUser.c
|
||||
],
|
||||
link_with: x11_bin_libs,
|
||||
dependencies: [xproto_dep, x11_bin_deps, mach_startup_dep],
|
||||
dependencies: [xproto_dep, x11_dep, x11_bin_deps, mach_startup_dep],
|
||||
include_directories: [inc, '..', top_dir_inc],
|
||||
c_args: xquartz_defs,
|
||||
link_args: ['-Objc'],
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ libXquartz = static_library('Xquartz',
|
|||
c_args: libxquartz_defs,
|
||||
objc_args: libxquartz_defs,
|
||||
include_directories: [inc, '../../pseudoramiX', '../../miext/rootless', top_dir_inc],
|
||||
dependencies: [xproto_dep, pixman_dep],
|
||||
dependencies: [xproto_dep, xdmcp_dep, pixman_dep],
|
||||
link_with: [libxserver_pseudoramix, libxserver_miext_rootless],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,8 @@
|
|||
|
||||
#include <dix-config.h>
|
||||
|
||||
#include "dix/dix_priv.h"
|
||||
|
||||
#include "quartzRandR.h"
|
||||
#include "inputstr.h"
|
||||
#include "quartz.h"
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@
|
|||
*/
|
||||
|
||||
#ifndef DRIWRAP_H
|
||||
#define DRIWRAP_H
|
||||
|
||||
#include "scrnintstr.h"
|
||||
|
||||
Bool
|
||||
|
|
|
|||
|
|
@ -4,9 +4,14 @@
|
|||
* Authors: Alexander Gottwald
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_XWIN_WINPRIV_H
|
||||
#define XSERVER_XWIN_WINPRIV_H
|
||||
|
||||
#include <X11/Xwindows.h>
|
||||
#include <windowstr.h>
|
||||
|
||||
HWND winGetWindowInfo(WindowPtr pWin);
|
||||
Bool winCheckScreenAiglxIsSupported(ScreenPtr pScreen);
|
||||
void winSetScreenAiglxIsActive(ScreenPtr pScreen);
|
||||
|
||||
#endif /* XSERVER_XWIN_WINPRIV_H */
|
||||
|
|
|
|||
|
|
@ -19,8 +19,13 @@
|
|||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_XWIN_WINAUTH_H
|
||||
#define XSERVER_XWIN_WINAUTH_H
|
||||
|
||||
#include <xcb/xcb.h>
|
||||
#include <X11/Xmd.h> // for BOOL
|
||||
|
||||
BOOL winGenerateAuthorization(void);
|
||||
xcb_auth_info_t * winGetXcbAuthInfo(void);
|
||||
|
||||
#endif /* XSERVER_XWIN_WINAUTH_H */
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@
|
|||
* XKB settings.
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_XWIN_WINLAYOUTS_H
|
||||
#define XSERVER_XWIN_WINLAYOUTS_H
|
||||
|
||||
typedef struct {
|
||||
unsigned int winlayout;
|
||||
int winkbtype;
|
||||
|
|
@ -98,3 +101,5 @@ WinKBLayoutRec winKBLayouts[] = {
|
|||
See http://technet.microsoft.com/en-us/library/cc766503%28WS.10%29.aspx
|
||||
for a listing of input locale (keyboard layout) codes
|
||||
*/
|
||||
|
||||
#endif /* XSERVER_XWIN_WINLAYOUTS_H */
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@ from The Open Group.
|
|||
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_XWIN_WINMONITORS_H
|
||||
#define XSERVER_XWIN_WINMONITORS_H
|
||||
|
||||
/* data returned for monitor information */
|
||||
struct GetMonitorInfoData {
|
||||
int requestedMonitor;
|
||||
|
|
@ -41,3 +44,5 @@ struct GetMonitorInfoData {
|
|||
};
|
||||
|
||||
Bool QueryMonitor(int i, struct GetMonitorInfoData *data);
|
||||
|
||||
#endif /* XSERVER_XWIN_WINMONITORS_H */
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
/* Do not include this file directly. It is included at the end of <dix-config.h> */
|
||||
|
||||
#ifndef XSERVER_CONFIG_APPLE_VERBATIM_H
|
||||
#define XSERVER_CONFIG_APPLE_VERBATIM_H
|
||||
|
||||
/* Correctly set _XSERVER64 for OSX fat binaries */
|
||||
#if defined(__LP64__) && !defined(_XSERVER64)
|
||||
#define _XSERVER64 1
|
||||
#elif !defined(__LP64__) && defined(_XSERVER64)
|
||||
#undef _XSERVER64
|
||||
#endif
|
||||
|
||||
#endif /* XSERVER_CONFIG_APPLE_VERBATIM_H */
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
* This file has all defines used in the xwin ddx
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_XWIN_CONFIG_H
|
||||
#define XSERVER_XWIN_CONFIG_H
|
||||
|
||||
#include <dix-config.h>
|
||||
|
||||
/* Winsock networking */
|
||||
|
|
@ -17,3 +21,5 @@
|
|||
|
||||
/* Whether we should re-locate the root to where the executable lives */
|
||||
#mesondefine RELOCATE_PROJECTROOT
|
||||
|
||||
#endif /* XSERVER_XWIN_CONFIG_H */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
/*
|
||||
|
||||
Copyright 1994, 1998 The Open Group
|
||||
|
|
@ -26,6 +25,7 @@ in this Software without prior written authorization from The Open Group.
|
|||
*/
|
||||
|
||||
#ifndef MILINE_H
|
||||
#define MILINE_H
|
||||
|
||||
#include "screenint.h"
|
||||
#include "privates.h"
|
||||
|
|
|
|||
|
|
@ -78,6 +78,9 @@ from The Open Group.
|
|||
* drawn (as with the even-odd rule).
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_MIPOLY_H
|
||||
#define XSERVER_MIPOLY_H
|
||||
|
||||
/*
|
||||
* for the winding number rule
|
||||
*/
|
||||
|
|
@ -172,3 +175,5 @@ typedef struct _ScanLineListBlock {
|
|||
pAET = pAET->next; \
|
||||
} \
|
||||
}
|
||||
|
||||
#endif /* XSERVER_MIPOLY_H */
|
||||
|
|
|
|||
|
|
@ -1,11 +1,3 @@
|
|||
/*
|
||||
* misprite.h
|
||||
*
|
||||
* software-sprite/sprite drawing interface spec
|
||||
*
|
||||
* mi versions of these routines exist.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
Copyright 1989, 1998 The Open Group
|
||||
|
|
@ -31,6 +23,17 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
|||
in this Software without prior written authorization from The Open Group.
|
||||
*/
|
||||
|
||||
/*
|
||||
* misprite.h
|
||||
*
|
||||
* software-sprite/sprite drawing interface spec
|
||||
*
|
||||
* mi versions of these routines exist.
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_MISPRITE_H
|
||||
#define XSERVER_MISPRITE_H
|
||||
|
||||
Bool miSpriteInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs);
|
||||
|
||||
Bool miDCRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
|
||||
|
|
@ -44,3 +47,5 @@ Bool miDCRestoreUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
|
|||
int x, int y, int w, int h);
|
||||
Bool miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
|
||||
void miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
|
||||
|
||||
#endif /* XSERVER_MISPRITE_H */
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ from The Open Group.
|
|||
|
||||
/* Author: Keith Packard, MIT X Consortium */
|
||||
|
||||
#ifndef XSERVER_MIWIDELINE_H
|
||||
#define XSERVER_MIWIDELINE_H
|
||||
|
||||
#include "mifpoly.h" /* for ICEIL */
|
||||
|
||||
/*
|
||||
|
|
@ -91,3 +94,5 @@ typedef struct _LineFace {
|
|||
ValidateGC (pDrawable, pGC); \
|
||||
} \
|
||||
}
|
||||
|
||||
#endif /* XSERVER_MIWIDELINE_H */
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@ in this Software without prior written authorization from The Open Group.
|
|||
|
||||
********************************************************/
|
||||
|
||||
#ifndef XSERVER_MIZERARC_H
|
||||
#define XSERVER_MIZERARC_H
|
||||
|
||||
typedef struct {
|
||||
int x;
|
||||
int y;
|
||||
|
|
@ -122,3 +125,5 @@ extern _X_EXPORT Bool miZeroArcSetup(xArc * /*arc */ ,
|
|||
miZeroArcRec * /*info */ ,
|
||||
Bool /*ok360 */
|
||||
);
|
||||
|
||||
#endif /* XSERVER_MIZERARC_H */
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@
|
|||
#ifndef _ROOTLESSWINDOW_H
|
||||
#define _ROOTLESSWINDOW_H
|
||||
|
||||
#include "dix/screen_hooks_priv.h"
|
||||
|
||||
#include "rootlessCommon.h"
|
||||
|
||||
Bool RootlessCreateWindow(WindowPtr pWin);
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@
|
|||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_C2P_CORE_H
|
||||
#define XSERVER_C2P_CORE_H
|
||||
|
||||
#include "os/bug_priv.h"
|
||||
|
||||
/*
|
||||
|
|
@ -186,3 +189,5 @@ static inline void transp2x(CARD32 d[], unsigned int n)
|
|||
_transp(d, 1, 0, n, mask);
|
||||
return;
|
||||
}
|
||||
|
||||
#endif /* XSERVER_C2P_CORE_H */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,12 @@
|
|||
* Minimal implementation of PanoramiX/Xinerama
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_PSEUDORAMIX_H
|
||||
#define XSERVER_PSEUDORAMIX_H
|
||||
|
||||
void
|
||||
PseudoramiXAddScreen(int x, int y, int w, int h);
|
||||
void
|
||||
PseudoramiXResetScreens(void);
|
||||
|
||||
#endif /* XSERVER_PSEUDORAMIX_H */
|
||||
|
|
|
|||
|
|
@ -51,6 +51,9 @@ from The Open Group.
|
|||
The following types and functions/macros define the ADT.
|
||||
*/
|
||||
|
||||
#ifndef XSERVER_SET_H
|
||||
#define XSERVER_SET_H
|
||||
|
||||
/* an interval of set members */
|
||||
typedef struct {
|
||||
CARD16 first;
|
||||
|
|
@ -133,3 +136,5 @@ int RecordSetMemoryRequirements(RecordSetInterval * /*pIntervals */ ,
|
|||
process interval;
|
||||
}
|
||||
*/
|
||||
|
||||
#endif /* XSERVER_SET_H */
|
||||
|
|
|
|||
Loading…
Reference in New Issue