gsk: Tweak GskGLShader long desc

Reformulate one paragraph, as suggested by Benjamin.
gsk: Use guint for array indices
2020-09-28 14:01:59 -04:00 · 2020-09-28 13:57:54 -04:00 · 2020-09-28 13:55:24 -04:00 · 2020-09-28 13:53:51 -04:00 · 2020-09-28 13:50:15 -04:00 · 2020-09-28 13:38:12 -04:00
2331 changed files with 240967 additions and 266680 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,3 @@
-include:
-  - project: 'gnome/citemplates'
-    file: 'flatpak/flatpak_ci_initiative.yml'
-
 stages:
  - build
  - analysis
@@ -20,13 +16,13 @@ stages:

 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false"
+  COMMON_MESON_FLAGS: "--fatal-meson-warnings -Dgtk:werror=true"
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v28"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v22"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v27"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"

 .only-default:
  only:
@@ -43,7 +39,6 @@ style-check-diff:
    - .gitlab-ci/run-style-check-diff.sh

 .build-fedora-default:
-  extends: .only-default
  image: $FEDORA_IMAGE
  artifacts:
    when: always
@@ -79,6 +74,7 @@ fedora-x86_64:
  script:
    - meson subprojects update
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+            -Dsysprof=enabled
            _build
    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build x11
@@ -104,7 +100,6 @@ installed-tests:
  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
-    G_TEST_ACCESSIBLE: 1
  script:
    - meson subprojects update
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
@@ -122,7 +117,6 @@ installed-tests:


 .mingw-defaults:
-  extends: .only-default
  stage: build
  tags:
    - win32-ps
@@ -146,32 +140,6 @@ msys2-mingw64:
    MSYSTEM: "MINGW64"
    CHERE_INVOKING: "yes"

-macos:
-  extends: .only-default
-  only:
-    - branches@GNOME/gtk
-  stage: build
-  tags:
-    - macos
-  needs: []
-  before_script:
-    - bash .gitlab-ci/show-execution-environment.sh
-    - pip3 install --user meson==0.56
-    - pip3 install --user ninja
-    - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
-    - export MESON_FORCE_BACKTRACE=1
-  script:
-    - meson -Dx11-backend=false
-            -Dintrospection=disabled
-            -Dcpp_std=c++11
-            -Dpixman:tests=disabled
-            _build
-    - ninja -C _build
-  artifacts:
-    when: always
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-
 .flatpak-defaults:
  image: $FLATPAK_IMAGE
  stage: flatpak
@@ -181,7 +149,6 @@ macos:
  artifacts:
    paths:
      - "${APPID}-dev.flatpak"
-      - 'repo.tar'
    expire_in: 1 day
  script:
    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
@@ -233,24 +200,6 @@ flatpak-master:icon-browser:
  variables:
    APPID: org.gtk.IconBrowser4

-# Publish the demo apps to the GNOME Nightly repo
-# https://wiki.gnome.org/Apps/Nightly
-# https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
-nightly demo:
-    extends: '.publish_nightly'
-    dependencies: ['flatpak-master:demo']
-    needs: ['flatpak-master:demo']
-
-nightly factory:
-    extends: '.publish_nightly'
-    dependencies: ['flatpak-master:widget-factory']
-    needs: ['flatpak-master:widget-factory']
-
-nightly icon-browser:
-    extends: '.publish_nightly'
-    dependencies: ['flatpak-master:icon-browser']
-    needs: ['flatpak-master:icon-browser']
-
 static-scan:
  image: $FEDORA_IMAGE
  stage: analysis
@@ -274,7 +223,7 @@ asan-build:
  needs: []
  variables:
  script:
-    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
+    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build wayland
  artifacts:
@@ -287,24 +236,14 @@ reference:
  stage: docs
  needs: []
  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release --force-fallback-for=gdk-pixbuf,pango"
+    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true -Dgdk-pixbuf:gtk_doc=true -Dpango:gtk_doc=true _build
-    - meson compile -C _build
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true _build
+    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
    - mkdir -p _reference/
-    - mv _build/docs/reference/gdk/gdk4/ _reference/gdk4/
-    - mv _build/docs/reference/gdk/gdk4-x11/ _reference/gdk4-x11/
-    - 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/subprojects/pango/docs/Pango/ _reference/Pango/
-    - mv _build/subprojects/pango/docs/PangoCairo/ _reference/PangoCairo/
-    - mv _build/subprojects/pango/docs/PangoFc/ _reference/PangoFc/
-    - mv _build/subprojects/pango/docs/PangoFT2/ _reference/PangoFT2/
-    - mv _build/subprojects/pango/docs/PangoOT/ _reference/PangoOT/
-    - mv _build/subprojects/pango/docs/PangoXft/ _reference/PangoXft/
-    - mv _build/subprojects/gdk-pixbuf/docs/gdk-pixbuf/ _reference/gdk-pixbuf/
-    - mv _build/subprojects/gdk-pixbuf/docs/gdk-pixdata/ _reference/gdk-pixdata/
+    - mv _build/docs/reference/gdk/html/ _reference/gdk/
+    - mv _build/docs/reference/gsk/html/ _reference/gsk/
+    - mv _build/docs/reference/gtk/html/ _reference/gtk/
  artifacts:
    paths:
      - _reference
@@ -314,7 +253,6 @@ pages:
  needs: ['reference']
  script:
    - mv _reference/ public/
-    - cp .gitlab-ci/pages/* public/
  artifacts:
    paths:
      - public
--- a/.gitlab-ci/README.md
+++ b/.gitlab-ci/README.md
@@ -17,8 +17,8 @@ branch, as well as their available versions.
 ### Checklist for Updating a CI image

 - [ ] Update the `${image}.Dockerfile` file with the dependencies
- - [ ] Run `./run-docker.sh build --base ${image} --version ${number}`
- - [ ] Run `./run-docker.sh push --base ${image} --version ${number}`
+ - [ ] Run `./run-docker.sh build --base ${image} --base-version ${number}`
+ - [ ] Run `./run-docker.sh push --base ${image} --base-version ${number}`
   once the Docker image is built; you may need to log in by using
   `docker login` or `podman login`
 - [ ] Update the `image` keys in the `.gitlab-ci.yml` file with the new
@@ -30,8 +30,8 @@ branch, as well as their available versions.
 - [ ] Write a new `${image}.Dockerfile` with the instructions to set up
   a build environment
 - [ ] Add the `pip3 install meson` incantation
- - [ ] Run `./run-docker.sh build --base ${image} --version ${number}`
- - [ ] Run `./run-docker.sh push --base ${image} --version ${number}`
+ - [ ] Run `./run-docker.sh build --base ${image} --base-version ${number}`
+ - [ ] Run `./run-docker.sh push --base ${image} --base-version ${number}`
 - [ ] Add the new job to `.gitlab-ci.yml` referencing the image
 - [ ] Open a merge request with your changes and let it run

--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:31

 RUN dnf -y install \
    adwaita-icon-theme \
@@ -44,7 +44,6 @@ RUN dnf -y install \
    lcov \
    libasan \
    libattr-devel \
-    libcloudproviders-devel \
    libepoxy-devel \
    libffi-devel \
    libmount-devel \
@@ -65,8 +64,7 @@ RUN dnf -y install \
    libxslt \
    mesa-dri-drivers \
    mesa-libEGL-devel \
-    mesa-libGLES-devel \
-    meson \
+    mesa-libwayland-egl-devel \
    ninja-build \
    pango-devel \
    pcre-devel \
@@ -87,3 +85,6 @@ RUN dnf -y install \
    which \
    xorg-x11-server-Xvfb \
 && dnf clean all
+
+RUN pip3 install meson==0.53.1
+
--- a/.gitlab-ci/fedora-docs.Dockerfile
+++ b/.gitlab-ci/fedora-docs.Dockerfile
@@ -1,12 +1,6 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19

-RUN dnf -y install \
-        graphviz \
-        python3-jinja2 \
-        python3-markdown \
-        python3-pygments \
-        python3-toml \
-        python3-typogrify
+RUN dnf -y install pandoc

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v21

 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
--- a/.gitlab-ci/flatpak-build.sh
+++ b/.gitlab-ci/flatpak-build.sh
@@ -22,7 +22,7 @@ flatpak build ${builddir} meson \
                -Dprint-backends=file \
                -Dbuild-tests=false \
                -Dbuild-examples=false \
-                -Dintrospection=disabled \
+                -Dintrospection=false \
                -Ddemos=true \
                _flatpak_build

@@ -40,8 +40,3 @@ flatpak build-bundle \
        ${appid}-dev.flatpak \
        --runtime-repo=https://nightly.gnome.org/gnome-nightly.flatpakrepo \
        ${appid}
-
-# to be consumed by the nightly publish jobs
-if [[ $CI_COMMIT_BRANCH == master ]]; then
-        tar cf repo.tar ${repodir}
-fi
--- a/.gitlab-ci/pages/fonts.css
+++ b/.gitlab-ci/pages/fonts.css
@@ -1,154 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021 GNOME Foundation
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-/**
- * RedHat Fonts taken from https://github.com/RedHatOfficial/RedHatFont
- * License: SIL Open Font License 1.1 http://scripts.sil.org/OFL
- */
-@import url('https://fonts.googleapis.com/css2?family=Noto+Serif:ital,wght@0,400;0,700;1,400;1,700&family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Noto+Serif:ital,wght@0,400;0,700;1,400;1,700&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600&display=swap');
-
-@font-face {
-  font-family: "RedHatDisplayWeb";
-  src: local('RedHatDisplayWeb'),
-       url("RedHatDisplay-Regular.woff2") format("woff2"),
-       url("RedHatDisplay-Regular.woff") format("woff");
-  font-style: normal;
-  font-weight: 400;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatDisplayWeb";
-  src: local('RedHatDisplayWeb'),
-       url("RedHatDisplay-RegularItalic.woff2") format("woff2"),
-       url("RedHatDisplay-RegularItalic.woff") format("woff");
-  font-style: italic;
-  font-weight: 400;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatDisplayWeb";
-  src: local('RedHatDisplayWeb'),
-       url("RedHatDisplay-Medium.woff2") format("woff2"),
-       url("RedHatDisplay-Medium.woff") format("woff");
-  font-style: normal;
-  font-weight: 500;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatDisplayWeb";
-  src: local('RedHatDisplayWeb'),
-       url("RedHatDisplay-MediumItalic.woff2") format("woff2"),
-       url("RedHatDisplay-MediumItalic.woff") format("woff");
-  font-style: italic;
-  font-weight: 500;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatDisplayWeb";
-  src: local('RedHatDisplayWeb'),
-       url("RedHatDisplay-Bold.woff2") format("woff2"),
-       url("RedHatDisplay-Bold.woff") format("woff");
-  font-style: normal;
-  font-weight: 700;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatDisplayWeb";
-  src: local('RedHatDisplayWeb'),
-       url("RedHatDisplay-BoldItalic.woff2") format("woff2"),
-       url("RedHatDisplay-BoldItalic.woff") format("woff");
-  font-style: italic;
-  font-weight: 700;
-  font-display: fallback;
-}
-
-
-@font-face {
-  font-family: "RedHatDisplayWeb";
-  src: local('RedHatDisplayWeb'),
-       url("RedHatDisplay-Black.woff2") format("woff2"),
-       url("RedHatDisplay-Black.woff") format("woff");
-  font-style: normal;
-  font-weight: 900;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatDisplayWeb";
-  src: local('RedHatDisplayWeb'),
-       url("RedHatDisplay-BlackItalic.woff2") format("woff2"),
-       url("RedHatDisplay-BlackItalic.woff") format("woff");
-  font-style: italic;
-  font-weight: 900;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatTextWeb";
-  src: local('RedHatTextWeb'),
-       url("RedHatText-Regular.woff2") format("woff2"),
-       url("RedHatText-Regular.woff") format("woff");
-  font-style: normal;
-  font-weight: 400;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatTextWeb";
-  src: local('RedHatTextWeb'),
-       url("RedHatText-RegularItalic.woff2") format("woff2"),
-       url("RedHatText-RegularItalic.woff") format("woff");
-  font-style: italic;
-  font-weight: 400;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatTextWeb";
-  src: local('RedHatTextWeb'),
-       url("RedHatText-Medium.woff2") format("woff2"),
-       url("RedHatText-Medium.woff") format("woff");
-  font-style: normal;
-  font-weight: 700;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatTextWeb";
-  src: local('RedHatTextWeb'),
-       url("RedHatText-MediumItalic.woff2") format("woff2"),
-       url("RedHatText-MediumItalic.woff") format("woff");
-  font-style: italic;
-  font-weight: 700;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatTextWeb";
-  src: local('RedHatTextWeb'),
-       url("RedHatText-Bold.woff2") format("woff2"),
-       url("RedHatText-Bold.woff") format("woff");
-  font-style: normal;
-  font-weight: 900;
-  font-display: fallback;
-}
-
-@font-face {
-  font-family: "RedHatTextWeb";
-  src: local('RedHatTextWeb'),
-       url("RedHatText-BoldItalic.woff2") format("woff2"),
-       url("RedHatText-BoldItalic.woff") format("woff");
-  font-style: italic;
-  font-weight: 900;
-  font-display: fallback;
-}
--- a/.gitlab-ci/pages/gtk-logo.svg
+++ b/.gitlab-ci/pages/gtk-logo.svg
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg6843"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   version="1.0"
-   sodipodi:docname="gtk-logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/ebassi/Pictures/gtk-logo-256.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <defs
-     id="defs6845">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-50 : 600 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="700 : 600 : 1"
-       inkscape:persp3d-origin="300 : 400 : 1"
-       id="perspective13" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="69.874353"
-     inkscape:cy="64.313526"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     width="128px"
-     height="128px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7947" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata6848">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <dc:date />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:source />
-        <dc:relation />
-        <dc:language />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path6976"
-       d="M 20.88413,30.82696 L 53.816977,55.527708 L 107.33282,39.060543 L 70.587303,17.177763 L 20.88413,30.82696 z"
-       style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6978"
-       d="M 22.94243,82.287118 L 20.88413,30.82696 L 53.816977,55.527708 L 53.816977,111.10486 L 22.94243,82.287118 z"
-       style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6980"
-       d="M 53.816977,111.10486 L 103.21619,90.5207 L 107.33282,39.060543 L 53.816977,55.527708 L 53.816977,111.10486 z"
-       style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path6982"
-       d="M 23.216626,81.319479 L 70.48573,67.361442 L 103.38422,90.444516"
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path6984"
-       d="M 70.434539,17.875593 L 70.434539,66.984877"
-       style="opacity:1;fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
--- a/.gitlab-ci/pages/index.html
+++ b/.gitlab-ci/pages/index.html
@@ -1,149 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 GNOME Foundation
-
-SPDX-License-Identifier: LGPL-2.1-or-later
-->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>GTK Documentation</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-  <meta charset="utf-8" />
-
-  <meta property="og:site_name" content="https://docs.gtk.org"/>
-  <meta property="og:title" content="GTK Documentation"/>
-  <meta property="og:url" content="https://docs.gtk.org"/>
-  <meta property="og:type" content="website"/>
-  <meta property="og:description" content="API reference for GTK"/>
-
-  <meta name="twitter:title" content="GTK Documentation"/>
-  <meta name="twitter:url" content="https://docs.gtk.org"/>
-  <meta name="twitter:card" content="summary"/>
-
-  <link rel="canonical" href="https://docs.gtk.org"/>
-
-  <link rel="stylesheet" href="style.css" type="text/css" />
-
-  <script src="main.js"></script>
-
-  <!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-</head>
-
-<body>
-  <div id="body-wrapper" tabindex="-1">
-
-    <nav class="sidebar">
-      
-      <div class="section">
-        <img src="gtk-logo.svg" class="logo"/>
-      </div>
-
-      <div class="section">
-        <h5>Sections</h5>
-        <div class="links">
-          <a href="#user-interface">User interface</a>
-          <a href="#core-libraries">Core libraries</a>
-        </div>
-      </div>
-
-    </nav>
-    
-    <button id="btn-to-top" class="hidden"><span class="up-arrow"></span></button>
-
-    <section id="main" class="content">
-      <header>
-        <h1>GTK Documentation</h1>
-      </header>
-
-      <div class="toggle-wrapper">
-        <h4 id="user-interface">
-          User interface
-          <a href="#user-interface" class="anchor"></a>
-        </h4>
-
-        <div class="docblock">
-          <h5 id="gdk">GTK</h5>
-          <p>GTK is the primary library used to construct user interfaces. It
-          provides user interface controls and signal callbacks to respond to
-          user actions.</p>
-          <p><a href="https://docs.gtk.org/gtk4/">GTK API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="gdk">GSK</h5>
-          <p>An intermediate layer which provides a rendering API implemented using Cairo, OpenGL or Vulkan.</p>
-          <p><a href="https://docs.gtk.org/gsk4/">GSK API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="gdk">GDK</h5>
-          <p>An intermediate layer which isolates GTK from the details of the windowing system.</p>
-          <p><a href="https://docs.gtk.org/gdk4/">GDK API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="pango">Pango</h5>
-          <p>Pango is the core text and font handling library used in GTK
-          applications. It has extensive support for the different writing
-          systems used throughout the world.</p>
-          <p><a href="https://docs.gtk.org/Pango/">Pango API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="gdk-pixbuf">GdkPixbuf</h5>
-          <p>GdkPixbuf is a library for image loading and manipulation.</p>
-          <p><a href="https://docs.gtk.org/gdk-pixbuf/">GdkPixbuf API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="cairo">Cairo</h5>
-          <p>Cairo is a 2D graphics library with support for multiple output
-          devices. It is designed to produce consistent, high quality output
-          on all media.</p>
-          <p><a href="https://www.cairographics.org/manual/" class="external">Cairo API reference</a></p>
-        </div>
-      </div>
-
-      <div class="toggle-wrapper">
-        <h4 id="core-libraries" style="display:flex;">
-          Core libraries
-          <a href="#core-libraries" class="anchor"></a>
-        </h4>
-
-        <div class="docblock">
-          <h5 id="glib">GLib</h5>
-          <p>GLib provides the core application building blocks for libraries
-          and applications written in C. It provides common data types
-          used in GTK, the main loop implementation, and a large set of
-          utility functions for strings and general portability across
-          different platforms.</p>
-          <p><a href="https://developer.gnome.org/glib/" class="external">GLib API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="gobject">GObject</h5>
-          <p>GObject provides the object system used by GTK.</p>
-          <p><a href="https://developer.gnome.org/gobject/" class="external">GObject API reference</a></p>
-        </div>
-
-        <div class="docblock">
-          <h5 id="gio">GIO</h5>
-          <p>GIO provides a portable, modern and easy-to-use file system
-          abstraction API for accessing local and remote files; a set of
-          low and high level abstractions over the <a href="https://www.freedesktop.org/wiki/Software/dbus/" class="external">DBus</a>
-          IPC specification; an application settings API; portable networking
-          abstractions; and additional utilities for writing asynchronous
-          operations without blocking the user interface of your application.</p>
-          <p><a href="https://developer.gnome.org/gio/" class="external">GIO API reference</a></p>
-        </div>
-      </div>
-
-    </section>
-
-    <footer>
-    </footer>
-  </div>
-</body>
-</html>
--- a/.gitlab-ci/pages/main.js
+++ b/.gitlab-ci/pages/main.js
@@ -1,140 +0,0 @@
-// SPDX-FileCopyrightText: 2021 GNOME Foundation
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-// eslint-disable-next-line no-unused-vars
-function hasClass(elem, className) {
-    return elem && elem.classList && elem.classList.contains(className);
-}
-
-// eslint-disable-next-line no-unused-vars
-function addClass(elem, className) {
-    if (!elem || !elem.classList) {
-        return;
-    }
-    elem.classList.add(className);
-}
-
-// eslint-disable-next-line no-unused-vars
-function removeClass(elem, className) {
-    if (!elem || !elem.classList) {
-        return;
-    }
-    elem.classList.remove(className);
-}
-
-function insertAfter(newNode, referenceNode) {
-    referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
-}
-
-function onEach(arr, func, reversed) {
-    if (arr && arr.length > 0 && func) {
-        var length = arr.length;
-        var i;
-        if (reversed !== true) {
-            for (i = 0; i < length; ++i) {
-                if (func(arr[i]) === true) {
-                    return true;
-                }
-            }
-        } else {
-            for (i = length - 1; i >= 0; --i) {
-                if (func(arr[i]) === true) {
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-
-function onEachLazy(lazyArray, func, reversed) {
-    return onEach(
-        Array.prototype.slice.call(lazyArray),
-        func,
-        reversed);
-}
-
-// eslint-disable-next-line no-unused-vars
-function hasOwnProperty(obj, property) {
-    return Object.prototype.hasOwnProperty.call(obj, property);
-}
-
-window.addEventListener("load", function() {
-    "use strict;"
-
-    var main = document.getElementById("main");
-    var btnToTop = document.getElementById("btn-to-top");
-
-    function labelForToggleButton(isCollapsed) {
-        if (isCollapsed) {
-            return "+";
-        }
-        return "\u2212";
-    }
-
-    function createToggle(isCollapsed) {
-        var toggle = document.createElement("a");
-        toggle.href = "javascript:void(0)";
-        toggle.className = "collapse-toggle";
-        toggle.innerHTML = "[<span class=\"inner\">"
-                         + labelForToggleButton(isCollapsed)
-                         + "</span>]";
-
-        return toggle;
-    }
-
-    function toggleClicked() {
-        if (hasClass(this, "collapsed")) {
-            removeClass(this, "collapsed");
-            this.innerHTML = "[<span class=\"inner\">"
-                           + labelForToggleButton(false)
-                           + "</span>]";
-            onEachLazy(this.parentNode.getElementsByClassName("docblock"), function(e) {
-                removeClass(e, "hidden");
-            });
-        } else {
-            addClass(this, "collapsed");
-            this.innerHTML = "[<span class=\"inner\">"
-                           + labelForToggleButton(true)
-                           + "</span>]";
-            onEachLazy(this.parentNode.getElementsByClassName("docblock"), function(e) {
-                addClass(e, "hidden");
-            });
-        }
-    }
-
-    onEachLazy(document.getElementsByClassName("toggle-wrapper"), function(e) {
-        let sectionHeader = e.querySelector(".section-header");
-        let fragmentMatches = sectionHeader !== null && location.hash === "#" + sectionHeader.getAttribute('id');
-        collapsedByDefault = hasClass(e, "default-hide") && !fragmentMatches;
-        var toggle = createToggle(collapsedByDefault);
-        toggle.onclick = toggleClicked;
-        e.insertBefore(toggle, e.firstChild);
-        if (collapsedByDefault) {
-            addClass(toggle, "collapsed");
-            onEachLazy(e.getElementsByClassName("docblock"), function(d) {
-                addClass(d, "hidden");
-            });
-        }
-    });
-
-    function scrollBackTop(e) {
-        e.preventDefault();
-        window.scroll({
-            top: 0,
-            behavior: 'smooth',
-        });
-    }
-
-    function toggleScrollButton() {
-        if (window.scrollY < 400) {
-            addClass(btnToTop, "hidden");
-        } else {
-            removeClass(btnToTop, "hidden");
-        }
-    }
-
-    window.onscroll = toggleScrollButton;
-    btnToTop.onclick = scrollBackTop;
-}, false);
--- a/.gitlab-ci/pages/style.css
+++ b/.gitlab-ci/pages/style.css
@@ -1,747 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021 GNOME Foundation
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-@import url("fonts.css");
-
-/*********************************
- * LIGHT THEME
- *********************************/
-:root {
-
-  /* colors */
-  --text-color: #333;
-  --text-color-muted: #999;
-  --primary: rgb(28, 118, 228);
-  --body-bg: #fff;
-  --sidebar-primary: rgb(144, 194, 255);
-  --sidebar-bg: #151515;
-  --sidebar-selected-bg: var(--primary);
-  --sidebar-text-color: #fafafa;
-  --sidebar-padding: 1.5em;
-
-  /* boxes, e.g. code blocks */
-  --box-bg: rgba(135, 135, 135, 0.085);
-  --box-radius: 0.35rem;
-  --box-padding: 0.75rem;
-  --box-margin: 0.75rem 0;
-  --box-text-color: #111;
-
-  /* typography */
-  --body-font-family: "Noto Serif",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
-  --body-font-scale: 0.95;
-  --body-font-size: calc(var(--body-font-scale) * clamp(16px, 1vw, 20px));
-  --body-font-weight: normal;
-
-  --monospace-font-family: "Source Code Pro", monospace;
-  --monospace-font-size: calc(0.86 * var(--body-font-size)); /* Monospace fonts are very different in terms of font-sizes. Adjust this value to scale it */
-
-  --heading-font-family: "Red Hat Display", var(--body-font-family);
-  --heading-weight: 900;
-  --heading-font-scale: 1.05;
-
-  --heading-small-font-family: var(--heading-font-family);
-  --heading-small-weight: 600;
-  --heading-small-font-scale: 1;
-
-  --heading-table-font-family: var(--heading-font-family);
-  --heading-table-weight: 600;
-
-  --heading-docblock-color: #6d6d6d;  /* docblocks have headings from source comments. we want them to differ.*/
-  --heading-docblock-scale: 0.9;        /* docblocks have headings from source comments. we want them to differ.*/
-
-  --symbol-font-family: var(--heading-font-family);
-  --symbol-font-weight: 500;
-  --symbol-font-scale: 1;
-
-  --table-font-size: 0.92em;    /* Tables often contain lots information. It's better to scale them down a big to get more sutff fitted inside */
-
-  /* misc */
-  --prefered-content-width: 90ch; /* The preferred width for the readable content */
-  --anchor-sign: "#";
-
-} 
-
-/*********************************
- * DARK THEME (overrides)
- *********************************/
- @media (prefers-color-scheme: dark) {
-  :root {
-    --primary: rgb(144, 194, 255);
-    --text-color: #f6f6f6;
-    --text-color-muted: #686868;
-    --body-bg: #121212;
-    --sidebar-primary: rgb(144, 194, 255);
-    --sidebar-bg: #1e1e1e;
-    --sidebar-selected-bg: rgb(17, 112, 228);
-    --sidebar-text-color: #fafafa;
-    --box-bg: rgba(135, 135, 135, 0.1);
-    --box-text-color: #fff;
-    --heading-docblock-color: #b7b7b7;
-  }
-
-  /* fix dark theme syntax highlighting with a filter (for now) */
-  .highlight pre span {
-  	filter: brightness(6);
-  }
-}
-
-/*********************************
- * GENERAL STYLING
- *********************************/
-*,
-*:before,
-*:after {
-  box-sizing: border-box;
-}
-
-::-moz-selection {
-  color: white;
-  background: var(--primary);
-}
-
-::selection {
-  color: white;
-  background: var(--primary);
-}
-
-::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-}
-
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background: rgba(128, 128, 128, 0.6);
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: rgba(128, 128, 128, 1);
-}
-
-::-webkit-scrollbar-track {
-  background: rgba(128, 128, 128, 0.15);
-}
-
-* {
-  scrollbar-width: initial;
-}
-
-body {
-  font: 16px/1.5 var(--body-font-family);
-  font-weight: var(--body-font-weight);
-  font-size: var(--body-font-size);
-  margin: 0;
-  padding: 0;
-  position: relative;
-
-  -webkit-font-feature-settings: "kern", "liga";
-  -moz-font-feature-settings: "kern", "liga";
-  font-feature-settings: "kern", "liga";
-  color: var(--text-color);
-  background: var(--body-bg);
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: var(--heading-font-family);
-  font-weight: var(--heading-weight);
-  margin: 1.75em 0 0.75em 0;
-  display: flex;
-  align-items: center;
-}
-
-h1 {
-  font-size: calc(1.75em * var(--heading-font-scale));
-}
-
-
-header h1 {
-  margin-top: 0;
-}
-
-h2 {
-  font-size: calc(1.4em * var(--heading-font-scale));
-}
-
-h3 {
-  font-size: calc(1.2em * var(--heading-font-scale));
-}
-
-header h3 {
-  color: var(--text-color-muted);
-  margin-bottom: 0;
-}
-
-h4, h5 {
-  font-size: calc(1em * var(--heading-font-scale));
-}
-
-h6 {
-  font-size: calc(1em * var(--heading-small-font-scale));
-  font-family: var(--heading-small-font-family);
-  font-weight: var(--heading-small-weight);
-}
-
-ol, ul {
-  padding-left: 1rem;
-}
-
-ul ul, ol ul, ul ol, ol ol {
-  margin-bottom: .6em;
-}
-
-p {
-  margin: 0 0 .6em 0;
-}
-
-a {
-  color: var(--primary);
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-summary {
-  outline: none;
-}
-
-blockquote {
-  border-left: 3px solid var(--primary);
-  background: var(--box-bg);
-  padding: var(--box-padding);
-  border-radius: var(--box-radius);
-  margin: var(--box--margin);
-}
-
-code, 
-pre {
-  font-family: var(--monospace-font-family);
-  font-size: var(--monospace-font-size);
-  color: var(--box-text-color);
-}
-
-pre {
-  background: var(--box-bg);
-  padding: var(--box-padding);
-  border-radius: var(--box-radius);
-  overflow: auto;
-}
-
-code {
-  background: var(--box-bg);
-  padding: 0 0.35em;
-  border-radius: 0.35rem;
-  word-break: break-word;
-}
-
-a > code {
-  color: var(--primary);
-}
-
-
-pre pre,
-pre code {
-  padding: 0;
-  margin: 0;
-  font-size: 1em;
-  background: none;
-  color: inherit;
-}
-
-h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
-  font-family: inherit;
-  font-weight: inherit;
-  font-size: 0.85em;
-}
-
-strong, b {
-  font-weight: 600;
-}
-
-/* fix unwanted margins in tables, code, lists and blockquotes */
-li > *:first-child,
-li > *:first-child > *:first-child,
-li > *:first-child > *:first-child > *:first-child,
-td > *:first-child,
-td > *:first-child > *:first-child,
-td > *:first-child > *:first-child > *:first-child,
-pre > *:first-child,
-pre > *:first-child > *:first-child,
-pre > *:first-child > *:first-child > *:first-child,
-blockquote > *:first-child,
-blockquote > *:first-child > *:first-child,
-blockquote > *:first-child > *:first-child > *:first-child {
-  margin-top: 0;
-}
-li > *:last-child,
-li > *:last-child > *:last-child,
-li > *:last-child > *:last-child > *:last-child,
-td > *:last-child,
-td > *:last-child > *:last-child,
-td > *:last-child > *:last-child > *:last-child,
-pre > *:last-child,
-pre > *:last-child > *:last-child,
-pre > *:last-child > *:last-child > *:last-child,
-blockquote > *:last-child,
-blockquote > *:last-child > *:last-child,
-blockquote > *:last-child > *:last-child > *:last-child {
-  margin-bottom: 0;
-}
-
-/*********************************
- * PAGE STRUCTURE
- *********************************/
-#body-wrapper {
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: row;
-}
-
-#body-wrapper:focus {
-  outline: none;
-}
-
-#main {
-  position: relative;
-  flex-grow: 1;
-  min-width: 0;
-  box-shadow: 0 0 134px rgba(0, 0, 0, 0.1);
-}
-
-footer {
-  width: 100%;
-  display: none;
-}
-
-/*********************************
- * Button
- *********************************/
-
-#btn-to-top {
-  position: fixed;
-  bottom: 12px;
-  right: 32px;
-  z-index: 1000;
-  border-radius: 50%;
-  width: 42px;
-  height: 42px;
-  border: 1px solid var(--primary);
-  background: var(--box-bg);
-  color: var(--text-color);
-  cursor: pointer;
-  text-transform: none;
-}
-
-#btn-to-top > .up-arrow:after {
-  content: "🡅"
-}
-
-/*********************************
- * SIDEBAR
- *********************************/
-.sidebar {
-  scrollbar-width: thin;
-  background: var(--sidebar-bg);
-  border-right: 1px solid var(--sidebar-bg);
-  min-width: 40ch;
-  padding: var(--sidebar-padding);
-  color: var(--sidebar-text-color);
-  position: sticky;
-  top: 0;
-  z-index: 2;
-  height: 100vh;
-  overflow-y: auto;
-}
-
-.sidebar a,
-.sidebar a:hover {
-  text-decoration: none;
-}
-
-.sidebar .logo {
-  display: block;
-  margin: 2rem auto 0 auto;
-  width: 70%;
-}
-
-.sidebar .section > ul > li {
-  margin-right: -10px;
-}
-
-.sidebar .section h3, .sidebar .section h5 {
-  text-align: left;
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
-  font-weight: var(--heading-weight);
-}
-
-.sidebar .section h5 {
-  font-size: 1em;
-  margin-bottom: 0.5em;
-}
-
-.sidebar .namespace > h3 {
-  margin-bottom: 0;
-  padding: 0;
-  font-size: 1.5em;
-  text-transform: uppercase;
-  font-weight: 900;
-}
-
-.sidebar .namespace > p {
-  font-size: 0.9em;
-  opacity: 0.8;
-  padding-left: 0.5rem;
-}
-
-.sidebar .section {
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
-}
-
-.sidebar .links {
-  margin-bottom: 1rem;
-}
-
-.sidebar .section a {
-  display: block;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  transition: background-color 150ms ease;
-  color: var(--sidebar-primary);
-  border-radius: var(--box-radius);
-   padding: 0.2rem 0.5rem;
-  margin-bottom: 0.15rem;
-}
-
-.sidebar .section a:hover {
-  background-color: rgba(127, 127, 127, 0.2);
-  color: var(--sidebar-text-color);
-}
-
-.sidebar .section a.current {
-  background-color: var(--sidebar-selected-bg);
-  color: white;
-}
-
-.sidebar .search {
-  box-sizing: border-box;
-  text-align: center;
-}
-
-.sidebar .search input[type="text"] {
-  border-color: transparent;
-  width: 100%;
-  border: 1px solid #ccc;
-  border-radius: 50px;
-  padding: 6px 12px;
-  display: inline-block;
-  font-size: 80%;
-  box-shadow: inset 0 1px 3px #ddd;
-  transition: border .3s linear;
-}
-
-/*********************************
- * ANCHORS & TOGGLERS
- *********************************/
-.anchor,
-.md-anchor {
-  position: relative;
-  z-index: 1;
-  text-decoration: none;
-  padding: 0 0.5em;
-  color: var(--text-color-muted);
-}
-
-.anchor:hover,
-.md-anchor:hover {
-  color: var(--primary);
-}
-
-.anchor:not([href]),
-.md-anchor:not([href]) {
-  display: none;
-}
-
-.anchor:before,
-.md-anchor:before {
-  content: var(--anchor-sign); /*'§'*/
-}
-
-.toggle-wrapper {
-  position: relative;
-}
-
-.collapse-toggle {
-  position: absolute;
-  right: 0;
-  left: -2em;
-  white-space: nowrap;
-  text-decoration: none;
-  font-size: 0.8em;
-  color: transparent;
-}
-
-.collapse-toggle > .inner {
-  width: 1rem;
-  height: 1rem;
-  border-radius: calc(0.75 * var(--box-radius));
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-  vertical-align: middle;
-  color: var(--box-text-color);
-  position: relative;
-  left: -0.25rem;
-  font-family: monospace;
-  font-size: 0.7rem;
-  font-weight: bold;
-  background: var(--box-bg);
-}
-
-/*********************************
- * UTILITY
- *********************************/
-.deprecated > h6 > a {
-  opacity: 0.65;
-}
-
-.hidden {
-  display: none !important;
-}
-
-/*********************************
- * CONTENT STYLING
- *********************************/
-.content {
-  padding: 2em 4em;
-  overflow: visible;
-  max-width: calc(var(--prefered-content-width) + 8em);
-}
-
-.content table:not(.table-display) {
-  border-spacing: 0 0.25rem;
-}
-
-.content td {
-  vertical-align: top;
-}
-
-.content td:first-child {
-  padding-right: 1rem;
-}
-
-.content td p:first-child {
-  margin-top: 0;
-}
-
-.content td h1, .content td h2 {
-  margin-left: 0;
-  font-size: 1.1em;
-}
-
-.content tr:first-child td {
-  border-top: 0;
-}
-
-kbd {
-  display: inline-block;
-  padding: 3px 5px;
-  font: 15px monospace;
-  line-height: 10px;
-  vertical-align: middle;
-  border: solid 1px;
-  border-radius: 3px;
-  box-shadow: inset 0 -1px 0;
-  cursor: default;
-}
-
-.content tr:first-child {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.35);
-}
-
-.content td {
-  vertical-align: top;
-}
-
-.content td:first-child {
-  padding-right: 1rem;
-}
-
-.content td p:first-child {
-  margin-top: 0;
-}
-
-.content td h4, .content td h5 {
-  margin-left: 0;
-  font-size: 1.1em;
-}
-
-.content tr:first-child td {
-  border-top: 0;
-}
-
-.srclink {
-  color: var(--text-color-muted);
-  font-size: 1rem;
-  font-weight: var(--body-font-weight);
-  flex-grow: 0;
-  text-decoration: none;
-  margin-left: auto;
-  position: relative;
-  z-index: 1;
-}
-
-.meta tr > td:not(:first-child) {
-  width: 100%;
-}
-
-.meta tr > td:first-child {
-  white-space: nowrap;
-}
-
-/*********************************
- * DOCBLOCK STYLING
- *********************************/
-.docblock {
-  position: relative;
-  text-align: left;
-}
-
-.docblock h1 {
-  font-size: calc(1.3em * var(--heading-docblock-scale) * var(--heading-font-scale));
-}
-
-.docblock h2 {
-  font-size: calc(1.2em * var(--heading-docblock-scale) * var(--heading-font-scale));
-}
-
-.docblock h3 {
-  font-size: calc(1.1em * var(--heading-docblock-scale) * var(--heading-font-scale));
-}
-
-.docblock h4 {
-  font-size: calc(1.05em * var(--heading-docblock-scale) * var(--heading-font-scale));
-}
-
-.docblock h1,
-.docblock h2,
-.docblock h3,
-.docblock h4,
-.docblock h5,
-.docblock h6 {
-  color: var(--heading-docblock-color)
-}
-
-.docblock table {
-  margin: .25em 0;
-  max-width: 100%;
-  font-size: var(--table-font-size);
-}
-
-.docblock table td {
-  padding: .25em;
-}
-
-.docblock table th {
-  padding: .25em;
-  text-align: left;
-  font-family: var(--heading-table-font-family);
-  font-weight: var(--heading-table-weight);
-}
-
-.docblock table tr th:first-child,
-.docblock table tr td:first-child {
-  padding-left: 0;
-}
-
-.docblock table tr th:last-child,
-.docblock table tr td:last-child {
-  padding-right: 0;
-}
-
-table.enum-members,
-table.results {
-  border-radius: var(--box-radius);
-  border: 1px solid var(--text-color-muted);
-  border-spacing: 0 0 !important;
-  font-size: 80%;
-}
-
-table.enum-members tr th,
-table.results tr th {
-  border-top-color: var(--body-bg);
-  background-color: var(--box-bg);
-  border-bottom: 1px solid var(--text-color-muted);
-}
-
-table.enum-members tr th:first-child,
-table.enum-members tr td:first-child {
-  min-width: 25em;
-  padding-left: .5em;
-}
-
-table.results tr th:first-child,
-table.results tr td:first-child {
-  padding-left: .5em;
-}
-
-table.enum-members tr th:last-child,
-table.enum-members tr td:last-child,
-table.results tr th:last-child,
-table.results tr td:last-child {
-  max-width: 35em;
-  padding-right: .5em;
-}
-
-table.results tr td code {
-  font-size: 100%;
-}
-
-.docblock ul li,
-.docblock ol li {
-  padding-top: 0.15rem;
-  padding-bottom: 0.15rem;
-}
-
-.docblock ul.type {
-  list-style: none;
-}
-
-.docblock ul.type li::before {
-  content: "»";
-  color: var(--text-color);
-  display: inline-block;
-  width: 1em;
-  margin-left: -1em;
-}
-
-/**************************
- RESPONSIVENESS
-**************************/
-@media (max-width: 700px) {
-  body {
-    padding-top: 0px;
-  }
-
-  #body-wrapper {
-    flex-direction: column;
-    overflow: hidden;
-  }
-
-  #main {
-    width: 100%;
-    padding: 2rem;
-  }
-
-  .sidebar {
-    position: static;
-    height: initial;
-    order: 1;
-  }
-}
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -32,7 +32,7 @@ while (($# > 0)); do
                list) list=1;;
                help) print_help=1;;
                --base|-b) read_arg base "$@" || shift;;
