gsk: Give up on text nodes with unuploadable glyphs

If we can't upload the glyphs, just give up and use fallback.
gsk: Don't try to upload NULL images
2024-01-11 14:54:34 -05:00 · 2024-01-11 06:26:23 -05:00 · 2024-01-11 06:25:22 -05:00
1626 changed files with 68834 additions and 152319 deletions
@@ -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
@@ -26,8 +26,7 @@ variables:
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  MESON_TEST_MAX_PROCESSES: 8
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v52"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v49"

 workflow:
  rules:
@@ -79,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"
@@ -118,12 +116,10 @@ release-build:
    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
    - .gitlab-ci/show-info-linux.sh
-    - mkdir _install
-    # don't use catch by default, since it causes sporadic test failures
-    # - 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}
@@ -213,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:
@@ -416,12 +409,11 @@ static-scan:
 # Run tests with the address sanitizer. We need to turn off introspection
 # and f16c, since they are incompatible with asan
 asan-build:
-  extends: .build-fedora-default
+  image: $FEDORA_IMAGE
  tags: [ asan ]
  stage: analysis
  needs: []
  variables:
-    MESON_TEST_MAX_PROCESSES: 4
  script:
    - export PATH="$HOME/.local/bin:$PATH"
    - CC=clang meson setup
@@ -436,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
@@ -449,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
@@ -464,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/
@@ -486,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"
-
@@ -1,7 +1,9 @@
-FROM fedora:40
+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 \
@@ -99,11 +102,8 @@ RUN dnf -y install \
    which \
    wireplumber \
    xorg-x11-server-Xvfb \
- && dnf -y update \
 && dnf clean all

-RUN rm /usr/share/vulkan/icd.d/powervr_mesa_icd.x86_64.json
-
 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers

@@ -24,10 +24,10 @@ flatpak build ${builddir} meson \
                -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
+flatpak build ${builddir} ninja -C _flatpak_build install

 flatpak-builder \
        --user --disable-rofiles-fuse \
@@ -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
@@ -8,19 +8,17 @@ builddir=$1
 setup=$2
 suite=$3
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
-n_processes=${MESON_TEST_MAX_PROCESSES:-1}

 # Ignore memory leaks lower in dependencies
 export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
+export G_SLICE=always-malloc

 case "${setup}" in
  x11*)
-    dbus-run-session -- \
-       xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
+    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
          meson test -C ${builddir} \
                --quiet \
                --timeout-multiplier "${multiplier}" \
