Add an simd implementation

This is strongly based on graphenes simd plumbing.
All three types get represented as graphene_simf4d_t,
scale as {x,y,0,0}, point as {x,y,0,0} and box as
{x0,y0,x1,y1}.

.clang-format

@@ -1,4 +1,4 @@
-# See https://www.apertis.org/policies/coding_conventions/#code-formatting
+# See https://wiki.apertis.org/Guidelines/Coding_conventions#Code_formatting
 BasedOnStyle: GNU
 AlwaysBreakAfterDefinitionReturnType: All
 BreakBeforeBinaryOperators: None

.gitlab-ci.yml

@@ -78,7 +78,6 @@ style-check-diff:
       - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.node"
       - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
       - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.node"
       - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
       - "${CI_PROJECT_DIR}/_build/testsuite/headless/*/*.log"
       - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
@@ -117,11 +116,10 @@ release-build:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - mkdir _install
-    - export PATH="$HOME/.local/bin:${CI_PROJECT_DIR}/_install/bin:$PATH"
-    - .gitlab-ci/install-meson-project.sh --prefix ${CI_PROJECT_DIR}/_install https://gitlab.gnome.org/jadahl/catch.git main
+    - export PATH="$HOME/.local/bin:$PATH"
     - meson subprojects download
     - meson subprojects update --reset
+    - mkdir _install
     - meson setup
             --prefix=${CI_PROJECT_DIR}/_install
             ${COMMON_MESON_FLAGS}
@@ -211,54 +209,51 @@ msys2-mingw64:
     paths:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
-macos:
+macos-x86_64:
   rules:
     # Do not run in forks as the runner is not available there.
-    # (except for dehesselle who maintains the runner)
-    - if: $CI_PROJECT_NAMESPACE != "GNOME" && $CI_PROJECT_NAMESPACE != "dehesselle"
-      when: never
-    - if: $RUNNER == "macosintel"
-      variables:
-        SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
-        NINJA_PKG: $CI_API_V4_URL/projects/30745/packages/generic/ninja_macos/v1.11.1.1+9/ninja-1.11.1.1-cp38-cp38-macosx_11_0_x86_64.whl
-      when: manual
-      allow_failure: true
-    - if: $RUNNER == "macosarm"
-      variables:
-        SDKROOT: /opt/sdks/MacOSX11.3.sdk
-        NINJA_PKG: ninja==1.11.1.1
+    - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
-  parallel:
-    matrix:
-      - RUNNER: [ "macosintel", "macosarm" ]
   tags:
-    - ${RUNNER}
+    - macosintel
   needs: []
   variables:
-    EXTRA_MESON_FLAGS: ""
-    BACKEND_FLAGS: "-Dx11-backend=false -Dbroadway-backend=true"
-    FEATURE_FLAGS: "-Dmedia-gstreamer=disabled -Dintrospection=enabled -Dgobject-introspection:werror=false"
+    MESON_FORCE_BACKTRACKE: 1
     TMPDIR: /Users/Shared/work/tmp
+    SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
     PIP_CACHE_DIR: /Users/Shared/build/cache
     PIPENV_CACHE_DIR: $PIP_CACHE_DIR
     PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
+    EXTRA_MESON_FLAGS: "-Dgobject-introspection:werror=false"
   before_script:
-    - .gitlab-ci/show-info-macos.sh
-    - python3 -m venv .venv
-    # Building the introspection feature requires pkg-config and bison.
-    - curl -L $CI_API_V4_URL/projects/30437/packages/generic/pkgconfig/v0.29.2+10/pkg-config-0.29.2+10_$(uname -m).tar.xz | tar -C .venv -xJ
-    - curl -L $CI_API_V4_URL/projects/30438/packages/generic/bison/v3.8.2+3/bison-3.8.2+3_$(uname -m).tar.xz | tar -C .venv -xJ
+    # Not using ccache on purpose as it accelerates the build so much that it
+    # can trigger race conditions in the gobject-introspection subproject.
+    - bash .gitlab-ci/show-info-osx.sh
+    - /opt/macports/bin/python3.10 -m venv .venv
+    - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
+    - ln -s /opt/pkg-config/bin/pkg-config .venv/bin
+    - ln -s /opt/bison/bin/bison .venv/bin
     - source .venv/bin/activate
-    - pip3 install meson==1.3.2 $NINJA_PKG
-    # We're not setting up ccache here on purpose as it accelerates the build
-    # so much that it triggers race conditions in the gobject-introspection
-    # subproject.
+    - pip3 install meson==1.2.0
+    - pip3 install ninja==1.11.1
+    - pip3 install /Users/Shared/build/pkgs/PyGObject-3.44.0-cp310-cp310-macosx_10_13_x86_64.whl
+                   /Users/Shared/build/pkgs/pycairo-1.23.0-cp310-cp310-macosx_10_13_x86_64.whl
   script:
     - meson setup
             ${COMMON_MESON_FLAGS}
             ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
+            -Dx11-backend=false
+            -Dbroadway-backend=true
+            -Dmacos-backend=true
+            -Dmedia-gstreamer=disabled
+            -Dintrospection=enabled
+            -Dcpp_std=c++11
+            -Dpixman:tests=disabled
+            -Dlibjpeg-turbo:simd=disabled
+            -Dbuild-demos=false
+            -Dbuild-tests=false
+            -Dbuild-examples=false
+            -Dbuild-testsuite=false
             _build
     - meson compile -C _build
   artifacts:
@@ -433,6 +428,13 @@ asan-build:
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland gtk
+  artifacts:
+    when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 reference:
   image: $FEDORA_IMAGE
@@ -446,10 +448,10 @@ reference:
             --force-fallback-for=gdk-pixbuf,pango
             -Dintrospection=enabled
             -Ddocumentation=true
-            -Dman-pages=true
+            -Dgtk_doc=true
             -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:documentation=true
-            -Dbuild-demos=true
+            -Dpango:gtk_doc=true
+            -Dbuild-demos=false
             -Dbuild-examples=false
             -Dbuild-tests=false
             -Dbuild-testsuite=false
@@ -461,7 +463,6 @@ reference:
     - mv _build/docs/reference/gdk/gdk4-wayland/ _reference/gdk4-wayland/
     - mv _build/docs/reference/gsk/gsk4/ _reference/gsk4/
     - mv _build/docs/reference/gtk/gtk4/ _reference/gtk4/