-                --version|-v) read_arg base_version "$@" || shift;;
+                --base-version) read_arg base_version "$@" || shift;;
                --no-login) no_login=1;;
                *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
        esac
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -8,8 +8,7 @@ builddir=$1
 backend=$2

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

 case "${backend}" in
  x11)
--- a/.gitlab-ci/show-execution-environment.sh
+++ b/.gitlab-ci/show-execution-environment.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -eux -o pipefail
-
-xcodebuild -version || :
-xcodebuild -showsdks || :
-
-system_profiler SPSoftwareDataType || :
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -60,12 +60,14 @@ pkg-config --modversion pango
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
+# FIXME: introspection disabled for now because of
+# https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/340
 meson \
    -Dx11-backend=false \
    -Dwayland-backend=false \
    -Dwin32-backend=true \
    -Dvulkan=disabled \
-    -Dintrospection=enabled \
+    -Dintrospection=false \
    -Dgtk:werror=true \
    _build
 unset CCACHE_DISABLE
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,13 +1,4 @@
-<!--
-  Please, read the CONTRIBUTING.md guide on how to file a new issue.
-
-  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
-->
 ## Steps to reproduce
-<!--
-  Please, explain the sequence of actions necessary to reproduce the
-  bug
-->

 1. ...
 2. ...
@@ -41,8 +32,5 @@
 ## Additional information
 <!--
 - Screenshots or screen recordings are useful for visual errors
-  - Attaching a screenshot or a video without explaining the current
-    behavior and the actions necessary to reproduce the bug will lead
-    to the bug being closed
 - Please report any warning or message printed on the terminal
 -->
--- a/.gitlab/issue_templates/Crash.md
+++ b/.gitlab/issue_templates/Crash.md
@@ -1,14 +1,4 @@
-<!--
-  Please, read the CONTRIBUTING.md guide on how to file a new issue.
-
-  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
-->
-
 ## Steps to reproduce
-<!--
-  Please, explain the sequence of actions necessary to reproduce the
-  crash
-->

 1. ...
 2. ...
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -56,12 +56,6 @@ If the issue includes a crash, you should also include:
 0. the eventual warnings printed on the terminal
 0. a backtrace, obtained with tools such as GDB or LLDB

-It is fine to include screenshots of screen recordings to demonstrate
-an issue that is best to understand visually, but please don't just
-dump screen recordings without further details into issues. It is
-essential that the problem is described in enough detail to reproduce
-it without watching a video.
-
 For small issues, such as:

 - spelling/grammar fixes in the documentation
--- a/9098
+++ b/9098
--- a/NEWS.pre-4.0
+++ b/NEWS.pre-4.0
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ license fees or royalties.

 The official download location

-  - https://download.gnome.org/sources/gtk/
+  - https://download.gnome.org/sources/gtk+

 The official web site

@@ -32,9 +32,9 @@ Discussion forum
  - https://discourse.gnome.org/c/platform/core/

 Nightly documentation can be found at
-  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk4/
-  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk4/
-  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk4/
+  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
+  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk/
+  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk/

 Building and installing
 -----------------------
@@ -49,11 +49,11 @@ In order to build GTK you will need:
 You will also need various dependencies, based on the platform you are
 building for:

-  - [GLib](https://download.gnome.org/sources/glib/)
-  - [GdkPixbuf](https://download.gnome.org/sources/gdk-pixbuf/)
-  - [GObject-Introspection](https://download.gnome.org/sources/gobject-introspection/)
-  - [Cairo](https://www.cairographics.org/)
-  - [Pango](https://download.gnome.org/sources/pango/)
+  - [GLib](https://download.gnome.org/sources/glib)
+  - [GdkPixbuf](https://download.gnome.org/sources/gdk-pixbuf)
+  - [GObject-Introspection](https://download.gnome.org/sources/gobject-introspection)
+  - [Cairo](https://www.cairographics.org)
+  - [Pango](https://download.gnome.org/sources/pango)
  - [Epoxy](https://github.com/anholt/libepoxy)
  - [Graphene](https://github.com/ebassi/graphene)
  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -35,15 +35,15 @@
    "modules" : [
        {
            "name" : "wayland",
-            "buildsystem" : "meson",
+            "buildsystem" : "autotools",
            "builddir" : true,
            "config-opts" : [
-                "-Ddocumentation=false"
+                "--disable-documentation"
            ],
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
+                    "url" : "https://github.com/wayland-project/wayland.git"
                }
            ]
        },
@@ -100,8 +100,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Dbuildtype=debugoptimized"
            ],
            "sources" : [
                {
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -35,15 +35,15 @@
    "modules" : [
        {
            "name" : "wayland",
-            "buildsystem" : "meson",
+            "buildsystem" : "autotools",
            "builddir" : true,
            "config-opts" : [
-                "-Ddocumentation=false"
+                "--disable-documentation"
            ],
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
+                    "url" : "https://github.com/wayland-project/wayland.git"
                }
            ]
        },
@@ -100,8 +100,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Dbuildtype=debugoptimized"
            ],
            "sources" : [
                {
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -35,15 +35,15 @@
    "modules" : [
        {
            "name" : "wayland",
-            "buildsystem" : "meson",
+            "buildsystem" : "autotools",
            "builddir" : true,
            "config-opts" : [
-                "-Ddocumentation=false"
+                "--disable-documentation"
            ],
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
+                    "url" : "https://github.com/wayland-project/wayland.git"
                }
            ]
        },
@@ -100,8 +100,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Dbuildtype=debugoptimized"
            ],
            "sources" : [
                {
--- a/build-aux/meson/dist-data.py
+++ b/build-aux/meson/dist-data.py
@@ -1,39 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import shutil
-import subprocess
-
-from pathlib import PurePath
-
-
-stylesheets = [
-    'gtk/theme/Adwaita/Adwaita.css',
-    'gtk/theme/Adwaita/Adwaita-dark.css',
-    'gtk/theme/HighContrast/HighContrast.css',
-    'gtk/theme/HighContrast/HighContrast-dark.css',
-]
-
-references = [
-    'docs/reference/gtk/gtk4',
-    'docs/reference/gsk/gsk4',
-    'docs/reference/gdk/gdk4',
-    'docs/reference/gdk/gdk4-wayland',
-    'docs/reference/gdk/gdk4-x11',
-]
-
-sourceroot = os.environ.get('MESON_SOURCE_ROOT')
-buildroot = os.environ.get('MESON_BUILD_ROOT')
-distroot = os.environ.get('MESON_DIST_ROOT')
-
-for stylesheet in stylesheets:
-    stylesheet_path = PurePath(stylesheet)
-    src = PurePath(sourceroot, stylesheet_path.with_suffix('.scss'))
-    dst = PurePath(distroot, stylesheet_path)
-    subprocess.call(['sassc', '-a', '-M', '-t', 'compact', src, dst])
-
-for reference in references:
-    src_path = os.path.join(buildroot, reference)
-    if os.path.isdir(src_path):
-        dst_path = os.path.join(distroot, reference)
-        shutil.copytree(src_path, dst_path)
--- a/build-aux/meson/post-install.py
+++ b/build-aux/meson/post-install.py
@@ -1,21 +1,20 @@
 #!/usr/bin/env python3
-
-import os
-import sys
-import subprocess
-
-if 'DESTDIR' not in os.environ:
-    gtk_api_version = sys.argv[1]
-    gtk_abi_version = sys.argv[2]
+
+import os
+import sys
+import subprocess
+
+if 'DESTDIR' not in os.environ:
+    gtk_api_version = sys.argv[1]
+    gtk_abi_version = sys.argv[2]
    gtk_libdir = sys.argv[3]
    gtk_datadir = sys.argv[4]
-    gtk_bindir = sys.argv[5]
-
-    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
-    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
-    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
-
-    print('Compiling GSettings schemas...')
+
+    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
+    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
+    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
+
+    print('Compiling GSettings schemas...')
    glib_compile_schemas = subprocess.check_output(['pkg-config',
                                                   '--variable=glib_compile_schemas',
                                                   'gio-2.0']).strip()
@@ -23,14 +22,13 @@ if 'DESTDIR' not in os.environ:
        # pkg-config variables only available since GLib 2.62.0.
        glib_compile_schemas = 'glib-compile-schemas'
    subprocess.call([glib_compile_schemas,
-                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
-
-    print('Updating icon cache...')
-    update_icon_cache = os.path.join(gtk_bindir, 'gtk4-update-icon-cache')
-    subprocess.call([update_icon_cache, '-q', '-t' ,'-f',
-                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
-
-    print('Updating module cache for print backends...')
+                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
+
+    print('Updating icon cache...')
+    subprocess.call(['gtk4-update-icon-cache', '-q', '-t' ,'-f',
+                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
+
+    print('Updating module cache for print backends...')
    os.makedirs(gtk_printmodule_dir, exist_ok=True)
    gio_querymodules = subprocess.check_output(['pkg-config',
                                                '--variable=gio_querymodules',
@@ -39,7 +37,7 @@ if 'DESTDIR' not in os.environ:
        # pkg-config variables only available since GLib 2.62.0.
        gio_querymodules = 'gio-querymodules'
    subprocess.call([gio_querymodules, gtk_printmodule_dir])
-
-    print('Updating module cache for input methods...')
+
+    print('Updating module cache for input methods...')
    os.makedirs(gtk_immodule_dir, exist_ok=True)
    subprocess.call([gio_querymodules, gtk_immodule_dir])
--- a/config.h.meson
+++ b/config.h.meson
@@ -1,9 +1,8 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1

-/* Use structured logging */
-#define G_LOG_STRUCTURED 1
-
 /* The prefix for our gettext translation domains. */
 #mesondefine GETTEXT_PACKAGE

--- a/demos/constraint-editor/constraint-editor-window.c
+++ b/demos/constraint-editor/constraint-editor-window.c
@@ -36,7 +36,7 @@ struct _ConstraintEditorWindow
 G_DEFINE_TYPE(ConstraintEditorWindow, constraint_editor_window, GTK_TYPE_APPLICATION_WINDOW);

 static GtkConstraintTarget *
-find_target (GListModel          *model,
+find_target (GListModel *model,
             GtkConstraintTarget *orig)
 {
  const char *name;
@@ -163,30 +163,20 @@ constraint_editor_window_load (ConstraintEditorWindow *self,
      GtkConstraint *clone;
      GtkConstraintTarget *target;
      GtkConstraintTarget *source;
-      GtkConstraintAttribute source_attr;

      item = g_list_model_get_item (list, i);
      constraint = GTK_CONSTRAINT (item);

      target = gtk_constraint_get_target (constraint);
      source = gtk_constraint_get_source (constraint);
-      source_attr = gtk_constraint_get_source_attribute (constraint);
-
-      if (source == NULL && source_attr == GTK_CONSTRAINT_ATTRIBUTE_NONE)
-        clone = gtk_constraint_new_constant (find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), target),
+      clone = gtk_constraint_new (find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), target),
                                  gtk_constraint_get_target_attribute (constraint),
                                  gtk_constraint_get_relation (constraint),
+                                  find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), source),
+                                  gtk_constraint_get_target_attribute (constraint),
+                                  gtk_constraint_get_multiplier (constraint),
                                  gtk_constraint_get_constant (constraint),
                                  gtk_constraint_get_strength (constraint));
-      else
-        clone = gtk_constraint_new (find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), target),
-                                    gtk_constraint_get_target_attribute (constraint),
-                                    gtk_constraint_get_relation (constraint),
-                                    find_target (constraint_view_get_model (CONSTRAINT_VIEW (self->view)), source),
-                                    source_attr,
-                                    gtk_constraint_get_multiplier (constraint),
-                                    gtk_constraint_get_constant (constraint),
-                                    gtk_constraint_get_strength (constraint));

      constraint_view_add_constraint (CONSTRAINT_VIEW (self->view), clone);

@@ -310,7 +300,7 @@ save_response_cb (GtkNativeDialog        *dialog,
      model = constraint_view_get_model (CONSTRAINT_VIEW (self->view));
      text = serialize_model (model);
      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-      g_file_replace_contents (file, text, strlen (text),
+      g_file_replace_contents (file, text, -1,
                               NULL, FALSE,
                               G_FILE_CREATE_NONE,
                               NULL,
--- a/demos/constraint-editor/constraint-editor-window.ui
+++ b/demos/constraint-editor/constraint-editor-window.ui
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <template class="ConstraintEditorWindow" parent="GtkApplicationWindow">
+    <style>
+      <class name="devel"/>
+    </style>
    <property name="title" translatable="yes">GTK Constraint Editor</property>
    <property name="default-width">1024</property>
    <property name="default-height">768</property>
--- a/demos/constraint-editor/constraint-editor.c
+++ b/demos/constraint-editor/constraint-editor.c
@@ -142,9 +142,6 @@ get_target (GListModel *model,
 {
  int i;

-  if (id == NULL)
-    return NULL;
-
  if (strcmp ("super", id) == 0)
    return NULL;

@@ -215,22 +212,6 @@ get_relation_nick (GtkConstraintRelation relation)
  return nick;
 }

-static const char *
-get_relation_display_name (GtkConstraintRelation relation)
-{
-  switch (relation)
-    {
-    case GTK_CONSTRAINT_RELATION_LE:
-      return "≤";
-    case GTK_CONSTRAINT_RELATION_EQ:
-      return "=";
-    case GTK_CONSTRAINT_RELATION_GE:
-      return "≥";
-    default:
-      return "?";
-    }
-}
-
 static GtkConstraintStrength
 get_strength (const char *id)
 {
@@ -350,7 +331,6 @@ source_attr_changed (ConstraintEditor *editor)
    {
      gtk_widget_set_sensitive (editor->source, TRUE);
      gtk_widget_set_sensitive (editor->multiplier, TRUE);
-      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1");
    }
 }

@@ -367,7 +347,7 @@ constraint_editor_constraint_to_string (GtkConstraint *constraint)

  name = get_target_name (gtk_constraint_get_target (constraint));
  attr = get_attr_nick (gtk_constraint_get_target_attribute (constraint));
-  relation = get_relation_display_name (gtk_constraint_get_relation (constraint));
+  relation = get_relation_nick (gtk_constraint_get_relation (constraint));

  if (name == NULL)
    name = "[ ]";
@@ -461,12 +441,8 @@ update_preview (ConstraintEditor *editor)
 static void
 update_button (ConstraintEditor *editor)
 {
-  const char *target = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  const char *source = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-  const char *source_attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-
-  if (target &&
-      (source || (source_attr && get_target_attr (source_attr) == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
+  if (gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target)) != NULL &&
+      gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source)) != NULL)
    gtk_widget_set_sensitive (editor->button, TRUE);
  else
    gtk_widget_set_sensitive (editor->button, FALSE);
--- a/demos/constraint-editor/constraint-editor.ui
+++ b/demos/constraint-editor/constraint-editor.ui
@@ -78,7 +78,6 @@
          <object class="GtkComboBoxText" id="source_attr">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <signal name="changed" handler="source_attr_changed" swapped="yes"/>
-            <signal name="changed" handler="update_button" swapped="yes"/>
            <layout>
              <property name="column">2</property>
              <property name="row">3</property>
--- a/demos/constraint-editor/meson.build
+++ b/demos/constraint-editor/meson.build
@@ -8,16 +8,14 @@ constraint_editor_sources = [
 ]

 constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
-  'constraint-editor.gresource.xml',
-  source_dir: '.',
-)
+                                                      'constraint-editor.gresource.xml',
+                                                      source_dir: '.')

 executable('gtk4-constraint-editor',
-  sources: [ constraint_editor_sources, constraint_editor_resources, ],
-  c_args: common_cflags,
-  dependencies: libgtk_dep,
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: false,
-)
+           constraint_editor_sources, constraint_editor_resources,
+           c_args: common_cflags,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: false)
--- a/demos/gtk-demo/alienplanet.glsl
+++ b/demos/gtk-demo/alienplanet.glsl
@@ -67,7 +67,7 @@ vec2 raySphere(vec3 ro, vec3 rd, vec4 sphere) {
  return vec2(t0, t1);
 }

-float noize1(vec2 p) {
+float noise1(vec2 p) {
  vec2 n = mod2(p, vec2(cellWidth));
  vec2 hh = hash(sqrt(2.0)*(n+1000.0));
  hh.x *= hh.y;
@@ -81,7 +81,7 @@ float noize1(vec2 p) {
  return h*0.25;
 }

-float noize2(vec2 p) {
+float noise2(vec2 p) {
  vec2 n = mod2(p, vec2(cellWidth));
  vec2 hh = hash(sqrt(2.0)*(n+1000.0));
  hh.x *= hh.y;
@@ -114,7 +114,7 @@ float height(vec2 p, float dd, int mx) {
  int i = 0;

  for (; i < 4;++i) {
-    float nn = a*noize2(p);
+    float nn = a*noise2(p);
    s += nn;
    d += abs(a);
    p += o;
@@ -130,7 +130,7 @@ float height(vec2 p, float dd, int mx) {
  mx = int(mix(float(4), float(mx), step(rdd, far)));

  for (; i < mx; ++i) {
-    float nn = a*noize1(p);
+    float nn = a*noise1(p);
    s += nn;
    d += abs(a);
    p += o;
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -465,7 +465,7 @@ demo_application_window_size_allocate (GtkWidget *widget,
                                                                          baseline);

  if (!window->maximized && !window->fullscreen)
-    gtk_window_get_default_size (GTK_WINDOW (window), &window->width, &window->height);
+    gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);
 }

 static void
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -98,9 +98,6 @@ create_page1 (GtkWidget *assistant)
  gtk_box_append (GTK_BOX (box), label);

  entry = gtk_entry_new ();
-  gtk_accessible_update_relation (GTK_ACCESSIBLE (entry),
-                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                  -1);
  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
  gtk_box_append (GTK_BOX (box), entry);
--- a/demos/gtk-demo/background.glsl
+++ b/demos/gtk-demo/background.glsl
@@ -1,26 +0,0 @@
-uniform float u_time;
-
-void
-mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  vec2 pos = (fragCoord.xy * 2.0 - resolution.xy)/ min (resolution.x, resolution.y) ;
-
-  float t0 = sin ((u_time + 0.00)*1.0);
-  float t1 = sin ((u_time + 0.30)*0.4);
-  float t2 = cos ((u_time + 0.23)*0.9);
-  float t3 = cos ((u_time + 0.41)*0.6);
-  float t4 = cos ((u_time + 0.11)*0.3);
-
-  vec2 p0 = vec2 (t1, t0) ;
-  vec2 p1 = vec2 (t2, t3) ;
-  vec2 p2 = vec2 (t4, t3) ;
-
-  float r = 1.0/distance (pos, p0);
-  float g = 1.0/distance (pos, p1);
-  float b = 1.0/distance (pos, p2);
-  float sum = r + g + b;
-
-  float alpha = 1.0 - pow (1.0/(sum), 40.0)*pow (10.0, 40.0*0.7);
-
-  fragColor = vec4 (r*0.5, g*0.5, b*0.5, 1.0) * alpha;
-}
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk+" version="3.20"/>
  <object class="GtkWindow" id="window">
    <property name="resizable">0</property>
    <property name="title">CSS Blend Modes</property>
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -1,5 +1,5 @@
 /* Builder
- * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkStatusBar, GtkShortcutController, toolbar
+ * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkStatusBar, toolbar
 *
 * Demonstrates a traditional interface, loaded from a XML description,
 * and shows how to connect actions to the menu items and toolbar buttons.
@@ -158,6 +158,7 @@ do_builder (GtkWidget *do_widget)
      about = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
      gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window));
      gtk_window_set_hide_on_close (GTK_WINDOW (about), TRUE);
+      g_signal_connect (about, "response", G_CALLBACK (gtk_widget_hide), NULL);
      g_object_set_data_full (G_OBJECT (window), "about",
                              about, (GDestroyNotify)gtk_window_destroy);

--- a/demos/gtk-demo/cogs.glsl
+++ b/demos/gtk-demo/cogs.glsl
@@ -177,7 +177,7 @@ float ccell2(vec2 p, float r) {
 float df(vec2 p, float scale, inout vec2 nn) {
  p /= scale;
  nn = hextile(p);
-  nn = floor(nn + 0.5);
+  nn = round(nn);
  float r = hash(nn);

  float d;;
--- a/demos/gtk-demo/cogs2.glsl
+++ b/demos/gtk-demo/cogs2.glsl
@@ -179,7 +179,7 @@ float ccell2(vec2 p, float r) {
 float df(vec2 p, float scale, inout vec2 nn) {
  p /= scale;
  nn = hextile(p);
-  nn = floor(nn + 0.5);
+  nn = round(nn);
  float r = hash(nn);

  float d;;
--- a/demos/gtk-demo/constraints.c
+++ b/demos/gtk-demo/constraints.c
@@ -1,16 +1,9 @@
-/* Constraints/Simple Constraints
+/* Constraints/Simple
 * #Keywords: GtkLayoutManager
 *
 * GtkConstraintLayout provides a layout manager that uses relations
- * between widgets (also known as “constraints”) to compute the position
+ * between widgets (also known as "constraints") to compute the position
 * and size of each child.
- *
- * In addition to child widgets, the constraints can involve spacer
- * objects (also known as “guides”). This example has a guide between
- * the two buttons in the top row.
- *
- * Try resizing the window to see how the constraints react to update
- * the layout.
 */

 #include <glib/gi18n.h>
@@ -241,12 +234,15 @@ simple_grid_init (SimpleGrid *self)

  self->button1 = gtk_button_new_with_label ("Child 1");
  gtk_widget_set_parent (self->button1, widget);
+  gtk_widget_set_name (self->button1, "button1");

  self->button2 = gtk_button_new_with_label ("Child 2");
  gtk_widget_set_parent (self->button2, widget);
+  gtk_widget_set_name (self->button2, "button2");

  self->button3 = gtk_button_new_with_label ("Child 3");
  gtk_widget_set_parent (self->button3, widget);
+  gtk_widget_set_name (self->button3, "button3");

  GtkLayoutManager *manager = gtk_widget_get_layout_manager (GTK_WIDGET (self));
  build_constraints (self, GTK_CONSTRAINT_LAYOUT (manager));
@@ -263,8 +259,7 @@ do_constraints (GtkWidget *do_widget)

     window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-     gtk_window_set_title (GTK_WINDOW (window), "Simple Constraints");
-     gtk_window_set_default_size (GTK_WINDOW (window), 260, -1);
+     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
--- a/demos/gtk-demo/constraints_interactive.c
+++ b/demos/gtk-demo/constraints_interactive.c
@@ -1,7 +1,7 @@
-/* Constraints/Interactive Constraints
+/* Constraints/Interactive
 * #Keywords: GtkConstraintLayout
 *
- * This example shows how constraints can be updated during user interaction.
+ * Demonstrate how constraints can be updates during user interaction.
 * The vertical edge between the buttons can be dragged with the mouse.
 */

@@ -205,7 +205,7 @@ interactive_grid_init (InteractiveGrid *self)
 }

 GtkWidget *
-do_constraints_interactive (GtkWidget *do_widget)
+do_constraints2 (GtkWidget *do_widget)
 {
 static GtkWidget *window;

@@ -215,8 +215,7 @@ do_constraints_interactive (GtkWidget *do_widget)

     window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-     gtk_window_set_title (GTK_WINDOW (window), "Interactive Constraints");
-     gtk_window_set_default_size (GTK_WINDOW (window), 260, -1);
+     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
--- a/demos/gtk-demo/constraints_vfl.c
+++ b/demos/gtk-demo/constraints_vfl.c
@@ -2,10 +2,6 @@
 *
 * GtkConstraintLayout allows defining constraints using a
 * compact syntax called Visual Format Language, or VFL.
- *
- * A typical example of a VFL specification looks like this:
- *
- * H:|-[button1(==button2)]-12-[button2]-|
 */

 #include <glib/gi18n.h>
@@ -128,7 +124,7 @@ vfl_grid_init (VflGrid *self)
 }

 GtkWidget *
-do_constraints_vfl (GtkWidget *do_widget)
+do_constraints3 (GtkWidget *do_widget)
 {
 static GtkWidget *window;

@@ -138,8 +134,7 @@ do_constraints_vfl (GtkWidget *do_widget)

     window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-     gtk_window_set_title (GTK_WINDOW (window), "Constraints — VFL");
-     gtk_window_set_default_size (GTK_WINDOW (window), 260, -1);
+     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
--- a/demos/gtk-demo/constraints_builder.c
+++ b/demos/gtk-demo/constraints_builder.c
@@ -1,74 +0,0 @@
-/* Constraints/Builder
- *
- * GtkConstraintLayouts can be created in .ui files, and constraints can
- * be set up at that time as well, as this example demonstrates. It shows
- * various ways to do spacing and sizing with constraints.
- *
- * Make the window wider to see the rows react differently
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-G_DECLARE_FINAL_TYPE (ConstraintsGrid, constraints_grid, CONSTRAINTS, GRID, GtkWidget)
-
-struct _ConstraintsGrid
-{
-  GtkWidget parent_instance;
-};
-
-G_DEFINE_TYPE (ConstraintsGrid, constraints_grid, GTK_TYPE_WIDGET)
-
-static void
-constraints_grid_init (ConstraintsGrid *grid)
-{
-}
-
-static void
-constraints_grid_dispose (GObject *object)
-{
-  GtkWidget *widget = GTK_WIDGET (object);
-  GtkWidget *child;
-
-  while ((child = gtk_widget_get_first_child (widget)))
-    gtk_widget_unparent (child);
-
-  G_OBJECT_CLASS (constraints_grid_parent_class)->dispose (object);
-}
-
-static void
-constraints_grid_class_init (ConstraintsGridClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = constraints_grid_dispose;
-}
-
-GtkWidget *
-do_constraints_builder (GtkWidget *do_widget)
-{
- static GtkWidget *window;
-
- if (!window)
-   {
-     GtkBuilder *builder;
-
-     g_type_ensure (constraints_grid_get_type ());
-
-     builder = gtk_builder_new_from_resource ("/constraints_builder/constraints_builder.ui");
-
-     window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-     gtk_window_set_display (GTK_WINDOW (window),
-                             gtk_widget_get_display (do_widget));
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-     g_object_unref (builder);
-   }
-
- if (!gtk_widget_get_visible (window))
-   gtk_widget_show (window);
- else
-   gtk_window_destroy (GTK_WINDOW (window));
-
- return window;
-}
--- a/demos/gtk-demo/constraints_builder.ui
+++ b/demos/gtk-demo/constraints_builder.ui
@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window1">
-    <property name="title" translatable="yes">Constraints — Builder</property>
-    <property name="default-width">260</property>
-    <child>
-      <object class="ConstraintsGrid">
-        <property name="halign">fill</property>
-        <property name="valign">fill</property>
-        <property name="margin-top">10</property>
-        <property name="margin-bottom">10</property>
-        <property name="margin-start">10</property>
-        <property name="margin-end">10</property>
-        <property name="layout-manager">
-          <object class="GtkConstraintLayout">
-            <constraints>
-              <guide name="guide1" min-width="10" nat-width="200" strength="weak"/>
-              <guide name="guide2" min-width="10" nat-width="200" strength="weak"/>
-              <guide name="guide3" min-width="10" nat-width="200" strength="weak"/>
-              <guide name="guide4" min-width="10" nat-width="200" strength="weak"/>
-              <guide name="guide5" min-width="10" nat-width="200" strength="weak"/>
-              <guide name="guide6" min-width="10" nat-width="200" strength="weak"/>
-              <guide name="guide7" min-width="10" nat-width="200" strength="weak"/>
-              <guide name="guide8" min-width="10" nat-width="200" strength="weak"/>
-              <guide name="guide9" min-width="0" nat-width="200" strength="weak"/>
-              <guide name="guide10" min-width="0" nat-width="200" strength="weak"/>
-              <guide name="barrier1" min-height="10"/>
-              <guide name="barrier2" min-height="10"/>
-              <guide name="barrier3" min-height="10"/>
-              <guide name="barrier4" min-height="10"/>
-
-              <!-- Spread Chain -->
-              <constraint target="super" target-attribute="top"
-                          relation="eq"
-                          source="button1" source-attribute="top"
-                          strength="required"/>
-              <constraint target="super" target-attribute="top"
-                          relation="eq"
-                          source="button2" source-attribute="top"
-                          strength="required"/>
-              <constraint target="super" target-attribute="top"
-                          relation="eq"
-                          source="button3" source-attribute="top"
-                          strength="required"/>
-
-              <constraint target="super" target-attribute="left"
-                          relation="eq"
-                          source="guide1" source-attribute="left"
-                          strength="required"/>
-              <constraint target="button1" target-attribute="left"
-                          relation="eq"
-                          source="guide1" source-attribute="right"
-                          strength="required"/>
-              <constraint target="guide2" target-attribute="left"
-                          relation="eq"
-                          source="button1" source-attribute="right"
-                          strength="required"/>
-              <constraint target="button2" target-attribute="left"
-                          relation="eq"
-                          source="guide2" source-attribute="right"
-                          strength="required"/>
-              <constraint target="guide3" target-attribute="left"
-                          relation="eq"
-                          source="button2" source-attribute="right"
-                          strength="required"/>
-              <constraint target="button3" target-attribute="left"
-                          relation="eq"
-                          source="guide3" source-attribute="right"
-                          strength="required"/>
-              <constraint target="guide4" target-attribute="left"
-                          relation="eq"
-                          source="button3" source-attribute="right"
-                          strength="required"/>
-              <constraint target="super" target-attribute="right"
-                          relation="eq"
-                          source="guide4" source-attribute="right"
-                          strength="required"/>
-
-              <constraint target="guide1" target-attribute="width"
-                          relation="eq"
-                          source="guide2" source-attribute="width"
-                          strength="required"/>
-              <constraint target="guide2" target-attribute="width"
-                          relation="eq"
-                          source="guide3" source-attribute="width"
-                          strength="required"/>
-              <constraint target="guide3" target-attribute="width"
-                          relation="eq"
-                          source="guide4" source-attribute="width"
-                          strength="required"/>
-
-              <constraint target="button1" target-attribute="width"
-                          relation="eq"
-                          source="button2" source-attribute="width"
-                          strength="required"/>
-              <constraint target="button2" target-attribute="width"
-                          relation="eq"
-                          source="button3" source-attribute="width"
-                          strength="required"/>
-
-              <constraint target="button1" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier1" source-attribute="top"
-                          strength="required"/>
-              <constraint target="button2" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier1" source-attribute="top"
-                          strength="required"/>
-              <constraint target="button3" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier1" source-attribute="top"
-                          strength="required"/>
-
-              <!-- Spread Inside Chain -->
-
-              <constraint target="super" target-attribute="left"
-                          relation="eq"
-                          source="button4" source-attribute="left"
-                          strength="required"/>
-              <constraint target="guide5" target-attribute="left"
-                          relation="eq"
-                          source="button4" source-attribute="right"
-                          strength="required"/>
-              <constraint target="button5" target-attribute="left"
-                          relation="eq"
-                          source="guide5" source-attribute="right"
-                          strength="required"/>
-              <constraint target="guide6" target-attribute="left"
-                          relation="eq"
-                          source="button5" source-attribute="right"
-                          strength="required"/>
-              <constraint target="button6" target-attribute="left"
-                          relation="eq"
-                          source="guide6" source-attribute="right"
-                          strength="required"/>
-              <constraint target="super" target-attribute="right"
-                          relation="eq"
-                          source="button6" source-attribute="right"
-                          strength="required"/>
-
-              <constraint target="guide5" target-attribute="width"
-                          relation="eq"
-                          source="guide6" source-attribute="width"
-                          strength="required"/>
-
-              <constraint target="button4" target-attribute="width"
-                          relation="eq"
-                          source="button5" source-attribute="width"
-                          strength="required"/>
-              <constraint target="button5" target-attribute="width"
-                          relation="eq"
-                          source="button6" source-attribute="width"
-                          strength="required"/>
-
-              <constraint target="button4" target-attribute="top"
-                          relation="eq"
-                          source="barrier1" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="button5" target-attribute="top"
-                          relation="eq"
-                          source="barrier1" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="button6" target-attribute="top"
-                          relation="eq"
-                          source="barrier1" source-attribute="bottom"
-                          strength="required"/>
-
-              <constraint target="button4" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier2" source-attribute="top"
-                          strength="required"/>
-              <constraint target="button5" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier2" source-attribute="top"
-                          strength="required"/>
-              <constraint target="button6" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier2" source-attribute="top"
-                          strength="required"/>
-
-              <!-- Weighted Chain -->
-
-              <constraint target="super" target-attribute="left"
-                          relation="eq"
-                          source="button7" source-attribute="left"
-                          strength="required"/>
-              <constraint target="button8" target-attribute="left"
-                          relation="eq"
-                          source="button7" source-attribute="right"
-                          constant="10"
-                          strength="required"/>
-              <constraint target="button9" target-attribute="left"
-                          relation="eq"
-                          source="button8" source-attribute="right"
-                          constant="10"
-                          strength="required"/>
-              <constraint target="super" target-attribute="right"
-                          relation="eq"
-                          source="button9" source-attribute="right"
-                          strength="required"/>
-
-              <constraint target="button8" target-attribute="width"
-                          relation="eq"
-                          source="button7" source-attribute="width"
-                          multiplier="2"
-                          strength="required"/>
-              <constraint target="button9" target-attribute="width"
-                          relation="eq"
-                          source="button7" source-attribute="width"
-                          multiplier="3"
-                          strength="required"/>
-
-              <constraint target="button7" target-attribute="top"
-                          relation="eq"
-                          source="barrier2" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="button8" target-attribute="top"
-                          relation="eq"
-                          source="barrier2" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="button9" target-attribute="top"
-                          relation="eq"
-                          source="barrier2" source-attribute="bottom"
-                          strength="required"/>
-
-              <constraint target="button7" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier3" source-attribute="top"
-                          strength="required"/>
-              <constraint target="button8" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier3" source-attribute="top"
-                          strength="required"/>
-              <constraint target="button9" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier3" source-attribute="top"
-                          strength="required"/>
-
-              <!-- Packed Chain -->
-
-              <constraint target="super" target-attribute="left"
-                          relation="eq"
-                          source="guide7" source-attribute="left"
-                          strength="required"/>
-              <constraint target="button10" target-attribute="left"
-                          relation="eq"
-                          source="guide7" source-attribute="right"
-                          strength="required"/>
-              <constraint target="button11" target-attribute="left"
-                          relation="eq"
-                          source="button10" source-attribute="right"
-                          constant="10"
-                          strength="required"/>
-              <constraint target="button12" target-attribute="left"
-                          relation="eq"
-                          source="button11" source-attribute="right"
-                          constant="10"
-                          strength="required"/>
-              <constraint target="guide8" target-attribute="left"
-                          relation="eq"
-                          source="button12" source-attribute="right"
-                          strength="required"/>
-              <constraint target="super" target-attribute="right"
-                          relation="eq"
-                          source="guide8" source-attribute="right"
-                          strength="required"/>
-
-              <constraint target="guide7" target-attribute="width"
-                          relation="eq"
-                          source="guide8" source-attribute="width"
-                          strength="required"/>
-
-              <constraint target="button10" target-attribute="width"
-                          relation="eq"
-                          source="button11" source-attribute="width"
-                          strength="required"/>
-              <constraint target="button11" target-attribute="width"
-                          relation="eq"
-                          source="button12" source-attribute="width"
-                          strength="required"/>
-
-              <constraint target="button10" target-attribute="top"
-                          relation="eq"
-                          source="barrier3" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="button11" target-attribute="top"
-                          relation="eq"
-                          source="barrier3" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="button12" target-attribute="top"
-                          relation="eq"
-                          source="barrier3" source-attribute="bottom"
-                          strength="required"/>
-
-              <constraint target="button10" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier4" source-attribute="top"
-                          strength="required"/>
-              <constraint target="button11" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier4" source-attribute="top"
-                          strength="required"/>
-              <constraint target="button12" target-attribute="bottom"
-                          relation="eq"
-                          source="barrier4" source-attribute="top"
-                          strength="required"/>
-
-              <!-- Packed Chain with Bias -->
-
-              <constraint target="super" target-attribute="left"
-                          relation="eq"
-                          source="guide9" source-attribute="left"
-                          strength="required"/>
-              <constraint target="button13" target-attribute="left"
-                          relation="eq"
-                          source="guide9" source-attribute="right"
-                          constant="10"
-                          strength="required"/>
-              <constraint target="button14" target-attribute="left"
-                          relation="eq"
-                          source="button13" source-attribute="right"
-                          constant="10"
-                          strength="required"/>
-              <constraint target="button15" target-attribute="left"
-                          relation="eq"
-                          source="button14" source-attribute="right"
-                          constant="10"
-                          strength="required"/>
-              <constraint target="guide10" target-attribute="left"
-                          relation="eq"
-                          source="button15" source-attribute="right"
-                          constant="10"
-                          strength="required"/>
-              <constraint target="super" target-attribute="right"
-                          relation="eq"
-                          source="guide10" source-attribute="right"
-                          strength="required"/>
-
-              <constraint target="guide9" target-attribute="width"
-                          relation="eq"
-                          source="guide10" source-attribute="width"
-                          multiplier="4"
-                          strength="required"/>
-
-              <constraint target="button13" target-attribute="width"
-                          relation="eq"
-                          source="button14" source-attribute="width"
-                          strength="required"/>
-              <constraint target="button14" target-attribute="width"
-                          relation="eq"
-                          source="button15" source-attribute="width"
-                          strength="required"/>
-
-              <constraint target="button13" target-attribute="top"
-                          relation="eq"
-                          source="barrier4" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="button14" target-attribute="top"
-                          relation="eq"
-                          source="barrier4" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="button15" target-attribute="top"
-                          relation="eq"
-                          source="barrier4" source-attribute="bottom"
-                          strength="required"/>
-
-              <constraint target="super" target-attribute="bottom"
-                          relation="ge"
-                          source="button13" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="super" target-attribute="bottom"
-                          relation="ge"
-                          source="button14" source-attribute="bottom"
-                          strength="required"/>
-              <constraint target="super" target-attribute="bottom"
-                          relation="ge"
-                          source="button15" source-attribute="bottom"
-                          strength="required"/>
-            </constraints>
-          </object>
-        </property>
-        <child>
-          <object class="GtkButton" id="button1">
-            <property name="label">A</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button2">
-            <property name="label">B</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button3">
-            <property name="label">C</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button4">
-            <property name="label">A</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button5">
-            <property name="label">B</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button6">
-            <property name="label">C</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button7">
-            <property name="label">A</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button8">
-            <property name="label">B</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button9">
-            <property name="label">C</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button10">
-            <property name="label">A</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button11">
-            <property name="label">B</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button12">
-            <property name="label">C</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button13">
-            <property name="label">A</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button14">
-            <property name="label">B</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button15">
-            <property name="label">C</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -18,9 +18,6 @@
    <file>demoimage.c</file>
    <file>demoimage.h</file>
  </gresource>
-  <gresource prefix="/constraints_builder">
-    <file>constraints_builder.ui</file>
-  </gresource>
  <gresource prefix="/css_accordion">
    <file>css_accordion.css</file>
    <file>reset.css</file>
@@ -43,11 +40,6 @@
    <file>cssview.css</file>
    <file>reset.css</file>
  </gresource>
-  <gresource prefix="/dropdown">
-    <file>suggestionentry.h</file>
-    <file>suggestionentry.c</file>
-    <file>suggestionentry.css</file>
-  </gresource>
  <gresource prefix="/theming_style_classes">
    <file>theming.ui</file>
  </gresource>
@@ -128,9 +120,6 @@
    <file>gtkfishbowl.c</file>
    <file>gtkfishbowl.h</file>
  </gresource>
-  <gresource prefix="/frames">
-    <file>frames.ui</file>
-  </gresource>
  <gresource prefix="/gears">
    <file>gtkgears.c</file>
    <file>gtkgears.h</file>
@@ -149,15 +138,12 @@
    <file>gtkshaderstack.h</file>
    <file>gtkshaderbin.h</file>
    <file>gtkshaderbin.c</file>
-    <file>gskshaderpaintable.h</file>
-    <file>gskshaderpaintable.c</file>
-    <file>wind.glsl</file>
-    <file>radial.glsl</file>
-    <file>crosswarp.glsl</file>
-    <file>kaleidoscope.glsl</file>
+    <file>fire.glsl</file>
+    <file>transition1.glsl</file>
+    <file>transition2.glsl</file>
+    <file>transition3.glsl</file>
+    <file>transition4.glsl</file>
    <file>cogs2.glsl</file>
-    <file>ripple.glsl</file>
-    <file>background.glsl</file>
  </gresource>
  <gresource prefix="/iconscroll">
    <file>iconscroll.ui</file>
@@ -195,9 +181,6 @@
  <gresource prefix="/listview_settings">
    <file>listview_settings.ui</file>
  </gresource>
-  <gresource prefix="/listview_ucd_data/">
-    <file>ucdnames.data</file>
-  </gresource>
  <gresource prefix="/listview_weather">
    <file compressed="true">listview_weather.txt</file>
  </gresource>
@@ -215,11 +198,6 @@
    <file>demo3widget.h</file>
    <file>demo3widget.ui</file>
  </gresource>
-  <gresource prefix="/paintable_svg">
-    <file>svgpaintable.h</file>
-    <file>svgpaintable.c</file>
-    <file>org.gtk.gtk4.NodeEditor.Devel.svg</file>
-  </gresource>
  <gresource prefix="/shortcuts">
    <file>shortcuts.ui</file>
    <file>shortcuts-builder.ui</file>
@@ -239,12 +217,9 @@
    <file>revealer.ui</file>
  </gresource>
  <gresource prefix="/images">
-    <file>pixbufpaintable.h</file>
-    <file>pixbufpaintable.c</file>
    <file>alphatest.png</file>
    <file>floppybuddy.gif</file>
    <file>gtk-logo.webm</file>
-    <file alias="org.gtk.Demo4.svg">data/scalable/apps/org.gtk.Demo4.svg</file>
  </gresource>
  <gresource prefix="/video-player">
    <file>bbb.png</file>
@@ -256,9 +231,8 @@
    <file>clipboard.c</file>
    <file>combobox.c</file>
    <file>constraints.c</file>
-    <file>constraints_interactive.c</file>
-    <file>constraints_vfl.c</file>
-    <file>constraints_builder.c</file>
+    <file>constraints2.c</file>
+    <file>constraints3.c</file>
    <file>css_accordion.c</file>
    <file>css_basics.c</file>
    <file>css_blendmodes.c</file>
@@ -279,7 +253,6 @@
    <file>fishbowl.c</file>
    <file>fixed.c</file>
    <file>flowbox.c</file>
-    <file>frames.c</file>
    <file>font_features.c</file>
    <file>fontplane.c</file>
    <file>fontrendering.c</file>
@@ -298,14 +271,13 @@
    <file>layoutmanager2.c</file>
    <file>links.c</file>
    <file>listbox.c</file>
-    <file>listbox_controls.c</file>
+    <file>listbox2.c</file>
    <file>listview_applauncher.c</file>
    <file>listview_colors.c</file>
    <file>listview_clocks.c</file>
    <file>listview_filebrowser.c</file>
    <file>listview_minesweeper.c</file>
    <file>listview_settings.c</file>
-    <file>listview_ucd.c</file>
    <file>listview_weather.c</file>
    <file>listview_words.c</file>
    <file>list_store.c</file>
@@ -313,14 +285,13 @@
    <file>markup.c</file>
    <file>menu.c</file>
    <file>overlay.c</file>
-    <file>overlay_decorative.c</file>
+    <file>overlay2.c</file>
    <file>paint.c</file>
    <file>pagesetup.c</file>
    <file>paintable.c</file>
    <file>paintable_animated.c</file>
    <file>paintable_emblem.c</file>
    <file>paintable_mediastream.c</file>
-    <file>paintable_svg.c</file>
    <file>panes.c</file>
    <file>password_entry.c</file>
    <file>peg_solitaire.c</file>
@@ -363,8 +334,8 @@
    <file>messages.txt</file>
    <file>apple-red.png</file>
  </gresource>
-  <gresource prefix="/listbox_controls">
-    <file>listbox_controls.ui</file>
+  <gresource prefix="/listbox2">
+    <file>listbox2.ui</file>
  </gresource>
  <gresource prefix="/glarea">
    <file>glarea-gl.fs.glsl</file>
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -83,7 +83,7 @@
  </menu>
  <object class="GtkAboutDialog" id="aboutdialog1">
    <property name="program-name" translatable="yes">Builder demo</property>
-    <property name="logo-icon-name" translatable="yes">org.gtk.Demo4</property>
+    <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
    <property name="modal">True</property>
  </object>
  <object class="GtkWindow" id="window1">
@@ -96,18 +96,13 @@
        <child>
          <object class="GtkPopoverMenuBar" id="menubar1">
            <property name="menu-model">menubar</property>
-            <accessibility>
-              <property name="label">Main Menu</property>
-            </accessibility>
          </object>
        </child>
        <child>
          <object class="GtkBox" id="toolbar1">
-            <property name="accessible-role">toolbar</property>
-            <property name="css-classes">toolbar</property>
-            <accessibility>
-              <property name="label">Toolbar</property>
-            </accessibility>
+            <style>
+              <class name="toolbar"/>
+            </style>
            <child>
              <object class="GtkButton">
                <property name="label" translatable="yes">New</property>
--- a/demos/gtk-demo/demo3widget.c
+++ b/demos/gtk-demo/demo3widget.c
@@ -97,9 +97,9 @@ demo3_widget_size_allocate (GtkWidget *widget,

  /* Since we are not using a layout manager (who would do this
   * for us), we need to allocate a size for our menu by calling
-   * gtk_popover_present().
+   * gtk_native_check_resize().
   */
-  gtk_popover_present (GTK_POPOVER (self->menu));
+  gtk_native_check_resize (GTK_NATIVE (self->menu));
 }

 static void
--- a/demos/gtk-demo/demoimage.c
+++ b/demos/gtk-demo/demoimage.c
@@ -47,38 +47,6 @@ get_image_paintable (GtkImage *image)
    }
 }

-static void
-update_drag_icon (DemoImage   *demo,
-                  GtkDragIcon *icon)
-{
-  const char *icon_name;
-  GdkPaintable *paintable;
-  GtkWidget *image;
-
-  switch (gtk_image_get_storage_type (GTK_IMAGE (demo->image)))
-    {
-    case GTK_IMAGE_PAINTABLE:
-      paintable = gtk_image_get_paintable (GTK_IMAGE (demo->image));
-      image = gtk_image_new_from_paintable (paintable);
-      break;
-    case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (GTK_IMAGE (demo->image));
-      image = gtk_image_new_from_icon_name (icon_name);
-      break;
-    case GTK_IMAGE_EMPTY:
-    case GTK_IMAGE_GICON:
-    default:
-      g_warning ("Image storage type %d not handled",
-                 gtk_image_get_storage_type (GTK_IMAGE (demo->image)));
-      return;
-    }
-
-  gtk_image_set_pixel_size (GTK_IMAGE (image),
-                            gtk_image_get_pixel_size (GTK_IMAGE (demo->image)));
-
-  gtk_drag_icon_set_child (icon, image);
-}
-
 static void
 drag_begin (GtkDragSource *source,
            GdkDrag       *drag,
@@ -86,8 +54,14 @@ drag_begin (GtkDragSource *source,
 {
  GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkPaintable *paintable;

-  update_drag_icon (demo, GTK_DRAG_ICON (gtk_drag_icon_get_for_drag (drag)));
+  paintable = get_image_paintable (GTK_IMAGE (demo->image));
+  if (paintable)
+    {
+      gtk_drag_icon_set_from_paintable (drag, paintable, -2, -2);
+      g_object_unref (paintable);
+    }
 }

 static GdkContentProvider *
--- a/demos/gtk-demo/demotaggedentry.c
+++ b/demos/gtk-demo/demotaggedentry.c
@@ -44,23 +44,11 @@ G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
 static void
 demo_tagged_entry_init (DemoTaggedEntry *entry)
 {
-  GtkCssProvider *provider;
-
  entry->text = gtk_text_new ();
  gtk_widget_set_hexpand (entry->text, TRUE);
  gtk_widget_set_vexpand (entry->text, TRUE);
  gtk_widget_set_parent (entry->text, GTK_WIDGET (entry));
  gtk_editable_init_delegate (GTK_EDITABLE (entry));
-  gtk_editable_set_width_chars (GTK_EDITABLE (entry->text), 6);
-  gtk_editable_set_max_width_chars (GTK_EDITABLE (entry->text), 6);
-  gtk_widget_add_css_class (GTK_WIDGET (entry), "tagged");
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/tagged_entry/tagstyle.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              800);
-  g_object_unref (provider);
 }

 static void
@@ -128,7 +116,6 @@ demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)

  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
  gtk_widget_class_set_css_name (widget_class, "entry");
-  gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_TEXT_BOX);
 }

 static GtkEditable *
@@ -224,6 +211,7 @@ static void
 demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
 {
  GtkGesture *gesture;
+  GtkCssProvider *provider;

  tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
@@ -233,6 +221,13 @@ demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
  gesture = gtk_gesture_click_new ();
  g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag);
  gtk_widget_add_controller (GTK_WIDGET (tag), GTK_EVENT_CONTROLLER (gesture));
+
+  provider = gtk_css_provider_new ();
+  gtk_css_provider_load_from_resource (provider, "/tagged_entry/tagstyle.css");
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
+                                              GTK_STYLE_PROVIDER (provider),
+                                              800);
+  g_object_unref (provider);
 }

 static void
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -113,9 +113,12 @@ apply_transform (CanvasItem *item)
  y = gtk_widget_get_allocated_height (item->label) / 2.0;
  item->r = sqrt (x*x + y*y);

-  transform = gsk_transform_translate (NULL, &(graphene_point_t) { item->r, item->r });
-  transform = gsk_transform_rotate (transform, item->angle + item->delta);
-  transform = gsk_transform_translate (transform, &(graphene_point_t) { -x, -y });
+  transform = gsk_transform_translate (
+                 gsk_transform_rotate (
+                   gsk_transform_translate (NULL,
+                                            &(graphene_point_t) { item->r, item->r }),
+                   item->angle + item->delta),
+                 &(graphene_point_t) { - x, - y });

  gtk_fixed_set_child_transform (GTK_FIXED (item->fixed), item->label, transform);
  gsk_transform_unref (transform);
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -311,7 +311,6 @@ do_drawingarea (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
-      gtk_window_set_default_size (GTK_WINDOW (window), 250, -1);

      g_signal_connect (window, "destroy",
                        G_CALLBACK (close_window), NULL);
@@ -326,8 +325,9 @@ do_drawingarea (GtkWidget *do_widget)
      /*
       * Create the groups area
       */
-      label = gtk_label_new ("Knockout groups");
-      gtk_widget_add_css_class (label, "heading");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "<u>Knockout groups</u>");
      gtk_box_append (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
@@ -344,8 +344,9 @@ do_drawingarea (GtkWidget *do_widget)
       * Create the scribble area
       */

-      label = gtk_label_new ("Scribble area");
-      gtk_widget_add_css_class (label, "heading");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "<u>Scribble area</u>");
      gtk_box_append (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
--- a/demos/gtk-demo/dropdown.c
+++ b/demos/gtk-demo/dropdown.c
@@ -1,16 +1,17 @@
-/* Lists/Selections
+/* Drop Downs
 *
 * The GtkDropDown widget is a modern alternative to GtkComboBox.
 * It uses list models instead of tree models, and the content is
 * displayed using widgets instead of cell renderers.
 *
- * This example also shows a custom widget that can replace
- * GtkEntryCompletion or GtkComboBoxText. It is not currently
- * part of GTK.
+ * The examples here demonstrate how to use different kinds of
+ * list models with GtkDropDown, how to use search and how to
+ * display the selected item differently from the presentation
+ * in the popup.
 */

 #include <gtk/gtk.h>
-#include "suggestionentry.h"
+

 #define STRING_TYPE_HOLDER (string_holder_get_type ())
 G_DECLARE_FINAL_TYPE (StringHolder, string_holder, STRING, HOLDER, GObject)
@@ -64,22 +65,18 @@ strings_setup_item_single_line (GtkSignalListItemFactory *factory,
                                GtkListItem              *item)
 {
  GtkWidget *box, *image, *title;
-  GtkWidget *checkmark;

  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);

  image = gtk_image_new ();
  title = gtk_label_new ("");
  gtk_label_set_xalign (GTK_LABEL (title), 0.0);
-  checkmark = gtk_image_new_from_icon_name ("object-select-symbolic");

  gtk_box_append (GTK_BOX (box), image);
  gtk_box_append (GTK_BOX (box), title);
-  gtk_box_append (GTK_BOX (box), checkmark);

  g_object_set_data (G_OBJECT (item), "title", title);
  g_object_set_data (G_OBJECT (item), "image", image);
-  g_object_set_data (G_OBJECT (item), "checkmark", checkmark);

  gtk_list_item_set_child (item, box);
 }
@@ -89,7 +86,6 @@ strings_setup_item_full (GtkSignalListItemFactory *factory,
                         GtkListItem              *item)
 {
  GtkWidget *box, *box2, *image, *title, *description;
-  GtkWidget *checkmark;

  image = gtk_image_new ();
  title = gtk_label_new ("");
@@ -97,7 +93,6 @@ strings_setup_item_full (GtkSignalListItemFactory *factory,
  description = gtk_label_new ("");
  gtk_label_set_xalign (GTK_LABEL (description), 0.0);
  gtk_widget_add_css_class (description, "dim-label");
-  checkmark = gtk_image_new_from_icon_name ("object-select-symbolic");

  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
@@ -106,48 +101,26 @@ strings_setup_item_full (GtkSignalListItemFactory *factory,
  gtk_box_append (GTK_BOX (box), box2);
  gtk_box_append (GTK_BOX (box2), title);
  gtk_box_append (GTK_BOX (box2), description);
-  gtk_box_append (GTK_BOX (box), checkmark);

  g_object_set_data (G_OBJECT (item), "title", title);
  g_object_set_data (G_OBJECT (item), "image", image);
  g_object_set_data (G_OBJECT (item), "description", description);
-  g_object_set_data (G_OBJECT (item), "checkmark", checkmark);

  gtk_list_item_set_child (item, box);
 }

-static void
-selected_item_changed (GtkDropDown *dropdown,
-                       GParamSpec  *pspec,
-                       GtkListItem *item)
-{
-  GtkWidget *checkmark;
-
-  checkmark = g_object_get_data (G_OBJECT (item), "checkmark");
-
-  if (gtk_drop_down_get_selected_item (dropdown) == gtk_list_item_get_item (item))
-    gtk_widget_set_opacity (checkmark, 1.0);
-  else
-    gtk_widget_set_opacity (checkmark, 0.0);
-}
-
 static void
 strings_bind_item (GtkSignalListItemFactory *factory,
-                   GtkListItem              *item,
-                   gpointer                  data)
+                    GtkListItem              *item)
 {
-  GtkDropDown *dropdown = data;
  GtkWidget *image, *title, *description;
-  GtkWidget *checkmark;
  StringHolder *holder;
-  GtkWidget *popup;

  holder = gtk_list_item_get_item (item);

  title = g_object_get_data (G_OBJECT (item), "title");
  image = g_object_get_data (G_OBJECT (item), "image");
  description = g_object_get_data (G_OBJECT (item), "description");
-  checkmark = g_object_get_data (G_OBJECT (item), "checkmark");

  gtk_label_set_label (GTK_LABEL (title), holder->title);
  if (image)
@@ -160,43 +133,19 @@ strings_bind_item (GtkSignalListItemFactory *factory,
      gtk_label_set_label (GTK_LABEL (description), holder->description);
      gtk_widget_set_visible (description , holder->description != NULL);
    }
-
-  popup = gtk_widget_get_ancestor (title, GTK_TYPE_POPOVER);
-  if (popup && gtk_widget_is_ancestor (popup, GTK_WIDGET (dropdown)))
-    {
-      gtk_widget_show (checkmark);
-      g_signal_connect (dropdown, "notify::selected-item",
-                        G_CALLBACK (selected_item_changed), item);
-      selected_item_changed (dropdown, NULL, item);
-    }
-  else
-    {
-      gtk_widget_hide (checkmark);
-    }
-}
-
-static void
-strings_unbind_item (GtkSignalListItemFactory *factory,
-                     GtkListItem              *list_item,
-                     gpointer                  data)
-{
-  GtkDropDown *dropdown = data;
-
-  g_signal_handlers_disconnect_by_func (dropdown, selected_item_changed, list_item);
 }

 static GtkListItemFactory *
-strings_factory_new (gpointer data, gboolean full)
+strings_factory_new (gboolean full)
 {
  GtkListItemFactory *factory;

  factory = gtk_signal_list_item_factory_new ();
  if (full)
-    g_signal_connect (factory, "setup", G_CALLBACK (strings_setup_item_full), data);
+    g_signal_connect (factory, "setup", G_CALLBACK (strings_setup_item_full), NULL);
  else
-    g_signal_connect (factory, "setup", G_CALLBACK (strings_setup_item_single_line), data);
-  g_signal_connect (factory, "bind", G_CALLBACK (strings_bind_item), data);
-  g_signal_connect (factory, "unbind", G_CALLBACK (strings_unbind_item), data);
+    g_signal_connect (factory, "setup", G_CALLBACK (strings_setup_item_single_line), NULL);
+  g_signal_connect (factory, "bind", G_CALLBACK (strings_bind_item), NULL);

  return factory;
 }
@@ -237,22 +186,19 @@ drop_down_new_from_strings (const char *const *titles,
  g_return_val_if_fail (descriptions == NULL || g_strv_length ((char **)icons) == g_strv_length ((char **)descriptions), NULL);

  model = strings_model_new (titles, icons, descriptions);
-  widget = g_object_new (GTK_TYPE_DROP_DOWN,
-                         "model", model,
-                         NULL);
-  g_object_unref (model);
-
-  factory = strings_factory_new (widget, FALSE);
+  factory = strings_factory_new (FALSE);
  if (icons != NULL || descriptions != NULL)
-    list_factory = strings_factory_new (widget, TRUE);
+    list_factory = strings_factory_new (TRUE);
  else
    list_factory = NULL;

-  g_object_set (widget,
-                "factory", factory,
-                "list-factory", list_factory,
-                NULL);
+  widget = g_object_new (GTK_TYPE_DROP_DOWN,
+                         "model", model,
+                         "factory", factory,
+                         "list-factory", list_factory,
+                         NULL);

+  g_object_unref (model);
  g_object_unref (factory);
  if (list_factory)
    g_object_unref (list_factory);
@@ -272,110 +218,13 @@ get_title (gpointer item)
  return g_strdup (STRING_HOLDER (item)->title);
 }

-static char *
-get_file_name (gpointer item)
-{
-  return g_strdup (g_file_info_get_display_name (G_FILE_INFO (item)));
-}
-
-static void
-setup_item (GtkSignalListItemFactory *factory,
-            GtkListItem              *item)
-{
-  GtkWidget *box;
-  GtkWidget *icon;
-  GtkWidget *label;
-
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  icon = gtk_image_new ();
-  label = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_box_append (GTK_BOX (box), icon);
-  gtk_box_append (GTK_BOX (box), label);
-  gtk_list_item_set_child (item, box);
-}
-
-static void
-bind_item (GtkSignalListItemFactory *factory,
-           GtkListItem              *item)
-{
-  MatchObject *match = MATCH_OBJECT (gtk_list_item_get_item (item));
-  GFileInfo *info = G_FILE_INFO (match_object_get_item (match));
-  GtkWidget *box = gtk_list_item_get_child (item);
-  GtkWidget *icon = gtk_widget_get_first_child (box);
-  GtkWidget *label = gtk_widget_get_last_child (box);
-
-  gtk_image_set_from_gicon (GTK_IMAGE (icon), g_file_info_get_icon (info));
-  gtk_label_set_label (GTK_LABEL (label), g_file_info_get_display_name (info));
-}
-
-static void
-setup_highlight_item (GtkSignalListItemFactory *factory,
-                      GtkListItem              *item)
-{
-  GtkWidget *label;
-
-  label = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_list_item_set_child (item, label);
-}
-
-static void
-bind_highlight_item (GtkSignalListItemFactory *factory,
-                     GtkListItem              *item)
-{
-  MatchObject *obj;
-  GtkWidget *label;
-  PangoAttrList *attrs;
-  PangoAttribute *attr;
-  const char *str;
-
-  obj = MATCH_OBJECT (gtk_list_item_get_item (item));
-  label = gtk_list_item_get_child (item);
-
-  str = match_object_get_string (obj);
-
-  gtk_label_set_label (GTK_LABEL (label), str);
-  attrs = pango_attr_list_new ();
-  attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
-  attr->start_index = match_object_get_match_start (obj);
-  attr->end_index = match_object_get_match_end (obj);
-  pango_attr_list_insert (attrs, attr);
-  gtk_label_set_attributes (GTK_LABEL (label), attrs);
-  pango_attr_list_unref (attrs);
-}
-
-static void
-match_func (MatchObject *obj,
-            const char  *search,
-            gpointer     user_data)
-{
-  char *tmp1, *tmp2;
-  char *p;
-
-  tmp1 = g_utf8_normalize (match_object_get_string (obj), -1, G_NORMALIZE_ALL);
-  tmp2 = g_utf8_normalize (search, -1, G_NORMALIZE_ALL);
-
-  if ((p = strstr (tmp1, tmp2)) != NULL)
-    match_object_set_match (obj,
-                            p - tmp1,
-                            (p - tmp1) + g_utf8_strlen (search, -1),
-                            1);
-  else
-    match_object_set_match (obj, 0, 0, 0);
-
-  g_free (tmp1);
-  g_free (tmp2);
-}
-
 GtkWidget *
 do_dropdown (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
-  GtkWidget *button, *box, *spin, *check, *hbox, *label, *entry;
+  GtkWidget *button, *box, *spin, *check;
  GListModel *model;
  GtkExpression *expression;
-  GtkListItemFactory *factory;
  const char * const times[] = { "1 minute", "2 minutes", "5 minutes", "20 minutes", NULL };
  const char * const many_times[] = {
    "1 minute", "2 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes",
@@ -388,49 +237,22 @@ do_dropdown (GtkWidget *do_widget)
  const char * const device_descriptions[] = {
    "Built-in Audio", "Built-in audio", "Thinkpad Tunderbolt 3 Dock USB Audio", "Thinkpad Tunderbolt 3 Dock USB Audio", NULL
  };
-  char *cwd;
-  GFile *file;
-  GListModel *dir;
-  GtkStringList *strings;

  if (!window)
    {
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Selections");
+      gtk_window_set_title (GTK_WINDOW (window), "Drop Downs");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
-
-      gtk_widget_set_margin_start (hbox, 20);
-      gtk_widget_set_margin_end (hbox, 20);
-      gtk_widget_set_margin_top (hbox, 20);
-      gtk_widget_set_margin_bottom (hbox, 20);
-      gtk_window_set_child (GTK_WINDOW (window), hbox);
-
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_append (GTK_BOX (hbox), box);
-
-      label = gtk_label_new ("Dropdowns");
-      gtk_widget_add_css_class (label, "title-4");
-      gtk_box_append (GTK_BOX (box), label);
-
-      /* A basic dropdown */
-      button = drop_down_new_from_strings (times, NULL, NULL);
-      gtk_box_append (GTK_BOX (box), button);
-
-      /* A dropdown using an expression to obtain strings */
-      button = drop_down_new_from_strings (many_times, NULL, NULL);
-      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
-                                                0, NULL,
-                                                (GCallback)get_title,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
-      gtk_expression_unref (expression);
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_widget_set_margin_start (box, 10);
+      gtk_widget_set_margin_end (box, 10);
+      gtk_widget_set_margin_top (box, 10);
+      gtk_widget_set_margin_bottom (box, 10);
+      gtk_window_set_child (GTK_WINDOW (window), box);

      button = gtk_drop_down_new (NULL, NULL);

@@ -448,118 +270,30 @@ do_dropdown (GtkWidget *do_widget)

      spin = gtk_spin_button_new_with_range (-1, g_list_model_get_n_items (G_LIST_MODEL (model)), 1);
      gtk_widget_set_halign (spin, GTK_ALIGN_START);
-      gtk_widget_set_margin_start (spin, 20);
      g_object_bind_property  (button, "selected", spin, "value", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
      gtk_box_append (GTK_BOX (box), spin);

      check = gtk_check_button_new_with_label ("Enable search");
-      gtk_widget_set_margin_start (check, 20);
      g_object_bind_property  (button, "enable-search", check, "active", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
      gtk_box_append (GTK_BOX (box), check);

      g_object_unref (model);

-      /* A dropdown with a separate list factory */
-      button = drop_down_new_from_strings (device_titles, device_icons, device_descriptions);
+      button = drop_down_new_from_strings (times, NULL, NULL);
      gtk_box_append (GTK_BOX (box), button);

-      gtk_box_append (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL));
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_append (GTK_BOX (hbox), box);
-
-      label = gtk_label_new ("Suggestions");
-      gtk_widget_add_css_class (label, "title-4");
-      gtk_box_append (GTK_BOX (box), label);
-
-      /* A basic suggestion entry */
-      entry = suggestion_entry_new ();
-      g_object_set (entry, "placeholder-text", "Words with T or G…", NULL);
-      strings = gtk_string_list_new ((const char *[]){
-                                     "GNOME",
-                                     "gnominious",
-                                     "Gnomonic projection",
-                                     "total",
-                                     "totally",
-                                     "toto",
-                                     "tottery",
-                                     "totterer",
-                                     "Totten trust",
-                                     "totipotent",
-                                     "totipotency",
-                                     "totemism",
-                                     "totem pole",
-                                     "Totara",
-                                     "totalizer",
-                                     "totalizator",
-                                     "totalitarianism",
-                                     "total parenteral nutrition",
-                                     "total hysterectomy",
-                                     "total eclipse",
-                                     "Totipresence",
-                                     "Totipalmi",
-                                     "Tomboy",
-                                     "zombie",
-                                     NULL});
-      suggestion_entry_set_model (SUGGESTION_ENTRY (entry), G_LIST_MODEL (strings));
-      g_object_unref (strings);
-
-      gtk_box_append (GTK_BOX (box), entry);
-
-      /* A suggestion entry using a custom model, and no filtering */
-      entry = suggestion_entry_new ();
-
-      cwd = g_get_current_dir ();
-      file = g_file_new_for_path (cwd);
-      dir = G_LIST_MODEL (gtk_directory_list_new ("standard::display-name,standard::content-type,standard::icon,standard::size", file));
-      suggestion_entry_set_model (SUGGESTION_ENTRY (entry), dir);
-      g_object_unref (dir);
-      g_object_unref (file);
-      g_free (cwd);
-
+      button = drop_down_new_from_strings (many_times, NULL, NULL);
+      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
      expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
                                                0, NULL,
-                                                (GCallback)get_file_name,
+                                                (GCallback)get_title,
                                                NULL, NULL);
-      suggestion_entry_set_expression (SUGGESTION_ENTRY (entry), expression);
+      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
      gtk_expression_unref (expression);
+      gtk_box_append (GTK_BOX (box), button);

-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_item), NULL);
-      g_signal_connect (factory, "bind", G_CALLBACK (bind_item), NULL);
-
-      suggestion_entry_set_factory (SUGGESTION_ENTRY (entry), factory);
-      g_object_unref (factory);
-
-      suggestion_entry_set_use_filter (SUGGESTION_ENTRY (entry), FALSE);
-      suggestion_entry_set_show_arrow (SUGGESTION_ENTRY (entry), TRUE);
-
-      gtk_box_append (GTK_BOX (box), entry);
-
-      /* A suggestion entry with match highlighting */
-      entry = suggestion_entry_new ();
-      g_object_set (entry, "placeholder-text", "Destination", NULL);
-
-      strings = gtk_string_list_new ((const char *[]){
-                                     "app-mockups",
-                                     "settings-mockups",
-                                     "os-mockups",
-                                     "software-mockups",
-                                     "mocktails",
-                                     NULL});
-      suggestion_entry_set_model (SUGGESTION_ENTRY (entry), G_LIST_MODEL (strings));
-      g_object_unref (strings);
-
-      gtk_box_append (GTK_BOX (box), entry);
-
-      suggestion_entry_set_match_func (SUGGESTION_ENTRY (entry), match_func, NULL, NULL);
-
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_highlight_item), NULL);
-      g_signal_connect (factory, "bind", G_CALLBACK (bind_highlight_item), NULL);
-      suggestion_entry_set_factory (SUGGESTION_ENTRY (entry), factory);
-      g_object_unref (factory);
-
+      button = drop_down_new_from_strings (device_titles, device_icons, device_descriptions);
+      gtk_box_append (GTK_BOX (box), button);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -78,11 +78,11 @@ do_entry_completion (GtkWidget *do_widget)
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-      gtk_widget_set_margin_start (vbox, 18);
-      gtk_widget_set_margin_end (vbox, 18);
-      gtk_widget_set_margin_top (vbox, 18);
-      gtk_widget_set_margin_bottom (vbox, 18);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      gtk_widget_set_margin_start (vbox, 5);
+      gtk_widget_set_margin_end (vbox, 5);
+      gtk_widget_set_margin_top (vbox, 5);
+      gtk_widget_set_margin_bottom (vbox, 5);
      gtk_window_set_child (GTK_WINDOW (window), vbox);

      label = gtk_label_new (NULL);
--- a/demos/gtk-demo/entry_undo.c
+++ b/demos/gtk-demo/entry_undo.c
@@ -27,16 +27,16 @@ do_entry_undo (GtkWidget *do_widget)
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-      gtk_widget_set_margin_start (vbox, 18);
-      gtk_widget_set_margin_end (vbox, 18);
-      gtk_widget_set_margin_top (vbox, 18);
-      gtk_widget_set_margin_bottom (vbox, 18);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      gtk_widget_set_margin_start (vbox, 5);
+      gtk_widget_set_margin_end (vbox, 5);
+      gtk_widget_set_margin_top (vbox, 5);
+      gtk_widget_set_margin_bottom (vbox, 5);
      gtk_window_set_child (GTK_WINDOW (window), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "Use Control+z or Control+Shift+z to undo or redo changes");
+                            "Use Primary+z or Primary+Shift+z to undo or redo changes");
      gtk_box_append (GTK_BOX (vbox), label);

      /* Create our entry */
--- a/demos/gtk-demo/errorstates.c
+++ b/demos/gtk-demo/errorstates.c
@@ -1,4 +1,4 @@
-/* Error States
+/* Error states
 *
 * GtkLabel and GtkEntry can indicate errors if you set the .error
 * style class on them.
--- a/demos/gtk-demo/errorstates.ui
+++ b/demos/gtk-demo/errorstates.ui
@@ -5,7 +5,7 @@
    <property name="modal">1</property>
    <property name="resizable">0</property>
    <property name="use-header-bar">1</property>
-    <property name="title" translatable="yes">Error States</property>
+    <property name="title" translatable="yes">Settings</property>
    <property name="hide-on-close">1</property>
    <child internal-child="content_area">
      <object class="GtkBox">
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk+" version="3.16"/>
  <object class="GtkListStore" id="liststore1">
    <columns>
      <column type="gint"/>
--- a/demos/gtk-demo/fire.glsl
+++ b/demos/gtk-demo/fire.glsl
@@ -0,0 +1,72 @@
+uniform float u_time;
+uniform sampler2D u_texture1;
+
+/* 2D -> [0..1] random number generator */
+float random(vec2 st) {
+  return fract(sin(dot(st.xy,
+                       vec2(12.9898,78.233))) *
+               43758.5453123);
+}
+
+/* Generate a smoothed 2d noise based on random() */
+float noise(vec2 v) {
+  /* Round point v to integer grid grid */
+  vec2 grid_point = floor(v);
+  /* Randomize in grid corners */
+  float corner1 = random(grid_point);
+  float corner2 = random(grid_point + vec2(1, 0));
+  float corner3 = random(grid_point + vec2(0, 1));
+  float corner4 = random(grid_point + vec2(1, 1));
+  /* Interpolate smoothly between grid points */
+  vec2 fraction = smoothstep(vec2(0.0), vec2(1.0), fract(v));
+  return mix(mix(corner1, corner2, fraction.x),
+             mix(corner3, corner4, fraction.x),
+             fraction.y);
+}
+
+/* fractal brownian motion noice, see https://www.iquilezles.org/www/articles/fbm/fbm.htm */
+float fbm(in vec2 x)
+{
+  const float octaveScale = 1.9;
+  const float G = 0.5;
+  float f = 1.0;
+  float a = 1.0;
+  float t = 0.0;
+  int numOctaves = 5;
+  for (int i = 0; i < numOctaves; i++) {
+    t += a*noise(f*x);
+    f *= octaveScale;
+    a *= G;
+  }
+
+  return t;
+}
+
+void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
+{
+  vec2 xy = fragCoord / resolution;
+
+  float zoom = 3.0 - sin(u_time*0.5)*0.3;
+
+  // Normalize coord to height of widget
+  vec2 p = (vec2 (-resolution.x/2.0 + fragCoord.x, resolution.y - fragCoord.y) / resolution.yy)* zoom;
+
+    // Use recursive incantations of fbm
+  float q1 = fbm(p - vec2(0.8, 0.3) * u_time);
+  float q2 = fbm(p - vec2(0.5, 1.3) * u_time);
+  float r = fbm(2.0*p + vec2(q1,q2) - vec2(0.0, 1.0)*u_time*10.0 *0.4);
+
+  // Compute intensity, mostly on the bottom
+  float w = 2.0 * r * p.y;
+
+  // Smooth out left/right side and fade in at start
+  w /= smoothstep(0.0,0.1, xy.x)* smoothstep(0.0,0.1, 1.0-xy.x) *  smoothstep(0.0,0.4, u_time);
+
+  // Compute colors
+  vec3 c = vec3(1.0,.2,.05);
+  vec3 color = 1.0 / (w*w/c + 1.0);
+
+  // Mix in widget
+  vec4 widget = GskTexture(u_texture1,uv);
+  fragColor = mix(vec4(color,1), widget, 1.0-color.x);
+}
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -119,12 +119,13 @@ create_label (void)
 static GtkWidget *
 create_video (void)
 {
-  GtkWidget *w = gtk_video_new ();
+  GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
+  GtkWidget *w = gtk_picture_new_for_paintable (GDK_PAINTABLE (stream));

  gtk_widget_set_size_request (w, 64, 64);
-  gtk_video_set_loop (GTK_VIDEO (w), TRUE);
-  gtk_video_set_autoplay (GTK_VIDEO (w), TRUE);
-  gtk_video_set_resource (GTK_VIDEO (w), "/images/gtk-logo.webm");
+  gtk_media_stream_set_loop (stream, TRUE);
+  gtk_media_stream_play (stream);
+  g_object_unref (stream);

  return w;
 }
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk+" version="3.12"/>
  <object class="GtkWindow" id="window">
    <property name="default-width">600</property>
    <property name="default-height">500</property>
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -1068,6 +1068,7 @@ update_font_variations (void)
  unsigned int length;
  int i;

+  child = gtk_widget_get_first_child (variations_grid);
  while ((child = gtk_widget_get_first_child (variations_grid)))
    gtk_grid_remove (GTK_GRID (variations_grid), child);

--- a/demos/gtk-demo/fontify.c
+++ b/demos/gtk-demo/fontify.c
@@ -501,7 +501,7 @@ fontify (const char    *format,
  char *theme;
  gboolean prefer_dark;
  const char *style_arg;
-  char *text;
+  const char *text;
  GtkTextIter start, end;
  GBytes *bytes;
  GError *error = NULL;
@@ -553,7 +553,7 @@ fontify (const char    *format,

  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
  text = gtk_text_buffer_get_text (source_buffer, &start, &end, TRUE);
-  bytes = g_bytes_new_take (text, strlen (text));
+  bytes = g_bytes_new_static (text, strlen (text));

 #ifdef HAVE_GIO_UNIX
  /* Work around https://gitlab.gnome.org/GNOME/glib/-/issues/2182 */
@@ -570,5 +570,4 @@ fontify (const char    *format,
                                  NULL,
                                  fontify_finish,
                                  g_object_ref (source_buffer));
-  g_bytes_unref (bytes);
 }
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -1,4 +1,4 @@
-/* Pango/Font Rendering
+/* Pango/Font rendering
 *
 * Demonstrates various aspects of font rendering.
 */
--- a/demos/gtk-demo/frames.c
+++ b/demos/gtk-demo/frames.c
@@ -1,165 +0,0 @@
-/* Benchmark/Frames
- *
- * This demo is intentionally as simple as possible, to see what
- * framerate the windowing system can deliver on its own.
- *
- * It does nothing but change the drawn color, for every frame.
- */
-
-#include <gtk/gtk.h>
-
-typedef struct
-{
-  GtkWidget parent_instance;
-
-  GdkRGBA color1;
-  GdkRGBA color2;
-  guint64 time2;
-  float t;
-
-  guint tick_cb;
-} ColorWidget;
-
-typedef struct
-{
-  GtkWidgetClass parent_class;
-} ColorWidgetClass;
-
-G_DEFINE_TYPE (ColorWidget, color_widget, GTK_TYPE_WIDGET)
-
-#define TIME_SPAN (3.0 * G_TIME_SPAN_SECOND)
-
-static gboolean
-change_color (GtkWidget     *widget,
-              GdkFrameClock *frame_clock,
-              gpointer       data)
-{
-  ColorWidget *color = (ColorWidget *)widget;
-  gint64 time;
-
-  time = gdk_frame_clock_get_frame_time (frame_clock);
-
-  if (time >= color->time2)
-    {
-      color->time2 = time + TIME_SPAN;
-
-      color->color1 = color->color2;
-      color->color2.red = g_random_double_range (0, 1);
-      color->color2.green = g_random_double_range (0, 1);
-      color->color2.blue = g_random_double_range (0, 1);
-      color->color2.alpha = 1;
-    }
-
-  color->t = 1 - (color->time2 - time) / TIME_SPAN;
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-color_widget_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  ColorWidget *color = (ColorWidget *)widget;
-  float w, h;
-  GdkRGBA c;
-
-  w = gtk_widget_get_width (widget);
-  h = gtk_widget_get_height (widget);
-
-  c.red = (1 - color->t) * color->color1.red + color->t * color->color2.red;
-  c.green = (1 - color->t) * color->color1.green + color->t * color->color2.green;
-  c.blue = (1 - color->t) * color->color1.blue + color->t * color->color2.blue;
-  c.alpha = 1;
-
-  gtk_snapshot_append_color (snapshot, &c, &GRAPHENE_RECT_INIT (0, 0, w, h));
-}
-
-static void
-color_widget_init (ColorWidget *color)
-{
-  gtk_widget_add_tick_callback (GTK_WIDGET (color), change_color, NULL, NULL);
-  gtk_widget_set_hexpand (GTK_WIDGET (color), TRUE);
-  gtk_widget_set_vexpand (GTK_WIDGET (color), TRUE);
-}
-
-static void
-color_widget_class_init (ColorWidgetClass *class)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  widget_class->snapshot = color_widget_snapshot;
-}
-
-GtkWidget *
-color_widget_new (void)
-{
-  return g_object_new (color_widget_get_type (), NULL);
-}
-
-static gboolean
-update_fps_label (gpointer data)
-{
-  GtkWidget *label = GTK_WIDGET (data);
-  GdkFrameClock *frame_clock;
-
-  frame_clock = gtk_widget_get_frame_clock (label);
-
-  if (frame_clock)
-    {
-      char *fps;
-
-      fps = g_strdup_printf ("%.2f fps", gdk_frame_clock_get_fps (frame_clock));
-      gtk_label_set_label (GTK_LABEL (label), fps);
-      g_free (fps);
-    }
-  else
-    gtk_label_set_label (GTK_LABEL (label), "");
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-remove_id (gpointer data)
-{
-  guint id = GPOINTER_TO_UINT (data);
-
-  g_source_remove (id);
-}
-
-GtkWidget *
-do_frames (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkBuilder *builder;
-      GtkWidget *box;
-      GtkWidget *label;
-      guint id;
-
-      builder = gtk_builder_new_from_resource ("/frames/frames.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-
-      label = GTK_WIDGET (gtk_builder_get_object (builder, "fps"));
-      box = GTK_WIDGET (gtk_builder_get_object (builder, "box"));
-
-      gtk_box_append (GTK_BOX (box), color_widget_new ());
-
-      id = g_timeout_add (500, update_fps_label, label);
-      g_object_set_data_full (G_OBJECT (label), "tick_cb",
-                              GUINT_TO_POINTER (id), remove_id);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
--- a/demos/gtk-demo/frames.ui
+++ b/demos/gtk-demo/frames.ui
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="resizable">1</property>
-    <property name="default-width">600</property>
-    <property name="default-height">400</property>
-    <property name="title">Frames</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header">
-        <child type="end">
-          <object class="GtkLabel" id="fps">
-            <attributes>
-              <attribute name="font-features" value="tnum=1"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox" id="box">
-      </object>
-    </child>
-  </object>
-</interface>
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -406,7 +406,6 @@ create_glarea_window (GtkWidget *do_widget)
  gl_area = gtk_gl_area_new ();
  gtk_widget_set_hexpand (gl_area, TRUE);
  gtk_widget_set_vexpand (gl_area, TRUE);
-  gtk_widget_set_size_request (gl_area, 100, 200);
  gtk_box_append (GTK_BOX (box), gl_area);

  /* We need to initialize and free GL resources, so we use
--- a/demos/gtk-demo/gltransition.c
+++ b/demos/gtk-demo/gltransition.c
@@ -1,5 +1,5 @@
-/* OpenGL/Transitions and Effects
- * #Keywords: OpenGL, shader, effect
+/* OpenGL/Transitions
+ * #Keywords: OpenGL, shader
 *
 * Create transitions between pages using a custom fragment shader.
 *
@@ -9,8 +9,7 @@
 * The transitions work with arbitrary content. We use images, shaders
 * GL areas and plain old widgets to demonstrate this.
 *
- * The demo also shows some over-the-top effects like wobbly widgets,
- * and animated backgrounds.
+ * The demo also shows some sample fire effects on the buttons.
 */

 #include <math.h>
@@ -86,15 +85,15 @@ clicked_cb (GtkGestureClick *gesture,
 }

 static GtkWidget *
-ripple_bin_new (void)
+fire_bin_new (void)
 {
  GtkWidget *bin = gtk_shader_bin_new ();
  static GskGLShader *shader = NULL;

  if (shader == NULL)
-    shader = gsk_gl_shader_new_from_resource ("/gltransition/ripple.glsl");
+    shader = gsk_gl_shader_new_from_resource ("/gltransition/fire.glsl");

-  gtk_shader_bin_add_shader (GTK_SHADER_BIN (bin), shader, GTK_STATE_FLAG_PRELIGHT, GTK_STATE_FLAG_PRELIGHT, 20);
+  gtk_shader_bin_add_shader (GTK_SHADER_BIN (bin), shader, GTK_STATE_FLAG_PRELIGHT, GTK_STATE_FLAG_PRELIGHT);

  return bin;
 }
@@ -132,7 +131,6 @@ update_paintable (GtkWidget     *widget,
 static GtkWidget *
 make_shader_stack (const char *name,
                   const char *resource_path,
-                   int active_child,
                   GtkWidget  *scale)
 {
  GtkWidget *stack, *child, *widget, *vbox, *hbox, *bin;
@@ -152,7 +150,7 @@ make_shader_stack (const char *name,
  gtk_shader_stack_set_shader (GTK_SHADER_STACK (stack), shader);
  g_object_unref (shader);

-  child = gtk_picture_new_for_resource ("/css_blendmodes/ducky.png");
+  child = gtk_picture_new_for_resource ("/css_pixbufs/background.jpg");
  gtk_picture_set_can_shrink (GTK_PICTURE (child), TRUE);
  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);

@@ -221,8 +219,6 @@ make_shader_stack (const char *name,

  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);

-  gtk_shader_stack_set_active (GTK_SHADER_STACK (stack), active_child);
-
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);

  widget = gtk_center_box_new ();
@@ -249,25 +245,22 @@ make_shader_stack (const char *name,

  gtk_box_append (GTK_BOX (vbox), widget);

-  GtkWidget *bin2 = ripple_bin_new ();
-  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin2), stack);
-
-  gtk_box_append (GTK_BOX (vbox), bin2);
+  gtk_box_append (GTK_BOX (vbox), stack);

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
  gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);

  gtk_box_append (GTK_BOX (vbox), hbox);

-  button = gtk_button_new_from_icon_name ("go-previous-symbolic");
+  button = gtk_button_new_from_icon_name ("go-previous");
  g_signal_connect (button, "clicked", G_CALLBACK (go_back), stack);
-  bin = ripple_bin_new ();
+  bin = fire_bin_new ();
  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin), button);
  gtk_box_append (GTK_BOX (hbox), bin);

-  button = gtk_button_new_from_icon_name ("go-next-symbolic");
+  button = gtk_button_new_from_icon_name ("go-next");
  g_signal_connect (button, "clicked", G_CALLBACK (go_forward), stack);
-  bin = ripple_bin_new ();
+  bin = fire_bin_new ();
  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin), button);
  gtk_box_append (GTK_BOX (hbox), bin);

@@ -277,37 +270,22 @@ make_shader_stack (const char *name,
 static GtkWidget *
 create_gltransition_window (GtkWidget *do_widget)
 {
-  GtkWidget *window, *headerbar, *scale, *outer_grid, *grid, *background;
-  GdkPaintable *paintable;
+  GtkWidget *window, *headerbar, *scale, *grid;

  window = gtk_window_new ();
  gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "Transitions and Effects");
+  gtk_window_set_title (GTK_WINDOW (window), "Transitions");
  headerbar = gtk_header_bar_new ();
  scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
  gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
  gtk_widget_set_size_request (scale, 100, -1);
-  gtk_widget_set_tooltip_text (scale, "Transition duration");
  gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), scale);
  gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

-  outer_grid = gtk_grid_new ();
-  gtk_window_set_child (GTK_WINDOW (window), outer_grid);
-
-  paintable = gsk_shader_paintable_new (gsk_gl_shader_new_from_resource ("/gltransition/background.glsl"), NULL);
-  background = gtk_picture_new_for_paintable (paintable);
-  gtk_widget_add_tick_callback (background, update_paintable, NULL, NULL);
-
-  gtk_grid_attach (GTK_GRID (outer_grid),
-                   background,
-                   0, 0, 1, 1);
-
  grid = gtk_grid_new ();
-  gtk_grid_attach (GTK_GRID (outer_grid),
-                   grid,
-                   0, 0, 1, 1);
+  gtk_window_set_child (GTK_WINDOW (window), grid);

  gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (grid, GTK_ALIGN_CENTER);
@@ -321,16 +299,16 @@ create_gltransition_window (GtkWidget *do_widget)
  gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);

  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Wind", "/gltransition/wind.glsl", 0, scale),
+                   make_shader_stack ("Wind", "/gltransition/transition1.glsl", scale),
                   0, 0, 1, 1);
  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Radial", "/gltransition/radial.glsl", 1, scale),
+                   make_shader_stack ("Radial", "/gltransition/transition2.glsl", scale),
                   1, 0, 1, 1);
  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Crosswarp", "/gltransition/crosswarp.glsl", 2, scale),
+                   make_shader_stack ("Crosswarp", "/gltransition/transition3.glsl", scale),
                   0, 1, 1, 1);
  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Kaleidoscope", "/gltransition/kaleidoscope.glsl", 3, scale),
+                   make_shader_stack ("Kaleidoscope", "/gltransition/transition4.glsl", scale),
                   1, 1, 1, 1);

  return window;
--- a/demos/gtk-demo/gskshaderpaintable.c
+++ b/demos/gtk-demo/gskshaderpaintable.c
@@ -32,7 +32,7 @@
 * that uses a #GskGLShader to create pixels.
 *
 * You can set the uniform data that the shader needs for rendering
- * using gsk_shader_paintable_set_args(). This function can
+ * using gsk_shader_paintable_set_uniform_data(). This function can
 * be called repeatedly to change the uniform data for the next
 * snapshot.
 *
@@ -48,7 +48,7 @@ struct _GskShaderPaintable
  GObject parent_instance;

  GskGLShader *shader;
-  GBytes *args;
+  GBytes *uniform_data;

  gint64 start_time;
 };
@@ -61,7 +61,7 @@ struct _GskShaderPaintableClass
 enum {
  PROP_0,
  PROP_SHADER,
-  PROP_ARGS,
+  PROP_UNIFORM_DATA,

  N_PROPS,
 };
@@ -76,7 +76,7 @@ gsk_shader_paintable_paintable_snapshot (GdkPaintable *paintable,
 {
  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (paintable);

-  gtk_snapshot_push_gl_shader (snapshot, self->shader, &GRAPHENE_RECT_INIT(0, 0, width, height), g_bytes_ref (self->args));
+  gtk_snapshot_push_gl_shader (snapshot, self->shader, &GRAPHENE_RECT_INIT(0, 0, width, height), g_bytes_ref (self->uniform_data));
  gtk_snapshot_pop (snapshot);
 }

@@ -105,8 +105,8 @@ gsk_shader_paintable_set_property (GObject      *object,
      gsk_shader_paintable_set_shader (self, g_value_get_object (value));
      break;

-    case PROP_ARGS:
-      gsk_shader_paintable_set_args (self, g_value_get_boxed (value));
+    case PROP_UNIFORM_DATA:
+      gsk_shader_paintable_set_uniform_data (self, g_value_get_boxed (value));
      break;

    default:
@@ -129,8 +129,8 @@ gsk_shader_paintable_get_property (GObject    *object,
      g_value_set_object (value, self->shader);
      break;

-    case PROP_ARGS:
-      g_value_set_boxed (value, self->args);
+    case PROP_UNIFORM_DATA:
+      g_value_set_boxed (value, self->uniform_data);
      break;

    default:
@@ -144,7 +144,7 @@ gsk_shader_paintable_finalize (GObject *object)
 {
  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (object);

-  g_clear_pointer (&self->args, g_bytes_unref);
+  g_clear_pointer (&self->uniform_data, g_bytes_unref);
  g_clear_object (&self->shader);

  G_OBJECT_CLASS (gsk_shader_paintable_parent_class)->finalize (object);
@@ -164,8 +164,8 @@ gsk_shader_paintable_class_init (GskShaderPaintableClass *klass)
                         GSK_TYPE_GL_SHADER,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

-  properties[PROP_ARGS] =
-    g_param_spec_boxed ("args", "Arguments", "The uniform arguments",
+  properties[PROP_UNIFORM_DATA] =
+    g_param_spec_boxed ("uniform-data", "Uniform data", "The uniform data",
                        G_TYPE_BYTES,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

@@ -204,7 +204,7 @@ gsk_shader_paintable_new (GskGLShader *shader,

  ret = g_object_new (GSK_TYPE_SHADER_PAINTABLE,
                      "shader", shader,
-                      "args", data,
+                      "uniform-data", data,
                      NULL);

  g_clear_object (&shader);
@@ -228,7 +228,7 @@ gsk_shader_paintable_set_shader (GskShaderPaintable *self,
 {
  g_return_if_fail (GSK_IS_SHADER_PAINTABLE (self));
  g_return_if_fail (shader == NULL || GSK_IS_GL_SHADER (shader));
-  g_return_if_fail (shader == NULL || gsk_gl_shader_get_n_textures (shader) == 0);
+  g_return_if_fail (shader == NULL || gsk_gl_shader_get_n_required_textures (shader) == 0);

  if (!g_set_object (&self->shader, shader))
    return;
@@ -236,7 +236,7 @@ gsk_shader_paintable_set_shader (GskShaderPaintable *self,
  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SHADER]);
  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));

-  g_clear_pointer (&self->args, g_bytes_unref);
+  g_clear_pointer (&self->uniform_data, g_bytes_unref);
 }

 /**
@@ -256,7 +256,7 @@ gsk_shader_paintable_get_shader (GskShaderPaintable *self)
 }

 /**
- * gsk_shader_paintable_set_args:
+ * gsk_shader_paintable_set_uniform_data:
 * @self: a #GskShaderPaintable
 * @data: Data block with uniform data for the shader
 *
@@ -268,35 +268,35 @@ gsk_shader_paintable_get_shader (GskShaderPaintable *self)
 * after it has been passed to this function.
 */
 void
-gsk_shader_paintable_set_args (GskShaderPaintable *self,
+gsk_shader_paintable_set_uniform_data (GskShaderPaintable *self,
                                       GBytes             *data)
 {
  g_return_if_fail (GSK_IS_SHADER_PAINTABLE (self));
  g_return_if_fail (data == NULL || g_bytes_get_size (data) == gsk_gl_shader_get_args_size (self->shader));

-  g_clear_pointer (&self->args, g_bytes_unref);
+  g_clear_pointer (&self->uniform_data, g_bytes_unref);
  if (data)
-    self->args = g_bytes_ref (data);
+    self->uniform_data = g_bytes_ref (data);

-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ARGS]);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UNIFORM_DATA]);
  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
 }

 /**
- * gsk_shader_paintable_get_args:
+ * gsk_shader_paintable_get_uniform_data:
 * @self: a #GskShaderPaintable
 *
 * Returns the uniform data set with
- * gsk_shader_paintable_get_args().
+ * gsk_shader_paintable_get_uniform_data().
 *
 * Returns: (transfer none): the uniform data
 */
 GBytes *
-gsk_shader_paintable_get_args (GskShaderPaintable *self)
+gsk_shader_paintable_get_uniform_data (GskShaderPaintable *self)
 {
  g_return_val_if_fail (GSK_IS_SHADER_PAINTABLE (self), NULL);

-  return self->args;
+  return self->uniform_data;
 }

 /**
@@ -306,7 +306,7 @@ gsk_shader_paintable_get_args (GskShaderPaintable *self)
 * @frame_time: the current frame time, as returned by #GdkFrameClock
 *
 * This function is a convenience wrapper for
- * gsk_shader_paintable_set_args() that leaves all
+ * gsk_shader_paintable_set_uniform_data() that leaves all
 * uniform values unchanged, except for the uniform with
 * index @time_idx, which will be set to the elapsed time
 * in seconds, since the first call to this function.
@@ -318,20 +318,27 @@ gsk_shader_paintable_update_time (GskShaderPaintable *self,
                                  int                 time_idx,
                                  gint64              frame_time)
 {
-  GskShaderArgsBuilder *builder;
-  GBytes *args;
+  int size;
+  int offset;
+  guchar *data;
  float time;
+  GBytes *uniform_data;
+
+  size = gsk_gl_shader_get_args_size (self->shader);
+  offset = gsk_gl_shader_get_uniform_offset (self->shader, time_idx);
+
+  data = g_new0 (guchar, size);
+  memcpy (data, g_bytes_get_data (self->uniform_data, NULL), size);

  if (self->start_time == 0)
    self->start_time = frame_time;

  time = (frame_time - self->start_time) / (float)G_TIME_SPAN_SECOND;
+  *(float*)(data + offset) = time;

-  builder = gsk_shader_args_builder_new (self->shader, self->args);
-  gsk_shader_args_builder_set_float (builder, time_idx, time);
-  args = gsk_shader_args_builder_free_to_args (builder);
+  uniform_data = g_bytes_new_take (data, size);

-  gsk_shader_paintable_set_args (self, args);
+  gsk_shader_paintable_set_uniform_data (self, uniform_data);

-  g_bytes_unref (args);
+  g_bytes_unref (uniform_data);
 }
--- a/demos/gtk-demo/gskshaderpaintable.h
+++ b/demos/gtk-demo/gskshaderpaintable.h
@@ -40,9 +40,9 @@ GDK_AVAILABLE_IN_ALL
 void             gsk_shader_paintable_set_shader       (GskShaderPaintable *self,
                                                        GskGLShader        *shader);
 GDK_AVAILABLE_IN_ALL
-GBytes *         gsk_shader_paintable_get_args         (GskShaderPaintable *self);
+GBytes *         gsk_shader_paintable_get_uniform_data (GskShaderPaintable *self);
 GDK_AVAILABLE_IN_ALL
-void             gsk_shader_paintable_set_args         (GskShaderPaintable *self,
+void             gsk_shader_paintable_set_uniform_data (GskShaderPaintable *self,
                                                        GBytes             *data);
 GDK_AVAILABLE_IN_ALL
 void             gsk_shader_paintable_update_time      (GskShaderPaintable *self,
--- a/demos/gtk-demo/gtkfishbowl.c
+++ b/demos/gtk-demo/gtkfishbowl.c
@@ -179,9 +179,6 @@ gtk_fishbowl_add (GtkFishbowl *fishbowl,
  child_info->dy = new_speed ();

  gtk_widget_set_parent (widget, GTK_WIDGET (fishbowl));
-  gtk_accessible_update_state (GTK_ACCESSIBLE (widget),
-                               GTK_ACCESSIBLE_STATE_HIDDEN, TRUE,
-                               -1);

  g_hash_table_insert (priv->children, widget, child_info);
  priv->count++;
@@ -345,8 +342,6 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                          G_PARAM_READWRITE);

  g_object_class_install_properties (object_class, NUM_PROPERTIES, props);
-
-  gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_PRESENTATION);
 }

 guint
--- a/demos/gtk-demo/gtkgears.c
+++ b/demos/gtk-demo/gtkgears.c
@@ -764,7 +764,7 @@ gtk_gears_realize (GtkWidget *widget)
  glShaderSource(v, 1, &p, NULL);
  glCompileShader(v);
  glGetShaderInfoLog(v, sizeof msg, NULL, msg);
-  g_debug ("vertex shader info: %s\n", msg);
+  g_print ("vertex shader info: %s\n", msg);

  /* Compile the fragment shader */
  if (gdk_gl_context_get_use_es (context))
@@ -775,7 +775,7 @@ gtk_gears_realize (GtkWidget *widget)
  glShaderSource(f, 1, &p, NULL);
  glCompileShader(f);
  glGetShaderInfoLog(f, sizeof msg, NULL, msg);
-  g_debug ("fragment shader info: %s\n", msg);
+  g_print ("fragment shader info: %s\n", msg);

  /* Create and link the shader program */
  program = glCreateProgram();
@@ -786,9 +786,7 @@ gtk_gears_realize (GtkWidget *widget)

  glLinkProgram(program);
  glGetProgramInfoLog(program, sizeof msg, NULL, msg);
-  g_debug ("program info: %s\n", msg);
-  glDetachShader (program, v);
-  glDetachShader (program, f);
+  g_print ("program info: %s\n", msg);
  glDeleteShader (v);
  glDeleteShader (f);

--- a/demos/gtk-demo/gtkshaderbin.c
+++ b/demos/gtk-demo/gtkshaderbin.c
@@ -4,7 +4,6 @@ typedef struct {
  GskGLShader *shader;
  GtkStateFlags state;
  GtkStateFlags state_mask;
-  float extra_border;
  gboolean compiled;
  gboolean compiled_ok;
 } ShaderInfo;
@@ -17,7 +16,6 @@ struct _GtkShaderBin
  GPtrArray *shaders;
  guint tick_id;
  float time;
-  float mouse_x, mouse_y;
  gint64 first_frame_time;
 };

@@ -73,25 +71,10 @@ gtk_shader_bin_tick (GtkWidget     *widget,
  return G_SOURCE_CONTINUE;
 }

-static void
-motion_cb (GtkEventControllerMotion *controller,
-           double                    x,
-           double                    y,
-           GtkShaderBin             *self)
-{
-  self->mouse_x = x;
-  self->mouse_y = y;
-}
-
 static void
 gtk_shader_bin_init (GtkShaderBin *self)
 {
-  GtkEventController *controller;
  self->shaders = g_ptr_array_new_with_free_func ((GDestroyNotify)shader_info_free);
-
-  controller = gtk_event_controller_motion_new ();
-  g_signal_connect (controller, "motion", G_CALLBACK (motion_cb), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
 }

 void
@@ -149,14 +132,12 @@ void
 gtk_shader_bin_add_shader (GtkShaderBin *self,
                           GskGLShader  *shader,
                           GtkStateFlags state,
-                           GtkStateFlags state_mask,
-                           float         extra_border)
+                           GtkStateFlags state_mask)
 {
  ShaderInfo *info = g_new0 (ShaderInfo, 1);
  info->shader = g_object_ref (shader);
  info->state = state;
  info->state_mask = state_mask;
-  info->extra_border = extra_border;

  g_ptr_array_add (self->shaders, info);

@@ -206,8 +187,8 @@ gtk_shader_bin_snapshot (GtkWidget   *widget,

          self->active_shader->compiled = TRUE;
          self->active_shader->compiled_ok =
-            gsk_gl_shader_compile (self->active_shader->shader,
-                                   renderer, &error);
+            gsk_gl_shader_try_compile_for (self->active_shader->shader,
+                                           renderer, &error);
          if (!self->active_shader->compiled_ok)
            {
              g_warning ("GtkShaderBin failed to compile shader: %s", error->message);
@@ -217,14 +198,10 @@ gtk_shader_bin_snapshot (GtkWidget   *widget,

      if (self->active_shader->compiled_ok)
        {
-          float border = self->active_shader->extra_border;
-          graphene_vec2_t mouse;
-          graphene_vec2_init (&mouse, self->mouse_x + border, self->mouse_y + border);
          gtk_snapshot_push_gl_shader (snapshot, self->active_shader->shader,
-                                       &GRAPHENE_RECT_INIT(-border, -border, width+2*border, height+2*border),
+                                       &GRAPHENE_RECT_INIT(0, 0, width, height),
                                       gsk_gl_shader_format_args (self->active_shader->shader,
                                                                  "u_time", self->time,
-                                                                  "u_mouse", &mouse,
                                                                  NULL));
          gtk_widget_snapshot_child (widget, self->child, snapshot);
          gtk_snapshot_gl_shader_pop_texture (snapshot);
--- a/demos/gtk-demo/gtkshaderbin.h
+++ b/demos/gtk-demo/gtkshaderbin.h
@@ -12,8 +12,7 @@ GtkWidget  *gtk_shader_bin_new        (void);
 void        gtk_shader_bin_add_shader (GtkShaderBin *self,
                                       GskGLShader  *shader,
                                       GtkStateFlags state,
-                                       GtkStateFlags state_mask,
-                                       float         extra_border);
+                                       GtkStateFlags state_mask);
 void       gtk_shader_bin_set_child   (GtkShaderBin *self,
                                       GtkWidget    *child);
 GtkWidget *gtk_shader_bin_get_child   (GtkShaderBin *self);
--- a/demos/gtk-demo/gtkshaderstack.c
+++ b/demos/gtk-demo/gtkshaderstack.c
@@ -238,7 +238,8 @@ gtk_shader_stack_snapshot (GtkWidget   *widget,
          progress = 1. - progress;
        }

-      if (gsk_gl_shader_compile (self->shader, renderer, NULL))
+      if (gsk_gl_shader_try_compile_for (self->shader,
+                                         renderer, NULL))
        {
          gtk_snapshot_push_gl_shader (snapshot,
                                       self->shader,
@@ -350,12 +351,3 @@ gtk_shader_stack_add_child (GtkShaderStack *self,
  else
    gtk_widget_set_child_visible (child, FALSE);
 }
-
-void
-gtk_shader_stack_set_active (GtkShaderStack *self,
-                             int             index)
-{
-  stop_transition (self);
-  self->current = MIN (index, self->children->len);
-  update_child_visible (self);
-}
--- a/demos/gtk-demo/gtkshaderstack.h
+++ b/demos/gtk-demo/gtkshaderstack.h
@@ -14,9 +14,7 @@ void        gtk_shader_stack_set_shader   (GtkShaderStack *self,
 void        gtk_shader_stack_add_child    (GtkShaderStack *self,
                                           GtkWidget      *child);
 void        gtk_shader_stack_transition   (GtkShaderStack *self,
-                                           gboolean        forward);
-void        gtk_shader_stack_set_active   (GtkShaderStack *self,
-                                           int             index);
+                                           gboolean       forward);

 G_END_DECLS

--- a/demos/gtk-demo/iconscroll.c
+++ b/demos/gtk-demo/iconscroll.c
@@ -13,7 +13,7 @@ static GtkWidget *window = NULL;
 static GtkWidget *scrolledwindow;
 static int selected;

-#define N_WIDGET_TYPES 8
+#define N_WIDGET_TYPES 6


 static int hincrement = 5;
@@ -110,41 +110,6 @@ populate_text (gboolean highlight)
  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), textview);
 }

-static void
-populate_emoji_text (void)
-{
-  GtkWidget *textview;
-  GtkTextBuffer *buffer;
-  GString *s;
-
-  s = g_string_sized_new (1000 * 30 * 4);
-
-  for (int i = 0; i < 1000; i++)
-    {
-      if (i % 2)
-        g_string_append (s, "x");
-      for (int j = 0; j < 30; j++)
-        g_string_append (s, "💓x");
-      g_string_append (s, "\n");
-    }
-
-  buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_set_text (buffer, s->str, s->len);
-
-  g_string_free (s, TRUE);
-
-  textview = gtk_text_view_new ();
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
-
-  hincrement = 0;
-  vincrement = 5;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), textview);
-}
-
 static void
 populate_image (void)
 {
@@ -212,24 +177,6 @@ populate_grid (void)
  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), list);
 }

-extern GtkWidget *create_ucd_view (GtkWidget *label);
-
-static void
-populate_list2 (void)
-{
-  GtkWidget *list;
-
-  list = create_ucd_view (NULL);
-
-  hincrement = 0;
-  vincrement = 5;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), list);
-}
-
 static void
 set_widget_type (int type)
 {
@@ -259,26 +206,16 @@ set_widget_type (int type)
      break;

    case 3:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling text with Emoji");
-      populate_emoji_text ();
-      break;
-
-    case 4:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a big image");
      populate_image ();
      break;

-    case 5:
+    case 4:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a list");
      populate_list ();
      break;

-    case 6:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a columned list");
-      populate_list2 ();
-      break;
-
-    case 7:
+    case 5:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a grid");
      populate_grid ();
      break;
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -17,7 +17,6 @@
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
-#include "pixbufpaintable.h"

 static GtkWidget *window = NULL;
 static GdkPixbufLoader *pixbuf_loader = NULL;
@@ -57,7 +56,6 @@ progressive_updated_callback (GdkPixbufLoader *loader,
  picture = GTK_WIDGET (data);

  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-  gtk_picture_set_pixbuf (GTK_PICTURE (picture), NULL);
  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
 }

@@ -264,7 +262,7 @@ start_progressive_loading (GtkWidget *picture)
   * The timeout simply simulates a slow data source by inserting
   * pauses in the reading process.
   */
-  load_timeout = g_timeout_add (300, progressive_timeout, picture);
+  load_timeout = g_timeout_add (1500, progressive_timeout, picture);
  g_source_set_name_by_id (load_timeout, "[gtk] progressive_timeout");
 }

@@ -347,8 +345,9 @@ do_images (GtkWidget *do_widget)
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_box_append (GTK_BOX (hbox), vbox);

-      label = gtk_label_new ("Image from a resource");
-      gtk_widget_add_css_class (label, "heading");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "<u>Image loaded from a file</u>");
      gtk_box_append (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
@@ -356,7 +355,7 @@ do_images (GtkWidget *do_widget)
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
      gtk_box_append (GTK_BOX (vbox), frame);

-      image = gtk_image_new_from_resource ("/images/org.gtk.Demo4.svg");
+      image = gtk_image_new_from_icon_name ("gtk3-demo");
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);

      gtk_frame_set_child (GTK_FRAME (frame), image);
@@ -364,8 +363,9 @@ do_images (GtkWidget *do_widget)

      /* Animation */

-      label = gtk_label_new ("Animation from a resource");
-      gtk_widget_add_css_class (label, "heading");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "<u>Animation loaded from a file</u>");
      gtk_box_append (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
@@ -373,16 +373,15 @@ do_images (GtkWidget *do_widget)
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
      gtk_box_append (GTK_BOX (vbox), frame);

-      paintable = pixbuf_paintable_new_from_resource ("/images/floppybuddy.gif");
-      picture = gtk_picture_new_for_paintable (paintable);
-      g_object_unref (paintable);
+      picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");

      gtk_frame_set_child (GTK_FRAME (frame), picture);

      /* Symbolic icon */

-      label = gtk_label_new ("Symbolic themed icon");
-      gtk_widget_add_css_class (label, "heading");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "<u>Symbolic themed icon</u>");
      gtk_box_append (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
@@ -401,8 +400,9 @@ do_images (GtkWidget *do_widget)
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_box_append (GTK_BOX (hbox), vbox);

-      label = gtk_label_new ("Progressive image loading");
-      gtk_widget_add_css_class (label, "heading");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "<u>Progressive image loading</u>");
      gtk_box_append (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
@@ -414,7 +414,6 @@ do_images (GtkWidget *do_widget)
       * will create the pixbuf and fill it in.
       */
      picture = gtk_picture_new ();
-      gtk_picture_set_alternative_text (GTK_PICTURE (picture), "A slowly loading image");
      gtk_frame_set_child (GTK_FRAME (frame), picture);

      start_progressive_loading (picture);
@@ -423,8 +422,9 @@ do_images (GtkWidget *do_widget)
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_box_append (GTK_BOX (hbox), vbox);

-      label = gtk_label_new ("Displaying video");
-      gtk_widget_add_css_class (label, "heading");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "<u>Displaying video</u>");
      gtk_box_append (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
@@ -440,8 +440,9 @@ do_images (GtkWidget *do_widget)
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_box_append (GTK_BOX (hbox), vbox);

-      label = gtk_label_new ("GtkWidgetPaintable");
-      gtk_widget_add_css_class (label, "heading");
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "<u>GtkWidgetPaintable</u>");
      gtk_box_append (GTK_BOX (vbox), label);

      paintable = gtk_widget_paintable_new (do_widget);
--- a/demos/gtk-demo/layoutmanager.c
+++ b/demos/gtk-demo/layoutmanager.c
@@ -34,7 +34,7 @@ do_layoutmanager (GtkWidget *parent)
      int i;

      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager — Transition");
+      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager—Transition");
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 600);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