-                --num-processes "${n_processes}" \
                --print-errorlogs \
                --setup=${setup} \
                --suite=${suite//,/ --suite=} \
@@ -42,11 +40,9 @@ case "${setup}" in
    compositor=$!
    export WAYLAND_DISPLAY=wayland-5

-    dbus-run-session -- \
-          meson test -C ${builddir} \
+    meson test -C ${builddir} \
                --quiet \
                --timeout-multiplier "${multiplier}" \
-                --num-processes "${n_processes}" \
                --print-errorlogs \
                --setup=${setup} \
                --suite=${suite//,/ --suite=} \
@@ -67,11 +63,9 @@ case "${setup}" in
    server=$!
    export BROADWAY_DISPLAY=:5

-    dbus-run-session -- \
-          meson test -C ${builddir} \
+    meson test -C ${builddir} \
                --quiet \
                --timeout-multiplier "${multiplier}" \
-                --num-processes "${n_processes}" \
                --print-errorlogs \
                --setup=${setup} \
                --suite=${suite//,/ --suite=} \
@@ -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 || :
@@ -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 \
@@ -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.
@@ -210,7 +213,7 @@ Closes #1234
 `git commit -a --author "Joe Coder <joe@coder.org>"` and `--signoff`.

 - If your commit is addressing an issue, use the
- [GitLab syntax](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
+ [GitLab syntax](https://docs.gitlab.com/ce/user/project/issues/automatic_issue_closing.html)
 to automatically close the issue when merging the commit with the upstream
 repository:

@@ -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).
@@ -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:

@@ -186,7 +186,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
            ],
            "sources" : [
                {
@@ -199,7 +199,6 @@
    ],
    "build-options" : {
        "env" : {
-            "GSK_RENDERER" : "opengl"
        }
    }
 }
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
            ],
            "sources" : [
                {
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
            ],
            "sources" : [
                {
@@ -129,7 +129,6 @@
    "build-options" : {
        "env" : {
            "DBUS_SESSION_BUS_ADDRESS" : "''",
-            "GSK_RENDERER" : "opengl",
            "G_ENABLE_DEBUG" : "true"
        }
    }
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
            ],
            "sources" : [
                {
@@ -129,7 +129,6 @@
    "build-options" : {
        "env" : {
            "DBUS_SESSION_BUS_ADDRESS" : "''",
-            "GSK_RENDERER" : "opengl",
            "G_ENABLE_DEBUG" : "true"
        }
    }
@@ -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);
    }

@@ -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>
@@ -454,9 +453,6 @@
    <file>icons/16x16/categories/applications-other.png</file>
    <file>icons/48x48/status/starred.png</file>
    <file alias="icons/scalable/apps/org.gtk.Demo4.svg">data/scalable/apps/org.gtk.Demo4.svg</file>
-    <file>portland-rose-thumbnail.png</file>
-    <file>large-image-thumbnail.png</file>
-    <file compressed="true">large-image.png</file>
  </gresource>
  <gresource prefix="/org/gtk/Demo4/gtk">
    <file preprocess="xml-stripblanks">help-overlay.ui</file>
@@ -55,7 +55,7 @@ mode_switch_state_set (GtkSwitch *sw,
    {
      gtk_widget_set_visible (label, TRUE);
      gtk_accessible_update_relation (GTK_ACCESSIBLE (sw),
-                                      GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, label, NULL,
+                                      GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, label,
                                      -1);
      gtk_accessible_update_state (GTK_ACCESSIBLE (sw),
                                   GTK_ACCESSIBLE_STATE_INVALID, GTK_ACCESSIBLE_INVALID_TRUE,
@@ -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
@@ -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);

@@ -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;
      }

@@ -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
@@ -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
@@ -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
@@ -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>
@@ -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--;
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,103 +14,6 @@
 #include <gtk/gtk.h>
 #include "demo3widget.h"

-static GtkWidget *window = NULL;
-static GCancellable *cancellable = NULL;
-
-static void
-load_texture (GTask        *task,
-              gpointer      source_object,
-              gpointer      task_data,
-              GCancellable *cable)
-{
-  GFile *file = task_data;
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  texture = gdk_texture_new_from_file (file, &error);
-
-  if (texture)
-    g_task_return_pointer (task, texture, g_object_unref);
-  else
-    g_task_return_error (task, error);
-}
-
-static void
-set_wait_cursor (GtkWidget *widget)
-{
-  gtk_widget_set_cursor_from_name (GTK_WIDGET (gtk_widget_get_root (widget)), "wait");
-}
-
-static void
-unset_wait_cursor (GtkWidget *widget)
-{
-  gtk_widget_set_cursor (GTK_WIDGET (gtk_widget_get_root (widget)), NULL);
-}
-
-static void
-texture_loaded (GObject      *source,
-                GAsyncResult *result,
-                gpointer      data)
-{
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  texture = g_task_propagate_pointer (G_TASK (result), &error);
-
-  if (!texture)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  if (!window)
-    {
-      g_object_unref (texture);
-      return;
-    }
-
-  unset_wait_cursor (GTK_WIDGET (data));
-
-  g_object_set (G_OBJECT (data), "texture", texture, NULL);
-}
-
-static void
-open_file_async (GFile     *file,
-                 GtkWidget *demo)
-{
-  GTask *task;
-
-  set_wait_cursor (demo);
-
-  task = g_task_new (demo, cancellable, texture_loaded, demo);
-  g_task_set_task_data (task, g_object_ref (file), g_object_unref);
-  g_task_run_in_thread (task, load_texture);
-  g_object_unref (task);
-}
-
-static void
-open_portland_rose (GtkWidget *button,
-                    GtkWidget *demo)
-{
-  GFile *file;
-
-  file = g_file_new_for_uri ("resource:///transparent/portland-rose.jpg");
-  open_file_async (file, demo);
-  g_object_unref (file);
-}
-
-static void
-open_large_image (GtkWidget *button,
-                  GtkWidget *demo)
-{
-  GFile *file;
-
-  file = g_file_new_for_uri ("resource:///org/gtk/Demo4/large-image.png");
-  open_file_async (file, demo);
-  g_object_unref (file);
-}
-
 static void
 file_opened (GObject      *source,
             GAsyncResult *result,
@@ -118,6 +21,7 @@ file_opened (GObject      *source,
 {
  GFile *file;
  GError *error = NULL;
+  GdkTexture *texture;

  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);

@@ -128,9 +32,17 @@ file_opened (GObject      *source,
      return;
    }

-  open_file_async (file, data);
-
+  texture = gdk_texture_new_from_file (file, &error);
  g_object_unref (file);
+  if (!texture)
+    {
+      g_print ("%s\n", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  g_object_set (G_OBJECT (data), "texture", texture, NULL);
+  g_object_unref (texture);
 }

 static void
@@ -204,26 +116,11 @@ transform_from (GBinding     *binding,
  return TRUE;
 }

-static void
-free_cancellable (gpointer data)
-{
-  g_cancellable_cancel (cancellable);
-  g_clear_object (&cancellable);
-}
-
-static gboolean
-cancel_load (GtkWidget *widget,
-             GVariant  *args,
-             gpointer   data)
-{
-  unset_wait_cursor (widget);
-  g_cancellable_cancel (G_CANCELLABLE (data));
-  return TRUE;
-}
-
 GtkWidget *
 do_image_scaling (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *box;
@@ -233,7 +130,6 @@ do_image_scaling (GtkWidget *do_widget)
      GtkWidget *scale;
      GtkWidget *dropdown;
      GtkWidget *button;
-      GtkEventController *controller;

      window = gtk_window_new ();
      gtk_window_set_title (GTK_WINDOW (window), "Image Scaling");
@@ -242,20 +138,6 @@ do_image_scaling (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      cancellable = g_cancellable_new ();
-      g_object_set_data_full (G_OBJECT (window), "cancellable",
-                              cancellable, free_cancellable);
-
-      controller = gtk_shortcut_controller_new ();
-      gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller),
-                                            gtk_shortcut_new (
-                                                gtk_keyval_trigger_new (GDK_KEY_Escape, 0),
-                                                gtk_callback_action_new (cancel_load, cancellable, NULL)
-                                                ));
-      gtk_shortcut_controller_set_scope (GTK_SHORTCUT_CONTROLLER (controller),
-                                         GTK_SHORTCUT_SCOPE_GLOBAL);
-      gtk_widget_add_controller (window, controller);
-
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_window_set_child (GTK_WINDOW (window), box);

@@ -274,22 +156,6 @@ do_image_scaling (GtkWidget *do_widget)
      g_signal_connect (button, "clicked", G_CALLBACK (open_file), widget);
      gtk_box_append (GTK_BOX (box2), button);

-      button = gtk_button_new ();
-      gtk_button_set_child (GTK_BUTTON (button),
-                            gtk_image_new_from_resource ("/org/gtk/Demo4/portland-rose-thumbnail.png"));
-      gtk_widget_add_css_class (button, "image-button");
-      gtk_widget_set_tooltip_text (button, "Portland Rose");
-      g_signal_connect (button, "clicked", G_CALLBACK (open_portland_rose), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      button = gtk_button_new ();
-      gtk_button_set_child (GTK_BUTTON (button),
-                            gtk_image_new_from_resource ("/org/gtk/Demo4/large-image-thumbnail.png"));
-      gtk_widget_add_css_class (button, "image-button");
-      gtk_widget_set_tooltip_text (button, "Large image");
-      g_signal_connect (button, "clicked", G_CALLBACK (open_large_image), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
      button = gtk_button_new_from_icon_name ("object-rotate-right-symbolic");
      gtk_widget_set_tooltip_text (button, "Rotate");
      g_signal_connect (button, "clicked", G_CALLBACK (rotate), widget);
@@ -325,9 +191,7 @@ do_image_scaling (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_set_visible (window, TRUE);
  else
-    {
-      gtk_window_destroy (GTK_WINDOW (window));
-    }
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -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);

@@ -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);
@@ -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
@@ -20,12 +20,11 @@
 #include "config.h"
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>

 #include "demos.h"
 #include "fontify.h"

-#include "profile_conf.h"
+#include "demo_conf.h"

 static GtkWidget *info_view;
 static GtkWidget *source_view;
@@ -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);
@@ -1068,8 +1018,6 @@ command_line (GApplication            *app,

  window = gtk_application_get_windows (GTK_APPLICATION (app))->data;

-  gtk_window_set_icon_name (GTK_WINDOW (window), "org.gtk.Demo4");
-
  if (name == NULL)
    goto out;

@@ -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>
@@ -236,7 +236,7 @@ foreach flag: common_cflags
  endif
 endforeach

-gtkdemo_deps += [ profile_conf_h ]
+gtkdemo_deps += [ demo_conf_h ]

 executable('gtk4-demo',
  sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
@@ -225,8 +225,7 @@ print_ready (GObject      *source,

  if (!g_output_stream_close (stream, NULL, &error))
    {
-      if (!g_error_matches (error, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_DISMISSED))
-        g_print ("Error from close: %s\n", error->message);
+      g_print ("Error from close: %s\n", error->message);
      g_error_free (error);
    }

@@ -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);

@@ -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);
@@ -4,7 +4,7 @@
 #include "iconbrowserapp.h"
 #include "iconbrowserwin.h"

-#include "profile_conf.h"
+#include "demo_conf.h"

 struct _IconBrowserApp
 {
@@ -139,8 +139,6 @@ icon_browser_app_activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (win), "devel");

-  gtk_window_set_icon_name (GTK_WINDOW (win), "org.gtk.IconBrowser4");
-
  gtk_window_present (GTK_WINDOW (win));
 }

@@ -14,7 +14,7 @@ iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
 executable('gtk4-icon-browser',
  sources: [iconbrowser_sources, iconbrowser_resources],
  c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
  win_subsystem: 'windows',
  link_args: extra_demo_ldflags,
@@ -1,3 +1,16 @@
+gen_demo_header = find_program('../build-aux/meson/gen-demo-header.py')
+demo_profile = get_option('demo-profile')
+
+demo_conf_h = declare_dependency(
+  sources: custom_target('demo-header',
+    command: [gen_demo_header, meson.project_source_root(), demo_profile],
+    capture: true,
+    output: 'demo_conf.h',
+    build_by_default: true,
+    build_always_stale: true,
+  )
+)
+
 # appdata

 appdata_config = configuration_data()
@@ -12,7 +12,7 @@ node_editor_resources = gnome.compile_resources('node_editor_resources',

 executable('gtk4-node-editor',
  sources: [node_editor_sources, node_editor_resources],
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
  c_args: common_cflags,
  win_subsystem: 'windows',
@@ -19,13 +19,15 @@

 #include "config.h"

-#include <glib/gstdio.h>
+#ifdef HAVE_PANGOFT
+#include <pango/pangofc-fontmap.h>
+#endif

 #include "node-editor-application.h"

 #include "node-editor-window.h"

-#include "profile_conf.h"
+#include "demo_conf.h"

 static const char *css =
 "textview.editor {"
@@ -47,11 +49,47 @@ struct _NodeEditorApplicationClass
  GtkApplicationClass parent_class;
 };

-G_DEFINE_TYPE(NodeEditorApplication, node_editor_application, GTK_TYPE_APPLICATION);
+G_DEFINE_TYPE (NodeEditorApplication, node_editor_application, GTK_TYPE_APPLICATION);
+
+static void
+maybe_add_test_fonts (void)
+{
+#ifdef HAVE_PANGOFT
+  const char *subdir = "testsuite/gsk/fonts";
+  const char *source_dir;
+  char *dir;
+
+  source_dir = g_getenv ("GTK_SOURCE_DIR");
+
+  if (source_dir)
+    {
+      char *abs_source_dir = g_canonicalize_filename (source_dir, NULL);
+      dir = g_canonicalize_filename (subdir, abs_source_dir);
+      g_free (abs_source_dir);
+    }
+  else
+    {
+      char *current_dir = g_get_current_dir ();
+      dir = g_canonicalize_filename (subdir, current_dir);
+      g_free (current_dir);
+    }
+
+  if (g_file_test (dir, G_FILE_TEST_EXISTS))
+    {
+      FcConfig *config;
+
+      config = FcConfigGetCurrent ();
+      FcConfigAppFontAddDir (config, (const FcChar8 *) dir);
+    }
+
+  g_free (dir);
+#endif
+}

 static void
 node_editor_application_init (NodeEditorApplication *app)
 {
+  maybe_add_test_fonts ();
 }

 static void
@@ -219,8 +257,6 @@ node_editor_application_activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (win), "devel");

-  gtk_window_set_icon_name (GTK_WINDOW (win), "org.gtk.gtk4.NodeEditor");
-
  gtk_window_present (GTK_WINDOW (win));
 }

@@ -251,63 +287,11 @@ node_editor_application_class_init (NodeEditorApplicationClass *class)
  application_class->open = node_editor_application_open;
 }

-static void
-print_version (void)
-{
-  g_print ("gtk4-node-editor %s%s%s\n",
-           PACKAGE_VERSION,
-           g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-           g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "");
-}
-
-static int
-local_options (GApplication *app,
-               GVariantDict *options,
-               gpointer      data)
-{
-  gboolean version = FALSE;
-  gboolean reset = FALSE;
-
-  g_variant_dict_lookup (options, "version", "b", &version);
-
-  if (version)
-    {
-      print_version ();
-      return 0;
-    }
-
-  g_variant_dict_lookup (options, "reset", "b", &reset);
-
-  if (reset)
-    {
-      char *path;
-
-      path = get_autosave_path ("-unsafe");
-      g_remove (path);
-      g_free (path);
-      path = get_autosave_path (NULL);
-      g_remove (path);
-      g_free (path);
-    }
-
-  return -1;
-}
-
-
 NodeEditorApplication *
 node_editor_application_new (void)
 {
-  NodeEditorApplication *app;
-
-  app = g_object_new (NODE_EDITOR_APPLICATION_TYPE,
-                      "application-id", "org.gtk.gtk4.NodeEditor",
-                      "flags", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE,
-                      NULL);
-
-  g_application_add_main_option (G_APPLICATION (app), "version", 0, 0,G_OPTION_ARG_NONE, "Show program version", NULL);
-  g_application_add_main_option (G_APPLICATION (app), "reset", 0, 0,G_OPTION_ARG_NONE, "Remove autosave content", NULL);
-
-  g_signal_connect (app, "handle-local-options", G_CALLBACK (local_options), NULL);
-
-  return app;
+  return g_object_new (NODE_EDITOR_APPLICATION_TYPE,
+                       "application-id", "org.gtk.gtk4.NodeEditor",
+                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       NULL);
 }
@@ -28,8 +28,6 @@
 #include "gsk/broadway/gskbroadwayrenderer.h"
 #endif

-#include <glib/gstdio.h>
-
 #include <cairo.h>
 #ifdef CAIRO_HAS_SVG_SURFACE
 #include <cairo-svg.h>
@@ -57,7 +55,6 @@ struct _NodeEditorWindow
  GtkWidget *testcase_name_entry;
  GtkWidget *testcase_save_button;
  GtkWidget *scale_scale;
-  GtkWidget *crash_warning;

  GtkWidget *renderer_listbox;
  GListStore *renderers;
@@ -67,10 +64,6 @@ struct _NodeEditorWindow
  GFileMonitor *file_monitor;

  GArray *errors;
-
-  gboolean auto_reload;
-  gboolean mark_as_safe_pending;
-  gulong after_paint_handler;
 };

 struct _NodeEditorWindowClass
@@ -78,13 +71,6 @@ struct _NodeEditorWindowClass
  GtkApplicationWindowClass parent_class;
 };

-enum {
-  PROP_AUTO_RELOAD = 1,
-  NUM_PROPERTIES
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-
 G_DEFINE_TYPE(NodeEditorWindow, node_editor_window, GTK_TYPE_APPLICATION_WINDOW);

 static void
@@ -177,121 +163,19 @@ text_iter_skip_whitespace_backward (GtkTextIter *iter)
 }

 static void
-highlight_text (NodeEditorWindow *self)
-{
-  GtkTextIter iter;
-  GtkTextIter start, end;
-
-  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);
-
-  while (!gtk_text_iter_is_end (&iter))
-    {
-      gunichar c = gtk_text_iter_get_char (&iter);
-
-      if (c == '{')
-        {
-          GtkTextIter word_end = iter;
-          GtkTextIter word_start;
-
-          gtk_text_iter_backward_char (&word_end);
-          text_iter_skip_whitespace_backward (&word_end);
-
-          word_start = word_end;
-          gtk_text_iter_backward_word_start (&word_start);
-          text_iter_skip_alpha_backward (&word_start);
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "nodename", &word_start, &word_end);
-        }
-      else if (c == ':')
-        {
-          GtkTextIter word_end = iter;
-          GtkTextIter word_start;
-
-          gtk_text_iter_backward_char (&word_end);
-          text_iter_skip_whitespace_backward (&word_end);
-
-          word_start = word_end;
-          gtk_text_iter_backward_word_start (&word_start);
-          text_iter_skip_alpha_backward (&word_start);
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "propname", &word_start, &word_end);
-        }
-      else if (c == '"')
-        {
-          GtkTextIter string_start = iter;
-          GtkTextIter string_end = iter;
-
-          gtk_text_iter_forward_char (&iter);
-          while (!gtk_text_iter_is_end (&iter))
-            {
-              c = gtk_text_iter_get_char (&iter);
-
-              if (c == '"')
-                {
-                  gtk_text_iter_forward_char (&iter);
-                  string_end = iter;
-                  break;
-                }
-
-              gtk_text_iter_forward_char (&iter);
-            }
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "string", &string_start, &string_end);
-        }
-
-      gtk_text_iter_forward_char (&iter);
-    }
-
-  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
-  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)
+text_changed (GtkTextBuffer    *buffer,
+              NodeEditorWindow *self)
 {
  char *text;
  GBytes *bytes;
+  GtkTextIter iter;
+  GtkTextIter start, end;
  float scale;
  GskRenderNode *big_node;

-  mark_autosave_as_unsafe ();
-
+  g_array_remove_range (self->errors, 0, self->errors->len);
  text = get_current_text (self->text_buffer);
+  text_buffer_remove_all_tags (self->text_buffer);
  bytes = g_bytes_new_take (text, strlen (text));

  g_clear_pointer (&self->node, gsk_render_node_unref);
@@ -353,20 +237,72 @@ reload (NodeEditorWindow *self)

  g_clear_pointer (&big_node, gsk_render_node_unref);

-  self->mark_as_safe_pending = TRUE;
-}
+  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);