-    - mv _build/docs/reference/gtk/*.html _reference/gtk4/
     - mv _build/subprojects/pango/docs/Pango/ _reference/Pango/
     - mv _build/subprojects/pango/docs/PangoCairo/ _reference/PangoCairo/
     - mv _build/subprojects/pango/docs/PangoFc/ _reference/PangoFc/
@@ -483,4 +484,3 @@ publish-docs:
     - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
   rules:
     - if: $CI_COMMIT_REF_NAME == "main"
-

.gitlab-ci/fedora.Dockerfile

@@ -2,6 +2,8 @@ FROM fedora:39
 
 RUN dnf -y install \
     adwaita-icon-theme \
+    atk-devel \
+    at-spi2-atk-devel \
     avahi-gobject-devel \
     cairo-devel \
     cairo-gobject-devel \
@@ -16,6 +18,7 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
+    docbook-style-xsl \
     elfutils-libelf-devel \
     expat-devel \
     fribidi-devel \

.gitlab-ci/flatpak-build.sh

@@ -19,12 +19,13 @@ flatpak build ${builddir} meson \
                 --buildtype=debugoptimized \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
+                -Dvulkan=disabled \
                 -Dbuild-tests=false \
                 -Dbuild-testsuite=false \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \
                 -Dbuild-demos=true \
-                -Dprofile=devel \
+                -Ddemo-profile=devel \
                 _flatpak_build
 
 flatpak build --env=CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA ${builddir} ninja -C _flatpak_build install

.gitlab-ci/install-meson-project.sh

@@ -1,91 +0,0 @@
-#!/bin/bash
-
-set -e
-
-usage() {
-  cat <<-EOF
-	Usage: $(basename $0) [OPTION…] REPO_URL COMMIT
-
-	Check out and install a meson project
-
-	Options:
-	  -Dkey=val      Option to pass on to meson
-	  --prefix       Prefix to install to
-	  --subdir       Build subdirectory instead of whole project
-	  --prepare      Script to run before build
-
-	  -h, --help     Display this help
-
-	EOF
-}
-
-TEMP=$(getopt \
-  --name=$(basename $0) \
-  --options='D:h' \
-  --longoptions='prefix:' \
-  --longoptions='subdir:' \
-  --longoptions='prepare:' \
-  --longoptions='help' \
-  -- "$@")
-
-eval set -- "$TEMP"
-unset TEMP
-
-MESON_OPTIONS=()
-PREFIX=/usr
-SUBDIR=.
-PREPARE=:
-
-while true; do
-  case "$1" in
-    -D)
-      MESON_OPTIONS+=( -D$2 )
-      shift 2
-    ;;
-
-    --prefix)
-      PREFIX=$2
-      shift 2
-    ;;
-
-    --subdir)
-      SUBDIR=$2
-      shift 2
-    ;;
-
-    --prepare)
-      PREPARE=$2
-      shift 2
-    ;;
-
-    -h|--help)
-      usage
-      exit 0
-    ;;
-
-    --)
-      shift
-      break
-    ;;
-  esac
-done
-
-if [[ $# -lt 2 ]]; then
-  usage
-  exit 1
-fi
-
-REPO_URL="$1"
-COMMIT="$2"
-
-CHECKOUT_DIR=$(mktemp --directory)
-trap "rm -rf $CHECKOUT_DIR" EXIT
-
-git clone --depth 1 "$REPO_URL" -b "$COMMIT" "$CHECKOUT_DIR"
-
-pushd "$CHECKOUT_DIR/$SUBDIR"
-sh -c "$PREPARE"
-meson setup --prefix "$PREFIX" _build "${MESON_OPTIONS[@]}"
-meson compile -C _build
-meson install -C _build
-popd

.gitlab-ci/show-info-osx.sh

@@ -3,11 +3,6 @@
 set -eux -o pipefail
 
 xcodebuild -version || :
-
-if [ -z "$SDKROOT" ]; then
-  xcodebuild -showsdks || :
-else
-  echo "SDKROOT = $SDKROOT"
-fi
+xcodebuild -showsdks || :
 
 system_profiler SPSoftwareDataType || :

.gitlab-ci/test-msys2.sh

@@ -34,8 +34,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-python-gobject \
     mingw-w64-$MSYS2_ARCH-shaderc \
-    mingw-w64-$MSYS2_ARCH-vulkan \
-    mingw-w64-$MSYS2_ARCH-vulkan-headers
+    mingw-w64-$MSYS2_ARCH-vulkan
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -45,7 +44,7 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
-meson setup \
+meson \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \

CONTRIBUTING.md

@@ -35,7 +35,7 @@ The issue tracker is meant to be used for actionable issues only.
 
 You should not open a new issue for security related questions.
 
-When in doubt, follow the process for [GNOME security issues](https://security.gnome.org/).
+When in doubt, follow [security](https://security.gnome.org/).
 
 ### Bug reports
 
@@ -100,16 +100,14 @@ development tools appropriate for your operating system, including:
  - Meson
  - Ninja
  - Gettext (19.7 or newer)
- - a [C99 compatible compiler][glib-toolchain-reqs]
+ - a [C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
 
 Up-to-date instructions about developing GNOME applications and libraries
 can be found on [the GNOME Developer Center](https://developer.gnome.org).
 
 The GTK project uses GitLab for code hosting and for tracking issues. More
-information about using GitLab can be found on [the GNOME handbook][handbook].
-
-[glib-toolchain-reqs]: https://gitlab.gnome.org/GNOME/glib/-/blob/main/docs/toolchain-requirements.md
-[handbook]: https://handbook.gnome.org/infrastructure/gitlab.html
+information about using GitLab can be found [on the GNOME
+wiki](https://wiki.gnome.org/GitLab).
 
 ### Dependencies
 
@@ -133,7 +131,7 @@ GTK will attempt to download and build some of these dependencies if it
 cannot find them on your system.
 
 Additionally, you may want to look at projects that create a development
-environment for you, like [jhbuild](https://gitlab.gnome.org/GNOME/jhbuild)
+environment for you, like [jhbuild](https://wiki.gnome.org/HowDoI/Jhbuild)
 and [gvsbuild](https://github.com/wingtk/gvsbuild).
 
 ### Getting started
@@ -146,28 +144,33 @@ $ git clone https://gitlab.gnome.org/yourusername/gtk.git
 $ cd gtk
 ```
 
+**Note**: if you plan to push changes to back to the main repository and
+have a GNOME account, you can skip the fork, and use the following instead:
+
+```sh
+$ git clone git@gitlab.gnome.org:GNOME/gtk.git
+$ cd gtk
+```
+
 To compile the Git version of GTK on your system, you will need to
 configure your build using Meson:
 
 ```sh
-$ meson setup _builddir .
-$ meson compile -C _builddir
+$ meson _builddir .
+$ cd _builddir
+$ ninja
 ```
 
 Typically, you should work on your own branch:
 
 ```sh
-$ git switch -C your-branch
+$ git checkout -b your-branch
 ```
 
 Once you've finished working on the bug fix or feature, push the branch
 to the Git repository and open a new merge request, to let the GTK
 maintainers review your contribution.
 
-**Important**: Do **not** attach a diff or a patch file to a GitLab issue.
-Patches cannot be reviewed, and do not not go through the CI pipeline. If
-you wish to submit your changes to GTK, always use a merge request.
-
 ### Code reviews
 
 Each contribution is reviewed by the core developers of the GTK project.
@@ -259,4 +262,4 @@ people committing to GTK to follow a few rules:
 
 If you have been contributing to GTK for a while and you don't have commit
 access to the repository, you may ask to obtain it following the [GNOME account
-process](https://handbook.gnome.org/infrastructure/developer-access.html).
+process](https://wiki.gnome.org/AccountsTeam/NewAccounts).

NEWS

@@ -1,687 +1,6 @@
-Overview of Changes in 4.15.5, xx-xx-xxxx
+Overview of Changes in 4.13.6, xx-xx-xxxx
 =========================================
 
-Overview of Changes in 4.15.4, 30-07-2024
-=========================================
-
-* GtkPopover:
- - Fix size allocation with wrapping labels
-
-* GtkColumnView:
- - Check column visibility when measuring
-
-* CSS:
- - Fix fallout from recent changes
- - Make implementation of currentcolor inheritance match browsers
-
-* Gdk:
- - Introduce GdkColorState for encoding color space information
-   Currently, we support srgb, srgb-linear, rec2100-pq and rec2100-linear
- - Add color states to GdkTexture, as well as to the texture builder
-   and downloader objects, and convert as necessary
- - Add GdkMemoryTextureBuilder
- - Attach color states when loading or saving textures
- - Add GdkCicpParams to create color state objects for cicp tuples
- - Drop GDK_DEBUG=vulkan-validate
-   Use VK_INSTEANCE_LAYERS=VK_LAYER_KHRONOS_validation instead
-
-* Gsk:
- - Improve caching of glyphs and textures
- - Remove the uber shader
- - Numerous bug fixes
- - Fix corner cases in offload handling
- - Implement occlusion culling for opaque content
- - Allow offloading (some) transformed textures
- - Take colorstate into account when compositing
- - Add GDK_DEBUG=linear to opt into linear compositing
- - Implement tiling for large textures
- - Stop using descriptors and go back to simpler texture
-   management that should work better with older GL
- - Use correct shader clip mode for glyphs
- - Improve shadow rendering
-
-* Media:
- - Attach color states to textures obtained from gstreamer
-
-* Wayland:
- - Allow offloading GL textures via dmabuf export
- - Suppot the xx-color-management-v4 protocol
-
-* Deprecations:
- - GskGLShader and the render node
-
-* Tools:
- - Improve the rendernode tool extract command
- - Add an image tool that is about manipulating textures
-
-* Build:
- - GTK now requires a C11 compiler
-
-* Translation updates
- Georgian
- Hebrew
- Hindi
- Occitan
- Slovenian
-
-
-Overview of Changes in 4.15.3, 29-06-2024
-=========================================
-
-* Accessibility:
- - Only emit notifications when cursor positions change in GtkText
- - Fix handling of help text properties
-
-* CSS:
- - Fix some crashes introduced in recent currentcolor changes
-
-* DND:
- - Avoid a critical
-
-* Documentation:
- - Fix many oversights and missing docs
-
-* maxOS:
- - Add native keyboard shortcuts
-
-
-Overview of Changes in 4.15.2, 28-06-2024
-=========================================
-
-* GtkFileChooserWidget:
- - Plug some memory leaks
- - Make Ctrl-Shift-N create a new folder
-
-* GtkPopover:
- - Handle resizing and position changes better
-
-* CSS:
- - Support color(), oklab(), etc (https://www.w3.org/TR/css-color-4/)
- - Support color-mix() (https://www.w3.org/TR/css-color-5/)
- - Support relative colors (https://www.w3.org/TR/css-color-5/)
- - Support more colorspaces in color()
- - Allow percentages for opacity
- - Handle currentcolor more correctly
-
-* Accessibility:
- - Avoid markup when reading labels
-
-* GSK:
- - Subset fonts when serializing node trees
- - Make ngl export render_texture results as dmabufs
-
-* Wayland:
- - Use xdg-dialog protocol for attached dialogs
-
-* Windows:
- - Build with UNICODE
-
-* macOS:
- - Implement fullscreen-on-monitor
-
-* Documentation:
- - Widget shortcuts and actions are now described in the docs
-
-* Debugging:
- - Add GTK_DEBUG=css for warning about deprecated css syntax
-
-* Tools:
- - rendernode-tool: Add an extract command for data urls
-
-* Deprecations:
- - CSS Color functions shade(), lighter(), darker(), alpha(), mix()
-
-* Translation updates:
- Czech
- Hebrew
- Serbian
-
-
-Overview of Changes in 4.15.1, 21-05-2024
-=========================================
-
-* GtkGraphicsOffload:
- - Don't crash without a child
-
-* GtkSpinner:
- - Don't animate when unmapped
-
-* CSS:
- - Support the :root selector
- - Support variables and custom properties (https://www.w3.org/TR/css-variables-1/)
- - Implement math functions (https://www.w3.org/TR/css-values-4/)
- - Support modern syntax and calc in rgb() and hsl()
-
-* Icontheme:
- - Make symbolic svg loading more efficient
- - Handle color-free symbolics more efficiently
-
-* Accessibility:
- - Make the gtk-demo sidebar search more accessible
- - Stop emitting focus events
- - Realize child contexts when necessary
-
-* GDK:
- - Support XDG_ACTIVATION_TOKEN
- - dmabuf: Be more defensive when importing unknown formats to GL
- - dmabuf: Use narrow range for YUV
- - vulkan: Recreate swapchains when necessary or beneficial
-
-* GSK:
- - Improve logging for GDK_DEBUG=offload
- - Improve logging for GSK_DEBUG=renderer
- - gpu: Warn about inefficient texture import
- - gpu: Handle tiny offscreens correctly
- - vulkan: Add profiler marks in various places
- - vulkan: Fix a problem with imported dmabufs showing up black
- - cairo: Speed up mask nodes, since we use them for symbolic icons
-
-* Wayland:
- - Use wl_compositor version 6
-
-* X11:
- - Implement a missing method
-
-* Build:
- - Fix many ubsan warnings
-
-* Debugging:
- - Show more texture details in the recorder
- - Use GTK_DEBUG=css to see CSS deprecations
-
-* macOS:
- - Fix problems with events handed back to the OS
- - Respect GDK_DEBUG=default-settings
- - Allow applictions to handle Dock > Quit
-
-* Deprecations:
- - Use of @name colors in CSS
-
-* Translation updates:
- Catalan
- Georgian
- Hungarian
- Korean
- Portuguese
- Turkish
-
-
-Overview of Changes in 4.15.0, 21-04-2024
-=========================================
-
-This release changes the default GSK renderer to be Vulkan, on
-Wayland. Other platforms still use ngl.
-
-The intent of this change is to get wider testing and verify that
-Vulkan drivers are good enough for us to rely on. If significant
-problems show up, we will revert this change for 4.16.
-
-You can still override the renderer choice using the GSK_RENDERER
-environment variable.
-
----
-
-This release also changes font rendering settings by introducing
-a new high-level gtk-font-rendering settings which gives GTK more
-freedom to decide on font rendering.
-
-You can still use the low-level font-related settings by changing
-the new property to 'manual'.
-
----
-
-* GtkColumnView:
- - Fix infinite loops in dispose
- - Fix problems with weak ref cycles in GtkExpression
-
-* GtkListView:
-* GtkShortcutManager:
- - Track the propagation phase of added controllers
-
-* GtkGLArea:
- - Produce dmabuf textures, so graphics offload is possible
-
-* GtkTextView:
- - Support text shadows
-
-* GtkGraphicsOffload:
- - Add a black-background property
-
-* Settings:
- - Add a new gtk-font-rendering setting
-
-* Accessibility:
- - Add support for GetRangeExtents to GtkAccessibleText
- - Add support for GetOffsetAtPoint to GtkAccessibleText
- - Implement GtkAccessibleRange for scrollbars
-
-* GDK:
- - Add a callback-based cursor API
-
-* GSK:
--  Use the Vulkan renderer by default
- - Avoid an infinite recursion with offscreens in some cases
- - Optimize graphics offload to make it more likely that compositors
-   can use direct scanout
-
-* X11:
- - Fix some confusing debug messages
- - Drop a no-longer-relevant optimization that was interfering with
-   getting the current window manager capabilities
-
-* macOS:
- - Implement the color picker for macOS 10.15+
-
-* Debugging:
- - Snow monitor resolution in the inspector
-
-* Demos:
- - Use graphics offload in the shadertoy demo
- - Show more reliable fps numbers in the fishbowl demo
-
-* Tools:
- - Support generating pdf in gtk4-rendernode-tool
-
-* Build:
- - Require pango 1.52
- - Require cairo 1.18
- - Add a missing dependency that was causing build failures
- - Drop deprecated build options:
-   gtk_doc -> documentation
-   update_screenshots -> screenshots
-   demo-profile -> profile
-   demos -> build-demos
-
-* Deprecations:
- - gdk_widget_set/get_font_options
- - gdk_wayland/x11_display_set_cursor_theme
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- British English
- Chinese (China)
- Hebrew
- Kabyle
- Persian
- Polish
- Russian
- Slovenian
- Swedish
- Turkish
-
-
-Overview of Changes in 4.14.2, 03-04-2024
-=========================================
-
-* GtkScale:
- - Improve positioning of values in some cases
-
-* Theme:
- - Make progress in entries visible
-
-* Accessibility:
- - Fix text insertion handling
-
-* GDK:
- - dnd: Use the default cursor durion motion
- - dnd: Use a better cursor for indicating the move action
-
-* GSK:
- - gl: Handle offloads in offscreen context better
- - Fix text rendering problems with some fonts
-
-* Wayland:
- - Tighten up some protocol version checks
- - Use the presentation time protocol
- - Fix a crash with subsurfaces
- - Improve settings portal handling
-
-* macOS:
- - Fix up the app menu support
-
-* Windows:
- - Fix problems with minimization
- - Fix build without fontconfig
-
-* Debugging:
- - Add font settings in the inspector
-
-* Demos:
- - Clean up the application demo
- - Update cursor images for the cursor demo
-
-* Translation updates:
- Catalan
- Czech
- French
- Georgian
- Hebrew
- Persian
- Slovenian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.14.1, 16-03-2024
-=========================================
-
-* GtkTextView:
- - Fix a mixup of cursor and anchor when retrieving surrounding text
-   in input methods
-
-* Printing:
- - Avoid accessing freed printers
-
-* Accessibility:
- - Fix memory leaks
-
-* GDK:
- - Rename the GDK_VULKAN_SKIP environment variable to GDK_VULKAN_DISABLE
- - Add a GDK_GL_DISABLE environment variable
-
-* GSK:
- - Rename the GSK_GPU_SKIP environment variable to GSK_GPU_DISABLE
- - Speed up handling of repeated ops, which should help for text
- - Speed up the inner loop of text node conversion
- - Drop the glyph-align optimization flag
- - ngl: Avoid reusing frames while they are in use
- - Fix flickering thumbnails in nautilus
- - Speed up buffer handling in both ngl and Vulkan
-
-* Demos:
- - Skip demos using gl shaders when we're not using the gl renderer
-
-* Build:
- - Fix some ubsan warnings
- - Avoid zink in ci since it spams stderr
-
-* Translation updates:
- Czech
- German
- Korean
- Russian
-
-
-Overview of Changes in 4.14.0, 12-03-2024
-=========================================
-
-Note: The new renderers and dmabuf support are using graphics drivers
-in different ways than the old gl renderer, and trigger new driver bugs,
-(see for example https://gitlab.gnome.org/GNOME/gtk/-/issues/6418 and
-https://gitlab.gnome.org/GNOME/gtk/-/issues/6388). Therefore, it is
-recommended to use the latest mesa release (24.x) with the new renderers.
-
-* GtkTextView:
- - Don't snapshot children twice
- - Don't blink the cursor when hidden
-
-* GtkEmojiChooser:
- - Fix presentation selector handling
-
-* GtkSnapshot:
- - Fix wrong nodes with transformed shadows
-
-* GtkIMContext:
- - Make gtk_im_context_activate_osk public
-
-* Accessibility:
- - Implement get_contents_at for all our text widgets
- - Add GtkAccessibleText.get_default_attributes
-
-* GSK:
- - Don't fall back to cairo for software rendering. gl+llvmpipe is better
- - Round vertical glyph position to a device pixel position if the font is hinted
- - Fix problems with clip handling
- - Make vulkan and ngl match their font handling
- - Fix some corner-cases with offloading and clips
- - Fix problem with rendering of missing glyphs in hinted fonts
-
-* MacOs:
- - Implement cursor-from-texture
-
-* Translation updates:
- Basque
- British English
- French
- Indonesian
- Kazakh
- Latvian
- Lithuanian
- Norwegian Bokmål
- Slovenian
- Spanish
- Turkish
-
-
-Overview of Changes in 4.13.9, 02-03-2024
-=========================================
-
-* GtkEditable:
- - Fix preconditions to be not too strict
-
-* GtkEmojiChooser:
- - Support search in the locale as well as in English
-
-* GtkIconTheme:
- - Make gtk_icon_paintable_new_for_file support symbolics
-
-* GtkVideo:
- - Fix a problem with cursor handling that could lead to crashes
-
-* Accessibility:
- - Fix GetCharacterAtOffset implementation
- - Add a Terminal role
- - Make TextCaretMoved match gtk3
- - Support multiple levels of GtkEditable delegates
-
-* GSK:
- - Make the node parser more flexible for text nodes
- - Change the way font scaling is handled to avoid clipping
- - Fix handling of missing glyphs in the new renderers
-
-* X11:
- - Don't claim to support shadows without a compositor
-
-* Wayland:
- - Fix handling of output scales
-
-* Tools:
- - Add a compare command to gtk4-rendernode-tool
-
-* Build:
- - Fix some ubsan complaints
-
-* Translation updates:
- Basque
- British English
- Catalan
- Finnish
- Galician
- Georgian
- Hebrew
- Indonesian
- Kazakh
- Latvian
- Lithuanian
- Persian
- Polish
- Russian
- Slovenian
- Spanish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.13.8, 20-02-2024
-=========================================
-
-* Accessibility:
- - Add a GtkAccessibleText interface for allowing 3rd party
-   text widgets (notably vte) to be accessible
- - Avoid duplicate accessible descriptions
- - Fix GetAccessibleAtPoint
-
-* GSK:
- - Avoid offscreens for disjoint containers
- - Don't use the gpu renderers with llvmpipe
- - Fix various rendering issues found by tests
- - Allow unnormalized node bounds again
- - Fix a broken case of rounded-rect intersection
- - Fix handling of external textures in gpu renderers
- - Make gpu renderers work with WGL on Windows
-
-* build:
- - Allow building without dmabuf support on (old) Linux
-
-* X11:
- - Fix monitor enter/leave signals
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Czech
- Galician
- Georgian
- Hebrew
- Lithuanian
- Persian
- Russian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.13.7, 11-02-2024
-=========================================
-
-* GtkFileChooser:
- - Speed up opening
-
-* GtkCalendar:
- - Add some missing setters and getters
-
-* Accessibility:
- - Add socket support for webkit accessibility
- - Implement AT-SPI text for GtkText
- - Implement AT-SPI component generically
- - Add an announce API
-
-* GSK:
- - Make the ngl renderer work on macOS
- - Fix a crash in the vulkan renderer
- - Make nodeparser allow aliases for fonts again
- - Implement cache eviction for glyph and texture caches
- - Fix ngl shaders to work on GL < 4.0
- - Require GL 3.3 for the ngl renderer
- - Fix problems with scaled shadows
- - Fix problems with holes for underlaid subsurfaces
- - Improve handling of scales and glyph cache efficiency
-
-* Media:
- - Support dmabufs in the gstreamer backend. This allows
-   zero-copy video playback on Wayland when paired with
-   hardware video decoding
- - Drop the experimental ffmpeg backend. It hasn't been
-   building for a year
-
-* Wayland:
- - Commit empty frames if and double-buffered state is pending
- - Fix monitor size information when using mutter without
-   the scale-monitor-framebuffer setting
- - Clear the current tablet on tab leave, fixing a crash
-
-* macOS:
- - Propagate unhandled input events back to the OS
-
-* Tools:
- - Make the crash handling in gtk4-node-editor more robust
-
-* Translation updates
- Galician
- Georgian
- Occitan
- Turkish
-
-
-Overview of Changes in 4.13.6, 25-01-2024
-=========================================
-
-This release changes the ngl renderer to be the default renderer.
-
-The intent of this change is to get wider testing and verify that
-the new renderers are production-ready. If significant problems
-show up, we will revert this change for 4.14.
-
-You can still override the renderer choice using the GSK_RENDERER
-environment variable.
-
-Since ngl can handle fractional scaling much better than the old gl
-renderer, we allow fractional scaling by default with gl now. If you
-are using the old gl renderer (e.g. because your system is limited to
-GLES2), you can disable fractional scaling by setting the GDK_DEBUG
-environment variable to include the gl-no-fractional key.
-
-* GtkColumnView:
- - Fix infinite loops in dispose
- - Fix problems with weak ref cycles in GtkExpression
-
-* GtkListView:
- - Fix some corner cases with sections during insertions and deletions
- - Don't double-recycle widgets
-
-* GtkStack:
- - Add automatic cleanup for GtkStackPage
-
-* GDK:
- - Use standard cursor names for drag cursors
- - Enable fractional scaling with gl by default
-
-* GSK:
- - Many fixes and improvements to the unified renderers:
-   - Fix text rendering with the uber shader
-   - Fix rounding issues with fractional scales
-   - Fix some memory leaks
-   - Many text rendering fixes
-   - Implement subpixel positioning for glyphs
-   - Support custom fonts in node files
-   - Add tests for font rendering
-   - Fix drawing of repeat nodes
-   - Implement subpixels positioning
-   - Evict stale textures, glyphs and atlases from the cache
- - Some fixes and improvements to the GL renderer:
-   - Fix problems with GLES on Nvidia
-   - Avoid a crash in the mask demo
-   - Respect opacity of the first child node in containers
- - Some fixes and improvements to the fallback renderer:
-   - Fix drawing of repeat nodes
- - Make ngl the default renderer
-
-* Wayland:
- - Fix problems with tablet cursors
- - Fix problems without seats
-
-* Accessibility:
- - Respect a separate "show-status-shapes setting
- - Fix change notification for accessible names on some widgets
-
-* Inspector:
- - Show the git commit in devel builds
-
-* Tools:
- - Make gtk4-node-editor autosave its contents
- - Add a benchmark command to gtk4-rendernode-tool
-
-* Translation updates:
- French
- Galician
- Georgian
- Occitan
- Persian
- Russian
- Vietnamese
-
-
 Overview of Changes in 4.13.5, 07-01-2024
 =========================================
 

README.md

@@ -39,21 +39,18 @@ Nightly documentation can be found at
   - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk4/
 
 Nightly flatpaks of our demos can be installed from the
-[GNOME Nightly](https://nightly.gnome.org/) repository:
-
-```sh
-flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
-flatpak install gnome-nightly org.gtk.Demo4
-flatpak install gnome-nightly org.gtk.WidgetFactory4
-flatpak install gnome-nightly org.gtk.IconBrowser4
-```
+[GNOME Nightly](https://wiki.gnome.org/Apps/Nightly) repository:
+  - `flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo`
+  - `flatpak install gnome-nightly org.gtk.Demo4`
+  - `flatpak install gnome-nightly org.gtk.WidgetFactory4`
+  - `flatpak install gnome-nightly org.gtk.IconBrowser4`
 
 Building and installing
 -----------------------
 
 In order to build GTK you will need:
 
-  - [a C11 compatible compiler](https://gitlab.gnome.org/GNOME/glib/-/blob/main/docs/toolchain-requirements.md)
+  - [a C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
   - [Python 3](https://www.python.org/)
   - [Meson](http://mesonbuild.com)
   - [Ninja](https://ninja-build.org)
@@ -128,7 +125,7 @@ version, for example `gtk-4-10`.
 How to report bugs
 ------------------
 
-Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/).
+Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/new).
 
 In the bug report please include:
 

build-aux/flatpak/org.gtk.Demo4.json

@@ -185,8 +185,9 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

build-aux/flatpak/org.gtk.IconBrowser4.json

@@ -114,8 +114,9 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {

build-aux/flatpak/org.gtk.WidgetFactory4.json

@@ -114,8 +114,9 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {
@@ -130,6 +131,7 @@
         "env" : {
             "DBUS_SESSION_BUS_ADDRESS" : "''",
             "GSK_RENDERER" : "opengl",
+            "GDK_DEBUG" : "vulkan-disable",
             "G_ENABLE_DEBUG" : "true"
         }
     }

build-aux/flatpak/org.gtk.gtk4.NodeEditor.json

@@ -114,8 +114,9 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
             ],
             "sources" : [
                 {
@@ -130,6 +131,7 @@
         "env" : {
             "DBUS_SESSION_BUS_ADDRESS" : "''",
             "GSK_RENDERER" : "opengl",
+            "GDK_DEBUG" : "vulkan-disable",
             "G_ENABLE_DEBUG" : "true"
         }
     }

demos/gtk-demo/cursors.c

@@ -15,54 +15,12 @@ on_destroy (gpointer data)
   window = NULL;
 }
 
-static GdkTexture *
-cursor_callback (GdkCursor *cursor,
-                 int        cursor_size,
-                 double     scale,
-                 int       *width,
-                 int       *height,
-                 int       *hotspot_x,
-                 int       *hotspot_y,
-                 gpointer   data)
-{
-  GdkPixbuf *pixbuf;
-  GdkTexture *texture;
-  GError *error = NULL;
-  int scaled_size;
-
-  scaled_size = ceil (cursor_size * scale);
-
-  pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/cursors/images/gtk-logo.svg",
-                                                  scaled_size, scaled_size,
-                                                  TRUE,
-                                                  &error);
-  if (!pixbuf)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return NULL;
-    }
-
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
-
-  g_object_unref (pixbuf);
-
-  *width = cursor_size;
-  *height = cursor_size;
-  *hotspot_x = 18 * cursor_size / 32.0;
-  *hotspot_y = 2 * cursor_size / 32.0;
-
-  return texture;
-}
-
 GtkWidget *
 do_cursors (GtkWidget *do_widget)
 {
   if (!window)
     {
       GtkBuilder *builder;
-      GtkWidget *logo_callback;
-      GdkCursor *cursor;
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
@@ -71,10 +29,6 @@ do_cursors (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (on_destroy), NULL);
-      logo_callback = GTK_WIDGET (gtk_builder_get_object (builder, "logo_callback"));
-      cursor = gdk_cursor_new_from_callback (cursor_callback, NULL, NULL, NULL);
-      gtk_widget_set_cursor (logo_callback, cursor);
-      g_object_unref (cursor);
       g_object_unref (builder);
     }
 

demos/gtk-demo/demo.gresource.xml

@@ -116,7 +116,6 @@
     <file>w_resize_cursor.png</file>
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
-    <file>gtk-logo.svg</file>
   </gresource>
   <gresource prefix="/dnd">
     <file>dnd.css</file>

demos/gtk-demo/fishbowl.c

@@ -170,7 +170,6 @@ update_paintable (GtkWidget     *widget,
 static GtkWidget *
 create_cogs (void)
 {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   GtkWidget *picture;
   static GskGLShader *cog_shader = NULL;
   GdkPaintable *paintable;
@@ -183,13 +182,6 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_widget_add_tick_callback (picture, update_paintable, NULL, NULL);
 
   return picture;
-G_GNUC_END_IGNORE_DEPRECATIONS
-}
-
-static gboolean
-check_cogs (GtkFishbowl *fb)
-{
-  return GSK_IS_GL_RENDERER (gtk_native_get_renderer (gtk_widget_get_native (GTK_WIDGET (fb))));
 }
 
 static void
@@ -226,41 +218,36 @@ create_graph (void)
 
 static const struct {
   const char *name;
-  GtkWidget * (* create_func) (void);
-  gboolean    (* check) (GtkFishbowl *fb);
+  GtkWidget * (*create_func) (void);
 } widget_types[] = {
-  { "Icon",       create_icon,           NULL },
-  { "Button",     create_button,         NULL },
-  { "Blurbutton", create_blurred_button, NULL },
-  { "Fontbutton", create_font_button,    NULL },
-  { "Levelbar",   create_level_bar,      NULL },
-  { "Label",      create_label,          NULL },
-  { "Spinner",    create_spinner,        NULL },
-  { "Spinbutton", create_spinbutton,     NULL },
-  { "Video",      create_video,          NULL },
-  { "Gears",      create_gears,          NULL },
-  { "Switch",     create_switch,         NULL },
-  { "Menubutton", create_menu_button,    NULL },
-  { "Shader",     create_cogs,           check_cogs },
-  { "Tiger",      create_tiger,          NULL },
-  { "Graph",      create_graph,          NULL },
+  { "Icon",       create_icon           },
+  { "Button",     create_button         },
+  { "Blurbutton", create_blurred_button },
+  { "Fontbutton", create_font_button    },
+  { "Levelbar",   create_level_bar      },
+  { "Label",      create_label          },
+  { "Spinner",    create_spinner        },
+  { "Spinbutton", create_spinbutton     },
+  { "Video",      create_video          },
+  { "Gears",      create_gears          },
+  { "Switch",     create_switch         },
+  { "Menubutton", create_menu_button    },
+  { "Shader",     create_cogs           },
+  { "Tiger",      create_tiger          },
+  { "Graph",      create_graph          },
 };
 
 static int selected_widget_type = -1;
 static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
 
-static gboolean
+static void
 set_widget_type (GtkFishbowl *fishbowl,
                  int          widget_type_index)
 {
   GtkWidget *window;
 
   if (widget_type_index == selected_widget_type)
-    return TRUE;
-
-  if (widget_types[widget_type_index].check != NULL &&
-      !widget_types[widget_type_index].check (fishbowl))
-    return FALSE;
+    return;
 
   selected_widget_type = widget_type_index;
 
@@ -270,8 +257,6 @@ set_widget_type (GtkFishbowl *fishbowl,
   window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (fishbowl)));
   gtk_window_set_title (GTK_WINDOW (window),
                         widget_types[selected_widget_type].name);
-
-  return TRUE;
 }
 
 G_MODULE_EXPORT void
@@ -279,17 +264,14 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
                                  gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
-  int new_index = selected_widget_type;
+  int new_index;
 
-  do
-    {
-      if (new_index + 1 >= N_WIDGET_TYPES)
-        new_index = 0;
-      else
-        new_index = new_index + 1;
+  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
+    new_index = 0;
+  else
+    new_index = selected_widget_type + 1;
 
-    }
-  while (!set_widget_type (fishbowl, new_index));
+  set_widget_type (fishbowl, new_index);
 }
 
 G_MODULE_EXPORT void
@@ -297,18 +279,14 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
                                  gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
-  int new_index = selected_widget_type;
+  int new_index;
 
-  do
-    {
-      if (new_index - 1 < 0)
-        new_index = N_WIDGET_TYPES - 1;
-      else
-        new_index = new_index - 1;
+  if (selected_widget_type - 1 < 0)
+    new_index = N_WIDGET_TYPES - 1;
+  else
+    new_index = selected_widget_type - 1;
 
-    }
-
-  while (!set_widget_type (fishbowl, new_index));
+  set_widget_type (fishbowl, new_index);
 }
 
 G_MODULE_EXPORT void

demos/gtk-demo/font_features.c

@@ -600,8 +600,8 @@ update_display (void)
   if (s->len > 0)
     {
       pango_font_description_set_variations (desc, s->str);
+      g_string_free (s, TRUE);
     }
-  g_string_free (s, TRUE);
 
   font_desc = pango_font_description_to_string (desc);
 

demos/gtk-demo/fontify.c

@@ -363,9 +363,7 @@ insert_markup_idle (gpointer data)
 
       if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
         {
-          guint id;
-          id = g_idle_add (insert_markup_idle, data);
-          g_source_set_name_by_id (id, "[gtk-demo] insert_markup_idle");
+          g_idle_add (insert_markup_idle, data);
           return G_SOURCE_REMOVE;
         }
 
@@ -400,9 +398,7 @@ parse_markup_idle (gpointer data)
   do {
     if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
       {
-        guint id;
-        id = g_idle_add (parse_markup_idle, data);
-        g_source_set_name_by_id (id, "[gtk-demo] parse_markup_idle");
+        g_idle_add (parse_markup_idle, data);
         return G_SOURCE_REMOVE;
       }
 

demos/gtk-demo/gltransition.c

@@ -20,8 +20,6 @@
 #include "gtkshadertoy.h"
 #include "gskshaderpaintable.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *demo_window = NULL;
 
 static void
@@ -362,5 +360,3 @@ do_gltransition (GtkWidget *do_widget)
 
   return demo_window;
 }
-
-G_GNUC_END_IGNORE_DEPRECATIONS

demos/gtk-demo/gskshaderpaintable.c

@@ -22,8 +22,6 @@
 #include <gtk/gtk.h>
 #include "gskshaderpaintable.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 /**
  * GskShaderPaintable:
  *
@@ -334,5 +332,3 @@ gsk_shader_paintable_update_time (GskShaderPaintable *self,
 
   g_bytes_unref (args);
 }
-
-G_GNUC_END_IGNORE_DEPRECATIONS

demos/gtk-demo/gskshaderpaintable.h

@@ -22,8 +22,6 @@
 #include <gdk/gdk.h>
 #include <gsk/gsk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 G_BEGIN_DECLS
 
 #define GSK_TYPE_SHADER_PAINTABLE (gsk_shader_paintable_get_type ())
@@ -43,5 +41,3 @@ void             gsk_shader_paintable_update_time      (GskShaderPaintable *self
                                                         int                 time_idx,
                                                         gint64              frame_time);
 G_END_DECLS
-
-G_GNUC_END_IGNORE_DEPRECATIONS

demos/gtk-demo/gtk-logo.svg

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg6843"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   version="1.0"
-   sodipodi:docname="gtk-logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/ebassi/Pictures/gtk-logo-256.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <defs
-     id="defs6845">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-50 : 600 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="700 : 600 : 1"
-       inkscape:persp3d-origin="300 : 400 : 1"
-       id="perspective13" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="69.874353"
-     inkscape:cy="64.313526"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     width="128px"
-     height="128px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7947" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata6848">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <dc:date />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:source />
-        <dc:relation />
-        <dc:language />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path6976"
-       d="M 20.88413,30.82696 L 53.816977,55.527708 L 107.33282,39.060543 L 70.587303,17.177763 L 20.88413,30.82696 z"
-       style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6978"
-       d="M 22.94243,82.287118 L 20.88413,30.82696 L 53.816977,55.527708 L 53.816977,111.10486 L 22.94243,82.287118 z"
-       style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6980"
-       d="M 53.816977,111.10486 L 103.21619,90.5207 L 107.33282,39.060543 L 53.816977,55.527708 L 53.816977,111.10486 z"
-       style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path6982"
-       d="M 23.216626,81.319479 L 70.48573,67.361442 L 103.38422,90.444516"
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path6984"
-       d="M 70.434539,17.875593 L 70.434539,66.984877"
-       style="opacity:1;fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>

demos/gtk-demo/gtkfishbowl.c

@@ -456,33 +456,43 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
 {
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
   GdkFrameClock *frame_clock;
-  GdkFrameTimings *end;
-  gint64 end_counter;
-  double fps, expected_fps;
+  GdkFrameTimings *start, *end;
+  gint64 start_counter, end_counter;
+  gint64 n_frames, expected_frames;
+  gint64 start_timestamp, end_timestamp;
   gint64 interval;
 
   frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (fishbowl));
   if (frame_clock == NULL)
     return;
 
-  fps = gdk_frame_clock_get_fps (frame_clock);
-  if (fps <= 0.0)
+  start_counter = gdk_frame_clock_get_history_start (frame_clock);
+  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
+  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
+  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
+       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
+       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
+    end_counter--;
+  if (end_counter - start_counter < 4)
     return;
 
-  priv->framerate = fps;
+  start_timestamp = gdk_frame_timings_get_presentation_time (start);
+  end_timestamp = gdk_frame_timings_get_presentation_time (end);
+  if (start_timestamp == 0 || end_timestamp == 0)
+    {
+      start_timestamp = gdk_frame_timings_get_frame_time (start);
+      end_timestamp = gdk_frame_timings_get_frame_time (end);
+    }
+
+  n_frames = end_counter - start_counter;
+  priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
+  priv->framerate = ((int)(priv->framerate * 100))/100.0;
+
   g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
 
   if (!priv->benchmark)
     return;
 
-  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
-  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
-       end != NULL && !gdk_frame_timings_get_complete (end);
-       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
-    end_counter--;
-  if (end == NULL)
-    return;
-
   interval = gdk_frame_timings_get_refresh_interval (end);
   if (interval == 0)
     {
@@ -490,16 +500,16 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
       if (interval == 0)
         return;
     }
-  expected_fps = (double) G_USEC_PER_SEC / interval;
+  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
 
-  if (fps > (expected_fps - 1))
+  if (n_frames >= expected_frames)
     {
       if (priv->last_benchmark_change > 0)
         priv->last_benchmark_change *= 2;
       else
         priv->last_benchmark_change = 1;
     }
-  else if (0.95 * fps < expected_fps)
+  else if (n_frames + 1 < expected_frames)
     {
       if (priv->last_benchmark_change < 0)
         priv->last_benchmark_change--;

demos/gtk-demo/gtkshaderbin.c

@@ -1,7 +1,5 @@
 #include "gtkshaderbin.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef struct {
   GskGLShader *shader;
   GtkStateFlags state;
@@ -264,5 +262,3 @@ gtk_shader_bin_new (void)
 
   return GTK_WIDGET (self);
 }
-
-G_GNUC_END_IGNORE_DEPRECATIONS

demos/gtk-demo/gtkshaderbin.h

@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 G_BEGIN_DECLS
 
 #define GTK_TYPE_SHADER_BIN      (gtk_shader_bin_get_type ())
@@ -20,5 +18,3 @@ void       gtk_shader_bin_set_child   (GtkShaderBin *self,
 GtkWidget *gtk_shader_bin_get_child   (GtkShaderBin *self);
 
 G_END_DECLS
-
-G_GNUC_END_IGNORE_DEPRECATIONS

demos/gtk-demo/gtkshaderstack.c

@@ -1,7 +1,5 @@
 #include "gtkshaderstack.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 struct _GtkShaderStack
 {
   GtkWidget parent_instance;
@@ -361,5 +359,3 @@ gtk_shader_stack_set_active (GtkShaderStack *self,
   self->current = MIN (index, self->children->len);
   update_child_visible (self);
 }
-
-G_GNUC_END_IGNORE_DEPRECATIONS

demos/gtk-demo/gtkshaderstack.h

@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 G_BEGIN_DECLS
 
 #define GTK_TYPE_SHADER_STACK     (gtk_shader_stack_get_type ())
@@ -20,5 +18,3 @@ void        gtk_shader_stack_set_active   (GtkShaderStack *self,
                                            int             index);
 
 G_END_DECLS
-
-G_GNUC_END_IGNORE_DEPRECATIONS

demos/gtk-demo/gtkshadertoy.c

@@ -116,9 +116,7 @@ static gboolean gtk_shadertoy_tick          (GtkWidget     *widget,
 GtkWidget *
 gtk_shadertoy_new (void)
 {
-  return g_object_new (gtk_shadertoy_get_type (),
-                       "allowed-apis", GDK_GL_API_GL,
-                       NULL);
+  return g_object_new (gtk_shadertoy_get_type (), NULL);
 }
 
 static void

demos/gtk-demo/images.c

@@ -354,7 +354,6 @@ do_images (GtkWidget *do_widget)
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon);
       gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-      g_object_unref (gicon);
 
       gtk_frame_set_child (GTK_FRAME (frame), image);
 

demos/gtk-demo/language-names.c

@@ -40,7 +40,7 @@ get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
 {
   wchar_t *langname_w = NULL;
   wchar_t locale_abbrev_w[9];
-  gchar *langname, *locale_abbrev, *locale;
+  gchar *langname, *locale_abbrev, *locale, *p;
   gint i;
   const LCTYPE iso639_lctypes[] = { LOCALE_SISO639LANGNAME, LOCALE_SISO639LANGNAME2 };
   GHashTable *ht_scripts_langs = (GHashTable *) param;
@@ -59,6 +59,7 @@ get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
   GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, langname_size);
   langname = g_utf16_to_utf8 (langname_w, -1, NULL, NULL, NULL);
   locale = g_utf16_to_utf8 (locale_w, -1, NULL, NULL, NULL);
+  p = strchr (locale, '-');
   lang = pango_language_from_string (locale);
   if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
     g_hash_table_insert (ht_scripts_langs, lang, langname);

demos/gtk-demo/listview_selections.c

@@ -1,5 +1,4 @@
 /* Lists/Selections
- * #Keywords: suggestion, completion
  *
  * The GtkDropDown widget is a modern alternative to GtkComboBox.
  * It uses list models instead of tree models, and the content is

demos/gtk-demo/main.c

@@ -20,7 +20,6 @@
 #include "config.h"
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
 
 #include "demos.h"
 #include "fontify.h"
@@ -828,25 +827,13 @@ demo_search_changed_cb (GtkSearchEntry *entry,
   gtk_filter_changed (filter, GTK_FILTER_CHANGE_DIFFERENT);
 }
 
-static gboolean
-demo_can_run (GtkWidget  *window,
-              const char *name)
-{
-  if (name != NULL && strcmp (name, "gltransition") == 0)
-    return GSK_IS_GL_RENDERER (gtk_native_get_renderer (GTK_NATIVE (window)));
-
-  return TRUE;
-}
-
 static GListModel *
-create_demo_model (GtkWidget *window)
+create_demo_model (void)
 {
   GListStore *store = g_list_store_new (GTK_TYPE_DEMO);
   DemoData *demo = gtk_demos;
   GtkDemo *d;
 
-  gtk_widget_realize (window);
-
   d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
   d->name = "main";
   d->title = "GTK Demo";
@@ -858,20 +845,16 @@ create_demo_model (GtkWidget *window)
 
   while (demo->title)
     {
-       DemoData *children = demo->children;
+      d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+      DemoData *children = demo->children;
 
-      if (demo_can_run (window, demo->name))
-        {
-          d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+      d->name = demo->name;
+      d->title = demo->title;
+      d->keywords = demo->keywords;
+      d->filename = demo->filename;
+      d->func = demo->func;
 
-          d->name = demo->name;
-          d->title = demo->title;
-          d->keywords = demo->keywords;
-          d->filename = demo->filename;
-          d->func = demo->func;
-
-          g_list_store_append (store, d);
-        }
+      g_list_store_append (store, d);
 
       if (children)
         {
@@ -879,19 +862,15 @@ create_demo_model (GtkWidget *window)
 
           while (children->title)
             {
-              if (demo_can_run (window, children->name))
-                {
-                  GtkDemo *child = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+              GtkDemo *child = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
 
-                  child->name = children->name;
-                  child->title = children->title;
-                  child->keywords = children->keywords;
-                  child->filename = children->filename;
-                  child->func = children->func;
-
-                  g_list_store_append (G_LIST_STORE (d->children_model), child);
-                }
+              child->name = children->name;
+              child->title = children->title;
+              child->keywords = children->keywords;
+              child->filename = children->filename;
+              child->func = children->func;
 
+              g_list_store_append (G_LIST_STORE (d->children_model), child);
               children++;
             }
         }
@@ -924,34 +903,6 @@ clear_search (GtkSearchBar *bar)
     }
 }
 
-static void
-search_results_update (GObject    *filter_model,
-                       GParamSpec *pspec,
-                       GtkEntry   *entry)
-{
-  gsize n_items = g_list_model_get_n_items (G_LIST_MODEL (filter_model));
-
-  if (strlen (gtk_editable_get_text (GTK_EDITABLE (entry))) > 0)
-    {
-      char *text;
-
-      if (n_items > 0)
-        text = g_strdup_printf (ngettext ("%ld search result", "%ld search results", (long) n_items), (long) n_items);
-      else
-        text = g_strdup (_("No search results"));
-
-      gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
-                                      GTK_ACCESSIBLE_PROPERTY_DESCRIPTION, text,
-                                      -1);
-
-      g_free (text);
-    }
-  else
-    {
-      gtk_accessible_reset_property (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_PROPERTY_DESCRIPTION);
-    }
-}
-
 static void
 activate (GApplication *app)
 {
@@ -985,7 +936,7 @@ activate (GApplication *app)
   search_bar = GTK_WIDGET (gtk_builder_get_object (builder, "searchbar"));
   g_signal_connect (search_bar, "notify::search-mode-enabled", G_CALLBACK (clear_search), NULL);
 
-  listmodel = create_demo_model (window);
+  listmodel = create_demo_model ();
   treemodel = gtk_tree_list_model_new (G_LIST_MODEL (listmodel),
                                        FALSE,
                                        TRUE,
@@ -999,7 +950,6 @@ activate (GApplication *app)
 
   search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
   g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);
-  g_signal_connect (filter_model, "notify::n-items", G_CALLBACK (search_results_update), search_entry);
 
   selection = gtk_single_selection_new (G_LIST_MODEL (filter_model));
   g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);

demos/gtk-demo/menus.ui

@@ -2,7 +2,7 @@
 <interface>
   <menu id="menubar">
     <submenu>
-      <attribute name="label" translatable="yes">_File</attribute>
+      <attribute name="label" translatable="yes">_Application</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">_New</attribute>
@@ -33,7 +33,7 @@
       </section>
     </submenu>
     <submenu>
-      <attribute name="label" translatable="yes">_Preferences</attribute>
+      <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>

demos/gtk-demo/path_maze.c

@@ -338,7 +338,7 @@ do_path_maze (GtkWidget *do_widget)
       GskPath *path;
 
       window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_window_set_title (GTK_WINDOW (window), "Follow the maze with the mouse");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 

demos/gtk-demo/shadertoy.c

@@ -120,7 +120,7 @@ create_shadertoy_window (GtkWidget *do_widget)
   gtk_box_append (GTK_BOX (box), aspect);
 
   shadertoy = new_shadertoy ("/shadertoy/alienplanet.glsl");
-  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (aspect), gtk_graphics_offload_new (shadertoy));
+  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (aspect), shadertoy);
 
   sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 250);

demos/node-editor/node-editor-application.c

@@ -299,7 +299,7 @@ node_editor_application_new (void)
 
   app = g_object_new (NODE_EDITOR_APPLICATION_TYPE,
                       "application-id", "org.gtk.gtk4.NodeEditor",
-                      "flags", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE,
+                      "flags", G_APPLICATION_HANDLES_OPEN,
                       NULL);
 
   g_application_add_main_option (G_APPLICATION (app), "version", 0, 0,G_OPTION_ARG_NONE, "Show program version", NULL);

demos/node-editor/node-editor-window.c

@@ -68,9 +68,8 @@ struct _NodeEditorWindow
 
   GArray *errors;
 
+  guint update_timeout;
   gboolean auto_reload;
-  gboolean mark_as_safe_pending;
-  gulong after_paint_handler;
 };
 
 struct _NodeEditorWindowClass
@@ -246,41 +245,6 @@ highlight_text (NodeEditorWindow *self)
   gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens", &start, &end);
 }
 
-static void
-mark_autosave_as_unsafe (void)
-{
-  char *path1 = NULL;
-  char *path2 = NULL;
-
-  path1 = get_autosave_path ("-unsafe");
-  path2 = get_autosave_path (NULL);
-
-  g_rename (path2, path1);
-}
-
-static void
-mark_autosave_as_safe (void)
-{
-  char *path1 = NULL;
-  char *path2 = NULL;
-
-  path1 = get_autosave_path ("-unsafe");
-  path2 = get_autosave_path (NULL);
-
-  g_rename (path1, path2);
-}
-
-static void
-after_paint (GdkFrameClock    *clock,
-             NodeEditorWindow *self)
-{
-  if (self->mark_as_safe_pending)
-    {
-      self->mark_as_safe_pending = FALSE;
-      mark_autosave_as_safe ();
-    }
-}
-
 static void
 reload (NodeEditorWindow *self)
 {
@@ -289,8 +253,6 @@ reload (NodeEditorWindow *self)
   float scale;
   GskRenderNode *big_node;
 
-  mark_autosave_as_unsafe ();
-
   text = get_current_text (self->text_buffer);
   bytes = g_bytes_new_take (text, strlen (text));
 
@@ -352,8 +314,6 @@ reload (NodeEditorWindow *self)
     }
 
   g_clear_pointer (&big_node, gsk_render_node_unref);
-
-  self->mark_as_safe_pending = TRUE;
 }
 
 static void
@@ -1165,6 +1125,9 @@ node_editor_window_finalize (GObject *object)
 {
   NodeEditorWindow *self = (NodeEditorWindow *)object;
 
+  if (self->update_timeout)
+    g_source_remove (self->update_timeout);
+
   g_array_free (self->errors, TRUE);
 
   g_clear_pointer (&self->node, gsk_render_node_unref);
@@ -1209,7 +1172,6 @@ static void
 node_editor_window_realize (GtkWidget *widget)
 {
   NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GdkFrameClock *frameclock;
 
   GTK_WIDGET_CLASS (node_editor_window_parent_class)->realize (widget);
 
@@ -1237,24 +1199,14 @@ node_editor_window_realize (GtkWidget *widget)
   node_editor_window_add_renderer (self,
                                    gsk_cairo_renderer_new (),
                                    "Cairo");
-
-  frameclock = gtk_widget_get_frame_clock (widget);
-  self->after_paint_handler = g_signal_connect (frameclock, "after-paint",
-                                                G_CALLBACK (after_paint), self);
-
 }
 
 static void
 node_editor_window_unrealize (GtkWidget *widget)
 {
   NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GdkFrameClock *frameclock;
   guint i;
 
-  frameclock = gtk_widget_get_frame_clock (widget);
-  g_signal_handler_disconnect (frameclock, self->after_paint_handler);
-  self->after_paint_handler = 0;
-
   for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i ++)
     {
       gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i);
@@ -1794,16 +1746,16 @@ set_initial_text (NodeEditorWindow *self)
   path = get_autosave_path (NULL);
   path1 = get_autosave_path ("-unsafe");
 
-  if (g_file_get_contents (path1, &initial_text, &len, NULL))
+  if (g_file_get_contents (path, &initial_text, &len, NULL))
+    {
+      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
+      g_free (initial_text);
+    }
+  else if (g_file_get_contents (path1, &initial_text, &len, NULL))
     {
       self->auto_reload = FALSE;
       gtk_revealer_set_reveal_child (GTK_REVEALER (self->crash_warning), TRUE);
 
-      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
-      g_free (initial_text);
-    }
-  else if (g_file_get_contents (path, &initial_text, &len, NULL))
-    {
       gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
       g_free (initial_text);
     }
@@ -1854,6 +1806,41 @@ autosave_contents (NodeEditorWindow *self)
   g_free (contents);
 }
 
+static void
+mark_autosave_as_safe (void)
+{
+  char *path1 = NULL;
+  char *path2 = NULL;
+
+  path1 = get_autosave_path ("-unsafe");
+  path2 = get_autosave_path (NULL);
+
+  g_rename (path1, path2);
+}
+
+static gboolean
+update_timeout_cb (gpointer data)
+{
+  NodeEditorWindow *self = data;
+
+  self->update_timeout = 0;
+
+  mark_autosave_as_safe ();
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+initiate_autosave (NodeEditorWindow *self)
+{
+  autosave_contents (self);
+
+  if (self->update_timeout != 0)
+    g_source_remove (self->update_timeout);
+
+  self->update_timeout = g_timeout_add (100, update_timeout_cb, self);
+}
+
 static void
 node_editor_window_init (NodeEditorWindow *self)
 {
@@ -1918,7 +1905,7 @@ node_editor_window_init (NodeEditorWindow *self)
 
   set_initial_text (self);
 
-  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (autosave_contents), self);
+  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (initiate_autosave), self);
 
   if (g_getenv ("GSK_RENDERER"))
     {

demos/node-editor/node-editor-window.ui

@@ -10,6 +10,10 @@
         <attribute name="label" translatable="yes">_Help</attribute>
         <attribute name="action">app.help</attribute>
       </item>
+      <item>
+        <attribute name="label" translatable="yes">_Help</attribute>
+        <attribute name="action">app.help</attribute>
+      </item>
       <item>
         <attribute name="label" translatable="yes">_Inspector</attribute>
         <attribute name="action">app.inspector</attribute>
@@ -209,7 +213,6 @@
                         <property name="halign">1</property>
                         <property name="label" translatable="1">The application may have crashed.
 As a precaution, auto-loading has been turned off.
-You can turn it back on in the menu.
 </property>
                       </object>
                     </child>

demos/node-editor/node-format.md

@@ -322,15 +322,12 @@ stroke bounds of the path.
 
 ### text
 
-| property     | syntax              | default             | printed     |
-| ------------ | ------------------- | ------------------- | ----------- |
-| color        | `<color>`           | black               | non-default |
-| font         | `<string>` `<url>`? | "Cantarell 15px"    | always      |
-| glyphs       | `<glyphs>`          | "Hello"             | always      |
-| offset       | `<point>`           | 0 0                 | non-default |
-| hint-style   | `<hint style>`      | slight              | non-default |
-| antialias    | `<antialias>`       | gray                | non-default |
-| hint-metrics | `<hint metrics>`    | off                 | non-default |
+| property | syntax              | default             | printed     |
+| -------- | ------------------- | ------------------- | ----------- |
+| color    | `<color>`           | black               | non-default |
+| font     | `<string>` `<url>`? | "Cantarell 11"      | always      |
+| glyphs   | `<glyphs>`          | "Hello"             | always      |
+| offset   | `<point>`           | 0 0                 | non-default |
 
 Creates a node like `gsk_text_node_new()` with the given properties.
 
@@ -339,16 +336,12 @@ font that is specified in the string. It can be either a data url containing
 a base64-encoded font file, or a regular url that points to a font file.
 
 Glyphs can be specified as an ASCII string, or as a comma-separated list of
-their glyph IDs. Optionally, the advance width, x and y offsets and flags can
+their glyph ID and advance width. Optionally, x and y offsets and flags can
 be specified as well, like this: 40 10 0 0 color.
 
 If the given font does not exist or the given glyphs are invalid for the given
 font, an error node will be returned.
 
-Possible values for hint-style are none, slight or full.
-Possible value for antialias are none or gray.
-Possible value for hint-metrics are on or off.
-
 ### texture
 
 | property | syntax              | default                | printed     |

docs/iconcache.txt

@@ -69,9 +69,9 @@ Image:
 4			CARD32		IMAGE_DATA_OFFSET	
 
 ICON_FLAGS
-HAS_SUFFIX_XPM	1
-HAS_SUFFIX_SVG	2
-HAS_SUFFIX_PNG	4
+HAS_SUFFIX_PNG	1
+HAS_SUFFIX_XPM	2
+HAS_SUFFIX_SVG	4
 HAS_ICON_FILE	8
 
 ImageData:

docs/reference/gdk/cairo.md

@@ -5,11 +5,8 @@ Title: Cairo interaction
 [Cairo](http://cairographics.org) is a graphics library that supports vector
 graphics and image compositing that can be used with GTK.
 
-GDK does not wrap the Cairo API and it is not possible to use cairo directly
-to draw on a [class@Gdk.Surface]. You can either use a
-[GtkDrawingArea](../gtk4/class.DrawingArea.html) widget or
-[gtk_snapshot_append_cairo](../gtk4/func.Snapshot.append_cairo.html)
-for drawing with cairo in a GTK4 application.
+GDK does not wrap the Cairo API; instead it allows to create Cairo
+drawing contexts which can be used to draw on [class@Gdk.Surface]s.
 
 Additional functions allow use [struct@Gdk.Rectangle]s with Cairo
 and to use [struct@Gdk.RGBA], `GdkPixbuf`, and [class@Gdk.Surface]

docs/reference/gdk/gdk4-wayland.toml.in

@@ -25,8 +25,6 @@ base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
 
 [extra]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "images/gtk-logo.svg",
 ]
 urlmap_file = "urlmap.js"

docs/reference/gdk/gdk4-x11.toml.in

@@ -24,8 +24,6 @@ base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
 
 [extra]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "images/gtk-logo.svg",
 ]
 urlmap_file = "urlmap.js"

docs/reference/gdk/gdk4.toml.in

@@ -67,8 +67,6 @@ content_files = [
   "macos.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "images/gtk-logo.svg",
   "images/rotated-text.png",
   "images/default_cursor.png",
@@ -111,11 +109,3 @@ content_images = [
 ]
 content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gdk/"
 urlmap_file = "urlmap.js"
-
-[[object]]
-name = "DECLARE_INTERNAL_TYPE"
-hidden = true
-
-[[object]]
-pattern = "KEY_*"
-check_ignore = true

docs/reference/gdk/meson.build

@@ -29,18 +29,6 @@ if get_option('documentation')
     install_dir: docs_dir,
   )
 
-  test('doc-check-gdk',
-    gidocgen,
-    args: [
-      'check',
-      '--config', gdk4_toml,
-      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-      gdk_gir[0],
-    ],
-    depends: gdk_gir[0],
-    suite: ['docs'],
-  )
-
   if x11_enabled
     gdk4x11_toml = configure_file(
       input: 'gdk4-x11.toml.in',
@@ -99,17 +87,5 @@ if get_option('documentation')
       install: true,
       install_dir: docs_dir,
     )
-
-    test('doc-check-gdk-wayland',
-      gidocgen,
-      args: [
-        'check',
-        '--config', gdk4wayland_toml,
-        '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-        gdk_wayland_gir[0],
-      ],
-      depends: gdk_wayland_gir[0],
-      suite: ['docs'],
-    )
   endif
 endif

docs/reference/gsk/gsk4.toml.in

@@ -36,8 +36,6 @@ content_files = [
   "paths.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "gtk-logo.svg",
   "images/arc-dark.png",
   "images/arc-light.png",
@@ -66,7 +64,3 @@ content_images = [
 ]
 content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gsk/"
 urlmap_file = "urlmap.js"
-
-[[object]]
-name = "INCLUDE_WARNING"
-hidden = true

docs/reference/gsk/meson.build

@@ -30,16 +30,4 @@ if get_option('documentation')
     install: true,
     install_dir: docs_dir,
   )
-
-  test('doc-check-gsk',
-    gidocgen,
-    args: [
-      'check',
-      '--config', gsk4_toml,
-      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-      gsk_gir[0],
-    ],
-    depends: gsk_gir[0],
-    suite: ['docs'],
-  )
 endif

docs/reference/gtk/building.md

@@ -38,13 +38,13 @@ can run the build, using Ninja:
 
 ```
 cd builddir
-meson compile
-meson install
+ninja
+ninja install
 ```
 
 If you don't have permission to write to the directory you are
 installing in, you may have to change to root temporarily before
-running `meson install`.
+running `ninja install`.
 
 Several environment variables are useful to pass to set before
 running *meson*. `CPPFLAGS` contains options to pass to the C
@@ -112,10 +112,10 @@ responsible for controlling the debugging features of GTK with
 
 ## Dependencies
 
-Before you can compile GTK, you need to have various other tools and
-libraries installed on your system. Dependencies of GTK have their own
-build systems, so you will need to refer to their own installation
-instructions.
+Before you can compile the GTK widget toolkit, you need to have
+various other tools and libraries installed on your
+system. Dependencies of GTK have their own build systems, so
+you will need to refer to their own installation instructions.
 
 A particular important tool used by GTK to find its dependencies
 is `pkg-config`.
@@ -140,7 +140,7 @@ Other libraries are maintained separately.
   file formats. It is available [here](ttps://download.gnome.org/sources/gdk-pixbuf/).
 - [Pango](http://www.pango.org) is a library for internationalized
   text handling. It is available [here](https://download.gnome.org/sources/pango/).
-- [GObject Introspection](https://gitlab.gnome.org/GNOME/gobject-introspection)
+- [GObject Introspection](https://wiki.gnome.org/Projects/GObjectIntrospection)
   is a framework for making introspection data available to language
   bindings. It is available [here](https://download.gnome.org/sources/gobject-introspection/).
 - The [GNU libiconv](https://www.gnu.org/software/libiconv/) library
@@ -156,8 +156,8 @@ Other libraries are maintained separately.
   the development environment for these libraries that your
   operating system vendor provides.
 - The [fontconfig](https://www.freedesktop.org/wiki/Software/fontconfig/)
-  library provides Pango with a standard way of locating fonts and matching
-  them against font names.
+  library provides Pango with a standard way of locating
+  fonts and matching them against font names.
 - [Cairo](https://www.cairographics.org) is a graphics library that
   supports vector graphics and image compositing. Both Pango and GTK
   use Cairo for drawing. Note that we also need the auxiliary cairo-gobject
@@ -220,12 +220,13 @@ meson configure builddir
 
 ### `x11-backend`, `win32-backend`, `broadway-backend`, `wayland-backend` and `macos-backend`
 
-Enable specific backends for GDK.  If none of these options are given, the
-Wayland backend will be enabled by default, if the platform is Linux; the
-X11 backend will also be enabled by default, unless the platform is Windows,
-in which case the default is win32, or the platform is macOS, in which case
-the default is macOS. If any backend is explicitly enabled or disabled, no
-other platform will be enabled automatically.
+Enable specific backends for GDK.  If none of these options
+are given, the Wayland backend will be enabled by default,
+if the platform is Linux; the X11 backend will also be enabled
+by default, unless the platform is Windows, in which case the
+default is win32, or the platform is macOS, in which case the
+default is macOS. If any backend is explicitly enabled or disabled,
+no other platform will be enabled automatically.
 
 ### `vulkan`
 
@@ -233,7 +234,7 @@ By default, GTK will try to build with support for the Vulkan graphics
 API in addition to cairo and OpenGL. This option can be used to explicitly
 control whether Vulkan should be used.
 
-### `media-gstreamer`
+### `media-gstreamer` and `media-ffmpeg`
 
 By default, GTK will try to build the gstreamer backend for
 media playback support. These options can be used to explicitly

docs/reference/gtk/css-overview.md

@@ -1,7 +1,7 @@
 Title: CSS in GTK
 Slug: css
 
-This chapter describes how GTK uses CSS for styling and layout.
+This chapter describes how GTK uses CSS for styling and layout. 
 It is not meant to be an explanation of CSS from first principles,
 but focuses on listing supported CSS features and differences
 between Web CSS and GTK.
@@ -74,7 +74,6 @@ in a selector, widget names must be prefixed with a # character.
 | E:not(selector) | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#negation) | |
 | E:dir(ltr), E:dir(rtl) | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#the-dir-pseudo) | |
 | E:drop(active) | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#drag-pseudos) | |
-| E:root | [CSS Selector Level 3](https://www.w3.org/TR/selectors-3/#root-pseudo) | |
 | E F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#descendent-combinators) | |
 | E > F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#child-combinators) | |
 | E ~ F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#general-sibling-combinators) | |

docs/reference/gtk/css-properties.md

@@ -15,16 +15,16 @@ spec.
 The following units are supported for basic datatypes:
 
 Length
-: px, pt, em, ex, rem, pc, in, cm, mm
+: px, pt, em, ex, rem, pc, in, cm, mm, calc()
 
 Percentage
-: %
+: %, calc()
 
 Angle
-: deg, rad, grad, turn
+: deg, grad, turn, calc()
 
 Time
-: s, ms
+: s, ms, calc()
 
 Length values with the em or ex units are resolved using the font
 size value, unless they occur in setting the font-size itself, in
@@ -33,15 +33,11 @@ which case they are resolved using the inherited font size value.
 The rem unit is resolved using the initial font size value, which is
 not quite the same as the CSS definition of rem.
 
-Length values using physical units (pt, pc, in, cm, mm) are translated
-to px using the dpi value specified by the -gtk-dpi property, which is
-different from the CSS definition, which uses a fixed dpi of 96.
-
-The calc() notation adds considerable expressive power to all of these
-datatypes. There are limits on what types can be combined in such an
-expression (e.g. it does not make sense to add a number and a time).
-For the full details, see the
-[CSS Values and Units](https://www.w3.org/TR/css-values-4/) spec.
+The calc() notation adds considerable expressive power. There are limits
+on what types can be combined in such an expression (e.g. it does not make
+sense to add a number and a time). For the full details, see the
+[CSS3 Values and Units](https://www.w3.org/TR/css3-values/#calc-notation)
+spec.
 
 A common pattern among shorthand properties (called 'four sides') is one
 where one to four values can be specified, to determine a value for each
@@ -60,80 +56,38 @@ follows:
 1 value:
 : all
 
-## Custom Properties
-
-GTK supports custom properties as defined in the
-[CSS Custom Properties for Cascading Variables](https://www.w3.org/TR/css-variables-1)
-spec.
-
-Custom properties are defined as follows:
-
-```css
---prop: red;
-```
-
-and used via the `var` keyword:
-
-```css
-color: var(--prop);
-```
-
-Custom properties can have a fallback for when the referred property is invalid:
-
-```css
-color: var(--prop, green);
-```
-
 ## Colors
 
-### CSS Colors
-
-Colors can be expressed in numerous ways in CSS (see the
-[Color Module](https://www.w3.org/TR/css-color-5/). GTK supports
-many (but not all) of these.
-
-You can use rgb(), rgba(), hsl() with both the legacy or the modern CSS
-syntax, and calc() can be used as well in color expressions. hwb(), oklab(),
-oklch(), color(), color-mix() and relative colors are supported as well.
-
-### Non-CSS Colors
-
-GTK  extends the CSS syntax with several additional ways to specify colors.
-
-These extensions are deprecated and should be replaced by the equivalent
-standard CSS notions.
+GTK extends the CSS syntax with several additional ways to specify colors.
 
 The first is a reference to a color defined via a @define-color rule in CSS.
 The syntax for @define-color rules is as follows:
 
 ```
-@define-color name color
+@define-color Name Color
 ```
 
 To refer to the color defined by a @define-color rule, prefix the name with @.
 
-The standard CSS mechanisms that should be used instead of @define-color are
-custom properties, :root and var().
-
 GTK also supports color expressions, which allow colors to be transformed to
 new ones. Color expressions can be nested, providing a rich language to
 define colors. Color expressions resemble functions, taking 1 or more colors
 and in some cases a number as arguments.
 
-`lighter(color)`
- : produces a brighter variant of `color`.
+`lighter(Color)`
+ : produces a brighter variant of Color
 
-`darker(color)`
- : produces a darker variant of `color`.
+`darker(Color)`
+ : produces a darker variant of Color
 
-`shade(color, number)`
- : changes the lightness of `color`. The `number` ranges from 0 for black to 2 for white.
+`shade(Color, Number)`
+ : changes the lightness of Color. The number ranges from 0 for black to 2 for white.
 
-`alpha(color, number)`
- : multiplies the alpha value of `color` by `number` (between 0 and 1).
+`alpha(Color, Number)`
+ : replaces the alpha value of color with number (between 0 and 1)
 
-`mix(color1, color2, number)`
- : interpolates between the two colors.
+`mix(Color1, Color2, Number)`
+ : interpolates between the two colors
 
 ## Images
 
@@ -141,7 +95,7 @@ GTK extends the CSS syntax for images and also uses it for specifying icons.
 To load a themed icon, use
 
 ```
--gtk-icontheme(name)
+-gtk-icontheme(Name)
 ```
 
 The specified icon name is used to look up a themed icon, while taking into
@@ -170,14 +124,14 @@ and the
 syntax makes this available. -gtk-recolor requires a url as first argument.
 The remaining arguments specify the color palette to use. If the palette is
 not explicitly specified, the current value of the -gtk-icon-palette property
-is used.
+is used. 
 
 GTK supports scaled rendering on hi-resolution displays. This works best if
 images can specify normal and hi-resolution variants. From CSS, this can be
 done with
 
 ```
--gtk-scaled(image1, image2)
+-gtk-scaled(Image1, Image2)
 ```
 
 ## GTK CSS Properties

docs/reference/gtk/drawing-model.md

@@ -99,15 +99,16 @@ reaches the requested phase. However, in practice most things
 happen at higher levels:
 
 - If you are doing an animation, you can use
-  [method@Gtk.Widget.add_tick_callback] which will cause a regular
+  gtk_widget_add_tick_callback() which will cause a regular
   beating of the clock with a callback in the Update phase
   until you stop the tick.
 - If some state changes that causes the size of your widget to
-  change you call [method@Gtk.Widget.queue_resize] which will request
+  change you call gtk_widget_queue_resize() which will request
   a Layout phase and mark your widget as needing relayout.
-- If some state changes so you need to redraw your widget you
-  use [method@Gtk.Widget.queue_draw] to request a Paint phase for
-  your widget.
+- If some state changes so you need to redraw some area of
+  your widget you use the normal gtk_widget_queue_draw()
+  set of functions. These will request a Paint phase and
+  mark the region as needing redraw.
 
 There are also a lot of implicit triggers of these from the
 CSS layer (which does animations, resizes and repaints as needed).

docs/reference/gtk/getting_started.md

@@ -245,6 +245,9 @@ to connect the "clicked" signal with [method@Gtk.Window.destroy], then the funct
 would be called on `button` (which would not go well, since the function expects
 a `GtkWindow` as argument).
 
+More information about creating buttons can be found
+[here](https://wiki.gnome.org/HowDoI/Buttons).
+
 The rest of the code in `example-1.c` is identical to `example-0.c`. The next
 section will elaborate further on how to add several [class@Gtk.Widget]s to your
 GTK application.

docs/reference/gtk/gtk4-broadwayd.rst

@@ -8,10 +8,6 @@ gtk4-broadwayd
 The Broadway display server
 ---------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-broadwayd** [OPTIONS...] <DISPLAY>

docs/reference/gtk/gtk4-builder-tool.rst

@@ -8,10 +8,6 @@ gtk4-builder-tool
 GtkBuilder File Utility
 -----------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-builder-tool** <COMMAND> [OPTIONS...] <FILE>

docs/reference/gtk/gtk4-demo-application.rst

@@ -8,9 +8,6 @@ gtk4-demo-application
 Demonstrate GtkApplication
 --------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
 
 SYNOPSIS
 --------

docs/reference/gtk/gtk4-demo.rst

@@ -8,10 +8,6 @@ gtk4-demo
 Demonstrate GTK widgets
 -----------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-encode-symbolic-svg.rst

@@ -8,10 +8,6 @@ gtk4-encode-symbolic-svg
 Symbolic icon conversion utility
 --------------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-icon-browser.rst

@@ -8,10 +8,6 @@ gtk4-icon-browser
 List themed icons
 -----------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-image-tool.rst

@@ -1,97 +0,0 @@
-.. _gtk4-image-tool(1):
-
-====================
-gtk4-image-tool
-====================
-
------------------------
-Image Utility
------------------------
-
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
-SYNOPSIS
---------
-|   **gtk4-image-tool** <COMMAND> [OPTIONS...] <FILE>...
-|
-|   **gtk4-image-tool** compare [OPTIONS...] <FILE1> <FILE2>
-|   **gtk4-image-tool** convert [OPTIONS...] <FILE1> <FILE2>
-|   **gtk4-image-tool** info [OPTIONS...] <FILE>
-|   **gtk4-image-tool** relabel [OPTIONS...] <FILE1> <FILE2>
-|   **gtk4-image-tool** show [OPTIONS...] <FILE>...
-
-DESCRIPTION
------------
-
-``gtk4-image-tool`` can perform various operations on images.
-
-COMMANDS
---------
-
-Information
-^^^^^^^^^^^
-
-The ``info`` command shows general information about the image, such
-as its format and color state.
-
-Showing
-^^^^^^^
-
-The ``show`` command displays one or more images, side-by-side.
-
-``--undecorated``
-
-Removes window decorations. This is meant for rendering of exactly the image
-without any titlebar.
-
-Compare
-^^^^^^^
-
-The ``compare`` command compares two images. If any differences are found,
-the exit code is 1. If the images are identical, it is 0.
-
-``--output=FILE``
-
-  Save the differences as a png image in ``FILE``.
-
-``--quiet``
-
-  Don't write results to stdout.
-
-Conversion
-^^^^^^^^^^
-
-The ``convert`` command converts the image to a different format or color state.
-
-``--format=FORMAT``
-
-  Convert to the given format. The supported formats can be listed
-  with ``--format=list``.
-
-``--color-state=COLORSTATE``
-
-  Convert to the given color state. The supported color states can be
-  listed with ``--format=list``.
-
-``--cicp=CICP``
-
-  Convert to a color state that is specified as a cicp tuple. The cicp tuple
-  must be specified as four numbers, separated by /, e.g. 1/13/6/0.
-
-Relabeling
-^^^^^^^^^^
-
-The ``relabel`` command changes the color state of an image without conversion.
-This can be useful to produce wrong color renderings for diagnostics.
-
-``--color-state=COLORSTATE``
-
-  Relabel to the given color state. The supported color states can be
-  listed with ``--format=list``.
-
-``--cicp=CICP``
-
-  Relabel to a color state that is specified as a cicp tuple. The cicp tuple
-  must be specified as four numbers, separated by /, e.g. 1/13/6/0.

docs/reference/gtk/gtk4-launch.rst

@@ -8,10 +8,6 @@ gtk4-launch
 Launch an application
 ---------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-node-editor.rst

@@ -8,10 +8,6 @@ gtk4-node-editor
 Editor render nodes
 -----------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-path-tool.rst

@@ -8,10 +8,6 @@ gtk4-path-tool
 GskPath Utility
 -----------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-path-tool** <COMMAND> [OPTIONS...] <PATH>

docs/reference/gtk/gtk4-query-settings.rst

@@ -8,10 +8,6 @@ gtk4-query-settings
 Print name and value of GTK settings
 ------------------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-rendernode-tool.rst

@@ -8,17 +8,11 @@ gtk4-rendernode-tool
 GskRenderNode Utility
 -----------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-rendernode-tool** <COMMAND> [OPTIONS...] <FILE>
 |
 |   **gtk4-rendernode-tool** benchmark [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** compare [OPTIONS...] <FILE1> <FILE2>
-|   **gtk4-rendernode-tool** extract [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** info [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
 |   **gtk4-rendernode-tool** show [OPTIONS...] <FILE>
@@ -50,14 +44,13 @@ without any titlebar.
 Rendering
 ^^^^^^^^^
 
-The ``render`` command saves a rendering of the rendernode as a png, tiff or svg
-image or as pdf document. The name of the file to write can be specified as a second
-FILE argument.
+The ``render`` command saves a rendering of the rendernode as a png or tiff image.
+The name of the file to write can be specified as a second FILE argument.
 
 ``--renderer=RENDERER``
 
   Use the given renderer. Use ``--renderer=help`` to get a information
-  about possible values for the ``RENDERER``.
+  about poassible values for the ``RENDERER``.
 
 Benchmark
 ^^^^^^^^^
@@ -82,33 +75,7 @@ and prints the runtimes.
   the execution of the commands on the GPU. It can be useful to use this flag to test
   command submission performance.
 
-Compare
-^^^^^^^
-
-The ``compare`` command compares the rendering of a node with a reference image,
-or the renderings of two nodes, or two images. If any differences are found, the
-exit code is 1. If the images are identical, it is 0.
-
-``--renderer=RENDERER``
-
-  Use the given renderer.
-
-``--output=FILE``
-
-  Save the differences as a png image in ``FILE``.
-
-``--quiet``
-
-  Don't write results to stdout.
 
 
-Extract
-^^^^^^^
 
-The ``extract`` command saves all the data urls found in a node file to a given
-directory. The file names for the extracted files are derived from the mimetype
-of the url.
 
-``--dir=DIRECTORY``
-
-  Save extracted files in ``DIRECTORY`` (defaults to the current directory).

docs/reference/gtk/gtk4-update-icon-cache.rst

@@ -8,10 +8,6 @@ gtk4-update-icon-cache
 Icon theme caching utility
 --------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4-widget-factory.rst

@@ -8,10 +8,6 @@ gtk4-widget-factory
 Showcase GTK widgets and styles
 -------------------------------
 
-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 

docs/reference/gtk/gtk4.toml.in

@@ -77,18 +77,14 @@ content_files = [
   "section-tree-widget.md",
   "migrating-2to4.md",
   "migrating-3to4.md",
-  "migrating-4to5.md",
   "broadway.md",
   "osx.md",
   "wayland.md",
   "windows.md",
   "x11.md",
-  "tools.md",
   "visual_index.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "images/aboutdialog.png",
   "images/action-bar.png",
   "images/appchooserbutton.png",
@@ -251,12 +247,3 @@ content_images = [
 ]
 content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gtk/"
 urlmap_file = "urlmap.js"
-
-[[object]]
-name = "StyleProvider"
-  [[object.signal]]
-  name = "gtk-private-changed"
-  hidden = true
-
-[check]
-skip_deprecated = true

docs/reference/gtk/input-handling.md

@@ -140,11 +140,6 @@ capture phase, and key bindings locally, during the target phase.
 Under the hood, all shortcuts are represented as instances of `GtkShortcut`,
 and they are managed by `GtkShortcutController`.
 
-Note that GTK does not do anything to map the primary shortcut modifier
-to <kbd>Command</kbd> on macOS. If you want to let your application to follow
-macOS user experience conventions, you must create macOS-specific keyboard shortcuts.
-The <kbd>Command</kbd> is named `Meta` (`GDK_META_MASK`) in GTK.
-
 ## Text input
 
 When actual text input is needed (i.e. not just keyboard shortcuts),

docs/reference/gtk/meson.build

@@ -14,7 +14,6 @@ expand_content_md_files = [
   'running.md',
   'migrating-2to4.md',
   'migrating-3to4.md',
-  'migrating-4to5.md',
   'actions.md',
   'input-handling.md',
   'drawing-model.md',
@@ -26,8 +25,7 @@ expand_content_md_files = [
   'section-tree-widget.md',
   'section-list-widget.md',
   'question_index.md',
-  'visual_index.md',
-  'tools.md',
+  'visual_index.md'
 ]
 
 gtk_images = []
@@ -62,52 +60,39 @@ if get_option('documentation')
     build_by_default: true,
     install: true,
     install_dir: docs_dir,
-    install_tag: 'doc',
-  )
-
-  test('doc-check-gtk',
-    gidocgen,
-    args: [
-      'check',
-      '--config', gtk4_toml,
-      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-      gtk_gir[0],
-    ],
-    depends: gtk_gir[0],
-    suite: ['docs'],
   )
 endif
 
-rst2man = find_program('rst2man', 'rst2man.py', required: get_option('man-pages'))
-rst2html5 = find_program('rst2html5', 'rst2html5.py', required: get_option('documentation'))
+rst2man = find_program('rst2man', 'rst2man.py', required: false)
+if get_option('man-pages') and not rst2man.found()
+  error('No rst2man found, but man pages were explicitly enabled')
+endif
 
-rst_files = [
-  [ 'gtk4-broadwayd', '1' ],
-  [ 'gtk4-builder-tool', '1' ],
-  [ 'gtk4-encode-symbolic-svg', '1', ],
-  [ 'gtk4-image-tool', '1' ],
-  [ 'gtk4-launch', '1', ],
-  [ 'gtk4-query-settings', '1', ],
-  [ 'gtk4-rendernode-tool', '1' ],
-  [ 'gtk4-update-icon-cache', '1', ],
-  [ 'gtk4-path-tool', '1', ],
-]
-
-if get_option('build-demos')
-  rst_files += [
-    [ 'gtk4-demo', '1', ],
-    [ 'gtk4-demo-application', '1', ],
-    [ 'gtk4-widget-factory', '1', ],
-    [ 'gtk4-icon-browser', '1', ],
-    [ 'gtk4-node-editor', '1', ],
+if get_option('man-pages') and rst2man.found()
+  rst_files = [
+    [ 'gtk4-broadwayd', '1' ],
+    [ 'gtk4-builder-tool', '1' ],
+    [ 'gtk4-encode-symbolic-svg', '1', ],
+    [ 'gtk4-launch', '1', ],
+    [ 'gtk4-query-settings', '1', ],
+    [ 'gtk4-rendernode-tool', '1' ],
+    [ 'gtk4-update-icon-cache', '1', ],
+    [ 'gtk4-path-tool', '1', ],
   ]
-endif
 
-rst2x_flags = [
-  '--syntax-highlight=none',
-]
+  if get_option('demos')
+    rst_files += [
+      [ 'gtk4-demo', '1', ],
+      [ 'gtk4-demo-application', '1', ],
+      [ 'gtk4-widget-factory', '1', ],
+      [ 'gtk4-icon-browser', '1', ],
+      [ 'gtk4-node-editor', '1', ],
+    ]
+  endif
 
-if get_option('man-pages')
+  rst2man_flags = [
+    '--syntax-highlight=none',
+  ]
 
   foreach rst: rst_files
     man_name = rst[0]
@@ -118,34 +103,12 @@ if get_option('man-pages')
       output: '@0@.@1@'.format(man_name, man_section),
       command: [
         rst2man,
-        rst2x_flags,
+        rst2man_flags,
         '@INPUT@',
       ],
       capture: true,
       install: true,
       install_dir: get_option('mandir') / 'man@0@'.format(man_section),
-      install_tag: 'doc',
-    )
-  endforeach
-endif
-
-if get_option('documentation')
-
-  foreach rst: rst_files
-    man_name = rst[0]
-
-    custom_target(
-      input: '@0@.rst'.format(man_name),
-      output: '@0@.html'.format(man_name),
-      command: [
-        rst2html5,
-        rst2x_flags,
-        '@INPUT@',
-      ],
-      capture: true,
-      install: true,
-      install_dir: docs_dir / 'gtk4',
-      install_tag: 'doc',
     )
   endforeach
 endif

docs/reference/gtk/migrating-3to4.md

@@ -451,11 +451,11 @@ hint about how modifiers are expected to be used. It also promoted
 the use of `<Primary>` instead of `<Control>` to specify accelerators that
 adapt to platform conventions.
 
-In GTK 4, the meaning of modifiers has been fixed, and applications are
+In GTK 4, the meaning of modifiers has been fixed, and backends are
 expected to map the platform conventions to the existing modifiers.
 The expected use of modifiers in GTK 4 is:
 
-`GDK_CONTROL_MASK` (`GDK_META_MASK` on macOS)
+`GDK_CONTROL_MASK`
  : Primary accelerators
 
 `GDK_ALT_MASK`
@@ -464,7 +464,7 @@ The expected use of modifiers in GTK 4 is:
 `GDK_SHIFT_MASK`
  : Extending selections
 
-`GDK_CONTROL_MASK` (`GDK_META_MASK` on macOS)
+`GDK_CONTROL_MASK`
  : Modifying selections
 
 `GDK_CONTROL_MASK|GDK_ALT_MASK`
@@ -473,15 +473,9 @@ The expected use of modifiers in GTK 4 is:
 Consequently, `GdkModifierIntent` and related APIs have been removed,
 and `<Control>` is preferred over `<Primary>` in accelerators.
 
-In GTK 3 on macOS, the `<Primary>` modifier mapped to  the <kbd>Command</kbd> key.
-In GTK 4, this is no longer the case: `<Primary>` is synonymous to `<Control>`.
-If you want to make your application to feel native on macOS,
-you need to add accelerators for macOS that use the `<Meta>` modifier.
-
 A related change is that GTK 4 no longer supports the use of archaic
 X11 'real' modifiers with the names Mod1,..., Mod5, and `GDK_MOD1_MASK`
-has been renamed to `GDK_ALT_MASK` and `GDK_MOD2_MASK` has been renamed to
-`GDK_META_MASK`.
+has been renamed to `GDK_ALT_MASK`.
 
 ### Replace `GtkClipboard` with `GdkClipboard`
 

docs/reference/gtk/migrating-4to5.md

@@ -58,7 +58,7 @@ use a GtkLabel.
 If you have a need for custom drawing that fits into the current
 (dark or light) theme, e.g. for rendering a graph, you can still
 get the current style foreground color, using
-[method@Gtk.Widget.get_color].
+[method@Gtk.Widget.get_style_color].
 
 ## Local stylesheets are going away
 
@@ -73,103 +73,6 @@ GTK 5 will no longer provide this functionality. The recommendations
 is to use a global stylesheet (i.e. gtk_style_context_add_provider_for_display())
 and rely on style classes to make your CSS apply only where desired.
 
-## Non-standard CSS extensions are going away
-
-GTK's CSS machinery has a some non-standard extensions around colors:
-named colors with \@define-color and color functions: lighter(), darker(),
-shade(), alpha(), mix().
-
-GTK now implements equivalent functionality from the CSS specs.
-
-### \@define-color is going away
-
-\@define-color should be replaced by custom properties in the :root scope.
-
-Instead of
-
-```
-@define-color fg_color #2e3436
-
-...
-
-box {
-  color: @fg_color;
-}
-```
-
-use
-
-```
-:root {
-  --fg-color: #2e3436;
-}
-
-...
-
-box {
-  color: var(--fg-color);
-}
-```
-
-For more information about custom CSS properties and variables, see the
-[CSS Custom Properties for Cascading Variables](https://www.w3.org/TR/css-variables-1/)
-spec.
-
-### Color expressions are going away
-
-The color functions can all be replaced by combinations of calc() and color-mix().
-
-ligher(c) and darker(c) are just shade(c, 1.3) or shade(c, 0.7), respectively, and
-thus can be handled the same way as shade in the examples below.
-
-Replace
-
-```
-a {
-  color: mix(red, green, 0.8);
-}
-
-b {
-  color: alpha(green, 0.6);
-}
-
-c {
-  color: shade(red, 1.3);
-}
-
-d {
-  color: shade(red, 0.7);
-}
-```
-
-with
-
-```
-a {
-  color: color-mix(in srgb, red, green 80%);
-}
-
-b {
-  color: rgb(from green, r g b / calc(alpha * 0.6));
-}
-
-c {
-  color: hsl(from red, h calc(s * 1.3) calc(l * 1.3));
-}
-
-d {
-  color: hsl(from red, h calc(s * 0.7) calc(l * 0.7));
-}
-```
-
-Variations of these replacements are possible.
-
-Note that GTK has historically computed mix() and shade() values in the SRGB and HSL
-colorspaces, but using OKLAB instead might yield slightly better results.
-
-For more information about color-mix(), see the
-[CSS Color](https://drafts.csswg.org/css-color-5) spec.
-
 ## Chooser interfaces are going away
 
 The GtkColorChooser, GtkFontChooser, GtkFileChooser and GtkAppChooser

docs/reference/gtk/osx.md

@@ -7,5 +7,5 @@ on top of the Quartz API.
 Currently, the macOS port does not use any additional commandline options
 or environment variables.
 
-For up-to-date information on building, installation, and bundling, see the
-[GTK website](https://www.gtk.org/docs/installations/macos).
+For up-to-date information about the current status of this port, see the
+[project page](https://wiki.gnome.org/Projects/GTK/OSX).

docs/reference/gtk/overview.md

@@ -28,9 +28,6 @@ GTK depends on the following libraries:
  - **OpenGL**: OpenGL is the premier environment for developing portable,
    interactive 2D and 3D graphics applications. More information available
    on the [Khronos website][opengl].
- - **Vulkan**: Vulkan is the a newer graphics API, that can be considered
-   the successor of OpenGL.  More information available on the
-   [Khronos website][vulkan].
  - **Pango**: Pango is a library for internationalized text handling. It
    centers around the `PangoLayout` object, representing a paragraph of
    text.  Pango provides the engine for `GtkTextView`, `GtkLabel`,
@@ -58,12 +55,11 @@ GTK is divided into three parts:
    storage types for efficient use in GUI applications, and much more.
 
 [gnu-lgpl]: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
-[glib]: https://docs.gtk.org/glib/
-[gobject]: https://docs.gtk.org/gobject/
-[gio]: https://docs.gtk.org/gio/
+[glib]: https://developer.gnome.org/glib/stable/
+[gobject]: https://developer.gnome.org/gobject/stable/
+[gio]: https://developer.gnome.org/gio/stable/
 [cairo]: https://www.cairographics.org/manual/
 [opengl]: https://www.opengl.org/about/
-[vulkan]: https://www.vulkan.org/
-[pango]: https://docs.gtk.org/Pango/
-[gdkpixbuf]: https://docs.gtk.org/gdk-pixbuf/
+[pango]: https://pango.gnome.org/
+[gdkpixbuf]: https://developer.gnome.org/gdk-pixbuf/stable/
 [graphene]: https://ebassi.github.io/graphene/

docs/reference/gtk/question_index.md

@@ -27,7 +27,7 @@ the question you have, this list is a good place to start.
     Every major version of GTK comes with a [migration guide](#migrating). You may also
     find useful information in the documentation for specific widgets and functions. If
     you have a question not covered in the manual, feel free to ask, and please
-    [file a bug report](https://gitlab.gnome.org/GNOME/gtk/issues/) against the
+    [file a bug report](https://gitlab.gnome.org/GNOME/gtk/issues/new) against the
     documentation.
 
 *  Should I maintain parallel versions of my UI in GTK x and GTK y?
@@ -54,7 +54,7 @@ the question you have, this list is a good place to start.
     For strings returned from functions, they will be declared "const" if they should
     not be freed. Non-const strings should be freed with `g_free()`. Arrays follow the
     same rule. If you find an undocumented exception to the rules, please
-    [file a bug report.](https://gitlab.gnome.org/GNOME/gtk/issues/).
+    [file a bug report.](https://gitlab.gnome.org/GNOME/gtk/issues/new).
 
     The transfer annotations for gobject-introspection that are part of the
     documentation can provide useful hints for memory handling semantics as well.

docs/reference/gtk/resources.md

@@ -4,7 +4,7 @@ Slug: gtk-resources
 ## Opening a bug or feature request
 
 If you encounter a bug, misfeature, or missing feature in GTK, please
-file a bug report on our [GitLab project](https://gitlab.gnome.org/GNOME/gtk/issues/).
+file a bug report on our [GitLab project](https://gitlab.gnome.org/GNOME/gtk/issues/new).
 You should also file issues if the documentation is out of date with the
 existing API, or unclear.
 

docs/reference/gtk/running.md

@@ -5,12 +5,10 @@ Slug: gtk-running
 
 GTK inspects a number of environment variables in addition to
 standard variables like `LANG`, `PATH`, `HOME` or `DISPLAY`; mostly
-to determine paths to look for certain files. The
-[X11](https://docs.gtk.org/gtk4/x11.html#x11-specific-environment-variables),
-[Wayland](https://docs.gtk.org/gtk4/wayland.html#wayland-specific-environment-variables),
-[Windows](https://docs.gtk.org/gtk4/windows.html#windows-specific-environment-variables) and
-[Broadway](https://docs.gtk.org/gtk4/broadway.html#broadway-specific-environment-variables)
-GDK backends use some additional environment variables.
+to determine paths to look for certain files. The [X11](#x11-envar),
+[Wayland](#wayland-envar), [Windows](#win32-envar) and
+[Broadway](#broadway-envar) GDK backends use some additional
+environment variables.
 
 Note that environment variables are generally used for debugging
 purposes. They are not guaranteed to be API stable, and should not
@@ -128,8 +126,8 @@ available on the system.
 ### `GTK_MEDIA`
 
 Specifies what backend to load for [class@Gtk.MediaFile]. The possible values
-depend on what options GTK was built with, and can include 'gstreamer'
-and 'none'. If set to 'none', media playback will be unavailable.
+depend on what options GTK was built with, and can include 'gstreamer',
+'ffmpeg' and 'none'. If set to 'none', media playback will be unavailable.
 The special value 'help' can be used to obtain a list of all supported
 media backends.
 
@@ -219,15 +217,11 @@ A number of options affect behavior instead of logging:
 `no-portals`
 : Disable use of [portals](https://docs.flatpak.org/en/latest/portals.html)
 
-`force-offload`
-: Force graphics offload for all textures, even when slower. This allows
-  to debug offloading in the absence of dmabufs.
-
 `gl-disable`
 : Disable OpenGL support
 
-`gl-no-fractional`
-: Disable fractional scaling for OpenGL.
+`gl-fractional`
+: Enable fractional scaling for OpenGL. This is experimental
 
 `gl-debug`
 : Insert debugging information in OpenGL
@@ -284,16 +278,19 @@ are only available when GTK has been configured with `-Ddebug=true`.
 : OpenGL renderer information
 
 `vulkan`
-: Check Vulkan errors
+: Vulkan renderer information
 
 `shaders`
 : Information about shaders
 
+`surface`
+: Information about surfaces
+
 `fallback`
 : Information about fallback usage in renderers
 
-`cache`
-: Information about caching
+`glyphcache`
+: Information about glyph caching
 
 `verbose`
 : Print verbose output while rendering
@@ -306,6 +303,9 @@ A number of options affect behavior instead of logging:
 `full-redraw`
 : Force full redraws
 
+`sync`
+: Sync after each frame
+
 `staging`
 : Use a staging image for texture upload (Vulkan only)
 
@@ -347,28 +347,6 @@ a `*`, which means: try all remaining backends. The special value
 backends. For more information about selecting backends,
 see the [func@Gdk.DisplayManager.get] function.
 
-### `GDK_GL_DISABLE`
-
-This variable can be set to a list of values, which cause GDK to
-disable extension features of the OpenGL support.
-Note that these features may already be disabled if the GL driver
-does not support them.
-
-`debug`
-: GL_KHR_debug
-
-`unpack-subimage`
-:GL_EXT_unpack_subimage
-
-`half-float`
-:GL_OES_vertex_half_float
-
-`sync`
-:GL_ARB_sync
-
-`base-instance`
-:GL_EXT_base_instance
-
 ### `GDK_VULKAN_DEVICE`
 
 This variable can be set to the index of a Vulkan device to override
@@ -376,7 +354,7 @@ the default selection of the device that is used for Vulkan rendering.
 The special value `list` can be used to obtain a list of all Vulkan
 devices.
 
-### `GDK_VULKAN_DISABLE`
+### `GDK_VULKAN_SKIP`
 
 This variable can be set to a list of values, which cause GDK to
 disable features of the Vulkan support.
@@ -456,7 +434,7 @@ using and the GDK backend supports them:
     installation.
 
 
-### `GSK_GPU_DISABLE`
+### `GSK_GPU_SKIP`
 
 This variable can be set to a list of values, which cause GSK to
 disable certain optimizations of the "ngl" and "vulkan" renderer.
@@ -476,22 +454,18 @@ disable certain optimizations of the "ngl" and "vulkan" renderer.
 `mipmap`
 : Avoid creating mipmaps
 
+`gl-baseinstance`
+: Assume no ARB/EXT_base_instance support
+
 The special value `all` can be used to turn on all values. The special
 value `help` can be used to obtain a list of all supported values.
 
-### `GSK_CACHE_TIMEOUT`
-
-Overrides the timeout for cache GC in the "ngl" and "vulkan" renderers.
-The value can be -1 to disable GC entirely, 0 to force GC to happen
-before every frame, or a positive number to do GC in a timeout every
-n seconds. The default timeout is 15 seconds.
-
 ### `GSK_MAX_TEXTURE_SIZE`
 
-Limit texture size to the minimum of this value and the OpenGL limit for
-texture sizes in the "gl" renderer. This can be used to debug issues with
-texture slicing on systems where the OpenGL texture size limit would
-otherwise make texture slicing difficult to test.
+Limit texture size to the minimum of this value and the OpenGL limit
+for texture sizes. This can be used to debug issues with texture slicing
+on systems where the OpenGL texture size limit would otherwise make
+texture slicing difficult to test.
 
 ### `GTK_CSD`
 

docs/reference/gtk/section-accessibility.md

@@ -155,7 +155,6 @@ Each property name is part of the `GtkAccessibleProperty` enumeration.
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_MIN | “aria-valuemin” | double |
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_NOW | “aria-valuenow” | double |
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT | “aria-valuetext” | translatable string |
-| %GTK_ACCESSIBLE_PROPERTY_HELP_TEXT | N/A | translatable string |
 
 #### List of accessible relations
 
@@ -217,10 +216,6 @@ are accessible as part of the development process. The GTK Inspector shows
 the accessible attributes of each widget, and also provides an overlay that
 can highlight accessibility issues.
 
-If you support some non-standard keyboard interactions for a widget, you
-**should** set an appropriate `GTK_ACCESSIBLE_PROPERTY_HELP_TEXT` to help
-discoverability of the behavior.
-
 It is possible to set accessible attributes in UI files as well:
 ```xml
 <object class="GtkButton" id="button1">

docs/reference/gtk/tools.md

@@ -1,18 +0,0 @@
-Title: Tools and Demos
-
-GTK ships with a number of tools and demos that come with their own
-documentation in the form of man pages.
-
- - [gtk4-broadwayd](gtk4-broadwayd.html)
- - [gtk4-builder-tool](gtk4-builder-tool.html)
- - [gtk4-demo](gtk4-demo.html)
- - [gtk4-demo-application](gtk4-demo-application.html)
- - [gtk4-encode-symbolic-svg](gtk4-encode-symbolic-svg.html)
- - [gtk4-icon-browser](gtk4-icon-browser.html)
- - [gtk4-launch](gtk4-launch.html)
- - [gtk4-node-editor](gtk4-node-editor.html)
- - [gtk4-path-tool](gtk4-path-tool.html)
- - [gtk4-query-settings](gtk4-query-settings.html)
- - [gtk4-rendernode-tool](gtk4-rendernode-tool.html)
- - [gtk4-update-icon-cache](gtk4-update-icon-cache.html)
- - [gtk4-widget-factory](gtk4-widget-factory.html)

docs/reference/gtk/x11.md

@@ -43,7 +43,7 @@ X11 details, in particular the ICCCM and the Extended Window Manager
 Hints specifications. [freedesktop.org](http://www.freedesktop.org/standards/)
 has links to many relevant specifications.
 
-The GDK manual covers [using Xlib in a GTK program](https://docs.gtk.org/gdk4/x11.html).
+The GDK manual covers [using Xlib in a GTK program](#gdk-X-Window-System-Interaction).
 
 ### Server, client, window manager
 

docs/reference/images/favicon.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="88.572334" height="96.050743" id="svg6843">
-  <defs id="defs6845"/>
-  <g transform="translate(-19.822308,-16.115941)" id="layer1">
-    <path d="M 20.88413,30.82696 53.816977,55.527708 107.33282,39.060543 70.587303,17.177763 20.88413,30.82696 z" id="path6976" style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="m 22.94243,82.287118 -2.0583,-51.460158 32.932847,24.700748 0,55.577152 L 22.94243,82.287118 z" id="path6978" style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="m 53.816977,111.10486 49.399213,-20.58416 4.11663,-51.460157 -53.515843,16.467165 0,55.577152 z" id="path6980" style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="M 23.216626,81.319479 70.48573,67.361442 103.38422,90.444516" id="path6982" style="fill:none;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
-    <path d="m 70.434539,17.875593 0,49.109284" id="path6984" style="fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
-  </g>
-</svg>

gdk/broadway/broadway.js

@@ -91,31 +91,6 @@ const GDK_META_MASK     = 1 << 28;
 
 var useDataUrls = window.location.search.includes("datauri");
 
-/* check if we are on Android and using Chrome */
-var isAndroidChrome = false;
-{
-    var ua = navigator.userAgent.toLowerCase();
-    if (ua.indexOf("android") > -1 && ua.indexOf("chrom") > -1) {
-	isAndroidChrome = true;
-    }
-}
-/* check for the passive option for Event listener */
-let passiveSupported = false;
-try {
-    const options = {
-	get passive() { // This function will be called when the browser
-            //   attempts to access the passive property.
-	    passiveSupported = true;
-	    return false;
-	}
-    };
-
-    window.addEventListener("test", null, options);
-    window.removeEventListener("test", null, options);
-} catch(err) {
-    passiveSupported = false;
-}
-
 /* This base64code is based on https://github.com/beatgammit/base64-js/blob/master/index.js which is MIT licensed */
 
 var b64_lookup = [];