--- a/demos/gtk-demo/layoutmanager2.c
+++ b/demos/gtk-demo/layoutmanager2.c
@@ -170,7 +170,7 @@ do_layoutmanager2 (GtkWidget *parent)
      int i;

      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager — Transformation");
+      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager—Transformation");
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 620);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -1,4 +1,4 @@
-/* List Box/Complex
+/* List Box/Complex list
 *
 * GtkListBox allows lists with complicated layouts, using
 * regular widgets supporting sorting and filtering.
@@ -197,7 +197,7 @@ gtk_message_row_update (GtkMessageRow *row)

  if (strcmp (priv->message->sender_nick, "@GTKtoolkit") == 0)
    {
-      gtk_image_set_from_icon_name (priv->avatar_image, "org.gtk.Demo4");
+      gtk_image_set_from_icon_name (priv->avatar_image, "gtk3-demo");
      gtk_image_set_icon_size (priv->avatar_image, GTK_ICON_SIZE_LARGE);
    }
  else
@@ -349,7 +349,7 @@ do_listbox (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "List Box — Complex");
+      gtk_window_set_title (GTK_WINDOW (window), "List Box");
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

--- a/demos/gtk-demo/listbox_controls.c
+++ b/demos/gtk-demo/listbox_controls.c
@@ -34,7 +34,7 @@ row_activated (GtkListBox    *list,
 }

 GtkWidget *
-do_listbox_controls (GtkWidget *do_widget)
+do_listbox2 (GtkWidget *do_widget)
 {
  if (!window)
    {
@@ -47,7 +47,7 @@ do_listbox_controls (GtkWidget *do_widget)
      builder = gtk_builder_new ();
      gtk_builder_set_scope (builder, scope);

-      gtk_builder_add_from_resource (builder, "/listbox_controls/listbox_controls.ui", NULL);
+      gtk_builder_add_from_resource (builder, "/listbox2/listbox2.ui", NULL);

      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      gtk_window_set_display (GTK_WINDOW (window),
--- a/demos/gtk-demo/listbox_controls.ui
+++ b/demos/gtk-demo/listbox_controls.ui
--- a/demos/gtk-demo/listview_applauncher.c
+++ b/demos/gtk-demo/listview_applauncher.c
@@ -39,7 +39,7 @@ create_application_list (void)
 }

 /* This is the function we use for setting up new listitems to display.
- * We add just an #GtkImage and a #GtkLabel here to display the application's
+ * We add just an #GtkImage and a #GtkKabel here to display the application's
 * icon and name, as this is just a simple demo.
 */
 static void