-static void
-text_changed (GtkTextBuffer    *buffer,
-              NodeEditorWindow *self)
-{
-  g_array_remove_range (self->errors, 0, self->errors->len);
-  text_buffer_remove_all_tags (self->text_buffer);
+  while (!gtk_text_iter_is_end (&iter))
+    {
+      gunichar c = gtk_text_iter_get_char (&iter);

-  if (self->auto_reload)
-    reload (self);
+      if (c == '{')
+        {
+          GtkTextIter word_end = iter;
+          GtkTextIter word_start;

-  highlight_text (self);
+          gtk_text_iter_backward_char (&word_end);
+          text_iter_skip_whitespace_backward (&word_end);
+
+          word_start = word_end;
+          gtk_text_iter_backward_word_start (&word_start);
+          text_iter_skip_alpha_backward (&word_start);
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "nodename",
+                                             &word_start, &word_end);
+        }
+      else if (c == ':')
+        {
+          GtkTextIter word_end = iter;
+          GtkTextIter word_start;
+
+          gtk_text_iter_backward_char (&word_end);
+          text_iter_skip_whitespace_backward (&word_end);
+
+          word_start = word_end;
+          gtk_text_iter_backward_word_start (&word_start);
+          text_iter_skip_alpha_backward (&word_start);
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "propname",
+                                             &word_start, &word_end);
+        }
+      else if (c == '"')
+        {
+          GtkTextIter string_start = iter;
+          GtkTextIter string_end = iter;
+
+          gtk_text_iter_forward_char (&iter);
+          while (!gtk_text_iter_is_end (&iter))
+            {
+              c = gtk_text_iter_get_char (&iter);
+
+              if (c == '"')
+                {
+                  gtk_text_iter_forward_char (&iter);
+                  string_end = iter;
+                  break;
+                }
+
+              gtk_text_iter_forward_char (&iter);
+            }
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "string",
+                                             &string_start, &string_end);
+        }
+
+      gtk_text_iter_forward_char (&iter);
+    }
+
+  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
+  gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens",
+                                     &start, &end);
 }

 static void