@@ -240,32 +215,11 @@ function logStackTrace(len) {
         log(callstack[i]);
 }
 
-/* Helper functions for touch identifier to make it unique on Android */
-var globalTouchIdentifier = Math.round(Date.now() / 1000);
-function touchIdentifierStart(tId)
-{
-    if (isAndroidChrome) {
-	if (tId == 0) {
-	    return ++globalTouchIdentifier;
-	}
-	return globalTouchIdentifier + tId;
-    }
-    return tId;
-}
-function touchIdentifier(tId)
-{
-    if (isAndroidChrome) {
-	return globalTouchIdentifier + tId;
-    }
-    return tId;
-}
-
 var grab = new Object();
 grab.surface = null;
 grab.ownerEvents = false;
 grab.implicit = false;
 var keyDownList = [];
-var inputList = [];
 var lastSerial = 0;
 var lastX = 0;
 var lastY = 0;
@@ -1033,14 +987,7 @@ function handleDisplayCommands(display_commands)
             break;
         case DISPLAY_OP_DELETE_SURFACE:
             var id = cmd[1];
-	    if (id == surfaceWithMouse) {
-		surfaceWithMouse = 0;
-	    }
-	    if (id == realSurfaceWithMouse) {
-		realSurfaceWithMouse = 0;
-		firstTouchDownId = null;
-	    }
-           delete surfaces[id];
+            delete surfaces[id];
             break;
         case DISPLAY_OP_CHANGE_TEXTURE:
             var image = cmd[1];