--- a/demos/gtk-demo/listview_ucd.c
+++ b/demos/gtk-demo/listview_ucd.c
@@ -1,382 +0,0 @@
-/* Lists/Characters
- *
- * This demo shows a multi-column representation of some parts
- * of the Unicode Character Database, or UCD.
- *
- * The dataset used here has 33 796 items.
- */
-
-#include <gtk/gtk.h>
-#include "script-names.h"
-#include "unicode-names.h"
-
-
-#define UCD_TYPE_ITEM (ucd_item_get_type ())
-G_DECLARE_FINAL_TYPE (UcdItem, ucd_item, UCD, ITEM, GObject)
-
-struct _UcdItem
-{
-  GObject parent_instance;
-  gunichar codepoint;
-  const char *name;
-};
-
-struct _UcdItemClass
-{
-  GObjectClass parent_class;
-};
-
-G_DEFINE_TYPE (UcdItem, ucd_item, G_TYPE_OBJECT)
-
-static void
-ucd_item_init (UcdItem *item)
-{
-}
-
-static void
-ucd_item_class_init (UcdItemClass *class)
-{
-}
-
-static UcdItem *
-ucd_item_new (gunichar    codepoint,
-              const char *name)
-{
-  UcdItem *item;
-
-  item = g_object_new (UCD_TYPE_ITEM, NULL);
-
-  item->codepoint = codepoint;
-  item->name = name;
-
-  return item;
-}
-
-static gunichar
-ucd_item_get_codepoint (UcdItem *item)
-{
-  return item->codepoint;
-}
-
-static const char *
-ucd_item_get_name (UcdItem *item)
-{
-  return item->name;
-}
-
-static GListModel *
-ucd_model_new (void)
-{
-  GBytes *bytes;
-  GVariant *v;
-  GVariantIter *iter;
-  GListStore *store;
-  guint u;
-  char *name;
-
-  bytes = g_resources_lookup_data ("/listview_ucd_data/ucdnames.data", 0, NULL);
-  v = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(us)"), bytes, TRUE));
-
-  iter = g_variant_iter_new (v);
-
-  store = g_list_store_new (G_TYPE_OBJECT);
-  while (g_variant_iter_next (iter, "(u&s)", &u, &name))
-    {
-      if (u == 0)
-        continue;
-
-      UcdItem *item = ucd_item_new (u, name);
-      g_list_store_append (store, item);
-      g_object_unref (item);
-    }
-
-  g_variant_iter_free (iter);
-  g_variant_unref (v);
-  g_bytes_unref (bytes);
-
-  return G_LIST_MODEL (store);
-}
-
-static void
-setup_centered_label (GtkSignalListItemFactory *factory,
-                      GObject                  *listitem)
-{
-  GtkWidget *label;
-  label = gtk_label_new ("");
-  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
-}
-
-static void
-setup_label (GtkSignalListItemFactory *factory,
-             GObject                  *listitem)
-{
-  GtkWidget *label;
-  label = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
-}
-
-static void
-setup_ellipsizing_label (GtkSignalListItemFactory *factory,
-                         GObject                  *listitem)
-{
-  GtkWidget *label;
-  label = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
-  gtk_label_set_width_chars (GTK_LABEL (label), 20);
-  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
-}
-
-static void
-bind_codepoint (GtkSignalListItemFactory *factory,
-                GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-  char buffer[16] = { 0, };
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  g_snprintf (buffer, 10, "%#06x", codepoint);
-  gtk_label_set_label (GTK_LABEL (label), buffer);
-}
-
-static void
-bind_char (GtkSignalListItemFactory *factory,
-           GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-  char buffer[16] = { 0, };
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  if (g_unichar_isprint (codepoint))
-    g_unichar_to_utf8 (codepoint, buffer);
-
-  gtk_label_set_label (GTK_LABEL (label), buffer);
-}
-
-static void
-bind_name (GtkSignalListItemFactory *factory,
-           GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  const char *name;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  name = ucd_item_get_name (UCD_ITEM (item));
-
-  gtk_label_set_label (GTK_LABEL (label), name);
-}
-
-static void
-bind_type (GtkSignalListItemFactory *factory,
-           GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  gtk_label_set_label (GTK_LABEL (label), get_unicode_type_name (g_unichar_type (codepoint)));
-}
-
-static void
-bind_break_type (GtkSignalListItemFactory *factory,
-                 GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  gtk_label_set_label (GTK_LABEL (label), get_break_type_name (g_unichar_break_type (codepoint)));
-}
-
-static void
-bind_combining_class (GtkSignalListItemFactory *factory,
-                      GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-
-  gtk_label_set_label (GTK_LABEL (label), get_combining_class_name (g_unichar_combining_class (codepoint)));
-}
-
-static void
-bind_script (GtkSignalListItemFactory *factory,
-             GObject                  *listitem)
-{
-  GtkWidget *label;
-  GObject *item;
-  gunichar codepoint;
-  GUnicodeScript script;
-
-  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
-  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
-  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
-  script = g_unichar_get_script (codepoint);
-
-  gtk_label_set_label (GTK_LABEL (label), get_script_name (script));
-}
-
-static void
-selection_changed (GObject    *object,
-                   GParamSpec *pspec,
-                   GtkWidget  *label)
-{
-  UcdItem *item;
-  guint codepoint;
-  char buffer[16] = { 0, };
-
-  item = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (object));
-  codepoint = ucd_item_get_codepoint (item);
-
-  if (g_unichar_isprint (codepoint))
-    g_unichar_to_utf8 (codepoint, buffer);
-
-  gtk_label_set_label (GTK_LABEL (label), buffer);
-}
-
-GtkWidget *
-create_ucd_view (GtkWidget *label)
-{
-  GtkWidget *cv;
-  GListModel *ucd_model;
-  GtkSingleSelection *selection;
-  GtkListItemFactory *factory;
-  GtkColumnViewColumn *column;
-
-  ucd_model = ucd_model_new ();
-
-  selection = gtk_single_selection_new (ucd_model);
-  gtk_single_selection_set_autoselect (selection, TRUE);
-  gtk_single_selection_set_can_unselect (selection, FALSE);
-  if (label)
-    g_signal_connect (selection, "notify::selected", G_CALLBACK (selection_changed), label);
-
-  cv = gtk_column_view_new (GTK_SELECTION_MODEL (selection));
-  gtk_column_view_set_show_column_separators (GTK_COLUMN_VIEW (cv), TRUE);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_centered_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_codepoint), NULL);
-  column = gtk_column_view_column_new ("Codepoint", factory);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-  g_object_unref (column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_centered_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_char), NULL);
-  column = gtk_column_view_column_new ("Char", factory);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-  g_object_unref (column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_ellipsizing_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_name), NULL);
-  column = gtk_column_view_column_new ("Name", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-  g_object_unref (column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_ellipsizing_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_type), NULL);
-  column = gtk_column_view_column_new ("Type", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-  g_object_unref (column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_ellipsizing_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_break_type), NULL);
-  column = gtk_column_view_column_new ("Break Type", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-  g_object_unref (column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_combining_class), NULL);
-  column = gtk_column_view_column_new ("Combining Class", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-  g_object_unref (column);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_label), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (bind_script), NULL);
-  column = gtk_column_view_column_new ("Script", factory);
-  gtk_column_view_column_set_resizable (column, TRUE);
-  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
-  g_object_unref (column);
-
-  return cv;
-}
-
-static GtkWidget *window;
-
-GtkWidget *
-do_listview_ucd (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *listview, *sw;
-      GtkWidget *box, *label;
-      GtkCssProvider *provider;
-
-      window = gtk_window_new ();
-      gtk_window_set_default_size (GTK_WINDOW (window), 800, 400);
-      gtk_window_set_title (GTK_WINDOW (window), "Characters");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      label = gtk_label_new ("");
-      gtk_label_set_width_chars (GTK_LABEL (label), 2);
-      gtk_widget_add_css_class (label, "enormous");
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, "label.enormous { font-size: 80px; }", -1);
-      gtk_style_context_add_provider (gtk_widget_get_style_context (label), GTK_STYLE_PROVIDER (provider), 800);
-      gtk_widget_set_hexpand (label, TRUE);
-      gtk_box_append (GTK_BOX (box), label);
-
-      sw = gtk_scrolled_window_new ();
-      gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (sw), TRUE);
-      listview = create_ucd_view (label);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
-      gtk_box_prepend (GTK_BOX (box), sw);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
-
--- a/demos/gtk-demo/listview_words.c
+++ b/demos/gtk-demo/listview_words.c
@@ -142,39 +142,16 @@ load_file (GtkStringList *list,
 }

 static void