@@ -1205,24 +1141,10 @@ node_editor_window_add_renderer (NodeEditorWindow *self,
  g_object_unref (paintable);
 }

-static void
-update_paste_action (GdkClipboard *clipboard,
-                     GParamSpec   *pspec,
-                     gpointer      data)
-{
-  GtkWidget *widget = GTK_WIDGET (data);
-  gboolean has_node;
-
-  has_node = gdk_content_formats_contain_mime_type (gdk_clipboard_get_formats (clipboard), "application/x-gtk-render-node");
-
-  gtk_widget_action_set_enabled (widget, "paste-node", has_node);
-}
-
 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);

@@ -1250,27 +1172,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);
-
-  g_signal_connect (gtk_widget_get_clipboard (widget), "notify::formats", G_CALLBACK (update_paste_action), widget);
 }

 static void
 node_editor_window_unrealize (GtkWidget *widget)
 {
  NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GdkFrameClock *frameclock;
  guint i;

-  g_signal_handlers_disconnect_by_func (gtk_widget_get_clipboard (widget), update_paste_action, widget);
-
-  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);
@@ -1631,97 +1540,6 @@ edit_action_cb (GtkWidget  *widget,
  node_editor_window_edit (self, &start);
 }

-static void
-text_received (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (data);
-  char *text;
-
-  text = gdk_clipboard_read_text_finish (clipboard, result, NULL);
-  if (text)
-    {
-      GtkTextBuffer *buffer;
-      GtkTextIter start, end;
-
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-      gtk_text_buffer_begin_user_action (buffer);
-      gtk_text_buffer_get_bounds (buffer, &start, &end);
-      gtk_text_buffer_delete (buffer, &start, &end);
-      gtk_text_buffer_insert (buffer, &start, text, -1);
-      gtk_text_buffer_end_user_action (buffer);
-      g_free (text);
-    }
-}
-
-static void
-paste_node_cb (GtkWidget  *widget,
-               const char *action_name,
-               GVariant   *parameter)
-{
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
-
-  gdk_clipboard_read_text_async (clipboard, NULL, text_received, widget);
-}
-
-static void
-node_editor_window_set_property (GObject      *object,
-                                 guint         prop_id,
-                                 const GValue *value,
-                                 GParamSpec   *pspec)
-{
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (object);
-
-  switch (prop_id)
-    {
-    case PROP_AUTO_RELOAD:
-      {
-        gboolean auto_reload = g_value_get_boolean (value);
-        if (self->auto_reload != auto_reload)
-          {
-            self->auto_reload = auto_reload;
-
-            if (self->auto_reload)
-              reload (self);
-          }
-      }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-node_editor_window_get_property (GObject    *object,
-                                 guint       prop_id,
-                                 GValue     *value,
-                                 GParamSpec *pspec)
-{
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (object);
-
-  switch (prop_id)
-    {
-    case PROP_AUTO_RELOAD:
-      g_value_set_boolean (value, self->auto_reload);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-close_crash_warning (GtkButton        *button,
-                     NodeEditorWindow *self)
-{
-  gtk_revealer_set_reveal_child (GTK_REVEALER (self->crash_warning), FALSE);
-}
-
 static void
 node_editor_window_class_init (NodeEditorWindowClass *class)
 {
@@ -1733,8 +1551,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)

  object_class->dispose = node_editor_window_dispose;
  object_class->finalize = node_editor_window_finalize;
-  object_class->set_property = node_editor_window_set_property;
-  object_class->get_property = node_editor_window_get_property;

  gtk_widget_class_set_template_from_resource (widget_class,
                                               "/org/gtk/gtk4/node-editor/node-editor-window.ui");
@@ -1742,12 +1558,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  widget_class->realize = node_editor_window_realize;
  widget_class->unrealize = node_editor_window_unrealize;

-  properties[PROP_AUTO_RELOAD] = g_param_spec_boolean ("auto-reload", NULL, NULL,
-                                                       TRUE,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME);
-
-  g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
-
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, text_view);
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, picture);
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, renderer_listbox);
@@ -1757,7 +1567,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_name_entry);
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_save_button);
  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, scale_scale);