@@ -1424,14 +1371,8 @@ function getEffectiveEventTarget (id) {
 function updateKeyboardStatus() {
     if (fakeInput != null && showKeyboardChanged) {
         showKeyboardChanged = false;
-        if (showKeyboard) {
-	    if (isAndroidChrome) {
-		fakeInput.blur();
-		fakeInput.value = ' '.repeat(80); // TODO: Should be exchange with broadway server
-		                                  // to bring real value here.
-	    }
+        if (showKeyboard)
             fakeInput.focus();
-	}
         else
             fakeInput.blur();
     }
@@ -2983,19 +2924,6 @@ function pushKeyEvent(fev) {
     keyDownList.push(fev);
 }
 
-function copyInputEvent(ev) {
-    var members = ['inputType', 'data'], i, obj = {};
-    for (i = 0; i < members.length; i++) {
-	if (typeof ev[members[i]] !== "undefined")
-	    obj[members[i]] = ev[members[i]];
-    }
-    return obj;
-}
-
-function pushInputEvent(fev) {
-    inputList.push(fev);
-}
-
 function getKeyEvent(keyCode, pop) {
     var i, fev = null;
     for (i = keyDownList.length-1; i >= 0; i--) {
@@ -3094,29 +3022,6 @@ function handleKeyUp(e) {
         keysym = fev.keysym;
     else {
         //log("Key event (keyCode = " + ev.keyCode + ") not found on keyDownList");
-	if (isAndroidChrome && (ev.keyCode == 229)) {
-	    var i, fev = null, len = inputList.length, str;
-	    for (i = 0; i < len; i++) {
-		fev = inputList[i];
-		switch(fev.inputType) {
-		case "deleteContentBackward":
-		    sendInput(BROADWAY_EVENT_KEY_PRESS, [65288, lastState]);
-		    sendInput(BROADWAY_EVENT_KEY_RELEASE, [65288, lastState]);
-		    break;
-		case "insertText":
-		    if (fev.data !== undefined) {
-			for (let sym of fev.data) {
-			    sendInput(BROADWAY_EVENT_KEY_PRESS, [sym.codePointAt(0), lastState]);
-			    sendInput(BROADWAY_EVENT_KEY_RELEASE, [sym.codePointAt(0), lastState]);
-			}
-		    }
-		    break;
-		default:
-		    break;
-		}
-	    }
-	    inputList.splice(0, len);
-	}
         keysym = 0;
     }
 
@@ -3125,16 +3030,6 @@ function handleKeyUp(e) {
     return cancelEvent(ev);
 }
 
-function handleInput (e)  {
-    var fev = null, ev = (e ? e : window.event), keysym = null, suppress = false;
-
-    fev = copyInputEvent(ev);
-    pushInputEvent(fev);
-
-    // Stop keypress events just in case
-    return cancelEvent(ev);
-}
-
 function onKeyDown (ev) {
     updateForEvent(ev);
     return handleKeyDown(ev);
@@ -3150,11 +3045,6 @@ function onKeyUp (ev) {
     return handleKeyUp(ev);
 }
 
-function onInput (ev) {
-    updateForEvent(ev);
-    return handleInput(ev);
-}
-
 function cancelEvent(ev)
 {
     ev = ev ? ev : window.event;
@@ -3186,14 +3076,13 @@ function onMouseWheel(ev)
 }
 
 function onTouchStart(ev) {
-    ev.preventDefault();
+    event.preventDefault();
 
     updateKeyboardStatus();
     updateForEvent(ev);
 
     for (var i = 0; i < ev.changedTouches.length; i++) {
         var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifierStart(touch.identifier);
 
         var origId = getSurfaceId(touch);
         var id = getEffectiveEventTarget (origId);
@@ -3201,7 +3090,7 @@ function onTouchStart(ev) {
         var isEmulated = 0;
 
         if (firstTouchDownId == null) {
-            firstTouchDownId = touchId;
+            firstTouchDownId = touch.identifier;
             isEmulated = 1;
 
             if (realSurfaceWithMouse != origId || id != surfaceWithMouse) {
@@ -3216,54 +3105,52 @@ function onTouchStart(ev) {
             }
         }
 
-        sendInput (BROADWAY_EVENT_TOUCH, [0, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [0, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
     }
 }
 
 function onTouchMove(ev) {
-    ev.preventDefault();
+    event.preventDefault();
 
     updateKeyboardStatus();
     updateForEvent(ev);
 
     for (var i = 0; i < ev.changedTouches.length; i++) {
         var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifier(touch.identifier);
 
         var origId = getSurfaceId(touch);
         var id = getEffectiveEventTarget (origId);
         var pos = getPositionsFromEvent(touch, id);
 
         var isEmulated = 0;
-        if (firstTouchDownId == touchId) {
+        if (firstTouchDownId == touch.identifier) {
             isEmulated = 1;
         }
 
-        sendInput (BROADWAY_EVENT_TOUCH, [1, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [1, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
     }
 }
 
 function onTouchEnd(ev) {
-    ev.preventDefault();
+    event.preventDefault();
 
     updateKeyboardStatus();
     updateForEvent(ev);
 
     for (var i = 0; i < ev.changedTouches.length; i++) {
         var touch = ev.changedTouches.item(i);
-	var touchId = touchIdentifier(touch.identifier);
 
         var origId = getSurfaceId(touch);
         var id = getEffectiveEventTarget (origId);
         var pos = getPositionsFromEvent(touch, id);
 
         var isEmulated = 0;
-        if (firstTouchDownId == touchId) {
+        if (firstTouchDownId == touch.identifier) {
             isEmulated = 1;
             firstTouchDownId = null;
         }
 
-        sendInput (BROADWAY_EVENT_TOUCH, [2, id, touchId, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
+        sendInput (BROADWAY_EVENT_TOUCH, [2, id, touch.identifier, isEmulated, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState]);
     }
 }
 
@@ -3280,11 +3167,11 @@ function setupDocument(document)
     document.onkeyup = onKeyUp;
 
     if (document.addEventListener) {
-	document.addEventListener('DOMMouseScroll', onMouseWheel, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('mousewheel', onMouseWheel, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchstart', onTouchStart, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchmove', onTouchMove, passiveSupported ? { passive: false, capture: false } : false);
-	document.addEventListener('touchend', onTouchEnd, passiveSupported ? { passive: false, capture: false } : false);
+      document.addEventListener('DOMMouseScroll', onMouseWheel, false);
+      document.addEventListener('mousewheel', onMouseWheel, false);
+      document.addEventListener('touchstart', onTouchStart, false);
+      document.addEventListener('touchmove', onTouchMove, false);
+      document.addEventListener('touchend', onTouchEnd, false);
     } else if (document.attachEvent) {
       element.attachEvent("onmousewheel", onMouseWheel);
     }
@@ -3350,14 +3237,12 @@ function connect()
     };
 
     var iOS = /(iPad|iPhone|iPod)/g.test( navigator.userAgent );
-    if (iOS || isAndroidChrome) {
+    if (iOS) {
         fakeInput = document.createElement("input");
         fakeInput.type = "text";
         fakeInput.style.position = "absolute";
         fakeInput.style.left = "-1000px";
         fakeInput.style.top = "-1000px";
         document.body.appendChild(fakeInput);
-	if (isAndroidChrome)
-	    fakeInput.addEventListener('input', onInput, passiveSupported ? { passive: false, capture: false } : false);
     }
 }

gdk/broadway/gdkcairocontext-broadway.c

@@ -33,11 +33,9 @@ gdk_broadway_cairo_context_dispose (GObject *object)
 }
 
 static void
-gdk_broadway_cairo_context_begin_frame (GdkDrawContext  *draw_context,
-                                        GdkMemoryDepth   depth,
-                                        cairo_region_t  *region,
-                                        GdkColorState  **out_color_state,
-                                        GdkMemoryDepth  *out_depth)
+gdk_broadway_cairo_context_begin_frame (GdkDrawContext *draw_context,
+                                        GdkMemoryDepth  depth,
+                                        cairo_region_t *region)
 {
   GdkBroadwayCairoContext *self = GDK_BROADWAY_CAIRO_CONTEXT (draw_context);
   GdkSurface *surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (self));
@@ -61,9 +59,6 @@ gdk_broadway_cairo_context_begin_frame (GdkDrawContext  *draw_context,
   cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
   cairo_fill (cr);
   cairo_destroy (cr);
-
-  *out_color_state = GDK_COLOR_STATE_SRGB;
-  *out_depth = gdk_color_state_get_depth (GDK_COLOR_STATE_SRGB);
 }
 
 static void

gdk/broadway/gdkdrawcontext-broadway.c

@@ -33,11 +33,9 @@ gdk_broadway_draw_context_dispose (GObject *object)
 }
 
 static void
-gdk_broadway_draw_context_begin_frame (GdkDrawContext  *draw_context,
-                                       GdkMemoryDepth   depth,
-                                       cairo_region_t  *region,
-                                       GdkColorState  **out_color_state,
-                                       GdkMemoryDepth  *out_depth)
+gdk_broadway_draw_context_begin_frame (GdkDrawContext *draw_context,
+                                       GdkMemoryDepth  depth,
+                                       cairo_region_t *region)
 {
   GdkBroadwayDrawContext *self = GDK_BROADWAY_DRAW_CONTEXT (draw_context);
   GdkSurface *surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (self));
@@ -54,9 +52,6 @@ gdk_broadway_draw_context_begin_frame (GdkDrawContext  *draw_context,
 
   self->nodes = g_array_new (FALSE, FALSE, sizeof(guint32));
   self->node_textures = g_ptr_array_new_with_free_func (g_object_unref);
-
-  *out_color_state = GDK_COLOR_STATE_SRGB;
-  *out_depth = gdk_color_state_get_depth (GDK_COLOR_STATE_SRGB);
 }
 
 static void

gdk/broadway/meson.build

@@ -52,7 +52,8 @@ broadwayjs_h = custom_target('broadwayjs.h',
 )
 
 libgdk_broadway = static_library('gdk-broadway',
-  sources: [ clienthtml_h, broadwayjs_h, gdk_broadway_sources, gdk_gen_headers ],
+  clienthtml_h, broadwayjs_h,
+  gdk_broadway_sources, gdkconfig, gdkenum_h,
   include_directories: [confinc, gdkinc],
   c_args: [
     '-DGTK_COMPILATION',

gdk/gdk.c

@@ -43,14 +43,6 @@
 
 #include <fribidi.h>
 
-/* GTK has a general architectural assumption that gsize is pointer-sized
- * (equivalent to uintptr_t), making it non-portable to architectures like
- * CHERI where that isn't true. If a future release relaxes that
- * assumption, changes will be needed in numerous places.
- * See also https://gitlab.gnome.org/GNOME/glib/-/issues/2842 for the
- * equivalent in GLib, which would be a prerequisite. */
-G_STATIC_ASSERT (sizeof (gsize) == sizeof (void *));
-G_STATIC_ASSERT (G_ALIGNOF (gsize) == G_ALIGNOF (void *));
 
 /**
  * GDK_WINDOWING_X11:
@@ -128,13 +120,10 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "dmabuf",          GDK_DEBUG_DMABUF, "Information about dmabuf buffers" },
   { "offload",         GDK_DEBUG_OFFLOAD, "Information about subsurfaces and graphics offload" },
 
-  { "linear",          GDK_DEBUG_LINEAR, "Enable linear rendering" },
-  { "hdr",             GDK_DEBUG_HDR, "Force HDR rendering" },
   { "portals",         GDK_DEBUG_PORTALS, "Force use of portals" },
   { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals" },
-  { "force-offload",   GDK_DEBUG_FORCE_OFFLOAD, "Force graphics offload for all textures" },
   { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
-  { "gl-no-fractional", GDK_DEBUG_GL_NO_FRACTIONAL, "Disable fractional scaling for OpenGL" },
+  { "gl-fractional",   GDK_DEBUG_GL_FRACTIONAL, "Enable fractional scaling for OpenGL (experimental)" },
   { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
   { "gl-disable-gl",   GDK_DEBUG_GL_DISABLE_GL, "Only allow OpenGL GLES API" },
   { "gl-disable-gles", GDK_DEBUG_GL_DISABLE_GLES, "Don't allow OpenGL GLES API" },
@@ -143,6 +132,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "gl-glx",          GDK_DEBUG_GL_GLX, "Use GLX on X11" },
   { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows" },
   { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support" },
+  { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer" },
   { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings" },
   { "high-depth",      GDK_DEBUG_HIGH_DEPTH, "Use high bit depth rendering if possible" },
   { "no-vsync",        GDK_DEBUG_NO_VSYNC, "Repaint instantly (uses 100% CPU with animations)" },
@@ -152,50 +142,31 @@ static const GdkDebugKey gdk_debug_keys[] = {
 
 #ifdef G_HAS_CONSTRUCTORS
 #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_and_unset_environment)
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_desktop_startup_notification_id)
 #endif
-G_DEFINE_CONSTRUCTOR(stash_and_unset_environment)
+G_DEFINE_CONSTRUCTOR(stash_desktop_startup_notification_id)
 #endif
 
 static char *startup_notification_id = NULL;
-static char *xdg_activation_token = NULL;
 
 static void
-stash_and_unset_environment (void)
+stash_desktop_startup_notification_id (void)
 {
-  /* Copies environment variables and unsets them so they won't be inherited by
-   * child processes and confuse things.
-   *
-   * Changing environment variables can be racy so we try to do this as early as
-   * possible in the program flow and before any printing that might involve
-   * environment variables.
-   */
-  struct {
-    const char *key;
-    char **dst;
-  } vars[] = {
-    { "DESKTOP_STARTUP_ID", &startup_notification_id },
-    { "XDG_ACTIVATION_TOKEN", &xdg_activation_token },
-  };
-  size_t i;
+  const char *desktop_startup_id;
 
-  for (i = 0; i < G_N_ELEMENTS (vars); i++)
-    *vars[i].dst = g_strdup (g_getenv (vars[i].key));
-
-  for (i = 0; i < G_N_ELEMENTS (vars); i++)
-    g_unsetenv (vars[i].key);
-
-  for (i = 0; i < G_N_ELEMENTS (vars); i++)
+  desktop_startup_id = g_getenv ("DESKTOP_STARTUP_ID");
+  if (desktop_startup_id && *desktop_startup_id != '\0')
     {
-      if (*vars[i].dst == NULL)
-        continue;
-
-      if (!g_utf8_validate (*vars[i].dst, -1, NULL))
-        {
-          g_warning ("%s contains invalid UTF-8", vars[i].key);
-          g_clear_pointer (vars[i].dst, g_free);
-        }
+      if (!g_utf8_validate (desktop_startup_id, -1, NULL))
+        g_warning ("DESKTOP_STARTUP_ID contains invalid UTF-8");
+      else
+        startup_notification_id = g_strdup (desktop_startup_id);
     }
+
+  /* Clear the environment variable so it won't be inherited by
+   * child processes and confuse things.
+   */
+  g_unsetenv ("DESKTOP_STARTUP_ID");
 }
 
 static gpointer
@@ -320,7 +291,7 @@ gdk_pre_parse (void)
     gdk_gl_backend_use (GDK_GL_WGL);
 
 #ifndef G_HAS_CONSTRUCTORS
-  stash_and_unset_environment ();
+  stash_desktop_startup_notification_id ();
 #endif
 }
 
@@ -354,20 +325,15 @@ gdk_display_open_default (void)
 /*< private >
  * gdk_get_startup_notification_id:
  *
- * Returns the original value of the XDG_ACTIVATION_TOKEN environment
- * variable if it was defined and valid, otherwise it returns the original
- * value of the DESKTOP_STARTUP_ID environment variable if it was defined
- * and valid, or %NULL if neither of them were defined and valid.
+ * Returns the original value of the DESKTOP_STARTUP_ID environment
+ * variable if it was defined and valid, or %NULL otherwise.
  *
  * Returns: (nullable) (transfer none): the original value of the
- *   XDG_ACTIVATION_TOKEN or DESKTOP_STARTUP_ID environment variable
+ *   DESKTOP_STARTUP_ID environment variable
  */
 const char *
 gdk_get_startup_notification_id (void)
 {
-  if (xdg_activation_token)
-    return xdg_activation_token;
-
   return startup_notification_id;
 }
 

gdk/gdk.h

@@ -29,9 +29,7 @@
 #include <gdk/gdkapplaunchcontext.h>
 #include <gdk/gdkcairo.h>
 #include <gdk/gdkcairocontext.h>
-#include <gdk/gdkcicpparams.h>
 #include <gdk/gdkclipboard.h>
-#include <gdk/gdkcolorstate.h>
 #include <gdk/gdkconfig.h>
 #include <gdk/gdkcontentdeserializer.h>
 #include <gdk/gdkcontentformats.h>
@@ -63,7 +61,6 @@
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkmemorytexture.h>
-#include <gdk/gdkmemorytexturebuilder.h>
 #include <gdk/gdkmonitor.h>
 #include <gdk/gdkpaintable.h>
 #include <gdk/gdkpango.h>