-open_response_cb (GtkNativeDialog *dialog,
-                  int              response,
-                  GtkStringList   *stringlist)
+file_selected_cb (GtkWidget     *button,
+                  GtkStringList *stringlist)
 {
-  gtk_native_dialog_hide (dialog);
+  GFile *file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (button));

-  if (response == GTK_RESPONSE_ACCEPT)
+  if (file)
    {
-      GFile *file;
-
-      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
      load_file (stringlist, file);
      g_object_unref (file);
    }
-
-  gtk_native_dialog_destroy (dialog);
-}
-
-static void
-file_open_cb (GtkWidget     *button,
-              GtkStringList *stringlist)
-{
-  GtkFileChooserNative *dialog;
-
-  dialog = gtk_file_chooser_native_new ("Open file",
-                                        GTK_WINDOW (gtk_widget_get_root (button)),
-                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Load",
-                                        "_Cancel");
-  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
-
-  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), stringlist);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
 }

 GtkWidget *
@@ -212,8 +189,8 @@ do_listview_words (GtkWidget *do_widget)

      header = gtk_header_bar_new ();
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      open_button = gtk_button_new_with_mnemonic ("_Open");
-      g_signal_connect (open_button, "clicked", G_CALLBACK (file_open_cb), stringlist);
+      open_button = gtk_file_chooser_button_new ("_Open", GTK_FILE_CHOOSER_ACTION_OPEN);
+      g_signal_connect (open_button, "file-set", G_CALLBACK (file_selected_cb), stringlist);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), open_button);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);