-  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, crash_warning);

  gtk_widget_class_bind_template_callback (widget_class, text_view_query_tooltip_cb);
  gtk_widget_class_bind_template_callback (widget_class, open_cb);
@@ -1770,7 +1579,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  gtk_widget_class_bind_template_callback (widget_class, on_picture_drag_prepare_cb);
  gtk_widget_class_bind_template_callback (widget_class, on_picture_drop_cb);
  gtk_widget_class_bind_template_callback (widget_class, click_gesture_pressed);
-  gtk_widget_class_bind_template_callback (widget_class, close_crash_warning);

  gtk_widget_class_install_action (widget_class, "smart-edit", NULL, edit_action_cb);

@@ -1778,13 +1586,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  action = gtk_named_action_new ("smart-edit");
  shortcut = gtk_shortcut_new (trigger, action);
  gtk_widget_class_add_shortcut (widget_class, shortcut);
-
-  gtk_widget_class_install_action (widget_class, "paste-node", NULL, paste_node_cb);
-
-  trigger = gtk_keyval_trigger_new (GDK_KEY_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK);
-  action = gtk_named_action_new ("paste-node");
-  shortcut = gtk_shortcut_new (trigger, action);
-  gtk_widget_class_add_shortcut (widget_class, shortcut);
 }

 static GtkWidget *
@@ -1829,98 +1630,11 @@ static GActionEntry win_entries[] = {
  { "open", window_open, NULL, NULL, NULL },
 };