--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -25,8 +25,6 @@
 #include "demos.h"
 #include "fontify.h"

-#include "demo_conf.h"
-
 static GtkWidget *info_view;
 static GtkWidget *source_view;

@@ -198,20 +196,16 @@ activate_about (GSimpleAction *action,
                          gtk_get_micro_version ());
  g_string_append_printf (s, "\nA link can appear here: <http://www.gtk.org>");

-  version = g_strdup_printf ("%s%s%s\nRunning against GTK %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                             PACKAGE_VERSION,
-                             g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-                             g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "",
                             gtk_get_major_version (),
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());

  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", g_strcmp0 (PROFILE, "devel") == 0
-                                         ? "GTK Demo (Development)"
-                                         : "GTK Demo",
+                         "program-name", "GTK Demo",
                         "version", version,
-                         "copyright", "© 1997—2021 The GTK Team",
+                         "copyright", "© 1997—2020 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK widgets",
@@ -343,8 +337,8 @@ display_text (const char  *format,

  bytes = g_resources_lookup_data (resource, 0, NULL);
  g_assert (bytes);
-  text = g_bytes_get_data (bytes, &len);
-  g_assert (g_utf8_validate (text, len, NULL));
+
+  g_assert (g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL));

  textview = gtk_text_view_new ();
  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (textview), 20);
@@ -360,8 +354,9 @@ display_text (const char  *format,
  gtk_text_view_set_monospace (GTK_TEXT_VIEW (textview), TRUE);

  buffer = gtk_text_buffer_new (NULL);
+
+  text = g_bytes_unref_to_data (bytes, &len);
  gtk_text_buffer_set_text (buffer, text, len);
-  g_bytes_unref (bytes);

  if (format)
    fontify (format, buffer);
@@ -396,7 +391,7 @@ display_nothing (const char *resource)
  GtkWidget *widget;
  char *str;

-  str = g_strdup_printf ("The contents of the resource at '%s' cannot be displayed", resource);
+  str = g_strdup_printf ("The lazy GTK developers forgot to add a way to display the resource '%s'", resource);
  widget = gtk_label_new (str);
  gtk_label_set_wrap (GTK_LABEL (widget), TRUE);

@@ -415,7 +410,6 @@ static struct {
  { ".gif", NULL, display_image },
  { ".jpg", NULL, display_image },
  { ".png", NULL, display_image },
-  { ".svg", NULL, display_image },
  { ".c", "c", display_text },
  { ".css", "css", display_text },
  { ".glsl", NULL, display_text },
@@ -907,9 +901,6 @@ activate (GApplication *app)
  window = (GtkWidget *)gtk_builder_get_object (builder, "window");
  gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (window));

-  if (g_strcmp0 (PROFILE, "devel") == 0)
-    gtk_widget_add_css_class (window, "devel");
-
  action = g_simple_action_new ("run", NULL);
  g_signal_connect (action, "activate", G_CALLBACK (activate_run), window);
  g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (action));
@@ -1052,10 +1043,10 @@ out:
 static void
 print_version (void)
 {
-  g_print ("gtk4-demo %s%s%s\n",
-           PACKAGE_VERSION,
-           g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-           g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "");
+  g_print ("gtk4-demo %d.%d.%d\n",
+           gtk_get_major_version (),
+           gtk_get_minor_version (),
+           gtk_get_micro_version ());
 }

 static int
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -17,6 +17,9 @@
    </section>
  </menu>
  <object class="GtkApplicationWindow" id="window">
+    <style>
+      <class name="devel"/>
+    </style>
    <property name="default-width">800</property>
    <property name="default-height">600</property>
    <child type="titlebar">
@@ -25,17 +28,14 @@
          <object class="GtkButton">
            <property name="valign">center</property>
            <property name="action-name">win.run</property>
-            <property name="label" translatable="yes">Run</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleButton">
-            <property name="icon-name">edit-find-symbolic</property>
-            <property name="valign">center</property>
-            <property name="active" bind-source="searchbar" bind-property="search-mode-enabled" bind-flags="bidirectional|sync-create"/>
-            <accessibility>
-              <property name="label" translatable="yes">Search</property>
-            </accessibility>
+            <style>
+              <class name="text-button"/>
+            </style>
+            <child>
+              <object class="GtkLabel">
+                <property name="label" translatable="yes">Run</property>
+              </object>
+            </child>
          </object>
        </child>
        <child type="end">
@@ -43,9 +43,6 @@
            <property name="valign">center</property>
            <property name="menu-model">gear_menu</property>
            <property name="icon-name">open-menu-symbolic</property>
-            <accessibility>
-              <property name="label" translatable="yes">Primary menu</property>
-            </accessibility>
          </object>
        </child>
      </object>
@@ -53,30 +50,24 @@
    <child>
      <object class="GtkBox">
        <child>
-          <object class="GtkBox">
-            <property name="width-request">220</property>
-            <property name="orientation">vertical</property>
+          <object class="GtkScrolledWindow">
+            <property name="width-request">120</property>
+            <property name="hscrollbar-policy">never</property>
+            <property name="min-content-width">150</property>
            <child>
-              <object class="GtkSearchBar" id="searchbar">
-                <property name="key-capture-widget">window</property>
+              <object class="GtkBox">
+                <property name="width-request">220</property>
+                <property name="orientation">vertical</property>
+
                <child>
-                  <object class="GtkSearchEntry" id="search-entry">
-                    <accessibility>
-                      <relation name="controls">listview</relation>
-                    </accessibility>
+                  <object class="GtkSearchBar" id="searchbar">
+                    <property name="key-capture-widget">window</property>
+                    <child>
+                      <object class="GtkSearchEntry" id="search-entry"/>
+                    </child>
                  </object>
                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <style>
-                  <class name="sidebar"/>
-                </style>
-                <property name="width-request">120</property>
-                <property name="hscrollbar-policy">never</property>
-                <property name="min-content-width">150</property>
-                <property name="vexpand">1</property>
+
                <child>
                  <object class="GtkListView" id="listview">
                    <style>
@@ -87,16 +78,16 @@
                        <property name="resource">/ui/main-listitem.ui</property>
                      </object>
                    </property>
-                    <accessibility>
-                      <property name="label" translatable="yes">Demo list</property>
-                      <relation name="controls">notebook</relation>
-                    </accessibility>
                  </object>
                </child>
+
              </object>
            </child>
          </object>
        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
        <child>
          <object class="GtkNotebook" id="notebook">
            <property name="scrollable">1</property>
@@ -121,10 +112,6 @@
                        <property name="editable">0</property>
                        <property name="wrap-mode">word</property>
                        <property name="cursor-visible">0</property>
-                        <accessibility>
-                          <property name="label" translatable="yes">Info</property>
-                          <property name="description" translatable="yes">A description of the demo</property>
-                        </accessibility>
                      </object>
                    </child>
                  </object>
@@ -155,10 +142,6 @@
                        <property name="wrap-mode">word</property>
                        <property name="pixels-above-lines">2</property>
                        <property name="pixels-below-lines">2</property>
-                        <accessibility>
-                          <property name="label" translatable="yes">Source</property>
-                          <property name="description" translatable="yes">The source code of the demo</property>
-                        </accessibility>
                      </object>
                    </child>
                  </object>
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -7,9 +7,8 @@ demos = files([
  'clipboard.c',
  'combobox.c',
  'constraints.c',
-  'constraints_interactive.c',
-  'constraints_vfl.c',
-  'constraints_builder.c',
+  'constraints2.c',
+  'constraints3.c',
  'css_accordion.c',
  'css_basics.c',
  'css_blendmodes.c',
@@ -19,6 +18,7 @@ demos = files([
  'cursors.c',
  'dialog.c',
  'drawingarea.c',
+  'dropdown.c',
  'dnd.c',
  'editable_cells.c',
  'entry_completion.c',
@@ -29,7 +29,6 @@ demos = files([
  'fishbowl.c',
  'fixed.c',
  'fontrendering.c',
-  'frames.c',
  'gears.c',
  'gestures.c',
  'glarea.c',
@@ -45,7 +44,7 @@ demos = files([
  'layoutmanager2.c',
  'links.c',
  'listbox.c',
-  'listbox_controls.c',
+  'listbox2.c',
  'menu.c',
  'flowbox.c',
  'list_store.c',
@@ -54,14 +53,12 @@ demos = files([
  'listview_colors.c',
  'listview_filebrowser.c',
  'listview_minesweeper.c',
-  'dropdown.c',
  'listview_settings.c',
-  'listview_ucd.c',
  'listview_weather.c',
  'listview_words.c',
  'markup.c',
  'overlay.c',
-  'overlay_decorative.c',
+  'overlay2.c',
  'paint.c',
  'paintable.c',
  'paintable_animated.c',
@@ -101,37 +98,31 @@ demos = files([

 gtkdemo_deps = [ libgtk_dep, ]

-extra_demo_sources = files([
-  'main.c',
-  'fontify.c',
-  'gtkfishbowl.c',
-  'fontplane.c',
-  'gtkgears.c',
-  'gtkshaderbin.c',
-  'gtkshadertoy.c',
-  'gtkshaderstack.c',
-  'gskshaderpaintable.c',
-  'puzzlepiece.c',
-  'bluroverlay.c',
-  'demoimage.c',
-  'demotaggedentry.c',
-  'demochild.c',
-  'demolayout.c',
-  'demowidget.c',
-  'demo2layout.c',
-  'singular_value_decomposition.c',
-  'four_point_transform.c',
-  'demo2widget.c',
-  'demo3widget.c',
-  'pixbufpaintable.c',
-  'script-names.c',
-  'unicode-names.c',
-  'suggestionentry.c',
-])
+extra_demo_sources = files(['main.c',
+                            'fontify.c',
+                            'gtkfishbowl.c',
+                            'fontplane.c',
+                            'gtkgears.c',
+                            'gtkshaderbin.c',
+                            'gtkshadertoy.c',
+                            'gtkshaderstack.c',
+                            'gskshaderpaintable.c',
+                            'puzzlepiece.c',
+                            'bluroverlay.c',
+                            'demoimage.c',
+                            'demotaggedentry.c',
+                            'demochild.c',
+                            'demolayout.c',
+                            'demowidget.c',
+                            'demo2layout.c',
+                            'singular_value_decomposition.c',
+                            'four_point_transform.c',
+                            'demo2widget.c',
+                            'demo3widget.c'])

 if harfbuzz_dep.found() and pangoft_dep.found()
-  demos += files(['font_features.c'])
-  extra_demo_sources += files(['language-names.c'])
+  demos += files('font_features.c')
+  extra_demo_sources += files(['script-names.c', 'language-names.c'])
  gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
 endif

@@ -139,28 +130,17 @@ if os_unix
  demos += files('pagesetup.c')
 endif

-librsvg_dep = dependency('librsvg-2.0', version: '>= 2.46.0', required: false)
-
-if librsvg_dep.found()
-  demos += files('paintable_svg.c')
-  extra_demo_sources += files(['svgpaintable.c'])
-  gtkdemo_deps += [ librsvg_dep ]
-endif
-
 gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]

 demos_h = custom_target('gtk4 demo header',
-  output: 'demos.h',
-  input: demos,
-  command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ],
-)
+                        output: 'demos.h',
+                        input: demos,
+                        command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ])

 gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
-  'demo.gresource.xml',
-  source_dir: '.',
-)
+                                            'demo.gresource.xml',
+                                            source_dir: '.')

-# Use a subset of compiler flags
 demo_cflags = []
 foreach flag: common_cflags
  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
@@ -168,33 +148,31 @@ foreach flag: common_cflags
  endif
 endforeach

-gtkdemo_deps += [ demo_conf_h ]
-
 executable('gtk4-demo',
-  sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
-  c_args: gtkdemo_args + demo_cflags,
-  dependencies: gtkdemo_deps,
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: true,
-)
+           demos, demos_h, extra_demo_sources, gtkdemo_resources,
+           c_args: gtkdemo_args + demo_cflags,
+           dependencies: gtkdemo_deps,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: true)

 executable('gtk4-demo-application',
-  sources: ['application.c', gtkdemo_resources],
-  c_args: gtkdemo_args + common_cflags,
-  dependencies: gtkdemo_deps,
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: true,
-)
+           'application.c', gtkdemo_resources,
+           c_args: gtkdemo_args + common_cflags,
+           dependencies: gtkdemo_deps,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: true)

 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

 foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size, install_dir: icontheme_dir)
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
 endforeach

 # desktop file
--- a/demos/gtk-demo/org.gtk.Demo4.desktop
+++ b/demos/gtk-demo/org.gtk.Demo4.desktop
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=Development;GTK;
+NoDisplay=true
--- a/demos/gtk-demo/org.gtk.gtk4.NodeEditor.Devel.svg
+++ b/demos/gtk-demo/org.gtk.gtk4.NodeEditor.Devel.svg
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="43.000351" x2="85.000351" y1="39.000164" y2="39.000164">
-        <stop offset="0" stop-color="#26a269"/>
-        <stop offset="0.0934161" stop-color="#84e3b7"/>
-        <stop offset="0.330831" stop-color="#26a269"/>
-        <stop offset="0.686952" stop-color="#26a269"/>
-        <stop offset="0.89736" stop-color="#175e3c"/>
-        <stop offset="1" stop-color="#26a269"/>
-    </linearGradient>
-    <linearGradient id="b" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#c0bfbc"/>
-        <stop offset="0.154754" stop-color="#ffffff"/>
-        <stop offset="0.433722" stop-color="#bdbbb5"/>
-        <stop offset="0.650505" stop-color="#c1c0ba"/>
-        <stop offset="0.825253" stop-color="#ffffff"/>
-        <stop offset="1" stop-color="#c0bfbc"/>
-    </linearGradient>
-    <linearGradient id="c" gradientTransform="matrix(0.0811899 -0.046875 0.069079 0.119648 307.03142 127.069456)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
-    <linearGradient id="d" gradientTransform="matrix(-0.0811899 -0.046875 -0.069079 0.119648 -177.242852 127.069447)" x1="-1710.210571" x2="-1774.45166" xlink:href="#b" y1="-1202.376709" y2="-1202.376709"/>
-    <linearGradient id="e" gradientUnits="userSpaceOnUse" x1="14" x2="56" y1="94.999964" y2="94.999964">
-        <stop offset="0" stop-color="#813d9c"/>
-        <stop offset="0.109119" stop-color="#b378ca"/>
-        <stop offset="0.241583" stop-color="#813d9c"/>
-        <stop offset="0.731841" stop-color="#813d9c"/>
-        <stop offset="0.872163" stop-color="#4d255d"/>
-        <stop offset="1" stop-color="#813d9c"/>
-    </linearGradient>
-    <linearGradient id="f" gradientUnits="userSpaceOnUse" x1="72" x2="114" y1="94.999964" y2="94.999964">
-        <stop offset="0" stop-color="#e66100"/>
-        <stop offset="0.0678478" stop-color="#ff903e"/>
-        <stop offset="0.168852" stop-color="#e66100"/>
-        <stop offset="0.886626" stop-color="#e66100"/>
-        <stop offset="1" stop-color="#9d4200"/>
-    </linearGradient>
-    <clipPath id="g">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="h">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <filter id="i" height="100%" width="100%" x="0%" y="0%">
-        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-    </filter>
-    <mask id="j">
-        <g clip-path="url(#h)" filter="url(#i)">
-            <g clip-path="url(#g)">
-                <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
-                <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
-                <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
-                <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
-                <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
-                <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
-                <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
-                <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
-            </g>
-        </g>
-    </mask>
-    <mask id="k">
-        <g filter="url(#i)">
-            <rect fill-opacity="0.8" height="128" width="128"/>
-        </g>
-    </mask>
-    <linearGradient id="l" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
-        <stop offset="0" stop-color="#f9f06b"/>
-        <stop offset="1" stop-color="#f5c211"/>
-    </linearGradient>
-    <clipPath id="m">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="n">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <path d="m 51 18 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
-    <path d="m 51 12 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#57e389"/>
-    <path d="m 76.976562 55.453125 c 1.480469 -0.855469 3.371094 -0.347656 4.226563 1.132813 l 6.742187 11.679687 c 0.855469 1.480469 0.347657 3.371094 -1.132812 4.226563 c -1.480469 0.851562 -3.371094 0.347656 -4.226562 -1.132813 l -6.742188 -11.679687 c -0.855469 -1.480469 -0.347656 -3.371094 1.132812 -4.226563 z m 0 0" fill="url(#c)"/>
-    <path d="m 52.8125 55.453125 c -1.480469 -0.855469 -3.371094 -0.347656 -4.226562 1.132813 l -6.742188 11.679687 c -0.855469 1.480469 -0.347656 3.371094 1.132812 4.226563 c 1.480469 0.851562 3.371094 0.347656 4.226563 -1.132813 l 6.742187 -11.679687 c 0.855469 -1.480469 0.347657 -3.371094 -1.132812 -4.226563 z m 0 0" fill="url(#d)"/>
-    <path d="m 22 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#e)"/>
-    <path d="m 22 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#dc8add"/>
-    <path d="m 80 74 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="url(#f)"/>
-    <path d="m 80 68 h 26 c 4.417969 0 8 3.582031 8 8 v 26 c 0 4.417969 -3.582031 8 -8 8 h -26 c -4.417969 0 -8 -3.582031 -8 -8 v -26 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#ffa348"/>
-    <g clip-path="url(#n)" mask="url(#j)">
-        <g clip-path="url(#m)" mask="url(#k)">
-            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#l)"/>
-            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
-        </g>
-    </g>
-</svg>
--- a/demos/gtk-demo/overlay_decorative.c
+++ b/demos/gtk-demo/overlay_decorative.c
@@ -21,7 +21,7 @@ margin_changed (GtkAdjustment *adjustment,
 }

 GtkWidget *
-do_overlay_decorative (GtkWidget *do_widget)
+do_overlay2 (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;

--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -1,4 +1,4 @@
-/* Paintable/Simple Paintable
+/* Paintable/A simple paintable
 *
 * GdkPaintable is an interface used by GTK for drawings of any sort
 * that do not require layouting or positioning.
--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -1,4 +1,4 @@
-/* Paintable/Animated Paintable
+/* Paintable/An animated paintable
 *
 * GdkPaintable also allows paintables to change.
 *
--- a/demos/gtk-demo/paintable_emblem.c
+++ b/demos/gtk-demo/paintable_emblem.c
@@ -153,7 +153,7 @@ do_paintable_emblem (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Paintable — Emblems");
+      gtk_window_set_title (GTK_WINDOW (window), "Emblems");
      gtk_window_set_default_size (GTK_WINDOW (window), 300, 200);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -1,4 +1,4 @@
-/* Paintable/Media Stream
+/* Paintable/A media stream
 *
 * GdkPaintable is also used by the GtkMediaStream class.
 *
--- a/demos/gtk-demo/paintable_svg.c
+++ b/demos/gtk-demo/paintable_svg.c
@@ -1,102 +0,0 @@
-/* Paintable/SVG
- *
- * This demo shows wrapping a librsvg RsvgHandle in a GdkPaintable
- * to display an SVG image that can be scaled by resizing the window.
- *
- * This demo relies on librsvg, which GTK itself does not link against.
- */
-
-#include <gtk/gtk.h>
-#include <librsvg/rsvg.h>
-
-#include "svgpaintable.h"
-
-
-static void
-open_response_cb (GtkNativeDialog *dialog,
-                  int              response,
-                  GtkPicture      *picture)
-{
-  gtk_native_dialog_hide (dialog);
-
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      GFile *file;
-      GdkPaintable *paintable;
-
-      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-      paintable = svg_paintable_new (file);
-      gtk_picture_set_paintable (GTK_PICTURE (picture), paintable);
-      g_object_unref (paintable);
-      g_object_unref (file);
-    }
-
-  gtk_native_dialog_destroy (dialog);
-}
-
-static void
-show_file_open (GtkWidget  *button,
-                GtkPicture *picture)
-{
-  GtkFileFilter *filter;
-  GtkFileChooserNative *dialog;
-
-  dialog = gtk_file_chooser_native_new ("Open node file",
-                                        GTK_WINDOW (gtk_widget_get_root (button)),
-                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Load",
-                                        "_Cancel");
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/svg+xml");
-  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
-  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
-  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), picture);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
-}
-
-static GtkWidget *window;
-
-GtkWidget *
-do_paintable_svg (GtkWidget *do_widget)
-{
-  GtkWidget *header;
-  GtkWidget *picture;
-  GtkWidget *button;
-  GFile *file;
-  GdkPaintable *paintable;
-
-  if (!window)
-    {
-      window = gtk_window_new ();
-      header = gtk_header_bar_new ();
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-      gtk_window_set_default_size (GTK_WINDOW (window), 330, 330);
-      gtk_window_set_title (GTK_WINDOW (window), "Paintable — SVG");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      button = gtk_button_new_with_mnemonic ("_Open");
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
-
-      picture = gtk_picture_new ();
-      gtk_picture_set_can_shrink (GTK_PICTURE (picture), TRUE);
-      gtk_widget_set_size_request (picture, 16, 16);
-
-      g_signal_connect (button, "clicked", G_CALLBACK (show_file_open), picture);
-
-      gtk_window_set_child (GTK_WINDOW (window), picture);
-
-      file = g_file_new_for_uri ("resource:///paintable_svg/org.gtk.gtk4.NodeEditor.Devel.svg");
-      paintable = svg_paintable_new (file);
-      gtk_picture_set_paintable (GTK_PICTURE (picture), paintable);
-      g_object_unref (paintable);
-      g_object_unref (file);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -3,16 +3,100 @@
 * The GtkPaned Widget divides its content area into two panes
 * with a divider in between that the user can adjust. A separate
 * child is placed into each pane. GtkPaned widgets can be split
- * horizontally or vertically. This test contains both a horizontal
- * and a vertical GtkPaned widget.
+ * horizontally or vertially.
 *
 * There are a number of options that can be set for each pane.
- * You can use the Inspector to adjust the options for each side
- * of each widget.
+ * This test contains both a horizontal and a vertical GtkPaned
+ * widget, and allows you to adjust the options for each side of
+ * each widget.
 */

 #include <gtk/gtk.h>

+static void
+toggle_resize (GtkWidget *widget,
+               GtkWidget *child)
+{
+  GtkWidget *parent;
+  GtkPaned *paned;
+
+  parent = gtk_widget_get_parent (child);
+  paned = GTK_PANED (parent);
+
+  if (child == gtk_paned_get_start_child (paned))
+    gtk_paned_set_resize_start_child (paned, !gtk_paned_get_resize_start_child (paned));
+  else
+    gtk_paned_set_resize_end_child (paned, !gtk_paned_get_resize_end_child (paned));
+}
+
+static void
+toggle_shrink (GtkWidget *widget,
+               GtkWidget *child)
+{
+  GtkWidget *parent;
+  GtkPaned *paned;
+
+  parent = gtk_widget_get_parent (child);
+  paned = GTK_PANED (parent);
+
+  if (child == gtk_paned_get_start_child (paned))
+    gtk_paned_set_shrink_start_child (paned, !gtk_paned_get_shrink_start_child (paned));
+  else
+    gtk_paned_set_shrink_end_child (paned, !gtk_paned_get_shrink_end_child (paned));
+}
+
+static GtkWidget *
+create_pane_options (GtkPaned    *paned,
+                     const char *frame_label,
+                     const char *label1,
+                     const char *label2)
+{
+  GtkWidget *child1, *child2;
+  GtkWidget *frame;
+  GtkWidget *table;
+  GtkWidget *label;
+  GtkWidget *check_button;
+
+  child1 = gtk_paned_get_start_child (paned);
+  child2 = gtk_paned_get_end_child (paned);
+
+  frame = gtk_frame_new (frame_label);
+
+  table = gtk_grid_new ();
+  gtk_frame_set_child (GTK_FRAME (frame), table);
+
+  label = gtk_label_new (label1);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
+
+  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
+  gtk_grid_attach (GTK_GRID (table), check_button, 0, 1, 1, 1);
+  g_signal_connect (check_button, "toggled",
+                    G_CALLBACK (toggle_resize), child1);
+
+  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
+  gtk_grid_attach (GTK_GRID (table), check_button, 0, 2, 1, 1);
+  gtk_check_button_set_active (GTK_CHECK_BUTTON (check_button), TRUE);
+  g_signal_connect (check_button, "toggled",
+                    G_CALLBACK (toggle_shrink), child1);
+
+  label = gtk_label_new (label2);
+  gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
+
+  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
+  gtk_grid_attach (GTK_GRID (table), check_button, 1, 1, 1, 1);
+  gtk_check_button_set_active (GTK_CHECK_BUTTON (check_button), TRUE);
+  g_signal_connect (check_button, "toggled",
+                    G_CALLBACK (toggle_resize), child2);
+
+  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
+  gtk_grid_attach (GTK_GRID (table), check_button, 1, 2, 1, 1);
+  gtk_check_button_set_active (GTK_CHECK_BUTTON (check_button), TRUE);
+  g_signal_connect (check_button, "toggled",
+                    G_CALLBACK (toggle_shrink), child2);
+
+  return frame;
+}
+
 GtkWidget *
 do_panes (GtkWidget *do_widget)
 {
@@ -20,19 +104,19 @@ do_panes (GtkWidget *do_widget)
  GtkWidget *frame;
  GtkWidget *hpaned;
  GtkWidget *vpaned;
-  GtkWidget *label;
+  GtkWidget *button;
  GtkWidget *vbox;
+  GtkWidget *box;

  if (!window)
    {
      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");
-      gtk_window_set_default_size (GTK_WINDOW (window), 330, 250);
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

+      gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");
+
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_widget_set_margin_start (vbox, 8);
      gtk_widget_set_margin_end (vbox, 8);
@@ -48,37 +132,41 @@ do_panes (GtkWidget *do_widget)

      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
      gtk_paned_set_start_child (GTK_PANED (vpaned), hpaned);
-      gtk_paned_set_shrink_start_child (GTK_PANED (vpaned), FALSE);

-      label = gtk_label_new ("Hi there");
-      gtk_widget_set_margin_start (label, 4);
-      gtk_widget_set_margin_end (label, 4);
-      gtk_widget_set_margin_top (label, 4);
-      gtk_widget_set_margin_bottom (label, 4);
-      gtk_widget_set_hexpand (label, TRUE);
-      gtk_widget_set_vexpand (label, TRUE);
-      gtk_paned_set_start_child (GTK_PANED (hpaned), label);
-      gtk_paned_set_shrink_start_child (GTK_PANED (hpaned), FALSE);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_widget_set_size_request (box, 60, 60);
+      gtk_paned_set_start_child (GTK_PANED (hpaned), box);

-      label = gtk_label_new ("Hello");
-      gtk_widget_set_margin_start (label, 4);
-      gtk_widget_set_margin_end (label, 4);
-      gtk_widget_set_margin_top (label, 4);
-      gtk_widget_set_margin_bottom (label, 4);
-      gtk_widget_set_hexpand (label, TRUE);
-      gtk_widget_set_vexpand (label, TRUE);
-      gtk_paned_set_end_child (GTK_PANED (hpaned), label);
-      gtk_paned_set_shrink_end_child (GTK_PANED (hpaned), FALSE);
+      button = gtk_button_new_with_mnemonic ("_Hi there");
+      gtk_widget_set_margin_start (button, 4);
+      gtk_widget_set_margin_end (button, 4);
+      gtk_widget_set_margin_top (button, 4);
+      gtk_widget_set_margin_bottom (button, 4);
+      gtk_widget_set_hexpand (button, TRUE);
+      gtk_widget_set_vexpand (button, TRUE);
+      gtk_box_append (GTK_BOX (box), button);

-      label = gtk_label_new ("Goodbye");
-      gtk_widget_set_margin_start (label, 4);
-      gtk_widget_set_margin_end (label, 4);
-      gtk_widget_set_margin_top (label, 4);
-      gtk_widget_set_margin_bottom (label, 4);
-      gtk_widget_set_hexpand (label, TRUE);
-      gtk_widget_set_vexpand (label, TRUE);
-      gtk_paned_set_end_child (GTK_PANED (vpaned), label);
-      gtk_paned_set_shrink_end_child (GTK_PANED (vpaned), FALSE);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_widget_set_size_request (box, 80, 60);
+      gtk_paned_set_end_child (GTK_PANED (hpaned), box);
+
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_widget_set_size_request (box, 60, 80);
+      gtk_paned_set_end_child (GTK_PANED (vpaned), box);
+
+      /* Now create toggle buttons to control sizing */
+
+      gtk_box_append (GTK_BOX (vbox),
+                          create_pane_options (GTK_PANED (hpaned),
+                                               "Horizontal",
+                                               "Left",
+                                               "Right"));
+
+      gtk_box_append (GTK_BOX (vbox),
+                          create_pane_options (GTK_PANED (vpaned),
+                                               "Vertical",
+                                               "Top",
+                                               "Bottom"));
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -1,8 +1,9 @@
 /* Pickers
- * #Keywords: GtkColorChooser, GtkFontChooser, GtkApplicationChooser
+ * #Keywords: GtkColorChooser, GtkFontChooser, GtkFileChooser,
+ * #Keywords: GtkApplicationChooser
 *
 * These widgets are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts, directories and applications.
+ * They allow to select colors, fonts, files, directories and applications.
 *
 * This demo shows both the default appearance for these dialogs,
 * as well as some of the customizations that are possible.
@@ -62,6 +63,9 @@ do_pickers (GtkWidget *do_widget)

  if (!window)
  {
+    char *dir;
+    GFile *file;
+
    window = gtk_window_new ();
    gtk_window_set_display (GTK_WINDOW (window),
                            gtk_widget_get_display (do_widget));
@@ -119,14 +123,55 @@ do_pickers (GtkWidget *do_widget)

    gtk_grid_attach (GTK_GRID (table), picker, 2, 1, 1, 1);

+    label = gtk_label_new ("File:");
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+    gtk_widget_set_hexpand (label, TRUE);
+    gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
+
+    picker = gtk_file_chooser_button_new ("Pick a File",
+                                          GTK_FILE_CHOOSER_ACTION_OPEN);
+    gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
+
+    picker = gtk_file_chooser_button_new ("Pick a File",
+                                          GTK_FILE_CHOOSER_ACTION_OPEN);
+
+    dir = g_get_current_dir ();
+    file = g_file_new_for_path (dir);
+    gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (picker), file, NULL);
+    g_object_unref (file);
+    g_free (dir);
+
+    gtk_file_chooser_add_choice (GTK_FILE_CHOOSER (picker),
+                                 "choice",
+                                 "Encoding",
+                                 (const char *[]) { "option1", "option2", NULL },
+                                 (const char *[]) { "UTF-8", "Other Encoding", NULL });
+    gtk_file_chooser_set_choice (GTK_FILE_CHOOSER (picker), "choice", "option1");
+    gtk_file_chooser_add_choice (GTK_FILE_CHOOSER (picker),
+                                 "check",
+                                 "Read backwards",
+                                 NULL, NULL);
+    gtk_file_chooser_set_choice (GTK_FILE_CHOOSER (picker), "check", "false");
+
+    gtk_grid_attach (GTK_GRID (table), picker, 2, 2, 1, 1);
+
+    label = gtk_label_new ("Folder:");
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+    picker = gtk_file_chooser_button_new ("Pick a Folder",
+                                          GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
+    gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
+
    label = gtk_label_new ("Mail:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
    gtk_widget_set_hexpand (label, TRUE);
    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
+    gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1);
+    gtk_grid_attach (GTK_GRID (table), picker, 1, 4, 1, 1);
  }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/pixbufpaintable.c
+++ b/demos/gtk-demo/pixbufpaintable.c
@@ -1,187 +0,0 @@
-#include <gtk/gtk.h>
-#include "pixbufpaintable.h"
-
-struct _PixbufPaintable {
-  GObject parent_instance;
-
-  char *resource_path;
-  GdkPixbufAnimation *anim;
-  GdkPixbufAnimationIter *iter;
-
-  guint timeout;
-};
-
-enum {
-  PROP_RESOURCE_PATH = 1,
-  NUM_PROPERTIES
-};
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-static void
-pixbuf_paintable_snapshot (GdkPaintable *paintable,
-                           GdkSnapshot  *snapshot,
-                           double        width,
-                           double        height)
-{
-  PixbufPaintable *self = PIXBUF_PAINTABLE (paintable);
-  GTimeVal val;
-  GdkPixbuf *pixbuf;
-  GdkTexture *texture;
-
-  g_get_current_time (&val);
-  gdk_pixbuf_animation_iter_advance (self->iter, &val);
-  pixbuf = gdk_pixbuf_animation_iter_get_pixbuf (self->iter);
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
-
-  gdk_paintable_snapshot (GDK_PAINTABLE (texture), snapshot, width, height);
-
-  g_object_unref (texture);
-}
-G_GNUC_END_IGNORE_DEPRECATIONS;
-
-static int
-pixbuf_paintable_get_intrinsic_width (GdkPaintable *paintable)
-{
-  PixbufPaintable *self = PIXBUF_PAINTABLE (paintable);
-
-  return gdk_pixbuf_animation_get_width (self->anim);
-}
-
-static int
-pixbuf_paintable_get_intrinsic_height (GdkPaintable *paintable)
-{
-  PixbufPaintable *self = PIXBUF_PAINTABLE (paintable);
-
-  return gdk_pixbuf_animation_get_height (self->anim);
-}
-
-static void
-pixbuf_paintable_init_interface (GdkPaintableInterface *iface)
-{
-  iface->snapshot = pixbuf_paintable_snapshot;
-  iface->get_intrinsic_width = pixbuf_paintable_get_intrinsic_width;
-  iface->get_intrinsic_height = pixbuf_paintable_get_intrinsic_height;
-}
-
-G_DEFINE_TYPE_WITH_CODE(PixbufPaintable, pixbuf_paintable, G_TYPE_OBJECT,
-                        G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                               pixbuf_paintable_init_interface))
-
-static void
-pixbuf_paintable_init (PixbufPaintable *paintable)
-{
-}
-
-static gboolean
-delay_cb (gpointer data)
-{
-  PixbufPaintable *self = data;
-  int delay;
-
-  delay = gdk_pixbuf_animation_iter_get_delay_time (self->iter);
-  self->timeout = g_timeout_add (delay, delay_cb, self);
-
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-pixbuf_paintable_set_resource_path (PixbufPaintable *self,
-                                    const char      *resource_path)
-{
-  int delay;
-
-  g_free (self->resource_path);
-  self->resource_path = g_strdup (resource_path);
-
-  g_clear_object (&self->anim);
-  self->anim = gdk_pixbuf_animation_new_from_resource (resource_path, NULL);
-  g_clear_object (&self->iter);
-  self->iter = gdk_pixbuf_animation_get_iter (self->anim, NULL);
-
-  delay = gdk_pixbuf_animation_iter_get_delay_time (self->iter);
-  self->timeout = g_timeout_add (delay, delay_cb, self);
-
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-
-  g_object_notify (G_OBJECT (self), "resource-path");
-}
-
-static void
-pixbuf_paintable_set_property (GObject      *object,
-                               guint         prop_id,
-                               const GValue *value,
-                               GParamSpec   *pspec)
-{
-  PixbufPaintable *self = PIXBUF_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_RESOURCE_PATH:
-      pixbuf_paintable_set_resource_path (self, g_value_get_string (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-pixbuf_paintable_get_property (GObject    *object,
-                               guint       prop_id,
-                               GValue     *value,
-                               GParamSpec *pspec)
-{
-  PixbufPaintable *self = PIXBUF_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_RESOURCE_PATH:
-      g_value_set_string (value, self->resource_path);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-pixbuf_paintable_dispose (GObject *object)
-{
-  PixbufPaintable *self = PIXBUF_PAINTABLE (object);
-
-  g_clear_pointer (&self->resource_path, g_free);
-  g_clear_object (&self->anim);
-  g_clear_object (&self->iter);
-  if (self->timeout)
-    {
-      g_source_remove (self->timeout);
-      self->timeout = 0;
-    }
-
-  G_OBJECT_CLASS (pixbuf_paintable_parent_class)->dispose (object);
-}
-
-static void
-pixbuf_paintable_class_init (PixbufPaintableClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->dispose = pixbuf_paintable_dispose;
-  object_class->get_property = pixbuf_paintable_get_property;
-  object_class->set_property = pixbuf_paintable_set_property;
-
-  g_object_class_install_property (object_class, PROP_RESOURCE_PATH,
-      g_param_spec_string ("resource-path", "Resource path", "Resource path",
-                           NULL, G_PARAM_READWRITE));
-
-}
-
-GdkPaintable *
-pixbuf_paintable_new_from_resource (const char *path)
-{
-  return g_object_new (PIXBUF_TYPE_PAINTABLE,
-                       "resource-path", path,
-                       NULL);
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	fe4f4d3719	gsk: Tweak GskGLShader long desc Reformulate one paragraph, as suggested by Benjamin.	2020-09-28 14:01:59 -04:00
Matthias Clasen	e8d1537606	gsk: Use guint for array indices Avoids some trivialities and static analyis complaints.	2020-09-28 13:57:54 -04:00
Matthias Clasen	2f33ec418b	gsk: Cosmetic docs tweak	2020-09-28 13:55:24 -04:00
Matthias Clasen	6fc9294036	gsk: Small doc tweaks Add an annotation, and tweak the docs for gsk_gl_shader_node_new slightly.	2020-09-28 13:53:51 -04:00
Matthias Clasen	3297510040	gsk: Improve gsk_gl_shader_node_new preconditions Check all that we can.	2020-09-28 13:50:15 -04:00
Matthias Clasen	a2849d3f7a	gsk: Tweak shader node deserialization Use a GskShaderArgsBuilder and make the parser more precise about commas vs semicolons.	2020-09-28 13:38:12 -04:00
Matthias Clasen	f8dc75089e	gsk: Reuse css printing function Don't copy _gtk_css_print_string, just use it.	2020-09-28 13:10:57 -04:00
Matthias Clasen	003cf4f6ce	css: Move the last parser api to the new header This lets us use it from the render node parser in gsk.	2020-09-28 13:09:54 -04:00
Matthias Clasen	30f2e7e153	rendernodeparser: Tweak the shader node serialization We call it args now in the api. Follow suit for the serialization.	2020-09-28 12:57:31 -04:00
Matthias Clasen	1ed2b1b8e3	gsk: Beef up GskShaderArgsBuilder docs Mention that args are zero-initialized.	2020-09-28 12:51:31 -04:00
Matthias Clasen	4906779f72	gtk-demo: Simplify transitions demo We are not using the frame clock anymore, so don't pass it around.	2020-09-28 12:45:31 -04:00
Matthias Clasen	cda8bb4384	gtk-demo: Tweak the transition demo text Fix some types, and say a bit more here.	2020-09-28 12:41:51 -04:00
Matthias Clasen	a801be3c97	gsk: Fix the shader example I mixed up my variable names.	2020-09-28 12:18:37 -04:00
Alexander Larsson	59c8c75ede	GskShaderArgBuilder: Use standard builder-like API Primarily this is ref/unref vs copy, and ne wfree_to_args() method. But also some minor renames.	2020-09-28 16:40:14 +02:00
Alexander Larsson	796b205958	gsk_gl_shader_format_args: Pass arguments by value Primitive values are now passed by values (although vectors still by pointer). Also since we can now no longer handle missing definitions that is an error.	2020-09-28 16:40:14 +02:00
Alexander Larsson	947a933819	gtk-demo: Only use one GskGLShader in fishbowl We don't want to use a new shader per paintable, because then we will need to recompile each one. Also remove some leftover unused vars from the cogs glsl.	2020-09-28 16:40:14 +02:00
Alexander Larsson	48cb5ca3db	snapshot: Drop n_children from push_gl_shader and use custom pop We now always assume you pass the right amount of children for the shader, and each such child is followed by gtk_snapshot_gl_shader_pop_texture() and then a final gtk_snapshot_pop(). This means we handle the 0 child case ok, and that we can validate that the number of pops of various types are correct.	2020-09-28 16:40:14 +02:00
Matthias Clasen	f19001d4c3	Add some more docs Add an example to the GskGLShader docs.	2020-09-25 20:38:22 -04:00
Matthias Clasen	6ecf612677	Add another shader test This one tests the convenience api for creating uniform data.	2020-09-25 20:37:48 -04:00
Matthias Clasen	e0b3746655	gtk-demo: Add a shader paintable to the fishbowl This gets around 500 instances at 60fps on my system.	2020-09-25 17:22:22 -04:00
Matthias Clasen	1bc81fac2a	gtk-demo: Add a shader paintable demo Add a shader paintable to the OpenGL transitions demo. This is reusing one of the shadertoy examples, tweaked slightly to work as a standalone fragment shader.	2020-09-25 17:22:22 -04:00
Matthias Clasen	bdcc29ebef	gtk-demo: Add a shader paintable This is a GdkPaintable implementation wrapped around a GskGLShader. It can optionally be hooked up to a frame clock to update a time uniform. The code is set up for this to live as public api in GSK, if we find it useful enough.	2020-09-25 17:21:40 -04:00
Alexander Larsson	810e9c238e	snapshot: Drop the varargs versions of push_gl_shader() We can now just use gsk_gl_shader_format_args() directly, relying on the transfer-full of the shader args argument.	2020-09-25 16:51:46 +02:00
Alexander Larsson	e4dfa5597a	gtk_snapshot_push_gl_shader: Make @args transfer-full This makes the common case of this just being created a lot easier.	2020-09-25 16:46:39 +02:00
Alexander Larsson	32aa470f68	Rename uniform_data to shader args, or just args This makes a lot of types and function names shorter. Also, we add a "..." version of gsk_gl_shader_format_args_va().	2020-09-25 16:38:10 +02:00
Alexander Larsson	a234ab1e55	Finish remaining renames from GLSHADER to GL_SHADER (etc) This fixes all remaining cases in public headers.	2020-09-25 14:31:44 +02:00
Alexander Larsson	e93a51b1cc	GskGLShader: Drop fallback node and add try_compile function to replace it This removes the fallback node from GskGLShaderNode and adds a new function gsk_gl_shader_try_compile_for() which tries to compile a shader against a renderer. Then you can use the return value of this both as a way to implement the fallback, and as a way to get at the error report in a saner way.	2020-09-25 14:31:33 +02:00
Matthias Clasen	66cd15d858	Add some shader tests These are just basic api usage tests, no rendering. They found the issues fixed in the preceding commits.	2020-09-23 18:05:57 -04:00
Matthias Clasen	a0bc9d65da	gsk: Make uniform regex more forgiving Accept - in initializers, otherwise we don't accept things like uniform int n = -2;	2020-09-23 18:03:52 -04:00
Matthias Clasen	a580c711e5	gsk: Make uniform regex more forgiving Accept comments after a uniform declaration - the very first shader example I tried had these, so we better support it.	2020-09-23 17:48:35 -04:00
Matthias Clasen	e91d5b82ce	gsk: Fix getters and setters for vector types The types we store for the uniforms are VEC2/3/4, even though we just store a bunch of floats. This was found while adding some simple tests.	2020-09-23 17:42:10 -04:00
Matthias Clasen	0516c59ff5	gsk: Add more shader debug spew Print out the full assembled shader sources when GSK_DEBUG=shaders is given. This is very verbose, but may be useful to see what we actually pass to the compiler.	2020-09-23 16:17:56 -04:00
Matthias Clasen	a3ea3f94dc	gsk: Add some shader debug spew When we're done extracting uniform info from the glsl, print out what we've found for GSK_DEBUG=shaders. If something goes wrong, this will be useful.	2020-09-23 15:40:57 -04:00
Matthias Clasen	5e9fe2f6e8	docs: Add new snapshot apis	2020-09-23 14:59:25 -04:00
Matthias Clasen	6613c523c2	Rename gl shader snapshot apis Rename gtk_snapshot_push_glshader and friends to gtk_snapshot_push_gl_shader, following the similar renaming in GSK. Update all callers.	2020-09-23 14:53:42 -04:00
Matthias Clasen	efa0fa0bf4	gsk: Small doc fixups Tweak the gl shader docs here and there.	2020-09-23 14:46:35 -04:00
Matthias Clasen	1b6f7917ed	Add GskGLShader apis to the docs	2020-09-23 14:41:22 -04:00
Alexander Larsson	8cc18d2c82	shadertoy demo: Fix GLSL on GLES I was getting "assignment to varying fragColor" errors	2020-09-23 17:38:03 +02:00
Alexander Larsson	d97267b897	gtk-demo: Add GskGLShaderNode demo Add adds a demo showing off GskGLShaderNode in various ways. It has a transistion widget, using some examples from gl-transitions.com, with child widgets being both images, a GL area and real widgets (that let you edit the transition shaders themselves. It also has a fancy fire effect on hove on the buttons.	2020-09-23 17:28:23 +02:00
Alexander Larsson	21e0ad0561	Support GLShaderNode in backends For vulkan/broadway this just means to ignore it, but for the gl backend we support (with up to 4 texture inputs, which is similar to what shadertoy does, so should be widely supported).	2020-09-23 17:01:17 +02:00
Alexander Larsson	94cccc5e71	GtkSnapshot: Add gtk_snapshot_push_glshader()	2020-09-23 17:01:13 +02:00
Alexander Larsson	111dfdf3f5	Add GskGLShaderNode This is a rendernode that is supposed to run a GLSL fragment shader with a set of inputs and produce outputs. The inputs are: * A GskGLShader object with the source and uniforms definitions computed from the source. * A the data for the uniforms, formated according to the GskGLShader * a list of render nodes that are rendered to textures Additionally there is a fallback node which is used in case OpenGL is not supported or there is some kind of failure with the shader code.	2020-09-23 17:01:08 +02:00
Alexander Larsson	0693deb02f	gl: Add some namespacing to the preamble symbols This adds a gsk prefix to the stuff in the preamble, as we want to avoid it conflicting with things in the main shader. Especially once we start allow some customization of shaders.	2020-09-22 12:50:10 +02:00
Alexander Larsson	ffd39c257a	gl backend: Add line numbers to source in glsl compilation errors Almost always the source is created by combining various sources, which means the line numbers in the error messages are hard to use. Adding the line numbers to the source in the error message helps with this.	2020-09-22 12:50:10 +02:00
Alexander Larsson	ec0ad5738c	gl: Properly report error if shader linking fails In gsk_gl_shader_builder_create_program(), if linking fails we need to return -1 to indicate error, rather than the old deleted program id.	2020-09-22 09:40:16 +02:00
Alexander Larsson	c958fd8e86	glrenderer: Move ProgramState into Program There is no real reason to have this on the side indexed via the index, as it is stored next to each other anyway. Plus, storing them together lets use use `Program` structures not in the array.	2020-09-22 09:40:16 +02:00