-char *
-get_autosave_path (const char *suffix)
-{
-  char *path;
-  char *name;
-
-  name = g_strconcat ("autosave", suffix, NULL);
-  path = g_build_filename (g_get_user_cache_dir (), "gtk4-node-editor", name, NULL);
-  g_free (name);
-
-  return path;
-}
-
-static void
-set_initial_text (NodeEditorWindow *self)
-{
-  char *path, *path1;
-  char *initial_text;
-  gsize len;
-
-  path = get_autosave_path (NULL);
-  path1 = get_autosave_path ("-unsafe");
-
-  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);
-    }
-  else
-    {
-      /* Default */
-      gtk_text_buffer_set_text (self->text_buffer,
-         "shadow {\n"
-         "  child: texture {\n"
-         "    bounds: 0 0 128 128;\n"
-         "    texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n"
-         "  }\n"
-         "  shadows: rgba(0,0,0,0.5) 0 1 12;\n"
-         "}\n"
-         "\n"
-         "transform {\n"
-         "  child: text {\n"
-         "    color: rgb(46,52,54);\n"
-         "    font: \"Cantarell Bold 11\";\n"
-         "    glyphs: \"GTK Node Editor\";\n"
-         "    offset: 8 14.418;\n"
-         "  }\n"
-         "  transform: translate(0, 140);\n"
-         "}", -1);
-    }
-
-  g_free (path);
-  g_free (path1);
-}
-
-static void
-autosave_contents (NodeEditorWindow *self)
-{
-  char *path = NULL;
-  char *dir = NULL;
-  char *contents;
-  GtkTextIter start, end;
-
-  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
-  contents = gtk_text_buffer_get_text (self->text_buffer, &start, &end, TRUE);
-  path = get_autosave_path ("-unsafe");
-  dir = g_path_get_dirname (path);
-  g_mkdir_with_parents (dir, 0755);
-  g_file_set_contents (path, contents, -1, NULL);
-
-  g_free (dir);
-  g_free (path);
-  g_free (contents);
-}
-
 static void
 node_editor_window_init (NodeEditorWindow *self)
 {
-  GAction *action;
-
  gtk_widget_init_template (GTK_WIDGET (self));

-  self->auto_reload = TRUE;
-
  self->renderers = g_list_store_new (GDK_TYPE_PAINTABLE);
  gtk_list_box_bind_model (GTK_LIST_BOX (self->renderer_listbox),
                           G_LIST_MODEL (self->renderers),
@@ -1933,10 +1647,6 @@ node_editor_window_init (NodeEditorWindow *self)

  g_action_map_add_action_entries (G_ACTION_MAP (self), win_entries, G_N_ELEMENTS (win_entries), self);

-  action = G_ACTION (g_property_action_new ("auto-reload", self, "auto-reload"));
-  g_action_map_add_action (G_ACTION_MAP (self), action);
-  g_object_unref (action);
-
  self->tag_table = gtk_text_tag_table_new ();
  gtk_text_tag_table_add (self->tag_table,
                          g_object_new (GTK_TYPE_TEXT_TAG,
@@ -1974,9 +1684,25 @@ node_editor_window_init (NodeEditorWindow *self)
  g_signal_connect (self->scale_scale, "notify::value", G_CALLBACK (scale_changed), self);
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (self->text_view), self->text_buffer);

-  set_initial_text (self);
-
-  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (autosave_contents), self);
+  /* Default */
+  gtk_text_buffer_set_text (self->text_buffer,
+         "shadow {\n"
+         "  child: texture {\n"
+         "    bounds: 0 0 128 128;\n"
+         "    texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n"
+         "  }\n"
+         "  shadows: rgba(0,0,0,0.5) 0 1 12;\n"
+         "}\n"
+         "\n"
+         "transform {\n"
+         "  child: text {\n"
+         "    color: rgb(46,52,54);\n"
+         "    font: \"Cantarell Bold 11\";\n"
+         "    glyphs: \"GTK Node Editor\";\n"
+         "    offset: 8 14.418;\n"
+         "  }\n"
+         "  transform: translate(0, 140);\n"
+         "}", -1);

  if (g_getenv ("GSK_RENDERER"))
    {
@@ -37,5 +37,3 @@ NodeEditorWindow *      node_editor_window_new          (NodeEditorApplication

 gboolean                node_editor_window_load         (NodeEditorWindow       *self,
                                                         GFile                  *file);
-
-char *                  get_autosave_path               (const char             *suffix);
@@ -2,10 +2,6 @@
 <interface>
  <menu id="gear_menu">
    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Reload automatically</attribute>
-        <attribute name="action">win.auto-reload</attribute>
-      </item>
      <item>
        <attribute name="label" translatable="yes">_Help</attribute>
        <attribute name="action">app.help</attribute>
@@ -22,16 +18,13 @@
  </menu>
  <menu id="extra_menu">
    <section>
-      <item>
-        <attribute name="label" translatable="yes">Paste _Node</attribute>
-        <attribute name="action">paste-node</attribute>
-      </item>
      <item>
        <attribute name="label" translatable="yes">Assisted _Edit</attribute>
        <attribute name="action">smart-edit</attribute>
      </item>
    </section>
  </menu>
+
  <object class="GtkPopover" id="testcase_popover">
    <child>
      <object class="GtkGrid">
@@ -46,7 +39,7 @@
          <object class="GtkEntry" id="testcase_name_entry">
            <property name="hexpand">1</property>
            <property name="activates-default">1</property>
-            <signal name="notify::text" handler="testcase_name_entry_changed_cb"/>
+            <signal name="notify::text" handler="testcase_name_entry_changed_cb" />
          </object>
        </child>
        <child>
@@ -59,6 +52,7 @@
            </layout>
          </object>
        </child>
+
        <child>
          <object class="GtkLabel">
            <property name="wrap">1</property>
@@ -72,6 +66,7 @@
            </layout>
          </object>
        </child>
+
        <child>
          <object class="GtkLabel" id="testcase_error_label">
            <property name="wrap">1</property>
@@ -83,6 +78,7 @@
            </layout>
          </object>
        </child>
+
        <child>
          <object class="GtkButton" id="testcase_save_button">
            <property name="label">Save</property>
@@ -90,9 +86,9 @@
            <property name="halign">end</property>
            <property name="receives-default">1</property>
            <property name="sensitive">0</property>
-            <signal name="clicked" handler="testcase_save_clicked_cb"/>
+            <signal name="clicked" handler="testcase_save_clicked_cb" />
            <style>
-              <class name="suggested-action"/>
+              <class name="suggested-action" />
            </style>
            <layout>
              <property name="row">4</property>
@@ -104,6 +100,7 @@
      </object>
    </child>
  </object>
+
  <template class="NodeEditorWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="yes">GTK Node Editor</property>
    <property name="default-width">1024</property>
@@ -188,129 +185,83 @@
      </object>
    </child>
    <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkRevealer" id="crash_warning">
-            <property name="transition-type">slide-down</property>
-            <property name="halign">center</property>
-            <property name="valign">start</property>
-            <property name="child">
-              <object class="GtkFrame">
+      <object class="GtkPaned">
+        <property name="shrink-start-child">false</property>
+        <property name="shrink-end-child">false</property>
+        <property name="position">400</property>
+        <property name="start-child">
+          <object class="GtkScrolledWindow">
+            <property name="hscrollbar-policy">never</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <child>
+              <object class="GtkTextView" id="text_view">
+                <property name="wrap-mode">word</property>
+                <property name="monospace">1</property>
+                <property name="top-margin">6</property>
+                <property name="left-margin">6</property>
+                <property name="right-margin">6</property>
+                <property name="bottom-margin">6</property>
+                <property name="has-tooltip">1</property>
+                <property name="extra-menu">extra_menu</property>
+                <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/>
                <style>
-                  <class name="app-notification"/>
+                  <class name="editor" />
                </style>
-                <property name="child">
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">20</property>
-                    <property name="margin-start">10</property>
-                    <property name="margin-end">10</property>
-                    <property name="margin-top">10</property>
-                    <property name="margin-bottom">10</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="hexpand">1</property>
-                        <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>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="valign">3</property>
-                        <property name="use-underline">1</property>
-                        <property name="label" translatable="1">_Close</property>
-                        <signal name="clicked" handler="close_crash_warning"/>
-                      </object>
-                    </child>
+                <child>
+                  <object class="GtkGestureClick">
+                    <property name="button">1</property>
+                    <signal name="pressed" handler="click_gesture_pressed"/>
                  </object>
-                </property>
+                </child>
              </object>
-            </property>
+            </child>
          </object>
-        </child>
-        <property name="child">
-          <object class="GtkPaned">
-            <property name="shrink-start-child">false</property>
-            <property name="shrink-end-child">false</property>
-            <property name="position">400</property>
-            <property name="start-child">
+        </property>
+        <property name="end-child">
+          <object class="GtkBox">
+            <child>
              <object class="GtkScrolledWindow">
-                <property name="hscrollbar-policy">never</property>
                <property name="hexpand">1</property>
                <property name="vexpand">1</property>
+                <property name="min-content-height">100</property>
+                <property name="min-content-width">100</property>
                <child>
-                  <object class="GtkTextView" id="text_view">
-                    <property name="wrap-mode">word</property>
-                    <property name="monospace">1</property>
-                    <property name="top-margin">6</property>
-                    <property name="left-margin">6</property>
-                    <property name="right-margin">6</property>
-                    <property name="bottom-margin">6</property>
-                    <property name="has-tooltip">1</property>
-                    <property name="extra-menu">extra_menu</property>
-                    <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/>
-                    <style>
-                      <class name="editor"/>
-                    </style>
+                  <object class="GtkViewport">
                    <child>
-                      <object class="GtkGestureClick">
-                        <property name="button">1</property>
-                        <signal name="pressed" handler="click_gesture_pressed"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </property>
-            <property name="end-child">
-              <object class="GtkBox">
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="hexpand">1</property>
-                    <property name="vexpand">1</property>
-                    <property name="min-content-height">100</property>
-                    <property name="min-content-width">100</property>
-                    <child>
-                      <object class="GtkViewport">
+                      <object class="GtkPicture" id="picture">
+                        <property name="can-shrink">0</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                        <child>
-                          <object class="GtkPicture" id="picture">
-                            <property name="can-shrink">0</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <property name="actions">copy</property>
-                                <signal name="prepare" handler="on_picture_drag_prepare_cb" swapped="no"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkDropTargetAsync">
+                          <object class="GtkDragSource">
                            <property name="actions">copy</property>
-                            <property name="formats">application/x-gtk-render-node</property>
-                            <signal name="drop" handler="on_picture_drop_cb" swapped="no"/>
+                            <signal name="prepare" handler="on_picture_drag_prepare_cb" swapped="no"/>
                          </object>
                        </child>
                      </object>
                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="hscrollbar-policy">never</property>
                    <child>
-                      <object class="GtkListBox" id="renderer_listbox">
-                        <property name="selection-mode">none</property>
+                      <object class="GtkDropTargetAsync">
+                        <property name="actions">copy</property>
+                        <property name="formats">application/x-gtk-render-node</property>
+                        <signal name="drop" handler="on_picture_drop_cb" swapped="no"/>
                      </object>
                    </child>
                  </object>
                </child>
              </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="hscrollbar-policy">never</property>
+                <child>
+                  <object class="GtkListBox" id="renderer_listbox">
+                    <property name="selection-mode">none</property>
+                  </object>
+                </child>
+              </object>
+            </child>
          </object>
        </property>
      </object>
@@ -3,7 +3,7 @@
  <gresource prefix="/org/gtk/gtk4/node-editor">
    <file preprocess="xml-stripblanks">node-editor-window.ui</file>
    <file preprocess="xml-stripblanks">help-window.ui</file>
-    <file alias='node-format.md'>../../docs/reference/gtk/node-format.md</file>
+    <file>node-format.md</file>
    <file alias='icons/apps/org.gtk.gtk4.NodeEditor.svg'>data/scalable/apps/org.gtk.gtk4.NodeEditor.svg</file>
  </gresource>
 </gresources>
@@ -1,15 +1,13 @@
-Title: The Node file format
+# The Node file format

 GSK render nodes can be serialized and deserialized using APIs such as `gsk_render_node_serialize()` and `gsk_render_node_deserialize()`. The intended use for this is development - primarily the development of GTK - by allowing things such as creating testsuites and benchmarks, exchanging nodes in bug reports. GTK includes the `gtk4-node-editor` application for creating such test files.

 The format is a text format that follows the [CSS syntax rules](https://drafts.csswg.org/css-syntax-3/). In particular, this means that every array of bytes will produce a render node when parsed, as there is a defined error recovery method. For more details on error handling, please refer to the documentation of the parsing APIs.

 The grammar of a node text representation using [the CSS value definition syntax](https://drafts.csswg.org/css-values-3/#value-defs) looks like this:
-
-    document: <@-rule>*<node>
-    @-rule: @cicp "name" { <property>* }
-    node: container [ "name" ] { <document> } | <node-type> [ "name" ] { <property>* } | "name"
-    property: <property-name>: <node> | <value> ;
+**document**: `<node>\*`
+**node**: container [ "name" ] { <document> } | `<node-type> [ "name" ] { <property>* }` | "name"
+**property**: `<property-name>: <node> | <value> ;`

 Each node has its own `<node-type>` and supports a custom set of properties, each with their own `<property-name>` and syntax. The following paragraphs document each of the nodes and their properties.

@@ -27,59 +25,6 @@ Nodes can be given a name by adding a string after the `<node-type>` in their de

 Just like nodes, textures can be referenced by name. When defining a named texture, the name has to be placed in front of the URL.

-# Color states
-
-Color states are represented either by an ident (for builtin ones) or a string
-(for custom ones):
-
-    color-state: <ident> | <string>
-
-Custom color states can be defined at the beginning of the document, with an @‌cicp rule.
-
-The format for @‌cicp rules is
-
-    @‌cicp "name" {
-      ...
-    }
-
-The following properties can be set for custom color states:
-
-| property  | syntax           | default  | printed     |
-| --------- | ---------------- | -------- | ----------- |
-| primaries | `<integer>`      | 2        | always      |
-| transfer  | `<integer>`      | 2        | always      |
-| matrix    | `<integer>`      | 2        | always      |
-| range     | `<range>`        | full     | non-default |
-
-Note that the primaries, transfer and matrix properties always need
-to be specified, since GTK does not allow creating color state objects
-with these being set to 2 (== unspecified).
-
-Range can have the following values:
-
-    range: narrow | full
-
-# Colors
-
-Colors can be specified with a variation of the modern CSS color syntax:
-
-    color(<color-state> <number> <number> <number> ["/" <number>])
-
-The traditional syntax for sRGB colors still works as well:
-
-    rgba(<number>, <number>, <number>, <number)
-    rgb(<number, <number>, <number>)
-
-# Rectangles
-
-Rectangles can be specified just as four integers for x, y, width and height:
-
-    rect: <number> <number> <number> <number>
-
-Rounded rectangles use a CSS-like syntax:
-
-    rounded-rect: <rect> [ "/" <number>{1,4} [ "/" <number>{1,4} ] ]
-
 # Nodes

 ### container
@@ -96,13 +41,6 @@ The **container** node is a special node that allows specifying a list of child

 Creates a node like `gsk_blend_node_new()` with the given properties.

-Possible values for the mode property are:
-
-    blend-mode: normal | multiply | screen | overlay | darken |
-                lighten | color-dodge | color-burn | hard-light |
-                soft-light | difference | exclusion | color |
-                hue | saturation | luminosity
-
 ### blur

 | property | syntax           | default                | printed     |
@@ -222,10 +160,6 @@ Creates a node like `gsk_fill_node_new()` with the given properties.
 The default child node is the default color node, but created with the
 bounds of the path.

-Possible values for the fill-rule property are:
-
-    fill-rule: winding | even-odd
-
 ### glshader

 | property   | syntax             | default                | printed     |
@@ -277,10 +211,6 @@ Creates a node like `gsk_linear_gradient_node_new()` with the given properties.

 Creates a node like `gsk_mask_node_new()` with the given properties.

-Possible values for the mode property are:
-
-    mask-mode: alpha | inverted-alpha | luminance | inverted-luminance
-
 ### opacity

 | property | syntax           | default                | printed     |
@@ -319,11 +249,11 @@ Creates a node like `gsk_radial_gradient_node_new()` with the given properties.

 ### repeat

-| property     | syntax     | default                | printed     |
-| ------------ | ---------- | ---------------------- | ----------- |
-| bounds       | `<rect>`   | *bounds of child node* | non-default |
-| child        | `<node>`   | color { }              | always      |
-| child-bounds | `<rect>`   | *bounds of child node* | non-default |
+| property    | syntax           | default                | printed     |
+| ----------- | ---------------- | ---------------------- | ----------- |
+| bounds      | `<rect>`         | *bounds of child node* | non-default |
+| child       | `<node>`         | color { }              | always      |
+| child-bounds| `<rect>`         | *bounds of child node* | non-default |

 Creates a node like `gsk_repeat_node_new()` with the given properties.

@@ -390,64 +320,29 @@ Creates a node like `gsk_stroke_node_new()` with the given properties.
 The default child node is the default color node, but created with the
 stroke bounds of the path.

-Possible values for the line-cap property are:
-
-    line-cap: butt | round | square
-
-Possible values for the line-join property are:
-
-    line-join: miter | round | bevel
-
 ### 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>`       | "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.

-If a url is specified for the font, it must point to a font file for the
-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
-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 the hint-style property are:
-
-    hint-style: none | slight | full
-
-Possible value for the antialias property are:
-
-    antialias:  none | gray
-
-Possible value for hint-metrics are:
-
-    hint-metrics:  on | off
-
 ### texture

-| property | syntax              | default                | printed     |
-| -------- | ------------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`            | 50                     | always      |
-| texture  | `<string>`?`<url>`? | *see below*            | always      |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| bounds   | `<rect>`         | 50                     | always      |
+| texture  | `<url>`          | *see below*            | always      |

 Creates a node like `gsk_texture_node_new()` with the given properties.

-If a string is specified for the texture, it will be used as a name for the text.
-Textures can be reused by specifying the name of a previously used texture. In
-that case, the url can be omitted.
-
 The default texture is a 10x10 checkerboard with the top left and bottom right
 5x5 being in the color #FF00CC and the other part being transparent. A possible
 representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")
@@ -459,15 +354,14 @@ representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANS
 | -------- | ---------------- | ---------------------- | ----------- |
 | bounds   | `<rect>`         | 50                     | always      |
 | texture  | `<url>`          | *see below*            | always      |
-| filter   | `filter`         | linear                 | non-default |
+| filter   | `filter`         | *see below*            | non-default |

 Creates a node like `gsk_texture_scale_node_new()` with the given properties.

 The default texture is a 10x10 checkerboard, just like for texture.

-Possible values for the filter property are:
-
-    filter: linear | nearest | trilinear
+The possible filter values are `linear`, `nearest` and `trilinear`, with
+`linear` being the default.

 ### transform

@@ -1,7 +1,7 @@
 executable('gtk4-print-editor',
  sources: ['print-editor.c'],
  c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
  win_subsystem: 'windows',
  link_args: extra_demo_ldflags,
@@ -4,7 +4,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-#include "profile_conf.h"
+#include "demo_conf.h"

 static GtkWidget *main_window;
 static GFile *filename = NULL;
@@ -798,7 +798,7 @@ activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (main_window), "devel");

-  gtk_window_set_icon_name (GTK_WINDOW (main_window), "org.gtk.PrintEditor4");
+  gtk_window_set_icon_name (GTK_WINDOW (main_window), "text-editor");
  gtk_window_set_default_size (GTK_WINDOW (main_window), 400, 600);
  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (main_window), TRUE);
  update_title (GTK_WINDOW (main_window));
@@ -66,7 +66,7 @@ endif
 executable('gtk4-widget-factory',
  sources: ['widget-factory.c', widgetfactory_resources],
  c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
  win_subsystem: 'windows',
  link_args: extra_demo_ldflags,
@@ -25,7 +25,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-#include "profile_conf.h"
+#include "demo_conf.h"

 static void
 change_dark_state (GSimpleAction *action,
@@ -2241,7 +2241,6 @@ activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (window), "devel");

-  gtk_window_set_icon_name (window, "org.gtk.WidgetFactory4");
  gtk_application_add_window (GTK_APPLICATION (app), window);
  g_action_map_add_action_entries (G_ACTION_MAP (window),
                                   win_entries, G_N_ELEMENTS (win_entries),
@@ -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:
@@ -151,11 +151,10 @@ Checks whether the widget is set to be visible or not.
 - Methods are special functions whose first argument is always the instance
   of a certain class. The instance argument for newly written code should be
   called `self`.
- - If a method is a setter or a getter for an object property
-   `GtkClassName:prop-name`, and if its name does not match the naming scheme
-   `gtk_class_name_{g,s}et_prop_name`, you should add a `(set-property
-   prop-name)` or a `(get-property prop-name)` annotation to the method's
-   identifier
+ - If a method is a setter or a getter for an object property, you should
+   add an `(attributes org.gtk.Method.set_property=property-name)` or a
+   an `(attributes org.gtk.Method.get_property=property-name)` annotation
+   to the method's identifier
 - If a method changes one or more properties as side effect, link those
   properties in the method's description
 - If a method is a signal emitter, you should use the
@@ -193,10 +192,9 @@ Checks whether the widget is set to be visible or not.
   purposes.
 - Always note if setting a property has side effects, like causing another
   property to change state.
- - If a property `GtkClassName:prop-name` has a public getter or setter, and
-   they do not match the naming scheme `gtk_class_name_{g,s}et_prop_name` you
-   should annotate it with the `(setter setter_function)` and `(getter
-   getter_function)`.
+ - If the property has public accessors you should annotate it with
+   the `(attributes org.gtk.Property.set=setter_function)` and
+   `(attributes org.gtk.Property.get=getter_function)` attributes
 - The syntax for property documentation is:

 ```c
@@ -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]
@@ -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"
@@ -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"
@@ -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
@@ -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', 'failing'],
-  )
-
  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
@@ -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
@@ -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
@@ -1,16 +1,12 @@
 Title: The Broadway windowing system
 Slug: broadway

+## Using GTK with Broadway
+
 The GDK Broadway backend provides support for displaying GTK applications in
 a web browser, using HTML5 and web sockets.

-Broadway was written as an experiment and is not the most actively developed
-backend. It supports the features that were required of GDK backends in GTK 4.0,
-but may not be up-to-date with the latest developments.
-
-## Using GTK with Broadway
-
-To run your application under Broadway, first run the broadway server,
+To run your application in this way, first run the broadway server,
 `gtk-broadwayd`, that ships with GTK:

 ```
@@ -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
@@ -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 &num; 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) | |
@@ -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
@@ -66,8 +66,8 @@ The clock has several phases:
 - Layout
 - Paint

-The phases happen in this order and all phases will always run
-through before going back to the start.
+ The phases happens in this order and we will always run each
+ phase through before going back to the start.

 The Events phase is a stretch of time between each redraw where
 GTK processes input events from the user and other events
@@ -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).
@@ -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.
@@ -8,10 +8,6 @@ gtk4-broadwayd
 The Broadway display server
 ---------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-broadwayd** [OPTIONS...] <DISPLAY>
@@ -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>
@@ -8,9 +8,6 @@ gtk4-demo-application
 Demonstrate GtkApplication
 --------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands

 SYNOPSIS
 --------
@@ -8,10 +8,6 @@ gtk4-demo
 Demonstrate GTK widgets
 -----------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-encode-symbolic-svg
 Symbolic icon conversion utility
 --------------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-icon-browser
 List themed icons
 -----------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -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.
@@ -8,10 +8,6 @@ gtk4-launch
 Launch an application
 ---------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-node-editor
 Editor render nodes
 -----------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -34,14 +30,6 @@ OPTIONS

  Show the application help.

-``--version``
-
-  Show the program version.
-
-``--reset``
-
-  Don't restore autosaved content and remove autosave files.
-
 ENVIRONMENT
 -----------

@@ -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>
@@ -8,10 +8,6 @@ gtk4-query-settings
 Print name and value of GTK settings
 ------------------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,20 +8,13 @@ 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>
+|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]

 DESCRIPTION
 -----------
@@ -50,65 +43,10 @@ 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``.
-
-Benchmark
-^^^^^^^^^
-
-The ``benchmark`` command benchmarks rendering of a node with the existing renderers
-and prints the runtimes.
-
-``--renderer=RENDERER``
-
-  Add the given renderer. This argument can be passed multiple times to test multiple
-  renderers. By default, all major GTK renderers are run.
-
-``--runs=RUNS``
-
-  Number of times to render the node on each renderer. By default, this is 3 times.
-  Keep in mind that the first run is often used to populate caches and might be
-  significantly slower.
-
-``--no-download``
-
-  Do not attempt to download the result. This may cause the measurement to not include
-  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).
+  about poassible values for the ``RENDERER``.
@@ -8,10 +8,6 @@ gtk4-update-icon-cache
 Icon theme caching utility
 --------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-widget-factory
 Showcase GTK widgets and styles
 -------------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	34990b6dc2	gsk: Give up on text nodes with unuploadable glyphs If we can't upload the glyphs, just give up and use fallback.	2024-01-11 14:54:34 -05:00
Matthias Clasen	8d74defbc1	gsk: Don't try to upload NULL images It doesn't work. Just return NULL and let the caller handle it, like we do in other cases where obtaining an image fails.	2024-01-11 06:26:23 -05:00
Matthias Clasen	fe95da256b	gpu: Plug a memory leak	2024-01-11 06:25:22 -05:00