node-editor: Save test data relative to current working directory

This avoids hard-coding the GTK source directory into the binary, which
would make the binary non-reproducible across different source paths,
particularly in a distro build environment where the source directory
used by autobuilders will often not exist on end-user systems. The node
editor can still be used to create new test-cases by running it with the
GTK source directory as its current working directory.

Resolves: https://gitlab.gnome.org/GNOME/gtk/-/issues/5403
Signed-off-by: Simon McVittie <smcv@debian.org>

.gitlab-ci.yml

@@ -22,35 +22,29 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false -Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false -Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false -Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false -Dharfbuzz:werror=false -Dfreetype2:werror=false -Dfontconfig:werror=false -Dfribidi:werror=false -Dlibffi:werror=false -Dlibjpeg-turbo:werror=false -Dmutest:werror=false -Dpixman:werror=false -Dproxy-libintl:werror=false"
+  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false -Dwayland:werror=false"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
+  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v42"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38"
+  FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
 
-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
-default:
-  retry:
-    max: 2
-    when:
-      - 'runner_system_failure'
-      - 'stuck_or_timeout_failure'
-      - 'scheduler_failure'
-      - 'api_failure'
-  interruptible: true
+.only-default:
+  only:
+    - branches
+  except:
+    - tags
 
 style-check-diff:
+  extends: .only-default
   image: $FEDORA_IMAGE
   stage: check
-  when: manual
+  allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
+  extends: .only-default
   image: $FEDORA_IMAGE
   artifacts:
     when: always
@@ -60,10 +54,6 @@ style-check-diff:
         - "${CI_PROJECT_DIR}/_build/report-x11_unstable.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland_unstable.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles_unstable.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_smalltexture.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_smalltexture_unstable.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway_unstable.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
@@ -81,6 +71,11 @@ style-check-diff:
     key: "$CI_JOB_NAME"
     paths:
       - _ccache/
+      - subprojects/gdk-pixbuf/
+      - subprojects/glib/
+      - subprojects/graphene/
+      - subprojects/libepoxy/
+      - subprojects/pango/
 
 fedora-x86_64:
   extends: .build-fedora-default
@@ -90,17 +85,10 @@ fedora-x86_64:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - pip3 install --user meson~=0.64
-    - meson subprojects download
-    - meson subprojects update --reset
+    - meson subprojects update
     - mkdir _install
-    - meson setup
-            --prefix=${CI_PROJECT_DIR}/_install
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
+    - meson --prefix=${CI_PROJECT_DIR}/_install
+            ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
     - meson install -C _build
@@ -108,8 +96,7 @@ fedora-x86_64:
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
     - .gitlab-ci/run-tests.sh _build x11
     - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
-    - .gitlab-ci/run-tests.sh _build wayland_smalltexture
+    - .gitlab-ci/run-tests.sh _build waylandgles
     - .gitlab-ci/run-tests.sh _build broadway
 
 release-build:
@@ -120,17 +107,10 @@ release-build:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - pip3 install --user meson~=0.64
-    - meson subprojects download
-    - meson subprojects update --reset
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
+    - meson subprojects update
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
-    - meson compile -C _build
+    - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11
 
 fedora-mingw64:
@@ -151,26 +131,37 @@ fedora-mingw64:
             # mingw64-graphene (rawhide)
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - pip3 install --user meson~=0.64
-    - meson subprojects download
-    - meson subprojects update --reset
-      # Test that mingw64-meson still fails. If it has stopped failing, the CI
-      # will fail and now you should remove the hack that follows this.
-    - FAILED=false
-    - mingw64-meson --version || FAILED=true
-    - test $FAILED = false && echo "mingw64-meson works now, remove the hack" && exit 1
-      # HACK: Running mingw64-meson directly fails on the CI with:
-      #  /usr/bin/mingw64-meson: line 92: fg: no job control
-      # Because rpm is not evaluating %__meson and it gets interpreted as a job
-      # specifier. So we fix that and run it ourselves.
-    - rpm --eval "%{mingw64_meson}" > mingw64-meson.sh
-    - sed -i -e 's/%__meson/meson/' mingw64-meson.sh
-    - chmod +x mingw64-meson.sh
-    - ./mingw64-meson.sh -Dintrospection=disabled -Dgraphene:introspection=disabled _build
+    - meson subprojects update
+    - mkdir _build && cd _build
+    - mingw64-meson -Dintrospection=disabled -Dgraphene:introspection=disabled
+    - ninja
+
+installed-tests:
+  extends: .build-fedora-default
+  stage: build
+  needs: []
+  variables:
+    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
+    G_TEST_ACCESSIBLE: 1
+  script:
+    - .gitlab-ci/show-info-linux.sh
+    - meson subprojects update
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+            _build
     - ninja -C _build
+    - sudo ninja -C _build install
+    - dbus-run-session xvfb-run -a -s "-screen 0 1024x768x24"
+            gnome-desktop-testing-runner
+                   --report-directory=_build/installed-tests-report/failed/
+                   --parallel=0
+                   gtk-4.0
+  artifacts:
+    paths:
+      - "_build/installed-tests-report/"
+
 
 .mingw-defaults:
+  extends: .only-default
   stage: build
   tags:
     - win32-ps
@@ -200,23 +191,21 @@ msys2-mingw64:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
 macos:
-  # Sadly, this fails regularly, and its failure is never enlightening
-  allow_failure: true
-  rules:
-    - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  extends: .only-default
+  only:
+    - branches@GNOME/gtk
   stage: build
   tags:
     - macos
   needs: []
   before_script:
     - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson~=0.64
+    - pip3 install --user meson==0.60.3
     - pip3 install --user ninja
     - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
     - export MESON_FORCE_BACKTRACE=1
   script:
-    - meson setup ${COMMON_MESON_FLAGS}
-            -Dx11-backend=false
+    - meson -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
             -Dmedia-gstreamer=disabled
@@ -224,21 +213,18 @@ macos:
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled
-            -Ddemos=false
-            -Dbuild-tests=false
-            -Dbuild-examples=false
-            -Dbuild-testsuite=false
             _build
-    - meson compile -C _build
+    - ninja -C _build
   artifacts:
     when: always
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 vs2017-x64:
+  extends: .only-default
   # TODO: Uncomment this when ready to merge.
-  # rules:
-  #   - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  #only:
+  #  - branches@GNOME/gtk
   stage: build
   tags:
     - win32-ps
@@ -251,7 +237,7 @@ vs2017-x64:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 .flatpak-defaults:
-  image: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
+  image: $FLATPAK_IMAGE
   stage: flatpak
   allow_failure: true
   tags:
@@ -261,67 +247,65 @@ vs2017-x64:
       - "${APPID}-dev.flatpak"
       - 'repo.tar'
     expire_in: 1 day
-  rules:
-    # Only build Flatpak bundles automatically on main
-    - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_BRANCH != "main"
-      when: "manual"
   script:
     - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
 
-flatpak:demo:
-  extends: '.flatpak-defaults'
+# Manual jobs, for branches and MRs
+.flatpak-manual:
+  extends: .flatpak-defaults
+  when: manual
+
+# Only build Flatpak bundles automatically on main
+.flatpak-main:
+  extends: .flatpak-defaults
+  only:
+    - main
+
+flatpak-manual:demo:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.Demo4
 
-flatpak:demo:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:demo:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.Demo4
 
-flatpak:widget-factory:
-  extends: '.flatpak-defaults'
+flatpak-manual:widget-factory:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak:widget-factory:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:widget-factory:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak:icon-browser:
-  extends: '.flatpak-defaults'
+flatpak-manual:icon-browser:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak:icon-browser:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:icon-browser:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak:node-editor:
-  extends: '.flatpak-defaults'
+flatpak-manual:node-editor:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
-flatpak:node-editor:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:node-editor:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
@@ -330,35 +314,23 @@ flatpak:node-editor:aarch64:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
     extends: '.publish_nightly'
-    needs: ['flatpak:demo']
-
-nightly demo aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:demo:aarch64']
+    dependencies: ['flatpak-main:demo']
+    needs: ['flatpak-main:demo']
 
 nightly factory:
     extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory']
-
-nightly factory aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory:aarch64']
+    dependencies: ['flatpak-main:widget-factory']
+    needs: ['flatpak-main:widget-factory']
 
 nightly icon-browser:
     extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser']
-
-nightly icon-browser aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser:aarch64']
+    dependencies: ['flatpak-main:icon-browser']
+    needs: ['flatpak-main:icon-browser']
 
 nightly node-editor:
     extends: '.publish_nightly'
-    needs: ['flatpak:node-editor']
-
-nightly node-editor aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:node-editor:aarch64']
+    dependencies: ['flatpak-main:node-editor']
+    needs: ['flatpak-main:node-editor']
 
 static-scan:
   image: $FEDORA_IMAGE
@@ -367,31 +339,23 @@ static-scan:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
   script:
-    - export PATH="$HOME/.local/bin:$PATH"
-    - pip3 install --user meson~=0.64
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            _scan_build
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _scan_build
     - ninja -C _scan_build scan-build
   artifacts:
     paths:
       - _scan_build/meson-logs
   allow_failure: true
 
-# Run tests with the address sanitizer. We need to turn off introspection
-# and f16c, since they are incompatible with asan
+# Run tests with the address sanitizer. We need to turn off introspection,
+# since it is incompatible with asan
 asan-build:
   image: $FEDORA_IMAGE
   tags: [ asan ]
   stage: analysis
   needs: []
-  when: manual
   variables:
   script:
-    - export PATH="$HOME/.local/bin:$PATH"
-    - pip3 install --user meson~=0.64
-    - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled -Df16c=disabled _build
+    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland
   artifacts:
@@ -403,22 +367,10 @@ reference:
   image: $FEDORA_IMAGE
   stage: docs
   needs: []
+  variables:
+    EXTRA_MESON_FLAGS: "--buildtype=release --force-fallback-for=gdk-pixbuf,pango"
   script:
-    - export PATH="$HOME/.local/bin:$PATH"
-    - pip3 install --user meson~=0.64
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            --buildtype=release
-            --force-fallback-for=gdk-pixbuf,pango
-            -Dintrospection=enabled
-            -Dgtk_doc=true
-            -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:gtk_doc=true
-            -Ddemos=false
-            -Dbuild-examples=false
-            -Dbuild-tests=false
-            -Dbuild-testsuite=false
-            _build
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true -Dgdk-pixbuf:gtk_doc=true -Dpango:gtk_doc=true _build
     - meson compile -C _build
     - mkdir -p _reference/
     - mv _build/docs/reference/gdk/gdk4/ _reference/gdk4/
@@ -441,9 +393,9 @@ reference:
 publish-docs:
   image: fedora:latest
   stage: publish
-  interruptible: false
   needs: ['reference']
   script:
     - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "main"
+  only:
+    refs:
+      - main

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:36
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -18,9 +18,7 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
-    docbook-style-xsl \
     elfutils-libelf-devel \
-    expat-devel \
     fribidi-devel \
     gcc \
     gcc-c++ \
@@ -33,7 +31,6 @@ RUN dnf -y install \
     glibc-devel \
     glibc-headers \
     gnome-desktop-testing \
-    gnupg2 \
     gobject-introspection-devel \
     graphene-devel \
     graphviz \
@@ -73,6 +70,7 @@ RUN dnf -y install \
     mesa-dri-drivers \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
+    meson \
     ninja-build \
     pango-devel \
     pcre-devel \
@@ -82,9 +80,9 @@ RUN dnf -y install \
     python3-gobject \
     python3-jinja2 \
     python3-markdown \
-    python3-packaging \
     python3-pip \
     python3-pygments \
+    python3-toml \
     python3-typogrify \
     python3-wheel \
     redhat-rpm-config \
@@ -96,6 +94,8 @@ RUN dnf -y install \
     weston-libs \
     which \
     xorg-x11-server-Xvfb \
+ && dnf install -y 'dnf-command(builddep)' \
+ && dnf builddep -y wayland \
  && dnf clean all
 
 # Enable sudo for wheel users

.gitlab-ci/flatpak-build.sh

@@ -20,7 +20,6 @@ flatpak build ${builddir} meson \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
                 -Dbuild-tests=false \
-                -Dbuild-testsuite=false \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \
                 -Ddemos=true \

.gitlab-ci/run-docker.sh

@@ -23,7 +23,6 @@ push=0
 list=0
 print_help=0
 no_login=0
-no_cache=0
 
 while (($# > 0)); do
         case "${1%%=*}" in
@@ -35,7 +34,6 @@ while (($# > 0)); do
                 --base|-b) read_arg base "$@" || shift;;
                 --version|-v) read_arg base_version "$@" || shift;;
                 --no-login) no_login=1;;
-                --no-cache) no_cache=1;;
                 *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
         esac
         shift
@@ -105,21 +103,11 @@ TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
 
 if [ $build == 1 ]; then
         echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        if [ $no_cache == 0 ]; then
-                ${CMD} build \
-                        ${format} \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        else
-                ${CMD} build \
-                        ${format} \
-                        --no-cache \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        fi
-
+        ${CMD} build \
+                ${format} \
+                --build-arg HOST_USER_ID="$UID" \
+                --tag "${TAG}" \
+                --file "${base}.Dockerfile" .
         exit $?
 fi
 

.gitlab-ci/run-tests.sh

@@ -8,7 +8,7 @@ builddir=$1
 backend=$2
 
 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:verbosity=1:log_threads=1
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0
 export G_SLICE=always-malloc
 
 case "${backend}" in
@@ -36,7 +36,7 @@ case "${backend}" in
                 --suite=failing || true
     ;;
 
-  wayland*)
+  wayland)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
     weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
@@ -63,6 +63,33 @@ case "${backend}" in
     kill ${compositor}
     ;;
 
+  waylandgles)
+    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+    weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
+    compositor=$!
+    export WAYLAND_DISPLAY=wayland-6
+
+    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend} \
+                --suite=gtk \
+                --no-suite=failing \
+                --no-suite=flaky \
+                --no-suite=gsk-compare-broadway
+    exit_code=$?
+
+    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend}_unstable \
+                --suite=flaky \
+                --suite=failing || true
+
+    kill ${compositor}
+    ;;
+
   broadway)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 

.gitlab-ci/test-msvc.bat

@@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 @echo on
 
 :: FIXME: make warnings fatal
-pip3 install --upgrade --user meson~=0.64 || goto :error
+pip3 install --upgrade --user meson==0.60.3 || goto :error
 meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 

CONTRIBUTING.md

@@ -21,7 +21,7 @@ many things that we value:
 Please, do not use the issue tracker for support questions. If you have
 questions on how to use GTK effectively, you can use:
 
- - the `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org)
+ - the `#gtk` IRC channel on irc.gnome.org
  - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
 
 You can also look at the GTK tag on [Stack
@@ -44,7 +44,6 @@ If you're reporting a bug make sure to list:
 
  0. which version of GTK are you using?
  0. which operating system are you using?
- 0. what display and graphics driver are you using?
  0. the necessary steps to reproduce the issue
  0. the expected outcome
  0. a description of the behavior; screenshots are also welcome

NEWS

@@ -1,364 +1,6 @@
-Overview of Changes in 4.11.2, xx-xx-xxxx
-=========================================
-
-Overview of Changes in 4.11.1, 03-04-2023
-=========================================
-
-* GtkLabel, GtkLinkButton:
- - Make file:// uris work again
-
-* GtkListView/GtkColumnView/GtkGridView:
- - Fix clipping issues
- - Handle focus movement better
- - Introduce ::tab-behavior properties
- - Introduce GtkListItem::focusable
- - Introduce GtkColumnViewCell
- - Introduce row factories in GtkColumnView
- - Make list grid and column views inert when not rendering
-
-* Drag-and-Drop:
- - Support resizing drag surfaces, using the new
-   GdkDragSurface::compute-size signal
-
-* Theme:
- - Port .boxed-list style from Adwaita
- - Make insensitive pictures appear grayed out
-
-* Accessibility:
- - Fix memory leaks
- - Fix a crash
-
-* GDK:
- - Add gdk_surface_get_scale to get the fractional scale
- - Use fractional scales on Wayland with cairo
- - Use fractional scales on Wayland with GL if GDK_DEBUG=gl-fractional
-   is set. This support is still experimental
-
-* GSK:
- - Allow limiting texture sizes with GSK_MAX_TEXTURE_SIZE
- - Use samplers for GL texture filtering
- - Fix problems with texture slicing
- - Avoid re-uploading textures when possible
- - Use mipmaps when it is beneficial
-
-* Wayland:
- - Fix handling of Drag hotspots
- - Fix a crash with cursor size 0
- - Support absolute paths in WAYLAND_DISPLAY
- - Use the fractional scale protocol
- - Use a viewporter to set buffer scale
-
-* Windows:
- - Fix problems with WGL
-
-* Vulkan:
- - Some fixes to the experimental Vulkan renderer
- - Support fractional scaling
-
-* Debugging:
- - Show more Wayland-specific information in the inspector
-
-* Deprecations:
- - gtk_widget_translate_coordinates
- - gdk_surface_create_similar_surface
-
-* Documentation:
- - Add a section on coordinate systems
-
-* Build:
- - Require wayland-protocols 1.31
-
-* Translation updates
- - British English
- - Bulgarian
- - Chinese (China)
- - Dutch
- - French
- - Persian
- - Russian
-
-
-Overview of Changes in 4.10.1, 14-03-2023
-=========================================
-
-* GtkFileChooser
- - Improve search performance
- - Be safe against pathless files
- - Fix memory leaks
- - Only show local files in recent files
- - Show most recent files first
- - Make files non-selectable in selet_folder mode
-
-* GtkListView / GtkColumnView / GtkGridView
- - Fix scrolling problems
- - Support CSS border-spacing
-
-* GtkComboBox
- - Fix a size allocation problem
-
-* gtk
- - Size allocation fixes
-
-* Accessibility
- - Miscellaneous property fixes and improvements
-
-* Wayland
- - Fix an ordering problem in surface disposal
-
-* Windows
- - Fix Visual Studio build with older GLib
-
-* Translation updates
- Basque
- Bulgarian
- Catalan
- Czech
- Danish
- Finnish
- Friulian
- Galician
- Georgian
- Hungarian
- Lithuanian
- Polish
- Portuguese
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.10.0, 04-03-2023
-=========================================
-
-* GtkTextView
- - Document hanging indentation
-
-* GtkListView
- - Fix a size allocation problem
-
-* GtkFileChooser
- - Fix paned behavior
- - Fix a crash
-
-* GtkText
- - Fix various problems with undo
-
-* Accessibility
- - Make some getters transfer-full
- - Allow setting accessible parents and siblings
- - Add a role for toggle buttons
- - Miscellaneous property fixes and improvements
-
-* gtk
- - Improve the handling resize-during-size-allocate
-
-* gdk
- - Introduce GdkTextureDownloader and use it
- - Make gdk_texture_get_format public
-
-* gsk
- - Make mask nodes more versatile
- - Improve the GL implementation for texture scale nodes
-
-* X11
- - Fix key handling during DND
-
-* Tools
- - gtk-builder-tool: Try harder to handle templates
- - gtk-builder-tool: Prefer properties over <child>
-
-* Translation updates
- Basque
- Belarusian
- Bulgarian
- Indonesian
- Galician
- Georgian
- German
- Hebrew
- Lithuanian
- Portuguese
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.4, 12-02-2023
+Overview of Changes in 4.9.2, xx-xx-xxxx
 ========================================
 
-* Printing:
- - Add a CPDB backend
- - Drop the lpr backend
-
-* GtkFileDialog:
- - Robustness fixes
-
-* GtkScaleButton:
- - Add an 'active' property
-
-* GtkSearchEntry:
- - Add placeholder text
-
-* Fix conflicting type names between gtk and gio
-
-* Gsk:
- - Settable filtering for scaled textures
- - Add mask nodes
- - Some robustness and crash fixes
-
-* Wayland:
- - Handle dispatch failing in more places
-
-* Deprecations:
- - GtkVolumeButton
-
-* Translation updates:
- Belarusian
- Chinese (Taiwan)
- Georgian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.3, 04-02-2023
-========================================
-
-* Add GtkUriLauncher, as replacement for gtk_show_uri
-
-* Add GdkMonitor::description
-
-* Fix problems with tooltip sizing
-
-* Deprecations:
- - GtkStatusbar
- - GtkAssistant
- - GtkLockButton
- - gtk_gesture_set_sequence_state
-
-* GtkColumnView:
- - Only create widgets for visible columns
-
-* GtkFileDialog:
- - Drop shortcut folders API
-
-* GtkCalendar:
- - Make marked days work again
-
-* GtkSwitch:
- - Make state and active independently settable
-
-* GtkFileChooser:
- - Fix a crash with DND
- - Fix excessively wide sidebar
- - Make context menus work again
-
-* Accessibility:
- - Make GtkAccessible public, so it can be implemented outside GTK
- - Support accessible implementation for editables
-
-* CSS:
- - Fix randomly stopping CSS animations
-
-* GL:
- - Fix synchronization with GStreamer
- - Fix problems with 3rd party GL in the same thread
-
-* Wayland:
- - Fix startup notification with xdg_activation
-
-* Broadway:
- - Implement modal windows
-
-* macOS:
- - Make DND work
-
-* Build:
- - Require graphene 1.10
- - Require gobject-introspection 1.72
-
-* Translation updates
- Catalan
- Galician
- German
- Hebrew
- Indonesian
- Portuguese
- Russian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.2, 26-12-2022
-========================================
-
-* GtkFileChooserWidget:
- - Add a grid view
-
-* GtkText, GtkTextView:
- - Fix activation of the on-screen keyboard
- - Prevent unexpected text direction changes
-
-* GtkCenterBox:
- - Add properties for children
-
-* GtkTreeExpander:
- - Add a hide-expander property
-
-* GtkStringList:
- - Add a construct-only strings property
-
-* GtkBuilder:
- - Support parsing Pango attributes in string form
-
-* GtkGestureStylus:
- - Add a stylus-only property
-
-* GtkFileLauncher:
- - New async-style api to replace gtk_show_uri
-
-* GtkColorDialog, GtkFontDialog, GtkFileDialog,
-  GtkAlertDialog:
- - APIs have seen some tweaks
- - Prefer portals when available
- - Fixes for cancellation
-
-* Add GDK_DEBUG=no-portals
-
-* Improve file DND with remote files
-
-* GtkInfoBar has been deprecated
-
-* gtk_widget_show/hide have been deprecated
-
-* gtk_show_uri has been deprecated
-
-* Wayland:
- - Fix button mask handling
- - Fix problems with cursor size on hi-dpi screens
- - Support newer versions of some protocols
- - Fix handling of surrounding text in input methods
-
-* X11:
- - Fix some ordering problems with surface destruction
-
-* Windows:
- - Improved system settings integration
- - Fix window resizing work with native decorations
- - Include a full hicolor index.theme file as a resource
-
-* Translation updates
- Croatian
- Dutch
- Hungarian
- Interlingua
- Persian
- Turkish
- Ukrainian
-
-
 Overview of Changes in 4.9.1, 31-10-2022
 ========================================
 

demos/constraint-editor/constraint-editor-window.c

@@ -228,9 +228,9 @@ open_cb (GtkWidget              *button,
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Open file");
   cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  gtk_file_dialog_set_current_folder (dialog, cwd);
   g_object_unref (cwd);
-  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, open_response_cb, self);
+  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, NULL, open_response_cb, self);
   g_object_unref (dialog);
 }
 
@@ -337,10 +337,11 @@ save_cb (GtkWidget              *button,
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Save constraints");
   cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  gtk_file_dialog_set_current_folder (dialog, cwd);
   g_object_unref (cwd);
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
+                        NULL, NULL,
                         NULL,
                         save_response_cb, self);
   g_object_unref (dialog);

demos/constraint-editor/meson.build

@@ -9,7 +9,7 @@ constraint_editor_sources = [
 
 constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
   'constraint-editor.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-constraint-editor',

demos/gtk-demo/application.c

@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
@@ -126,7 +124,7 @@ activate_open (GSimpleAction *action,
   GtkFileDialog *dialog;
 
   dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_open (dialog, NULL, NULL, open_response_cb, g_object_ref (app));
+  gtk_file_dialog_open (dialog, NULL, NULL, NULL, open_response_cb, g_object_ref (app));
   g_object_unref (dialog);
 }
 

demos/gtk-demo/assistant.c

@@ -7,8 +7,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *progress_bar = NULL;
 
 static gboolean

demos/gtk-demo/bluroverlay.c

@@ -297,13 +297,12 @@ blur_overlay_snapshot (GtkWidget   *widget,
   GtkWidget *main_widget;
   GskRenderNode *main_widget_node = NULL;
   GtkWidget *child;
-  int width, height;
+  GtkAllocation main_alloc;
   cairo_region_t *clip = NULL;
   int i;
 
   main_widget = BLUR_OVERLAY (widget)->main_widget;
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
+  gtk_widget_get_allocation (widget, &main_alloc);
 
   for (child = gtk_widget_get_first_child (widget);
        child != NULL;
@@ -316,7 +315,7 @@ blur_overlay_snapshot (GtkWidget   *widget,
 
       if (blur > 0)
         {
-          cairo_rectangle_int_t rect;
+          GtkAllocation alloc;
           graphene_rect_t bounds;
 
           if (main_widget_node == NULL)
@@ -328,8 +327,8 @@ blur_overlay_snapshot (GtkWidget   *widget,
               main_widget_node = gtk_snapshot_free_to_node (child_snapshot);
             }
 
-          if (!gtk_widget_compute_bounds (child, gtk_widget_get_parent (child), &bounds))
-            graphene_rect_init (&bounds, 0, 0, 0, 0);
+          gtk_widget_get_allocation (child, &alloc);
+          graphene_rect_init (&bounds, alloc.x, alloc.y, alloc.width, alloc.height);
           gtk_snapshot_push_blur (snapshot, blur);
           gtk_snapshot_push_clip (snapshot, &bounds);
           gtk_snapshot_append_node (snapshot, main_widget_node);
@@ -338,17 +337,13 @@ blur_overlay_snapshot (GtkWidget   *widget,
 
           if (clip == NULL)
             {
+              cairo_rectangle_int_t rect;
               rect.x = rect.y = 0;
-              rect.width = width;
-              rect.height = height;
+              rect.width = main_alloc.width;
+              rect.height = main_alloc.height;
               clip = cairo_region_create_rectangle (&rect);
             }
-
-          rect.x = floor (bounds.origin.x);
-          rect.y = floor (bounds.origin.y);
-          rect.width = ceil (bounds.origin.x + bounds.size.width - rect.x);
-          rect.height = ceil (bounds.origin.y + bounds.size.height - rect.y);
-          cairo_region_subtract_rectangle (clip, &rect);
+          cairo_region_subtract_rectangle (clip, (cairo_rectangle_int_t *)&alloc);
         }
     }
 

demos/gtk-demo/builder.c

@@ -37,8 +37,6 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static gboolean
 pop_status (gpointer data)
 {
@@ -59,8 +57,6 @@ status_message (GtkStatusbar *status,
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
-G_GNUC_END_IGNORE_DEPRECATIONS
-
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,

demos/gtk-demo/clipboard.c

@@ -244,9 +244,8 @@ open_file_cb (GtkWidget *button)
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
                         NULL,
+                        NULL,
                         file_chooser_response, button);
-
-  g_object_unref (dialog);
 }
 
 static void
@@ -278,11 +277,9 @@ open_folder_cb (GtkWidget *button)
   gtk_file_dialog_select_folder (dialog,
                                  GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
                                  NULL,
+                                 NULL,
                                  folder_chooser_response, button);
-
-  g_object_unref (dialog);
 }
-
 static void
 update_paste_button_sensitivity (GdkClipboard *clipboard,
                                  GtkWidget    *paste_button)

demos/gtk-demo/demo.gresource.xml

@@ -43,7 +43,7 @@
     <file>cssview.css</file>
     <file>reset.css</file>
   </gresource>
-  <gresource prefix="/listview_selections">
+  <gresource prefix="/dropdown">
     <file>suggestionentry.h</file>
     <file>suggestionentry.c</file>
     <file>suggestionentry.css</file>
@@ -215,12 +215,6 @@
     <file>demo3widget.h</file>
     <file>demo3widget.ui</file>
   </gresource>
-  <gresource prefix="/mask">
-    <file>demo4widget.c</file>
-    <file>demo4widget.h</file>
-    <file>hsla.h</file>
-    <file>hsla.c</file>
-  </gresource>
   <gresource prefix="/paintable_svg">
     <file>svgpaintable.h</file>
     <file>svgpaintable.c</file>
@@ -274,6 +268,7 @@
     <file>cursors.c</file>
     <file>dialog.c</file>
     <file>drawingarea.c</file>
+    <file>dropdown.c</file>
     <file>dnd.c</file>
     <file>editable_cells.c</file>
     <file>entry_completion.c</file>
@@ -297,7 +292,6 @@
     <file>iconscroll.c</file>
     <file>iconview.c</file>
     <file>iconview_edit.c</file>
-    <file>image_scaling.c</file>
     <file>images.c</file>
     <file>infobar.c</file>
     <file>layoutmanager.c</file>
@@ -310,7 +304,6 @@
     <file>listview_clocks.c</file>
     <file>listview_filebrowser.c</file>
     <file>listview_minesweeper.c</file>
-    <file>listview_selections.c</file>
     <file>listview_settings.c</file>
     <file>listview_ucd.c</file>
     <file>listview_weather.c</file>
@@ -318,7 +311,7 @@
     <file>list_store.c</file>
     <file>main.c</file>
     <file>markup.c</file>
-    <file>mask.c</file>
+    <file>menu.c</file>
     <file>overlay.c</file>
     <file>overlay_decorative.c</file>
     <file>paint.c</file>

demos/gtk-demo/demo3widget.c

@@ -3,20 +3,16 @@
 
 enum
 {
-  PROP_TEXTURE = 1,
-  PROP_FILTER,
-  PROP_SCALE,
-  PROP_ANGLE,
+  PROP_PAINTABLE = 1,
+  PROP_SCALE
 };
 
 struct _Demo3Widget
 {
   GtkWidget parent_instance;
 
-  GdkTexture *texture;
+  GdkPaintable *paintable;
   float scale;
-  float angle;
-  GskScalingFilter filter;
 
   GtkWidget *menu;
 };
@@ -28,86 +24,10 @@ struct _Demo3WidgetClass
 
 G_DEFINE_TYPE (Demo3Widget, demo3_widget, GTK_TYPE_WIDGET)
 
-static gboolean
-query_tooltip (GtkWidget  *widget,
-               int         x,
-               int         y,
-               gboolean    keyboard_mode,
-               GtkTooltip *tooltip,
-               gpointer    data)
-{
-  Demo3Widget *self = DEMO3_WIDGET (widget);
-  GtkWidget *grid;
-  GtkWidget *label;
-  char *s, *s2;
-  const char *filter[] = { "Linear", "Nearest", "Trilinear" };
-  int precision, l;
-
-  grid = gtk_grid_new ();
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-  label = gtk_label_new ("Texture");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
-  s = g_strdup_printf ("%d\342\200\206\303\227\342\200\206%d",
-                       gdk_texture_get_width (self->texture),
-                       gdk_texture_get_height (self->texture));
-  label = gtk_label_new (s);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
-
-  label = gtk_label_new ("Rotation");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
-  s = g_strdup_printf ("%.1f", self->angle);
-  if (g_str_has_suffix (s, ".0"))
-    s[strlen (s) - 2] = '\0';
-  s2 = g_strconcat (s, "\302\260", NULL);
-  label = gtk_label_new (s2);
-  g_free (s2);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
-
-  label = gtk_label_new ("Scale");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
-
-  precision = 1;
-  do {
-    s = g_strdup_printf ("%.*f", precision, self->scale);
-    l = strlen (s) - 1;
-    while (s[l] == '0')
-      l--;
-    if (s[l] == '.')
-      s[l] = '\0';
-    precision++;
-  } while (strcmp (s, "0") == 0);
-
-  label = gtk_label_new (s);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 1, 1);
-
-  label = gtk_label_new ("Filter");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
-  label = gtk_label_new (filter[self->filter]);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 3, 1, 1);
-
-  gtk_tooltip_set_custom (tooltip, grid);
-
-  return TRUE;
-}
-
 static void
 demo3_widget_init (Demo3Widget *self)
 {
   self->scale = 1.f;
-  self->angle = 0.f;
-  self->filter = GSK_SCALING_FILTER_LINEAR;
   gtk_widget_init_template (GTK_WIDGET (self));
 }
 
@@ -116,7 +36,7 @@ demo3_widget_dispose (GObject *object)
 {
   Demo3Widget *self = DEMO3_WIDGET (object);
 
-  g_clear_object (&self->texture);
+  g_clear_object (&self->paintable);
 
   gtk_widget_dispose_template (GTK_WIDGET (self), DEMO3_TYPE_WIDGET);
 
@@ -129,35 +49,21 @@ demo3_widget_snapshot (GtkWidget   *widget,
 {
   Demo3Widget *self = DEMO3_WIDGET (widget);
   int x, y, width, height;
-  double w, h, w2, h2;
+  double w, h;
 
   width = gtk_widget_get_width (widget);
   height = gtk_widget_get_height (widget);
 
-  w2 = w = self->scale * gdk_texture_get_width (self->texture);
-  h2 = h = self->scale * gdk_texture_get_height (self->texture);
+  w = self->scale * gdk_paintable_get_intrinsic_width (self->paintable);
+  h = self->scale * gdk_paintable_get_intrinsic_height (self->paintable);
 
-  if (G_APPROX_VALUE (self->angle, 90.f, FLT_EPSILON) ||
-      G_APPROX_VALUE (self->angle, 270.f, FLT_EPSILON))
-    {
-      double s = w2;
-      w2 = h2;
-      h2 = s;
-    }
-
-  x = (width - ceil (w2)) / 2;
-  y = (height - ceil (h2)) / 2;
+  x = MAX (0, (width - ceil (w)) / 2);
+  y = MAX (0, (height - ceil (h)) / 2);
 
   gtk_snapshot_push_clip (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
   gtk_snapshot_save (snapshot);
   gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (x, y));
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (w2 / 2, h2 / 2));
-  gtk_snapshot_rotate (snapshot, self->angle);
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- w / 2, - h / 2));
-  gtk_snapshot_append_scaled_texture (snapshot,
-                                      self->texture,
-                                      self->filter,
-                                      &GRAPHENE_RECT_INIT (0, 0, w, h));
+  gdk_paintable_snapshot (self->paintable, snapshot, w, h);
   gtk_snapshot_restore (snapshot);
   gtk_snapshot_pop (snapshot);
 }
@@ -172,26 +78,14 @@ demo3_widget_measure (GtkWidget      *widget,
                       int            *natural_baseline)
 {
   Demo3Widget *self = DEMO3_WIDGET (widget);
-  int width, height;
   int size;
 
-  width = gdk_texture_get_width (self->texture);
-  height = gdk_texture_get_height (self->texture);
-
-  if (G_APPROX_VALUE (self->angle, 90.f, FLT_EPSILON) ||
-      G_APPROX_VALUE (self->angle, 270.f, FLT_EPSILON))
-    {
-      int s = width;
-      width = height;
-      height = s;
-    }
-
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    size = width;
+    size = gdk_paintable_get_intrinsic_width (self->paintable);
   else
-    size = height;
+    size = gdk_paintable_get_intrinsic_height (self->paintable);
 
-  *minimum = *natural = (int) ceil (self->scale * size);
+  *minimum = *natural = self->scale * size;
 }
 
 static void
@@ -209,8 +103,6 @@ demo3_widget_size_allocate (GtkWidget *widget,
   gtk_popover_present (GTK_POPOVER (self->menu));
 }
 
-static void update_actions (Demo3Widget *self);
-
 static void
 demo3_widget_set_property (GObject      *object,
                            guint         prop_id,
@@ -221,32 +113,14 @@ demo3_widget_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_TEXTURE:
-      g_clear_object (&self->texture);
-      self->texture = g_value_dup_object (value);
-      self->scale = 1.f;
-      self->angle = 0.f;
-      self->filter = GSK_SCALING_FILTER_LINEAR;
-      update_actions (self);
+    case PROP_PAINTABLE:
+      g_clear_object (&self->paintable);
+      self->paintable = g_value_dup_object (value);
       gtk_widget_queue_resize (GTK_WIDGET (object));
-      g_object_notify (object, "scale");
-      g_object_notify (object, "angle");
-      g_object_notify (object, "filter");
       break;
 
     case PROP_SCALE:
       self->scale = g_value_get_float (value);
-      update_actions (self);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
-    case PROP_ANGLE:
-      self->angle = fmodf (g_value_get_float (value), 360.f);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
-    case PROP_FILTER:
-      self->filter = g_value_get_enum (value);
       gtk_widget_queue_resize (GTK_WIDGET (object));
       break;
 
@@ -266,22 +140,14 @@ demo3_widget_get_property (GObject     *object,
 
   switch (prop_id)
     {
-    case PROP_TEXTURE:
-      g_value_set_object (value, self->texture);
+    case PROP_PAINTABLE:
+      g_value_set_object (value, self->paintable);
       break;
 
     case PROP_SCALE:
       g_value_set_float (value, self->scale);
       break;
 
-    case PROP_ANGLE:
-      g_value_set_float (value, self->angle);
-      break;
-
-    case PROP_FILTER:
-      g_value_set_enum (value, self->filter);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -303,14 +169,6 @@ pressed_cb (GtkGestureClick *gesture,
   gtk_popover_popup (GTK_POPOVER (self->menu));
 }
 
-static void
-update_actions (Demo3Widget *self)
-{
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.in", self->scale < 1024.);
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.out", self->scale > 1./1024.);
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.reset", self->scale != 1.);
-}
-
 static void
 zoom_cb (GtkWidget  *widget,
          const char *action_name,
@@ -320,30 +178,19 @@ zoom_cb (GtkWidget  *widget,
   float scale;
 
   if (g_str_equal (action_name, "zoom.in"))
-    scale = MIN (1024., self->scale * M_SQRT2);
+    scale = MIN (10, self->scale * M_SQRT2);
   else if (g_str_equal (action_name, "zoom.out"))
-    scale = MAX (1./1024., self->scale / M_SQRT2);
-  else if (g_str_equal (action_name, "zoom.reset"))
-    scale = 1.0;
+    scale = MAX (0.01, self->scale / M_SQRT2);
   else
-    g_assert_not_reached ();
+    scale = 1.0;
+
+  gtk_widget_action_set_enabled (widget, "zoom.in", scale < 10);
+  gtk_widget_action_set_enabled (widget, "zoom.out", scale > 0.01);
+  gtk_widget_action_set_enabled (widget, "zoom.reset", scale != 1);
 
   g_object_set (widget, "scale", scale, NULL);
 }
 
-static void
-rotate_cb (GtkWidget  *widget,
-           const char *action_name,
-           GVariant   *parameter)
-{
-  Demo3Widget *self = DEMO3_WIDGET (widget);
-  int angle;
-
-  g_variant_get (parameter, "i", &angle);
-
-  g_object_set (widget, "angle", fmodf (self->angle + angle, 360.f), NULL);
-}
-
 static void
 demo3_widget_class_init (Demo3WidgetClass *class)
 {
@@ -358,31 +205,20 @@ demo3_widget_class_init (Demo3WidgetClass *class)
   widget_class->measure = demo3_widget_measure;
   widget_class->size_allocate = demo3_widget_size_allocate;
 
-  g_object_class_install_property (object_class, PROP_TEXTURE,
-      g_param_spec_object ("texture", NULL, NULL,
-                           GDK_TYPE_TEXTURE,
+  g_object_class_install_property (object_class, PROP_PAINTABLE,
+      g_param_spec_object ("paintable", "Paintable", "Paintable",
+                           GDK_TYPE_PAINTABLE,
                            G_PARAM_READWRITE));
 
   g_object_class_install_property (object_class, PROP_SCALE,
-      g_param_spec_float ("scale", NULL, NULL,
-                          1./1024., 1024., 1.0,
+      g_param_spec_float ("scale", "Scale", "Scale",
+                          0.0, 10.0, 1.0,
                           G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, PROP_ANGLE,
-      g_param_spec_float ("angle", NULL, NULL,
-                          0.0, 360.0, 0.0,
-                          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_FILTER,
-      g_param_spec_enum ("filter", NULL, NULL,
-                         GSK_TYPE_SCALING_FILTER, GSK_SCALING_FILTER_LINEAR,
-                         G_PARAM_READWRITE));
-
   /* These are the actions that we are using in the menu */
   gtk_widget_class_install_action (widget_class, "zoom.in", NULL, zoom_cb);
   gtk_widget_class_install_action (widget_class, "zoom.out", NULL, zoom_cb);
   gtk_widget_class_install_action (widget_class, "zoom.reset", NULL, zoom_cb);
-  gtk_widget_class_install_action (widget_class, "rotate", "i", rotate_cb);
 
   gtk_widget_class_set_template_from_resource (widget_class, "/menu/demo3widget.ui");
   gtk_widget_class_bind_template_child (widget_class, Demo3Widget, menu);
@@ -393,18 +229,16 @@ GtkWidget *
 demo3_widget_new (const char *resource)
 {
   Demo3Widget *self;
-  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
+  GdkPaintable *paintable;
 
-  texture = gdk_texture_new_from_resource (resource);
+  pixbuf = gdk_pixbuf_new_from_resource (resource, NULL);
+  paintable = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (pixbuf));
 
-  self = g_object_new (DEMO3_TYPE_WIDGET,
-                       "texture", texture,
-                       "has-tooltip", TRUE,
-                       NULL);
+  self = g_object_new (DEMO3_TYPE_WIDGET, "paintable", paintable, NULL);
 
-  g_signal_connect (self, "query-tooltip", G_CALLBACK (query_tooltip), NULL);
-
-  g_object_unref (texture);
+  g_object_unref (pixbuf);
+  g_object_unref (paintable);
 
   return GTK_WIDGET (self);
 }

demos/gtk-demo/demo3widget.ui

@@ -12,11 +12,6 @@
       <attribute name="label">1∶1</attribute>
       <attribute name="action">zoom.reset</attribute>
     </item>
-    <item>
-      <attribute name="label">Rotate</attribute>
-      <attribute name="action">rotate</attribute>
-      <attribute name="target" type="i">90</attribute>
-    </item>
   </menu>
   <template class="Demo3Widget">
     <child>

demos/gtk-demo/demo4widget.c

@@ -1,226 +0,0 @@
-#include <math.h>
-#include "demo4widget.h"
-#include "hsla.h"
-
-enum
-{
-  PROP_0,
-  PROP_PROGRESS,
-};
-
-struct _Demo4Widget
-{
-  GtkWidget parent_instance;
-  PangoLayout *layout;
-  GskColorStop stops[8];
-  gsize n_stops;
-  double progress;
-
-  guint tick;
-};
-
-struct _Demo4WidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (Demo4Widget, demo4_widget, GTK_TYPE_WIDGET)
-
-static void
-rotate_color (GdkRGBA *rgba)
-{
-  GdkHSLA hsla;
-
-  _gdk_hsla_init_from_rgba (&hsla, rgba);
-  hsla.hue -= 1;
-  _gdk_rgba_init_from_hsla (rgba, &hsla);
-}
-
-static gboolean
-rotate_colors (GtkWidget     *widget,
-               GdkFrameClock *clock,
-               gpointer       user_data)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-
-  for (unsigned int i = 0; i < self->n_stops; i++)
-    rotate_color (&self->stops[i].color);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-demo4_widget_init (Demo4Widget *self)
-{
-  PangoFontDescription *desc;
-
-  self->progress = 0.5;
-
-  self->n_stops = 8;
-  self->stops[0].offset = 0;
-  self->stops[0].color = (GdkRGBA) { 1, 0, 0, 1 };
-
-  for (unsigned int i = 1; i < self->n_stops; i++)
-    {
-      GdkHSLA hsla;
-
-      self->stops[i].offset = i / (double)(self->n_stops - 1);
-      _gdk_hsla_init_from_rgba (&hsla, &self->stops[i - 1].color);
-      hsla.hue += 360.0 / (double)(self->n_stops - 1);
-      _gdk_rgba_init_from_hsla (&self->stops[i].color, &hsla);
-    }
-
-  self->layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "123");
-  desc = pango_font_description_from_string ("Cantarell Bold 210");
-  pango_layout_set_font_description (self->layout, desc);
-  pango_font_description_free (desc);
-
-  self->tick = gtk_widget_add_tick_callback (GTK_WIDGET (self), rotate_colors, NULL, NULL);
-}
-
-static void
-demo4_widget_dispose (GObject *object)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  g_clear_object (&self->layout);
-  gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick);
-
-  G_OBJECT_CLASS (demo4_widget_parent_class)->dispose (object);
-}
-
-static void
-demo4_widget_snapshot_content (GtkWidget   *widget,
-                               GtkSnapshot *snapshot,
-                               GskMaskMode  mode)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height, layout_width, layout_height;
-  double scale;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, mode);
-  pango_layout_get_pixel_size (self->layout, &layout_width, &layout_height);
-  scale = MIN ((double) width / layout_width, (double) height / layout_height);
-  gtk_snapshot_translate (snapshot,
-                          &GRAPHENE_POINT_INIT ((width - scale * layout_width) / 2,
-                                                (height - scale * layout_height) / 2));
-  gtk_snapshot_scale (snapshot, scale, scale);
-  gtk_snapshot_append_layout (snapshot, self->layout, &(GdkRGBA) { 0, 0, 0, 1 });
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, height),
-                                       self->stops,
-                                       self->n_stops);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_INVERTED_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_INVERTED_ALPHA);
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_ALPHA);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      self->progress = g_value_get_double (value);
-      gtk_widget_queue_draw (GTK_WIDGET (object));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_get_property (GObject     *object,
-                           guint        prop_id,
-                           GValue      *value,
-                           GParamSpec  *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      g_value_set_double (value, self->progress);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_class_init (Demo4WidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo4_widget_dispose;
-  object_class->get_property = demo4_widget_get_property;
-  object_class->set_property = demo4_widget_set_property;
-
-  widget_class->snapshot = demo4_widget_snapshot;
-
-  g_object_class_install_property (object_class, PROP_PROGRESS,
-      g_param_spec_double ("progress", NULL, NULL,
-                           0.0, 1.0, 0.5,
-                           G_PARAM_READWRITE));
-}
-
-GtkWidget *
-demo4_widget_new (void)
-{
-  return g_object_new (DEMO4_TYPE_WIDGET, NULL);
-}
-

demos/gtk-demo/demo4widget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define DEMO4_TYPE_WIDGET (demo4_widget_get_type ())
-G_DECLARE_FINAL_TYPE (Demo4Widget, demo4_widget, DEMO4, WIDGET, GtkWidget)
-
-GtkWidget * demo4_widget_new (void);

demos/gtk-demo/dnd.c

@@ -324,7 +324,7 @@ canvas_item_start_editing (CanvasItem *item)
   GtkWidget *canvas = gtk_widget_get_parent (GTK_WIDGET (item));
   GtkWidget *entry;
   GtkWidget *scale;
-  graphene_point_t p;
+  double x, y;
 
   if (item->editor)
     return;
@@ -350,17 +350,12 @@ canvas_item_start_editing (CanvasItem *item)
 
   gtk_box_append (GTK_BOX (item->editor), scale);
 
-  if (!gtk_widget_compute_point (GTK_WIDGET (item), canvas, &GRAPHENE_POINT_INIT (0, 0), &p))
-    graphene_point_init (&p, 0, 0);
-  gtk_fixed_put (GTK_FIXED (canvas), item->editor, p.x, p.y + 2 * item->r);
+  gtk_widget_translate_coordinates (GTK_WIDGET (item), canvas, 0, 0, &x, &y);
+  gtk_fixed_put (GTK_FIXED (canvas), item->editor, x, y + 2 * item->r);
   gtk_widget_grab_focus (entry);
 
 }
 
-typedef struct {
-  double x, y;
-} Hotspot;
-
 static GdkContentProvider *
 prepare (GtkDragSource *source,
          double         x,
@@ -368,8 +363,6 @@ prepare (GtkDragSource *source,
 {
   GtkWidget *canvas;
   GtkWidget *item;
-  Hotspot *hotspot;
-  graphene_point_t p;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
@@ -380,13 +373,6 @@ prepare (GtkDragSource *source,
 
   g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
 
-  hotspot = g_new (Hotspot, 1);
-  if (!gtk_widget_compute_point (canvas, item, &GRAPHENE_POINT_INIT (x, y), &p))
-    graphene_point_init (&p, x, y);
-  hotspot->x = p.x;
-  hotspot->y = p.y;
-  g_object_set_data_full (G_OBJECT (canvas), "hotspot", hotspot, g_free);
-
   return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
 }
 
@@ -397,14 +383,12 @@ drag_begin (GtkDragSource *source,
   GtkWidget *canvas;
   CanvasItem *item;
   GdkPaintable *paintable;
-  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
-  hotspot = (Hotspot *) g_object_get_data (G_OBJECT (canvas), "hotspot");
 
   paintable = canvas_item_get_drag_icon (item);
-  gtk_drag_source_set_icon (source, paintable, hotspot->x, hotspot->y);
+  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
   g_object_unref (paintable);
 
   gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);

demos/gtk-demo/drawingarea.c

@@ -362,7 +362,7 @@ do_drawingarea (GtkWidget *do_widget)
                         G_CALLBACK (scribble_resize), NULL);
 
       drag = gtk_gesture_drag_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), 0);
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
       gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
 
       g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);

demos/gtk-demo/dropdown.c

@@ -369,7 +369,7 @@ match_func (MatchObject *obj,
 }
 
 GtkWidget *
-do_listview_selections (GtkWidget *do_widget)
+do_dropdown (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *button, *box, *spin, *check, *hbox, *label, *entry;

demos/gtk-demo/glarea.c

@@ -221,13 +221,16 @@ static void
 realize (GtkWidget *widget)
 {
   const char *vertex_path, *fragment_path;
+  GdkGLContext *context;
 
   gtk_gl_area_make_current (GTK_GL_AREA (widget));
 
   if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
     return;
 
-  if (gtk_gl_area_get_api (GTK_GL_AREA (widget)) == GDK_GL_API_GLES)
+  context = gtk_gl_area_get_context (GTK_GL_AREA (widget));
+
+  if (gdk_gl_context_get_use_es (context))
     {
       vertex_path = "/glarea/glarea-gles.vs.glsl";
       fragment_path = "/glarea/glarea-gles.fs.glsl";

demos/gtk-demo/gtkgears.c

@@ -48,16 +48,14 @@
 #define VERTICES_PER_TOOTH 34
 #define GEAR_VERTEX_STRIDE 6
 
-static inline void
-_sincos (double x, double *_sin, double *_cos)
+#ifndef HAVE_SINCOS
+static void
+sincos (double x, double *_sin, double *_cos)
 {
-#ifdef HAVE_SINCOS
-  sincos (x, _sin, _cos);
-#else
   *_sin = sin (x);
   *_cos = cos (x);
-#endif
 }
+#endif
 
 /**
  * Struct describing the vertices in triangle strip
@@ -309,11 +307,11 @@ create_gear (GLfloat inner_radius,
     struct point p[7];
 
     /* Calculate needed sin/cos for various angles */
-    _sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
+    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
+    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
+    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
+    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
+    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
 
     GEAR_POINT(p[0], r2, 1);
     GEAR_POINT(p[1], r2, 2);
@@ -522,7 +520,7 @@ void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloa
    identity(tmp);
 
    deltaZ = zFar - zNear;
-   _sincos(radians, &sine, &cosine);
+   sincos(radians, &sine, &cosine);
 
    if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
       return;
@@ -737,6 +735,7 @@ gtk_gears_realize (GtkWidget *widget)
   GtkGLArea *glarea = GTK_GL_AREA (widget);
   GtkGears *gears = GTK_GEARS (widget);
   GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
+  GdkGLContext *context;
   GLuint vao, v, f, program;
   const char *p;
   char msg[512];
@@ -747,6 +746,8 @@ gtk_gears_realize (GtkWidget *widget)
   if (gtk_gl_area_get_error (glarea) != NULL)
     return;
 
+  context = gtk_gl_area_get_context (glarea);
+
   glEnable (GL_CULL_FACE);
   glEnable (GL_DEPTH_TEST);
 
@@ -756,7 +757,7 @@ gtk_gears_realize (GtkWidget *widget)
   priv->vao = vao;
 
   /* Compile the vertex shader */
-  if (gtk_gl_area_get_api (glarea) == GDK_GL_API_GLES)
+  if (gdk_gl_context_get_use_es (context))
     p = vertex_shader_gles;
   else
     p = vertex_shader_gl;
@@ -767,7 +768,7 @@ gtk_gears_realize (GtkWidget *widget)
   g_debug ("vertex shader info: %s\n", msg);
 
   /* Compile the fragment shader */
-  if (gtk_gl_area_get_api (glarea) == GDK_GL_API_GLES)
+  if (gdk_gl_context_get_use_es (context))
     p = fragment_shader_gles;
   else
     p = fragment_shader_gl;

demos/gtk-demo/hsla.c

@@ -1,146 +0,0 @@
-#include <gdk/gdk.h>
-#include "hsla.h"
-
-void
-_gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
-                          const GdkRGBA *rgba)
-{
-  float min;
-  float max;
-  float red;
-  float green;
-  float blue;
-  float delta;
-
-  g_return_if_fail (hsla != NULL);
-  g_return_if_fail (rgba != NULL);
-
-  red = rgba->red;
-  green = rgba->green;
-  blue = rgba->blue;
-
-  if (red > green)
-    {
-      if (red > blue)
-        max = red;
-      else
-        max = blue;
-
-      if (green < blue)
-        min = green;
-      else
-        min = blue;
-    }
-  else
-    {
-      if (green > blue)
-        max = green;
-      else
-        max = blue;
-
-      if (red < blue)
-        min = red;
-      else
-        min = blue;
-    }
-
-  hsla->lightness = (max + min) / 2;
-  hsla->saturation = 0;
-  hsla->hue = 0;
-  hsla->alpha = rgba->alpha;
-
-  if (max != min)
-    {
-      if (hsla->lightness <= 0.5)
-        hsla->saturation = (max - min) / (max + min);
-      else
-        hsla->saturation = (max - min) / (2 - max - min);
-
-      delta = max -min;
-      if (red == max)
-        hsla->hue = (green - blue) / delta;
-      else if (green == max)
-        hsla->hue = 2 + (blue - red) / delta;
-      else if (blue == max)
-        hsla->hue = 4 + (red - green) / delta;
-
-      hsla->hue *= 60;
-      if (hsla->hue < 0.0)
-        hsla->hue += 360;
-    }
-}
-
-void
-_gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
-                          const GdkHSLA *hsla)
-{
-  float hue;
-  float lightness;
-  float saturation;
-  float m1, m2;
-
-  lightness = hsla->lightness;
-  saturation = hsla->saturation;
-
-  if (lightness <= 0.5)
-    m2 = lightness * (1 + saturation);
-  else
-    m2 = lightness + saturation - lightness * saturation;
-  m1 = 2 * lightness - m2;
-
-  rgba->alpha = hsla->alpha;
-
-  if (saturation == 0)
-    {
-      rgba->red = lightness;
-      rgba->green = lightness;
-      rgba->blue = lightness;
-    }
-  else
-    {
-      hue = hsla->hue + 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->red = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->red = m2;
-      else if (hue < 240)
-        rgba->red = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->red = m1;
-
-      hue = hsla->hue;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->green = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->green = m2;
-      else if (hue < 240)
-        rgba->green = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->green = m1;
-
-      hue = hsla->hue - 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->blue = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->blue = m2;
-      else if (hue < 240)
-        rgba->blue = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->blue = m1;
-    }
-}

demos/gtk-demo/hsla.h

@@ -1,15 +0,0 @@
-#pragma once
-
-typedef struct _GdkHSLA GdkHSLA;
-
-struct _GdkHSLA {
-  float hue;
-  float saturation;
-  float lightness;
-  float alpha;
-};
-
-void            _gdk_hsla_init_from_rgba    (GdkHSLA          *hsla,
-                                             const GdkRGBA    *rgba);
-void            _gdk_rgba_init_from_hsla    (GdkRGBA          *rgba,
-                                             const GdkHSLA    *hsla);

demos/gtk-demo/image_scaling.c

@@ -1,191 +0,0 @@
-/* Image Scaling
- * #Keywords: zoom, scale, filter, action, menu
- *
- * The custom widget we create here is similar to a GtkPicture,
- * but allows setting a zoom level and filtering mode for the
- * displayed paintable.
- *
- * It also demonstrates how to add a context menu to a custom
- * widget and connect it with widget actions.
- *
- * The context menu has items to change the zoom level.
- */
-
-#include <gtk/gtk.h>
-#include "demo3widget.h"
-
-static void
-file_opened (GObject      *source,
-             GAsyncResult *result,
-             void         *data)
-{
-  GFile *file;
-  GError *error = NULL;
-  GdkTexture *texture;
-
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
-
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  texture = gdk_texture_new_from_file (file, &error);
-  g_object_unref (file);
-  if (!texture)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  g_object_set (G_OBJECT (data), "texture", texture, NULL);
-  g_object_unref (texture);
-}
-
-static void
-open_file (GtkWidget *picker,
-           GtkWidget *demo)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (picker));
-  GtkFileDialog *dialog;
-  GtkFileFilter *filter;
-  GListStore *filters;
-
-  dialog = gtk_file_dialog_new ();
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, "Images");
-  gtk_file_filter_add_pixbuf_formats (filter);
-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
-  g_object_unref (filters);
-
-  gtk_file_dialog_open (dialog, parent, NULL, file_opened, demo);
-
-  g_object_unref (dialog);
-}
-
-static void
-rotate (GtkWidget *button,
-        GtkWidget *demo)
-{
-  float angle;
-
-  g_object_get (demo, "angle", &angle, NULL);
-
-  angle = fmodf (angle + 90.f, 360.f);
-
-  g_object_set (demo, "angle", angle, NULL);
-}
-
-static gboolean
-transform_to (GBinding     *binding,
-              const GValue *src,
-              GValue       *dest,
-              gpointer      user_data)
-{
-  double from;
-  float to;
-
-  from = g_value_get_double (src);
-  to = (float) pow (2., from);
-  g_value_set_float (dest, to);
-
-  return TRUE;
-}
-
-static gboolean
-transform_from (GBinding     *binding,
-                const GValue *src,
-                GValue       *dest,
-                gpointer      user_data)
-{
-  float to;
-  double from;
-
-  to = g_value_get_float (src);
-  from = log2 (to);
-  g_value_set_double (dest, from);
-
-  return TRUE;
-}
-
-GtkWidget *
-do_image_scaling (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *box2;
-      GtkWidget *sw;
-      GtkWidget *widget;
-      GtkWidget *scale;
-      GtkWidget *dropdown;
-      GtkWidget *button;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Image Scaling");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      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_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      sw = gtk_scrolled_window_new ();
-      gtk_widget_set_vexpand (sw, TRUE);
-      gtk_box_append (GTK_BOX (box), sw);
-
-      widget = demo3_widget_new ("/transparent/portland-rose.jpg");
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);
-
-      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), box2);
-
-      button = gtk_button_new_from_icon_name ("document-open-symbolic");
-      gtk_widget_set_tooltip_text (button, "Open File");
-      g_signal_connect (button, "clicked", G_CALLBACK (open_file), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      button = gtk_button_new_from_icon_name ("object-rotate-right-symbolic");
-      gtk_widget_set_tooltip_text (button, "Rotate");
-      g_signal_connect (button, "clicked", G_CALLBACK (rotate), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, -10., 10., 0.1);
-      gtk_scale_add_mark (GTK_SCALE (scale), 0., GTK_POS_TOP, NULL);
-      gtk_widget_set_tooltip_text (scale, "Zoom");
-      gtk_range_set_value (GTK_RANGE (scale), 0.);
-      gtk_widget_set_hexpand (scale, TRUE);
-      gtk_box_append (GTK_BOX (box2), scale);
-
-      dropdown = gtk_drop_down_new (G_LIST_MODEL (gtk_string_list_new ((const char *[]){ "Linear", "Nearest", "Trilinear", NULL })), NULL);
-      gtk_widget_set_tooltip_text (dropdown, "Filter");
-      gtk_box_append (GTK_BOX (box2), dropdown);
-
-      g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);
-
-      g_object_bind_property_full (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
-                                   widget, "scale",
-                                   G_BINDING_BIDIRECTIONAL,
-                                   transform_to,
-                                   transform_from,
-                                   NULL, NULL);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/listbox_controls.ui

@@ -30,86 +30,90 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkListBox">
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="row_activated"/>
-                    <style>
-                      <class name="rich-list"/>
-                      <class name="boxed-list"/>
-                    </style>
-
+                  <object class="GtkFrame">
                     <child>
-                      <object class="GtkListBoxRow">
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+                        <property name="show-separators">1</property>
+                        <signal name="row-activated" handler="row_activated"/>
+                        <style>
+                          <class name="rich-list"/>
+                        </style>
+
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="switch_label">
-                                <property name="label" translatable="yes">Switch</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="switch">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="switch_label">
+                                    <property name="label" translatable="yes">Switch</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSwitch" id="switch">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
 
-                    <child>
-                      <object class="GtkListBoxRow">
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="check_label">
-                                <property name="label" translatable="yes">Check</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="check">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="active">1</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="check_label">
+                                    <property name="label" translatable="yes">Check</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="check">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="active">1</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
 
-                    <child>
-                      <object class="GtkListBoxRow">
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="image_label">
-                                <property name="label" translatable="yes">Click here!</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage" id="image">
-                                <property name="icon-name">object-select-symbolic</property>
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="opacity">0</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="image_label">
+                                    <property name="label" translatable="yes">Click here!</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkImage" id="image">
+                                    <property name="icon-name">object-select-symbolic</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="opacity">0</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -130,142 +134,146 @@
                     </style>
                   </object>
                 </child>
-                  <child>
-                    <object class="GtkListBox">
-                      <property name="selection-mode">none</property>
-                      <style>
-                        <class name="rich-list"/>
-                        <class name="boxed-list"/>
-                      </style>
+                <child>
+                  <object class="GtkFrame">
+                    <child>
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+                        <property name="show-separators">1</property>
+                        <style>
+                          <class name="rich-list"/>
+                        </style>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="scale_label">
-                                  <property name="label" translatable="yes">Scale</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkScale">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="draw-value">0</property>
-                                  <property name="width-request">150</property>
-                                  <property name="adjustment">
-                                    <object class="GtkAdjustment">
-                                      <property name="upper">100</property>
-                                      <property name="value">50</property>
-                                      <property name="step-increment">1</property>
-                                      <property name="page-increment">10</property>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="scale_label">
+                                    <property name="label" translatable="yes">Scale</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkScale">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="draw-value">0</property>
+                                    <property name="width-request">150</property>
+                                    <property name="adjustment">
+                                      <object class="GtkAdjustment">
+                                        <property name="upper">100</property>
+                                        <property name="value">50</property>
+                                        <property name="step-increment">1</property>
+                                        <property name="page-increment">10</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="spin_label">
-                                  <property name="label" translatable="yes">Spinbutton</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkSpinButton">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="adjustment">
-                                    <object class="GtkAdjustment">
-                                      <property name="upper">100</property>
-                                      <property name="value">50</property>
-                                      <property name="step-increment">1</property>
-                                      <property name="page-increment">10</property>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="dropdown_label">
-                                  <property name="label" translatable="yes">Dropdown</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkDropDown">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="model">
-                                    <object class="GtkStringList">
-                                      <items>
-                                        <item>Choice 1</item>
-                                        <item>Choice 2</item>
-                                        <item>Choice 3</item>
-                                        <item>Choice 4</item>
-                                      </items>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="spin_label">
+                                    <property name="label" translatable="yes">Spinbutton</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="adjustment">
+                                      <object class="GtkAdjustment">
+                                        <property name="upper">100</property>
+                                        <property name="value">50</property>
+                                        <property name="step-increment">1</property>
+                                        <property name="page-increment">10</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="dropdown_label">
+                                    <property name="label" translatable="yes">Dropdown</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkDropDown">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="model">
+                                      <object class="GtkStringList">
+                                        <items>
+                                          <item>Choice 1</item>
+                                          <item>Choice 2</item>
+                                          <item>Choice 3</item>
+                                          <item>Choice 4</item>
+                                        </items>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="entry_label">
-                                  <property name="label" translatable="yes">Entry</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkEntry">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="placeholder-text">Type here…</property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="entry_label">
+                                    <property name="label" translatable="yes">Entry</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="placeholder-text">Type here…</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>

demos/gtk-demo/listview_settings.c

@@ -148,9 +148,9 @@ settings_key_new (GSettings          *settings,
 }
 
 static void
-item_value_changed (GtkEditableLabel  *label,
-                    GParamSpec        *pspec,
-                    GtkColumnViewCell *cell)
+item_value_changed (GtkEditableLabel *label,
+                    GParamSpec       *pspec,
+                    GtkListItem      *item)
 {
   SettingsKey *self;
   const char *text;
@@ -162,7 +162,8 @@ item_value_changed (GtkEditableLabel  *label,
 
   text = gtk_editable_get_text (GTK_EDITABLE (label));
 
-  self = gtk_column_view_cell_get_item (cell);
+  g_object_get (item, "item", &self, NULL);
+  g_object_unref (self);
 
   type = g_settings_schema_key_get_value_type (self->key);
   name = g_settings_schema_key_get_name (self->key);

demos/gtk-demo/listview_settings.ui

@@ -20,7 +20,6 @@
           <object class="GtkScrolledWindow">
             <child>
               <object class="GtkListView" id="listview">
-                <property name="tab-behavior">item</property>
                 <style>
                   <class name="navigation-sidebar"/>
                 </style>
@@ -77,7 +76,6 @@
                 <property name="vexpand">1</property>
                 <child>
                   <object class="GtkColumnView" id="columnview">
-                    <property name="tab-behavior">cell</property>
                     <style>
                       <class name="data-table"/>
                     </style>
@@ -90,13 +88,13 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <binding name="label">
           <lookup name="name" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>
@@ -118,12 +116,12 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkEditableLabel">
         <binding name="text">
           <lookup name="value" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
         <signal name="notify::label" handler="item_value_changed"/>
@@ -146,13 +144,13 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <binding name="label">
           <lookup name="type" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>
@@ -175,13 +173,13 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <binding name="label">
           <lookup name="default-value" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>
@@ -205,14 +203,14 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <property name="wrap">1</property>
         <binding name="label">
           <lookup name="summary" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>
@@ -236,14 +234,14 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <property name="wrap">1</property>
         <binding name="label">
           <lookup name="description" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>

demos/gtk-demo/listview_words.c

@@ -167,6 +167,7 @@ file_open_cb (GtkWidget     *button,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_root (button)),
                         NULL,
+                        NULL,
                         open_response_cb, stringlist);
   g_object_unref (dialog);
 }

demos/gtk-demo/main-listitem.ui

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="GtkListItem">
-    <property name="focusable">0</property>
     <property name="child">
       <object class="GtkTreeExpander" id="expander">
         <binding name="list-row">

demos/gtk-demo/mask.c

@@ -1,53 +0,0 @@
-/* Masking
- *
- * Demonstrates mask nodes.
- *
- * This demo uses a text node as mask for
- * an animated linear gradient.
- */
-
-#include <gtk/gtk.h>
-#include "demo4widget.h"
-
-
-GtkWidget *
-do_mask (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *demo;
-      GtkWidget *scale;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Mask Nodes");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      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_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      demo = demo4_widget_new ();
-      gtk_widget_set_hexpand (demo, TRUE);
-      gtk_widget_set_vexpand (demo, TRUE);
-
-      gtk_box_append (GTK_BOX (box), demo);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 1, 0.1);
-      gtk_range_set_value (GTK_RANGE (scale), 0.5);
-      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value", demo, "progress", 0);
-
-      gtk_box_append (GTK_BOX (box), scale);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/menu.c

@@ -0,0 +1,61 @@
+/* Menu
+ * #Keywords: action, zoom
+ *
+ * Demonstrates how to add a context menu to a custom widget
+ * and connect it with widget actions.
+ *
+ * The custom widget we create here is similar to a GtkPicture,
+ * but allows setting a zoom level for the displayed paintable.
+ *
+ * Our context menu has items to change the zoom level.
+ */
+
+#include <gtk/gtk.h>
+#include "demo3widget.h"
+
+
+GtkWidget *
+do_menu (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *box;
+      GtkWidget *sw;
+      GtkWidget *widget;
+      GtkWidget *scale;
+
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Menu");
+      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
+      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_VERTICAL, 0);
+      gtk_window_set_child (GTK_WINDOW (window), box);
+
+      sw = gtk_scrolled_window_new ();
+      gtk_widget_set_vexpand (sw, TRUE);
+      gtk_box_append (GTK_BOX (box), sw);
+
+      widget = demo3_widget_new ("/transparent/portland-rose.jpg");
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);
+
+      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.01, 10.0, 0.1);
+      gtk_range_set_value (GTK_RANGE (scale), 1.0);
+      gtk_box_append (GTK_BOX (box), scale);
+
+      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
+                              widget, "scale",
+                              G_BINDING_BIDIRECTIONAL);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_set_visible (window, TRUE);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/meson.build

@@ -39,7 +39,6 @@ demos = files([
   'iconscroll.c',
   'iconview.c',
   'iconview_edit.c',
-  'image_scaling.c',
   'images.c',
   'infobar.c',
   'layoutmanager.c',
@@ -47,7 +46,7 @@ demos = files([
   'links.c',
   'listbox.c',
   'listbox_controls.c',
-  'mask.c',
+  'menu.c',
   'flowbox.c',
   'list_store.c',
   'listview_applauncher.c',
@@ -55,7 +54,7 @@ demos = files([
   'listview_colors.c',
   'listview_filebrowser.c',
   'listview_minesweeper.c',
-  'listview_selections.c',
+  'dropdown.c',
   'listview_settings.c',
   'listview_ucd.c',
   'listview_weather.c',
@@ -115,7 +114,6 @@ extra_demo_sources = files([
   'gtkshadertoy.c',
   'gtkshaderstack.c',
   'gskshaderpaintable.c',
-  'hsla.c',
   'puzzlepiece.c',
   'bluroverlay.c',
   'demoimage.c',
@@ -128,7 +126,6 @@ extra_demo_sources = files([
   'four_point_transform.c',
   'demo2widget.c',
   'demo3widget.c',
-  'demo4widget.c',
   'pixbufpaintable.c',
   'script-names.c',
   'unicode-names.c',
@@ -159,7 +156,7 @@ demos_h = custom_target('gtk4 demo header',
 objcopy_supports_add_symbol = false
 objcopy = find_program('objcopy', required : false)
 if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
+  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
 endif
 
 ld = find_program('ld', required : false)
@@ -225,7 +222,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
 else
   gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
     'demo.gresource.xml',
-    source_dir: meson.current_source_dir()
+    source_dir: '.',
   )
 endif
 

demos/gtk-demo/paint.c

@@ -24,7 +24,6 @@ typedef struct
   GdkRGBA draw_color;
   GtkPadController *pad_controller;
   double brush_size;
-  GtkGesture *gesture;
 } DrawingArea;
 
 typedef struct
@@ -104,11 +103,13 @@ drawing_area_size_allocate (GtkWidget *widget,
 static void
 drawing_area_map (GtkWidget *widget)
 {
+  GtkAllocation allocation;
+
   GTK_WIDGET_CLASS (drawing_area_parent_class)->map (widget);
 
+  gtk_widget_get_allocation (widget, &allocation);
   drawing_area_ensure_surface ((DrawingArea *) widget,
-                               gtk_widget_get_width (widget),
-                               gtk_widget_get_height (widget));
+                               allocation.width, allocation.height);
 }
 
 static void
@@ -261,7 +262,7 @@ drawing_area_apply_stroke (DrawingArea   *area,
                            double         y,
                            double         pressure)
 {
-  if (tool && gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
+  if (gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
     {
       cairo_set_line_width (area->cr, 10 * pressure * area->brush_size);
       cairo_set_operator (area->cr, CAIRO_OPERATOR_DEST_OUT);
@@ -312,9 +313,7 @@ stylus_gesture_motion (GtkGestureStylus *gesture,
           drawing_area_apply_stroke (area, tool,
                                      backlog[i].axes[GDK_AXIS_X],
                                      backlog[i].axes[GDK_AXIS_Y],
-                                     backlog[i].flags & GDK_AXIS_FLAG_PRESSURE
-                                        ? backlog[i].axes[GDK_AXIS_PRESSURE]
-                                        : 1);
+                                     backlog[i].axes[GDK_AXIS_PRESSURE]);
         }
 
       g_free (backlog);
@@ -344,8 +343,6 @@ drawing_area_init (DrawingArea *area)
 
   area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
   area->brush_size = 1;
-
-  area->gesture = gesture;
 }
 
 static GtkWidget *
@@ -384,12 +381,6 @@ drawing_area_color_set (DrawingArea          *area,
   gtk_color_dialog_button_set_rgba (button, color);
 }
 
-static GtkGesture *
-drawing_area_get_gesture (DrawingArea *area)
-{
-  return area->gesture;
-}
-
 GtkWidget *
 do_paint (GtkWidget *toplevel)
 {
@@ -397,7 +388,7 @@ do_paint (GtkWidget *toplevel)
 
   if (!window)
     {
-      GtkWidget *draw_area, *headerbar, *button;
+      GtkWidget *draw_area, *headerbar, *colorbutton;
 
       window = gtk_window_new ();
 
@@ -406,22 +397,15 @@ do_paint (GtkWidget *toplevel)
 
       headerbar = gtk_header_bar_new ();
 
-      button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
-      g_signal_connect (button, "notify::rgba",
+      colorbutton = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+      g_signal_connect (colorbutton, "notify::rgba",
                         G_CALLBACK (color_button_color_set), draw_area);
       g_signal_connect (draw_area, "color-set",
-                        G_CALLBACK (drawing_area_color_set), button);
-      gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (button),
+                        G_CALLBACK (drawing_area_color_set), colorbutton);
+      gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (colorbutton),
                                         &(GdkRGBA) { 0, 0, 0, 1 });
 
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), button);
-
-      button = gtk_check_button_new_with_label ("Stylus only");
-      g_object_bind_property (button, "active",
-                              drawing_area_get_gesture ((DrawingArea *)draw_area), "stylus-only",
-                              G_BINDING_SYNC_CREATE);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar), button);
-
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
       gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
       gtk_window_set_title (GTK_WINDOW (window), "Paint");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

demos/gtk-demo/paintable_svg.c

@@ -55,6 +55,7 @@ show_file_open (GtkWidget  *button,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_root (button)),
                         NULL,
+                        NULL,
                         open_response_cb, picture);
 }
 

demos/gtk-demo/pickers.c

@@ -1,38 +1,15 @@
-/* Pickers and Launchers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkFileLauncher, GtkUriLauncher
+/* Pickers
+ * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog
  *
- * The dialogs are mainly intended for use in preference dialogs.
+ * These widgets are mainly intended for use in preference dialogs.
  * They allow to select colors, fonts and applications.
  *
- * The launchers let you open files or URIs in applications that
- * can handle them.
+ * This demo shows both the default appearance for these dialogs,
+ * as well as some of the customizations that are possible.
  */
 
 #include <gtk/gtk.h>
 
-static GtkWidget *app_picker;
-
-static void
-set_file (GFile    *file,
-          gpointer  data)
-{
-  char *name;
-
-  if (!file)
-    {
-      gtk_widget_set_sensitive (app_picker, FALSE);
-      g_object_set_data (G_OBJECT (app_picker), "file", NULL);
-      return;
-    }
-
-  name = g_file_get_basename (file);
-  gtk_label_set_label (GTK_LABEL (data), name);
-  g_free (name);
-
-  gtk_widget_set_sensitive (app_picker, TRUE);
-  g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
-}
-
 static void
 file_opened (GObject *source,
              GAsyncResult *result,
@@ -40,6 +17,7 @@ file_opened (GObject *source,
 {
   GFile *file;
   GError *error = NULL;
+  char *name;
 
   file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
 
@@ -47,9 +25,12 @@ file_opened (GObject *source,
     {
       g_print ("%s\n", error->message);
       g_error_free (error);
+      return;
     }
 
-  set_file (file, data);
+  name = g_file_get_basename (file);
+  gtk_label_set_label (GTK_LABEL (data), name);
+  g_free (name);
 }
 
 static gboolean
@@ -78,99 +59,24 @@ open_file (GtkButton *picker,
                               20,
                               abort_mission, g_object_ref (cancellable), g_object_unref);
 
-  gtk_file_dialog_open (dialog, parent, cancellable, file_opened, label);
+  gtk_file_dialog_open (dialog, parent, NULL, cancellable, file_opened, label);
 
   g_object_unref (cancellable);
   g_object_unref (dialog);
 }
 
-static void
-open_app_done (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GtkFileLauncher *launcher = GTK_FILE_LAUNCHER (source);
-  GError *error = NULL;
-
-  if (!gtk_file_launcher_launch_finish (launcher, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-open_app (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkFileLauncher *launcher;
-  GFile *file;
-
-  file = G_FILE (g_object_get_data (G_OBJECT (picker), "file"));
-  launcher = gtk_file_launcher_new (file);
-
-  gtk_file_launcher_launch (launcher, parent, NULL, open_app_done, NULL);
-
-  g_object_unref (launcher);
-}
-
-static void
-open_uri_done (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GtkUriLauncher *launcher = GTK_URI_LAUNCHER (source);
-  GError *error = NULL;
-
-  if (!gtk_uri_launcher_launch_finish (launcher, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-launch_uri (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkUriLauncher *launcher;
-
-  launcher = gtk_uri_launcher_new ("http://www.gtk.org");
-
-  gtk_uri_launcher_launch (launcher, parent, NULL, open_uri_done, NULL);
-
-  g_object_unref (launcher);
-}
-
-static gboolean
-on_drop (GtkDropTarget *target,
-         const GValue  *value,
-         double         x,
-         double         y,
-         gpointer       data)
-{
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      set_file (g_value_get_object (value), data);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 GtkWidget *
 do_pickers (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *table, *label, *picker, *button;
-  GtkDropTarget *drop_target;
 
   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), "Pickers and Launchers");
+    gtk_window_set_title (GTK_WINDOW (window), "Pickers");
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
     table = gtk_grid_new ();
@@ -178,8 +84,8 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_margin_end (table, 20);
     gtk_widget_set_margin_top (table, 20);
     gtk_widget_set_margin_bottom (table, 20);
-    gtk_grid_set_row_spacing (GTK_GRID (table), 6);
-    gtk_grid_set_column_spacing (GTK_GRID (table), 6);
+    gtk_grid_set_row_spacing (GTK_GRID (table), 3);
+    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
     gtk_window_set_child (GTK_WINDOW (window), table);
 
     label = gtk_label_new ("Color:");
@@ -206,37 +112,30 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_hexpand (label, TRUE);
     gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
 
-    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
     button = gtk_button_new_from_icon_name ("document-open-symbolic");
-
     label = gtk_label_new ("None");
-
-    drop_target = gtk_drop_target_new (G_TYPE_FILE, GDK_ACTION_COPY);
-    g_signal_connect (drop_target, "drop", G_CALLBACK (on_drop), label);
-    gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (drop_target));
-
     gtk_label_set_xalign (GTK_LABEL (label), 0.);
     gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
     gtk_widget_set_hexpand (label, TRUE);
     g_signal_connect (button, "clicked", G_CALLBACK (open_file), label);
     gtk_box_append (GTK_BOX (picker), label);
     gtk_box_append (GTK_BOX (picker), button);
-    app_picker = gtk_button_new_from_icon_name ("emblem-system-symbolic");
-    gtk_widget_set_halign (app_picker, GTK_ALIGN_END);
-    gtk_widget_set_sensitive (app_picker, FALSE);
-    g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
-    gtk_box_append (GTK_BOX (picker), app_picker);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
-    label = gtk_label_new ("URI:");
+    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);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
 
-    picker = gtk_button_new_with_label ("www.gtk.org");
-    g_signal_connect (picker, "clicked", G_CALLBACK (launch_uri), NULL);
+    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
+    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
+
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
   }
 

demos/gtk-demo/shortcuts.c

@@ -22,7 +22,6 @@ show_shortcuts (GtkWidget   *window,
   gtk_window_set_transient_for (GTK_WINDOW (overlay), GTK_WINDOW (window));
   g_object_set (overlay, "view-name", view, NULL);
   g_object_unref (builder);
-  gtk_window_present (GTK_WINDOW (overlay));
 }
 
 G_MODULE_EXPORT void

demos/gtk-demo/suggestionentry.c

@@ -849,7 +849,7 @@ suggestion_entry_init (SuggestionEntry *self)
       GtkCssProvider *provider;
 
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_resource (provider, "/listview_selections/suggestionentry.css");
+      gtk_css_provider_load_from_resource (provider, "/dropdown/suggestionentry.css");
       gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                                   GTK_STYLE_PROVIDER (provider),
                                                   800);

demos/gtk-demo/transparent.c

@@ -1,5 +1,5 @@
 /* Overlay/Transparency
- * #Keywords: GtkOverlay, GtkSnapshot, blur
+ * #Keywords: GtkOverlay, GtkSnapshot
  *
  * Blur the background behind an overlay.
  */

demos/gtk-demo/video_player.c

@@ -56,7 +56,7 @@ open_clicked_cb (GtkWidget *button,
   gtk_file_filter_set_name (filter, "Video");
   g_list_store_append (filters, filter);
 
-  gtk_file_dialog_set_default_filter (dialog, filter);
+  gtk_file_dialog_set_current_filter (dialog, filter);
   g_object_unref (filter);
 
   gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
@@ -65,6 +65,7 @@ open_clicked_cb (GtkWidget *button,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_root (button)),
                         NULL,
+                        NULL,
                         open_dialog_response_cb, video);
 }
 

demos/icon-browser/meson.build

@@ -8,7 +8,7 @@ iconbrowser_sources = [
 
 iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
   'iconbrowser.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-icon-browser',

demos/node-editor/meson.build

@@ -7,14 +7,16 @@ node_editor_sources = [
 
 node_editor_resources = gnome.compile_resources('node_editor_resources',
   'node-editor.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-node-editor',
   sources: [node_editor_sources, node_editor_resources],
   dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
-  c_args: common_cflags,
+  c_args: [
+    '-DNODE_EDITOR_SOURCE_DIR="testsuite/gsk/compare/"'
+  ] + common_cflags,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,
   install: true,

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

@@ -32,9 +32,8 @@
 #include "gsk/vulkan/gskvulkanrenderer.h"
 #endif
 
-#include <cairo.h>
-#ifdef CAIRO_HAS_SVG_SURFACE
-#include <cairo-svg.h>
+#ifndef NODE_EDITOR_SOURCE_DIR
+#define NODE_EDITOR_SOURCE_DIR "." /* Fallback */
 #endif
 
 typedef struct
@@ -174,7 +173,6 @@ text_changed (GtkTextBuffer    *buffer,
   GtkTextIter iter;
   GtkTextIter start, end;
   float scale;
-  GskRenderNode *big_node;
 
   g_array_remove_range (self->errors, 0, self->errors->len);
   text = get_current_text (self->text_buffer);
@@ -187,18 +185,13 @@ text_changed (GtkTextBuffer    *buffer,
   self->node = gsk_render_node_deserialize (bytes, deserialize_error_func, self);
 
   scale = gtk_scale_button_get_value (GTK_SCALE_BUTTON (self->scale_scale));
-  if (self->node && scale != 0.)
+  if (self->node && scale != 1.0)
     {
-      scale = pow (2., scale);
-      big_node = gsk_transform_node_new (self->node, gsk_transform_scale (NULL, scale, scale));
-    }
-  else if (self->node)
-    {
-      big_node = gsk_render_node_ref (self->node);
-    }
-  else
-    {
-      big_node = NULL;
+      GskRenderNode *node;
+
+      node = gsk_transform_node_new (self->node, gsk_transform_scale (NULL, scale, scale));
+      gsk_render_node_unref (self->node);
+      self->node = node;
     }
 
   g_bytes_unref (bytes);
@@ -210,27 +203,18 @@ text_changed (GtkTextBuffer    *buffer,
       graphene_rect_t bounds;
       guint i;
 
-      snapshot = gtk_snapshot_new ();
-      gsk_render_node_get_bounds (big_node, &bounds);
-      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
-      gtk_snapshot_append_node (snapshot, big_node);
-      paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
-      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
-      g_clear_object (&paintable);
-
       snapshot = gtk_snapshot_new ();
       gsk_render_node_get_bounds (self->node, &bounds);
       gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
       gtk_snapshot_append_node (snapshot, self->node);
       paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
-
+      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
       for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i++)
         {
           gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i);
           gtk_renderer_paintable_set_paintable (item, paintable);
           g_object_unref (item);
         }
-
       g_clear_object (&paintable);
     }
   else
@@ -238,8 +222,6 @@ text_changed (GtkTextBuffer    *buffer,
       gtk_picture_set_paintable (GTK_PICTURE (self->picture), NULL);
     }
 
-  g_clear_pointer (&big_node, gsk_render_node_unref);
-
   gtk_text_buffer_get_start_iter (self->text_buffer, &iter);
 
   while (!gtk_text_iter_is_end (&iter))
@@ -591,10 +573,10 @@ show_open_filechooser (NodeEditorWindow *self)
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Open node file");
   cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  gtk_file_dialog_set_current_folder (dialog, cwd);
   g_object_unref (cwd);
   gtk_file_dialog_open (dialog, GTK_WINDOW (self),
-                        NULL, open_response_cb, self);
+                        NULL, NULL, open_response_cb, self);
   g_object_unref (dialog);
 }
 
@@ -655,44 +637,34 @@ save_cb (GtkWidget        *button,
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Save node");
   cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_initial_folder (dialog, cwd);
-  gtk_file_dialog_set_initial_name (dialog, "demo.node");
+  gtk_file_dialog_set_current_folder (dialog, cwd);
   g_object_unref (cwd);
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
                         NULL,
+                        "demo.node",
+                        NULL,
                         save_response_cb, self);
   g_object_unref (dialog);
 }
 
-static GskRenderNode *
-create_node (NodeEditorWindow *self)
+static GdkTexture *
+create_texture (NodeEditorWindow *self)
 {
   GdkPaintable *paintable;
   GtkSnapshot *snapshot;
+  GskRenderer *renderer;
   GskRenderNode *node;
+  GdkTexture *texture;
 
   paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture));
   if (paintable == NULL ||
       gdk_paintable_get_intrinsic_width (paintable) <= 0 ||
       gdk_paintable_get_intrinsic_height (paintable) <= 0)
     return NULL;
-
   snapshot = gtk_snapshot_new ();
   gdk_paintable_snapshot (paintable, snapshot, gdk_paintable_get_intrinsic_width (paintable), gdk_paintable_get_intrinsic_height (paintable));
   node = gtk_snapshot_free_to_node (snapshot);
-
-  return node;
-}
-
-static GdkTexture *
-create_texture (NodeEditorWindow *self)
-{
-  GskRenderer *renderer;
-  GskRenderNode *node;
-  GdkTexture *texture;
-
-  node = create_node (self);
   if (node == NULL)
     return NULL;
 
@@ -703,58 +675,6 @@ create_texture (NodeEditorWindow *self)
   return texture;
 }
 
-#ifdef CAIRO_HAS_SVG_SURFACE
-static cairo_status_t
-cairo_serializer_write (gpointer             user_data,
-                        const unsigned char *data,
-                        unsigned int         length)
-{
-  g_byte_array_append (user_data, data, length);
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-static GBytes *
-create_svg (GskRenderNode  *node,
-            GError        **error)
-{
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  graphene_rect_t bounds;
-  GByteArray *array;
-
-  gsk_render_node_get_bounds (node, &bounds);
-  array = g_byte_array_new ();
-
-  surface = cairo_svg_surface_create_for_stream (cairo_serializer_write,
-                                                 array,
-                                                 bounds.size.width,
-                                                 bounds.size.height);
-  cairo_svg_surface_set_document_unit (surface, CAIRO_SVG_UNIT_PX);
-  cairo_surface_set_device_offset (surface, -bounds.origin.x, -bounds.origin.y);
-
-  cr = cairo_create (surface);
-  gsk_render_node_draw (node, cr);
-  cairo_destroy (cr);
-
-  cairo_surface_finish (surface);
-  if (cairo_surface_status (surface) == CAIRO_STATUS_SUCCESS)
-    {
-      cairo_surface_destroy (surface);
-      return g_byte_array_free_to_bytes (array);
-    }
-  else
-    {
-      g_set_error (error,
-                   G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "%s", cairo_status_to_string (cairo_surface_status (surface)));
-      cairo_surface_destroy (surface);
-      g_byte_array_unref (array);
-      return NULL;
-    }
-}
-#endif
-
 static GdkTexture *
 create_cairo_texture (NodeEditorWindow *self)
 {
@@ -787,140 +707,51 @@ create_cairo_texture (NodeEditorWindow *self)
 }
 
 static void
-export_image_saved_cb (GObject      *source,
-                       GAsyncResult *result,
-                       void         *user_data)
-{
-  GError *error = NULL;
-
-  if (!g_file_replace_contents_finish (G_FILE (source), result, NULL, &error))
-    {
-      GtkAlertDialog *alert;
-
-      alert = gtk_alert_dialog_new ("Exporting to image failed");
-      gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, NULL);
-      g_object_unref (alert);
-      g_clear_error (&error);
-    }
-}
-
-static void
-export_image_response_cb (GObject      *source,
+export_image_response_cb (GObject *source,
                           GAsyncResult *result,
-                          void         *user_data)
+                          void *user_data)
 {
   GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GskRenderNode *node = user_data;
+  GdkTexture *texture = user_data;
   GFile *file;
-  char *uri;
-  GBytes *bytes;
 
   file = gtk_file_dialog_save_finish (dialog, result, NULL);
-  if (file == NULL)
+  if (file)
     {
-      gsk_render_node_unref (node);
-      return;
-    }
-
-  uri = g_file_get_uri (file);
-#ifdef CAIRO_HAS_SVG_SURFACE
-  if (g_str_has_suffix (uri, "svg"))
-    {
-      GError *error = NULL;
-
-      bytes = create_svg (node, &error);
-      if (bytes == NULL)
+      if (!gdk_texture_save_to_png (texture, g_file_peek_path (file)))
         {
           GtkAlertDialog *alert;
 
           alert = gtk_alert_dialog_new ("Exporting to image failed");
-          gtk_alert_dialog_set_detail (alert, error->message);
-          gtk_alert_dialog_show (alert, NULL);
+          gtk_alert_dialog_show (alert, GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))));
           g_object_unref (alert);
-          g_clear_error (&error);
         }
-    }
-  else
-#endif
-    {
-      GdkTexture *texture;
-      GskRenderer *renderer;
 
-      renderer = gsk_gl_renderer_new ();
-      if (!gsk_renderer_realize (renderer, NULL, NULL))
-        {
-          g_object_unref (renderer);
-          renderer = gsk_cairo_renderer_new ();
-          if (!gsk_renderer_realize (renderer, NULL, NULL))
-            {
-              g_assert_not_reached ();
-            }
-        }
-      texture = gsk_renderer_render_texture (renderer, node, NULL);
-      gsk_renderer_unrealize (renderer);
-      g_object_unref (renderer);
-
-      if (g_str_has_suffix (uri, "tiff"))
-        bytes = gdk_texture_save_to_tiff_bytes (texture);
-      else
-        bytes = gdk_texture_save_to_png_bytes (texture);
-      g_object_unref (texture);
+      g_object_unref (file);
     }
-  g_free (uri);
 
-  if (bytes)
-    {
-      g_file_replace_contents_bytes_async (file,
-                                           bytes,
-                                           NULL,
-                                           FALSE,
-                                           0,
-                                           NULL,
-                                           export_image_saved_cb,
-                                           NULL);
-      g_bytes_unref (bytes);
-    }
-  gsk_render_node_unref (node);
-  g_object_unref (file);
+  g_object_unref (texture);
 }
 
 static void
 export_image_cb (GtkWidget        *button,
                  NodeEditorWindow *self)
 {
-  GskRenderNode *node;
+  GdkTexture *texture;
   GtkFileDialog *dialog;
-  GtkFileFilter *filter;
-  GListStore *filters;
 
-  node = create_node (self);
-  if (node == NULL)
+  texture = create_texture (self);
+  if (texture == NULL)
     return;
 
-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/png");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/svg+xml");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/tiff");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "");
-  gtk_file_dialog_set_initial_name (dialog, "example.png");
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
                         NULL,
-                        export_image_response_cb, node);
-  g_object_unref (filters);
+                        "example.png",
+                        NULL,
+                        export_image_response_cb, texture);
   g_object_unref (dialog);
 }
 
@@ -957,52 +788,12 @@ testcase_name_entry_changed_cb (GtkWidget        *button,
     gtk_widget_set_sensitive (self->testcase_save_button, FALSE);
 }
 
-/* Returns the location where gsk test cases are stored in
- * the GTK testsuite, if we can determine it.
- *
- * When running node editor outside of a GTK build, you can
- * set GTK_SOURCE_DIR to point it at the checkout.
- */
-static char *
-get_source_dir (void)
-{
-  const char *subdir = "testsuite/gsk/compare";
-  const char *source_dir;
-  char *current_dir;
-  char *dir;
-
-  source_dir = g_getenv ("GTK_SOURCE_DIR");
-  current_dir = g_get_current_dir ();
-
-  if (source_dir)
-    {
-      char *abs_source_dir = g_canonicalize_filename (source_dir, NULL);
-      dir = g_canonicalize_filename (subdir, abs_source_dir);
-      g_free (abs_source_dir);
-    }
-  else
-    {
-      dir = g_canonicalize_filename (subdir, current_dir);
-    }
-
-  if (g_file_test (dir, G_FILE_TEST_EXISTS))
-    {
-      g_free (current_dir);
-
-      return dir;
-    }
-
-  g_free (dir);
-
-  return current_dir;
-}
-
 static void
 testcase_save_clicked_cb (GtkWidget        *button,
                           NodeEditorWindow *self)
 {
   const char *testcase_name = gtk_editable_get_text (GTK_EDITABLE (self->testcase_name_entry));
-  char *source_dir = get_source_dir ();
+  char *source_dir = g_canonicalize_filename (NODE_EDITOR_SOURCE_DIR, NULL);
   char *node_file_name;
   char *node_file;
   char *png_file_name;
@@ -1015,8 +806,6 @@ testcase_save_clicked_cb (GtkWidget        *button,
   node_file = g_build_filename (source_dir, node_file_name, NULL);
   g_free (node_file_name);
 
-  g_debug ("Saving testcase in %s", node_file);
-
   png_file_name = g_strconcat (testcase_name, ".png", NULL);
   png_file = g_build_filename (source_dir, png_file_name, NULL);
   g_free (png_file_name);
@@ -1034,19 +823,6 @@ testcase_save_clicked_cb (GtkWidget        *button,
     }
 
   text = get_current_text (self->text_buffer);
-  {
-    GBytes *bytes;
-    GskRenderNode *node;
-    gsize size;
-
-    bytes = g_bytes_new_take (text, strlen (text) + 1);
-    node = gsk_render_node_deserialize (bytes, NULL, NULL);
-    g_bytes_unref (bytes);
-    bytes = gsk_render_node_serialize (node);
-    gsk_render_node_unref (node);
-    text = g_bytes_unref_to_data (bytes, &size);
-  }
-
   if (!g_file_set_contents (node_file, text, -1, &error))
     {
       gtk_label_set_label (GTK_LABEL (self->testcase_error_label), error->message);

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

@@ -163,9 +163,9 @@
             <property name="valign">center</property>
             <property name="adjustment">
               <object class="GtkAdjustment">
-                <property name="lower">-4</property>
-                <property name="value">0</property>
-                <property name="upper">4</property>
+                <property name="lower">1</property>
+                <property name="value">1</property>
+                <property name="upper">10</property>
                 <property name="step-increment">0.1</property>
                 <property name="page-increment">0.5</property>
               </object>

demos/node-editor/node-format.md

@@ -2,29 +2,19 @@
 
 GSK render nodes can be serialized and deserialized using APIs such as `gsk_render_node_serialize()` and `gsk_render_node_deserialize()`. The intended use for this is development - primarily the development of GTK - by allowing things such as creating testsuites and benchmarks, exchanging nodes in bug reports. GTK includes the `gtk4-node-editor` application for creating such test files.
 
-The format is a text format that follows the [CSS syntax rules](https://drafts.csswg.org/css-syntax-3/). In particular, this means that every array of bytes will produce a render node when parsed, as there is a defined error recovery method. For more details on error handling, please refer to the documentation of the parsing APIs.
+The format is a text format that follows the [CSS syntax rules](https://drafts.csswg.org/css-syntax-3/). In particular, this means that every array of bytes will produce a render node when parsed, as there is a defined error recovery method. For more details on error handling, please refer to the documentation of the aprsing APIs.
 
 The grammar of a node text representation using [the CSS value definition syntax](https://drafts.csswg.org/css-values-3/#value-defs) looks like this:
 **document**: `<node>\*`
-**node**: container [ "name" ] { <document> } | `<node-type> [ "name" ] { <property>* }` | "name"
+**node**: container { <document> } | `<node-name> { <property>* }`
 **property**: `<property-name>: <node> | <value> ;`
 
-Each node has its own `<node-type>` and supports a custom set of properties, each with their own `<property-name>` and syntax. The following paragraphs document each of the nodes and their properties.
+Each node has its own `<node-name>` and supports a custom set of properties, each with their own `<property-name>` and syntax. The following paragraphs document each of the nodes and their properties.
 
 When serializing and the value of a property equals the default value, this value will not be serialized. Serialization aims to produce an output as small as possible.
 
 To embed newlines in strings, use \A. To break a long string into multiple lines, escape the newline with a \.
 
-# Names
-
-### Nodes
-
-Nodes can be given a name by adding a string after the `<node-type>` in their definition. That same node can then be used further down in the document by specifying just the name identifying the node.
-
-### Textures
-
-Just like nodes, textures can be referenced by name. When defining a named texture, the name has to be placed in front of the URL.
-
 # Nodes
 
 ### container
@@ -188,16 +178,6 @@ Creates a node like `gsk_inset_shadow_node_new()` with the given properties.
 
 Creates a node like `gsk_linear_gradient_node_new()` with the given properties.
 
-### mask
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| source   | `<node>`         | color { }              | always      |
-| mode     | `<blend-mode>`   | alpha                  | non-default |
-| mask     | `<node>`         | color { }              | always      |
-
-Creates a node like `gsk_mask_node_new()` with the given properties.
-
 ### opacity
 
 | property | syntax           | default                | printed     |
@@ -317,21 +297,6 @@ The default texture is a 10x10 checkerboard with the top left and bottom right
 representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")
 `.
 
-### texture-scale
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| texture  | `<url>`          | *see below*            | always      |
-| filter   | `filter`         | *see below*            | non-default |
-
-Creates a node like `gsk_texture_scale_node_new()` with the given properties.
-
-The default texture is a 10x10 checkerboard, just like for texture.
-
-The possible filter values are `linear`, `nearest` and `trilinear`, with
-`linear` being the default.
-
 ### transform
 
 | property | syntax           | default                | printed     |

demos/print-editor/print-editor.c

@@ -6,8 +6,6 @@
 
 #include "demo_conf.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;
@@ -510,6 +508,8 @@ activate_save_as (GSimpleAction *action,
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (main_window),
                         NULL,
+                        NULL,
+                        NULL,
                         on_save_response, NULL);
   g_object_unref (dialog);
 }
@@ -553,6 +553,7 @@ activate_open (GSimpleAction *action,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (main_window),
                         NULL,
+                        NULL,
                         on_open_response, NULL);
   g_object_unref (dialog);
 }

demos/widget-factory/meson.build

@@ -3,7 +3,7 @@
 objcopy_supports_add_symbol = false
 objcopy = find_program('objcopy', required : false)
 if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
+  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
 endif
 
 ld = find_program('ld', required : false)
@@ -69,7 +69,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
 else
   widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
     'widget-factory.gresource.xml',
-    source_dir: meson.current_source_dir(),
+    source_dir: '.',
   )
 endif
 

demos/widget-factory/widget-factory.c

@@ -237,7 +237,7 @@ activate_open_file (GSimpleAction *action,
   GtkFileDialog *dialog;
 
   dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_open (dialog, NULL, NULL, file_chooser_response, NULL);
+  gtk_file_dialog_open (dialog, NULL, NULL, NULL, file_chooser_response, NULL);
   g_object_unref (dialog);
 }
 
@@ -2056,67 +2056,6 @@ hide_widget (GtkWidget *widget)
   gtk_widget_set_visible (widget, FALSE);
 }
 
-static void
-load_texture_thread (GTask *task,
-                     gpointer source_object,
-                     gpointer task_data,
-                     GCancellable *cancellable)
-{
-  const char *resource_path = (const char *) task_data;
-  GBytes *bytes;
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  bytes = g_resources_lookup_data (resource_path, 0, &error);
-  if (!bytes)
-    {
-      g_task_return_error (task, error);
-      return;
-    }
-
-  texture = gdk_texture_new_from_bytes (bytes, &error);
-  g_bytes_unref (bytes);
-
-  if (!texture)
-    {
-      g_task_return_error (task, error);
-      return;
-    }
-
-  g_task_return_pointer (task, texture, g_object_unref);
-}
-
-static void
-load_texture_done (GObject *source,
-                   GAsyncResult *result,
-                   gpointer data)
-{
-  GtkWidget *picture = GTK_WIDGET (source);
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  texture = g_task_propagate_pointer (G_TASK (result), &error);
-  if (!texture)
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-}
-
-static void
-load_texture_in_thread (GtkWidget  *picture,
-                        const char *resource_path)
-{
-  GTask *task = g_task_new (picture, NULL, load_texture_done, NULL);
-  g_task_set_task_data (task, (gpointer)resource_path, NULL);
-  g_task_run_in_thread (task, load_texture_thread);
-  g_object_unref (task);
-}
-
 static void
 activate (GApplication *app)
 {
@@ -2216,13 +2155,6 @@ activate (GApplication *app)
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
 
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_sunset"),
-                          "/org/gtk/WidgetFactory4/sunset.jpg");
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_nyc"),
-                          "/org/gtk/WidgetFactory4/nyc.jpg");
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_beach"),
-                          "/org/gtk/WidgetFactory4/beach.jpg");
-
   if (g_strcmp0 (PROFILE, "devel") == 0)
     gtk_widget_add_css_class (GTK_WIDGET (window), "devel");
 
@@ -2252,13 +2184,11 @@ activate (GApplication *app)
   for (i = 0; i < G_N_ELEMENTS (accels); i++)
     gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
   gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
   action = G_ACTION (g_property_action_new ("statusbar", widget, "visible"));
   g_action_map_add_action (G_ACTION_MAP (window), action);
   g_object_unref (G_OBJECT (action));
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
   action = G_ACTION (g_property_action_new ("toolbar", widget, "visible"));
@@ -2432,7 +2362,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "record_button");
   g_object_set_data (G_OBJECT (window), "record_button", widget);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "lockbox");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "lockbutton");
   g_object_set_data (G_OBJECT (window), "lockbutton", widget2);
@@ -2450,7 +2379,6 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
                           G_BINDING_SYNC_CREATE);
   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (widget2), permission);
   g_object_unref (permission);
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "iconview1");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "increase_button");

demos/widget-factory/widget-factory.ui

@@ -1263,7 +1263,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_sunset">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/sunset.jpg</property>
                                     <property name="content-fit">cover</property>
                                     <child>
                                       <object class="GtkDragSource">
@@ -1289,7 +1290,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_nyc">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/nyc.jpg</property>
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
@@ -1314,7 +1316,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_beach">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/beach.jpg</property>
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>

docs/CODING-STYLE.md

@@ -500,9 +500,8 @@ Public headers should never be included directly:
 Private headers should include the public header first, if one exists:
 
 ```c
-  #pragma once
-
-  /* gtkfooprivate.h */
+  #ifndef __GTK_FOO_PRIVATE_H__
+  #define __GTK_FOO_PRIVATE_H__
 
   #include "gtkfoo.h"
 
@@ -511,8 +510,18 @@ Private headers should include the public header first, if one exists:
   #endif /* __GTK_FOO_PRIVATE_H__ */
 ```
 
-All headers should use the `once` pragma to prevent multiple inclusion,
-instead of the classic pre-processor guards:
+All headers should have inclusion guards:
+
+```c
+  #ifndef __GTK_FOO_H__
+  #define __GTK_FOO_H__
+
+  ...
+
+  #endif /* __GTK_FOO_H__ */
+```
+
+You can also use the `once` pragma instead of the classic pre-processor guard:
 
 ```c
   #pragma once
@@ -544,8 +553,6 @@ the source file, either the public installed header, or the private header, if
 it exists.
 
 ```c
-  /* gtkfoo.c */
-
   #include "config.h"
 
   #include "gtkfoo.h"
@@ -587,8 +594,8 @@ Finally, source files should include the system headers last:
   #include <string.h>
 ```
 
-Cyclic dependencies should be avoided if at all possible;
-for instance, you could use additional headers to break cycles.
+Cyclic dependencies should be avoided if at all possible; for instance, you
+could use additional headers to break cycles.
 
 ### GObject
 
@@ -629,8 +636,7 @@ Instance structures should only contain the parent type:
 ```
 
 You should use the `G_DECLARE_DERIVABLE_TYPE()` and `G_DECLARE_FINAL_TYPE()`
-macros in newly written headers. There is also a `GDK_DECLARE_INTERNAL_TYPE()`
-for declaring types that can be derived inside GTK, but not in 3rd party code.
+macros in newly written headers.
 
 Inside your source file, always use the `G_DEFINE_TYPE()`,
 `G_DEFINE_TYPE_WITH_PRIVATE()`, and `G_DEFINE_TYPE_WITH_CODE()` macros, or their
@@ -670,20 +676,13 @@ Interfaces must have the following macros:
 | `GTK_IS_<iface_name>`        | `G_TYPE_CHECK_INSTANCE_TYPE`    |
 | `GTK_<iface_name>_GET_IFACE` | `G_TYPE_INSTANCE_GET_INTERFACE` |
 
-The `G_DECLARE` macros define these as static inline functions instead.
-
 ### Memory allocation
 
-When dynamically allocating data on the heap use `g_new()`.
+When dynamically allocating data on the heap either use `g_new()` or,
+if allocating multiple small data structures, `g_slice_new()`.
 
 Public structure types should always be returned after being zero-ed,
-either explicitly for each member, or by using `g_new0()`. Do not use
-`g_slice` in new code.
-
-Memory that is only needed within the scope of a function can be
-stack-allocated using `g_newa()` or `g_alloca()`. But limit the amount
-of stack memory that you consume this way, in particular in recursive
-functions.
+either explicitly for each member, or by using `g_new0()` or `g_slice_new0()`.
 
 ### Macros
 

docs/reference/gdk/gdk4.toml.in

@@ -18,12 +18,12 @@ search_index = true
   docs_url = "https://docs.gtk.org/gobject/"
 
   [dependencies."Gio-2.0"]
-  name = "Gio"
+  name = "GIO"
   description = "GObject Interfaces and Objects, Networking, IPC, and I/O"
   docs_url = "https://docs.gtk.org/gio/"
 
   [dependencies."cairo-1.0"]
-  name = "cairo"
+  name = "Cairo"
   description = "A 2D graphics library with support for multiple output devices"
   docs_url = "https://www.cairographics.org/manual/"
 

docs/reference/gsk/gsk4.toml.in

@@ -19,7 +19,7 @@ dependencies = ["Graphene-1.0", "Gdk-4.0"]
   docs_url = "https://ebassi.github.io/graphene/docs/"
 
   [dependencies."Gdk-4.0"]
-  name = "Gdk"
+  name = "GDK"
   description = "The GTK windowing system abstraction"
   docs_url = "https://docs.gtk.org/gdk4/"
 

docs/reference/gtk/broadway.md

@@ -6,15 +6,22 @@ Slug: broadway
 The GDK Broadway backend provides support for displaying GTK applications in
 a web browser, using HTML5 and web sockets.
 
-To run your application in this way, first run the broadway server,
-`gtk-broadwayd`, that ships with GTK:
+To run your application in this way, select the Broadway backend by setting
+`GDK_BACKEND=broadway`. Then you can make your application appear in a web
+browser by pointing it at `http://127.0.0.1:8080`. Note that you need to
+enable web sockets in your web browser.
+
+You can choose a different port from the default 8080 by setting the
+`BROADWAY_DISPLAY` environment variable to the port that you want to use.
+
+It is also possible to use multiple GTK applications in the same web browser
+window, by using the Broadway server, `gtk4-broadwayd`, that ships with GTK.
+To start the Broadway server use:
 
 ```
 gtk4-broadwayd :5
 ```
 
-The server expects the colon-prefixed display number as a commandline argument.
-
 Then point your web browser at `http://127.0.0.1:8085`.
 
 Once the Broadway server is running, you can start your applications like
@@ -24,8 +31,6 @@ this:
 GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
 ```
 
-Multiple applications can be presented in the same web browser window.
-
 ## Broadway-specific environment variables
 
 ### `BROADWAY_DISPLAY`

docs/reference/gtk/building.md

@@ -236,17 +236,23 @@ By default, GTK will try to build with support for the Vulkan graphics
 API in addition to cairo and OpenGL. This option can be used to explicitly
 control whether Vulkan should be used.
 
-### `media-gstreamer` and `media-ffmpeg`
+### `xinerama`
+
+By default, GTK will try to link against the Xinerama libraries
+if they are found. This option can be used to explicitly control
+whether Xinerama should be used.
+
+### `media`
 
 By default, GTK will try to build the gstreamer backend for
-media playback support. These options can be used to explicitly
+media playback support. This option can be used to explicitly
 control which media backends should be built.
 
-### `print-cups` and `print-cpdb`
+### `print`
 
-By default, GTK will try to build the cups and file print backends
-if their dependencies are found. These options can be used to
-explicitly control which print backends should be built.
+By default, GTK will try to build various print backends
+if their dependencies are found. This option can be used
+to explicitly control which print backends should be built.
 
 ### `cloudproviders`
 
@@ -268,13 +274,18 @@ support in the file chooser.
 This option controls whether GTK should use colord for color
 calibration support in the cups print backend.
 
-### `gtk_doc`, `man-pages` and `update_screenshots`
+### `gtk_doc` and `man-pages`
 
-The *gi-docgen* package is used to generate the reference documentation
-included with GTK. By default support for *gi-docgen* is disabled
+The *gtk-doc* package is used to generate the reference documentation
+included with GTK. By default support for *gtk-doc* is disabled
 because it requires various extra dependencies to be installed.
-Introspection needs to be enabled, since the documentation is generated
-from introspection data.
+If you have *gtk-doc* and *pandoc* installed and are modifying GTK,
+you may want to enable *gtk-doc* support by passing in `-Dgtk_doc=true`.
+
+Additionally, some tools provided by GTK have their own
+manual pages generated using a similar set of dependencies;
+if you have *xsltproc* then you can generate manual pages by
+passing `-Dman-pages=true` when configuring the build.
 
 ### `introspection`
 
@@ -283,14 +294,9 @@ is mainly useful for shortening turnaround times on developer
 systems. Installed builds of GTK should always have introspection
 support.
 
-### `build-testsuite`
+### `build-tests`, `install-tests`, `demos`
 
-If you want to run the testsuite to ensure that your GTK build
-works, you should enable it with this option.
-
-### `build-tests`, `build-examples`, `demos`
-
-By default, GTK will build quite a few tests, examples and demos.
+By default, GTK will build quite a few tests and demos.
 While these are useful on a developer system, they are not
 needed when GTK is built e.g. for a flatpak runtime. These
 options allow to disable building tests and demos.

docs/reference/gtk/coordinates.md

@@ -1,80 +0,0 @@
-Title: Coordinate systems
-Slug: gtk-coordinates
-
-## Coordinate systems in GTK
-
-All coordinate systems in GTK have the origin at the top left, with the X axis
-pointing right, and the Y axis pointing down. This matches the convention used
-in X11, Wayland and cairo, but differs from OpenGL and PostScript, where the origin
-is in the lower left, and the Y axis is pointing up.
-
-Every widget in a window has its own coordinate system that it uses to place its
-child widgets and to interpret events. Most of the time, this fact can be safely
-ignored. The section will explain the details for the few cases when it is important.
-
-## The box model
-
-When it comes to rendering, GTK follows the CSS box model as far as practical.
-
-<picture>
-  <source srcset="box-model-dark.png" media="(prefers-color-scheme: dark)">
-  <img alt="Box Model" src="box-model-light.png">
-</picture>
-
-The CSS stylesheet that is in use determines the sizes (and appearance) of the
-margin, border and padding areas for each widget. The size of the content area
-is determined by GTKs layout algorithm using each widgets [vfunc@Gtk.Widget.measure]
-and [vfunc@Gtk.Widget.size_allocate] vfuncs.
-
-You can learn more about the CSS box model by reading the
-[CSS specification](https://www.w3.org/TR/css-box-3/#box-model) or the
-Mozilla [documentation](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/The_box_model).
-
-To learn more about where GTK CSS differs from CSS on the web, see the
-[CSS overview](css-overview.html).
-
-## Widgets
-
-The content area in the CSS box model is the region that the widget considers its own.
-
-The origin of the widgets coordinate system is the top left corner of the content area,
-and its size is the widgets size. The size can be queried with [method@Gtk.Widget.get_width]
-and [method@Gtk.Widget.get_height]. GTK allows general 3D transformations to position
-widgets (although most of the time, the transformation will be a simple 2D translation).
-The transform to go from one widgets coordinate system to another one can be obtained
-with [method@Gtk.Widget.compute_transform].
-
-When widget APIs expect positions or areas, they need to be expressed in this coordinate
-system, typically called **_widget coordinates_**. GTK provides a number of APIs to translate
-between different widgets' coordinate systems, such as [method@Gtk.Widget.compute_point]
-or [method@Gtk.Widget.compute_bounds]. These methods can fail (either because the widgets
-don't share a common ancestor, or because of a singular transformation), and callers need
-to handle this eventuality.
-
-Another area that is occasionally relevant are the widgets **_bounds_**, which is the area
-that a widgets rendering is typically confined to (technically, widgets can draw outside
-of this area, unless clipping is enforced via the [property@Gtk.Widget:overflow] property).
-In CSS terms, the bounds of a widget correspond to the border area.
-
-During GTK's layout algorithm, a parent widget needs to measure each visible child and
-allocate them at least as much size as measured. These functions take care of respecting
-the CSS box model and widget properties such as align and margin. This happens in the
-parent's coordinate system.
-
-Note that the **_text direction_** of a widget does not influence its coordinate
-system, but simply determines whether text flows in the direction of increasing
-or decreasing X coordinates.
-
-## Events
-
-Event controllers and gestures report positions in the coordinate system of the widget
-they are attached to.
-
-If you are dealing with raw events in the form of [class@Gdk.Event] that have positions
-associated with them (e.g. the pointer position), such positions are expressed in
-**_surface coordinates_**, which have their origin at the top left corner of the
-[class@Gdk.Surface].
-
-To translate from surface to widget coordinates, you have to apply the offset from the
-top left corner of the surface to the top left corner of the topmost widget, which can
-be obtained with [method@Gtk.Native.get_surface_transform].

docs/reference/gtk/getting_started.md

@@ -51,7 +51,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
@@ -66,10 +66,6 @@ You can compile the program above with GCC using:
 gcc $( pkg-config --cflags gtk4 ) -o example-0 example-0.c $( pkg-config --libs gtk4 )
 ```
 
-**Note**: If the above compilation does not work due to an error regarding `G_APPLICATION_DEFAULT_FLAGS`
-this could be due to your OS providing an older version of GLib. For GLib versions older than 2.74 you
-will need to replace `G_APPLICATION_DEFAULT_FLAGS` with `G_APPLICATION_FLAGS_NONE` in this example, and
-others in this documentation.
 For more information on how to compile a GTK application, please
 refer to the [Compiling GTK Applications](compiling.html)
 section in this reference.
@@ -193,7 +189,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
@@ -342,7 +338,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
@@ -381,7 +377,7 @@ demonstrates input event handling with event controllers.
 
 ### Drawing in response to input
 
-Create a new file with the following content named `example-3.c`.
+Create a new file with the following content named `example-4.c`.
 
 ```c
 #include <gtk/gtk.h>
@@ -564,7 +560,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
@@ -576,7 +572,7 @@ main (int    argc,
 You can compile the program above with GCC using:
 
 ```
-gcc $( pkg-config --cflags gtk4 ) -o example-3 example-3.c $( pkg-config --libs gtk4 )
+gcc $( pkg-config --cflags gtk4 ) -o example-4 example-4.c $( pkg-config --libs gtk4 )
 ```
 
 ## Building user interfaces
@@ -591,7 +587,7 @@ XML format that can be parsed by the [class@Gtk.Builder] class.
 
 ### Packing buttons with GtkBuilder
 
-Create a new file with the following content named `example-4.c`.
+Create a new file with the following content named `example-3.c`.
 
 ```c
 #include <gtk/gtk.h>
@@ -645,7 +641,7 @@ main (int   argc,
   g_chdir (GTK_SRCDIR);
 #endif
 
-  GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
   int status = g_application_run (G_APPLICATION (app), argc, argv);
@@ -701,7 +697,7 @@ Create a new file with the following content named `builder.ui`.
 You can compile the program above with GCC using:
 
 ```
-gcc $( pkg-config --cflags gtk4 ) -o example-4 example-4.c $( pkg-config --libs gtk4 )
+gcc $( pkg-config --cflags gtk4 ) -o example-3 example-3.c $( pkg-config --libs gtk4 )
 ```
 
 Note that `GtkBuilder` can also be used to construct objects that are
@@ -1022,10 +1018,6 @@ Our application now looks like this:
 In this step, we make our application show the content of all the files
 that it is given on the commandline.
 
-**Note: Providing filenames (e.g. `./exampleapp examplewin.c examplewin.h`) at
-the command line is a requirement for example apps 3-9 to display as shown in
-the screenshots below.**
-
 To this end, we add a member to the struct of our application window subclass
 and keep a reference to the `GtkStack` there. The first member of the struct
 should be the parent type from which the class is derived. Here,

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

@@ -33,11 +33,6 @@ Validation
 The ``validate`` command validates the given UI definition file and reports
 errors to ``stderr``.
 
-Note that there are limitations to the validation that can be done for templates,
-since they are closely tied to the class_init function they are used in.
-If your UI file uses types from third-party libraries, it may help to add those
-libraries to the `LD_PRELOAD` environment variable.
-
 ``--deprecations``
 
   Warn about uses of deprecated types in the UI definition file.

docs/reference/gtk/gtk4.toml.in

@@ -14,12 +14,12 @@ search_index = true
 dependencies = ["Gdk-4.0", "Gsk-4.0"]
 
   [dependencies."Gdk-4.0"]
-  name = "Gdk"
+  name = "GDK"
   description = "The GTK windowing system abstraction"
   docs_url = "https://docs.gtk.org/gdk4/"
 
   [dependencies."Gsk-4.0"]
-  name = "Gsk"
+  name = "GSK"
   description = "The GTK rendering abstraction"
   docs_url = "https://docs.gtk.org/gsk4/"
 
@@ -68,7 +68,6 @@ content_files = [
   "input-handling.md",
   "drag-and-drop.md",
   "drawing-model.md",
-  "coordinates.md",
   "css-overview.md",
   "css-properties.md",
   "section-accessibility.md",
@@ -242,7 +241,5 @@ content_images = [
   "images/rich-list.png",
   "images/data-table.png",
   "images/navigation-sidebar.png",
-  "images/box-model-light.png",
-  "images/box-model-dark.png",
 ]
 urlmap_file = "urlmap.js"

docs/reference/gtk/images/box-model.svg

@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   sodipodi:docname="box-model.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="0.84096521"
-     inkscape:cx="265.76605"
-     inkscape:cy="312.14133"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="Arrow2"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Arrow2"
-       markerWidth="7.6999998"
-       markerHeight="5.5999999"
-       viewBox="0 0 7.7 5.6"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.7)"
-         d="M -2,-4 9,0 -2,4 c 2,-2.33 2,-5.66 0,-8 z"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:none"
-         id="arrow2L" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow2-4"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Arrow2"
-       markerWidth="7.6999998"
-       markerHeight="5.5999999"
-       viewBox="0 0 7.7 5.6"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.7)"
-         d="M -2,-4 9,0 -2,4 c 2,-2.33 2,-5.66 0,-8 z"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:none"
-         id="arrow2L-7" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:10.58333333;stroke-dasharray:none"
-       id="rect234-0"
-       width="112.51476"
-       height="70.089249"
-       x="38.634876"
-       y="49.512993" />
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:0.487868;stroke-dasharray:none"
-       id="rect234"
-       width="146.21118"
-       height="103.37679"
-       x="21.283342"
-       y="33.173706" />
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:0.54387;stroke-dasharray:none"
-       id="rect234-3"
-       width="79.543648"
-       height="37.520485"
-       x="55.724121"
-       y="65.367287" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none"
-       x="76.878265"
-       y="100.819"
-       id="text3935"><tspan
-         sodipodi:role="line"
-         id="tspan3933"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke-width:0.264583"
-         x="76.878265"
-         y="100.819">content</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none"
-       x="77.072464"
-       y="111.58885"
-       id="text4767"><tspan
-         sodipodi:role="line"
-         id="tspan4765"
-         style="fill:#000000;fill-opacity:1;stroke-width:0.264583"
-         x="77.072464"
-         y="111.58885">padding</tspan><tspan
-         sodipodi:role="line"
-         style="fill:#000000;fill-opacity:1;stroke-width:0.264583"
-         x="77.072464"
-         y="124.8181"
-         id="tspan4769" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none"
-       x="77.337868"
-       y="133.01045"
-       id="text4767-1"><tspan
-         sodipodi:role="line"
-         id="tspan8053"
-         x="77.337868"
-         y="133.01045">margin</tspan><tspan
-         sodipodi:role="line"
-         id="tspan8055"
-         x="77.337868"
-         y="146.2397"></tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-       x="77.311295"
-       y="123.22021"
-       id="text7028"><tspan
-         sodipodi:role="line"
-         id="tspan7026"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-         x="77.311295"
-         y="123.22021">border</tspan></text>
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2)"
-       d="M 58.115912,67.846321 71.79645,67.813301"
-       id="path9563" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2-4)"
-       d="m 58.054931,67.806272 -0.03031,13.680545"
-       id="path9563-6"
-       inkscape:transform-center-x="0.99122989"
-       inkscape:transform-center-y="-10.282891" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52785px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-       x="74.660751"
-       y="69.01046"
-       id="text10129"><tspan
-         sodipodi:role="line"
-         id="tspan10127"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52785px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583"
-         x="74.660751"
-         y="69.01046">X</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52785px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-       x="56.974892"
-       y="86.498825"
-       id="text10133"><tspan
-         sodipodi:role="line"
-         id="tspan10131"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52785px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583"
-         x="56.974892"
-         y="86.498825">Y</tspan></text>
-    <circle
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-       id="path10187"
-       cx="58.076889"
-       cy="67.895195"
-       r="0.2" />
-  </g>
-</svg>

docs/reference/gtk/input-handling.md

@@ -103,14 +103,14 @@ fields, but e.g. buttons can take the focus too.
 
 Input widgets can be given the focus by clicking on them, but focus
 can also be moved around with certain key events (this is known as
-“keyboard navigation”). GTK reserves the <kbd>Tab</kbd> key to move the focus
-to the next location, and <kbd>Shift</kbd>+<kbd>Tab</kbd> to move it back to the previous
+“keyboard navigation”). GTK reserves the Tab key to move the focus
+to the next location, and Shift-Tab to move it back to the previous
 one. In addition many containers allow “directional navigation” with
 the arrow keys.
 
 Many widgets can be “activated” to trigger and action. E.g., you can
 activate a button or switch by clicking on them, but you can also
-activate them with the keyboard, by using the <kbd>Enter</kbd> or <kbd>␣</kbd> keys.
+activate them with the keyboard, by using the Enter or Space keys.
 
 Apart from keyboard navigation, activation and directly typing into
 entries or text views, GTK widgets can use key events for activating

docs/reference/gtk/meson.build

@@ -17,7 +17,6 @@ expand_content_md_files = [
   'actions.md',
   'input-handling.md',
   'drawing-model.md',
-  'coordinates.md',
   'css-overview.md',
   'css-properties.md',
   'section-accessibility.md',

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

@@ -105,17 +105,3 @@ retire it. If you need such a widget, it is relatively trivial to create one
 using a [class@Gtk.Revealer] with labels and buttons.
 
 Other libraries, such as libadwaita, may provide replacements as well.
-
-## gtk_show_uri is being replaced
-
-Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher.
-
-## GtkStatusbar is going away
-
-This is an oldfashioned widget that does not do all that much anymore, since
-it no longer has a resize handle for the window.
-
-## GtkLockButton and GtkVolumeButton are going away
-
-These are very specialized widgets that should better live with the application
-where they are used.

docs/reference/gtk/question_index.md

@@ -7,50 +7,37 @@ the question you have, this list is a good place to start.
 
 ## General Questions
 
-*  How do I get started with GTK?
+1.  How do I get started with GTK?
 
     The GTK [website](https://www.gtk.org) offers some
     [tutorials](https://www.gtk.org/documentation.php) and other documentation
-    This reference manual also contains a introductory
+    (most of it about GTK 2.x and 3.x, but still somewhat applicable). This
+    reference manual also contains a introductory
     [Getting Started](#gtk-getting-started) part.
 
     More documentation ranging from whitepapers to online books can be found at
     the [GNOME developer's site](https://developer.gnome.org). After studying these
     materials you should be well prepared to come back to this reference manual for details.
 
-*  Where can I get help with GTK, submit a bug report, or make a feature request?
+2.  Where can I get help with GTK, submit a bug report, or make a feature request?
 
     See the [documentation](#gtk-resources) on this topic.
 
-*  How do I port from one GTK version to another?
+3.  How do I port from one GTK version to another?
 
-    Every major version of GTK comes with a [migration guide](#migrating). You may also
-    find useful information in the documentation for specific widgets and functions. If
-    you have a question not covered in the manual, feel free to ask, and please
+    See the [migration guide](#migrating). You may also find useful information in
+    the documentation for specific widgets and functions. If you have a question not
+    covered in the manual, feel free to ask, and please
     [file a bug report](https://gitlab.gnome.org/GNOME/gtk/issues/new) against the
     documentation.
 
-*  Should I maintain parallel versions of my UI in GTK x and GTK y?
-
-    At the end of the day, that is up to you.
-
-    Our experience is that it is a lot of work, and usually not a good idea.
-
-    If you are not ready to make the jump to the next major version of GTK,
-    it is perfectly fine to stick with the stable release. We maintain them
-    for that reason.
-
-*  How does memory management work in GTK? Should I free data returned from functions?
+4.  How does memory management work in GTK? Should I free data returned from functions?
 
     See the documentation for `GObject` and `GInitiallyUnowned`. For `GObject` note
     specifically `g_object_ref()` and `g_object_unref()`. `GInitiallyUnowned` is a
     subclass of `GObject` so the same points apply, except that it has a "floating"
     state (explained in its documentation).
 
-    In a widget tree, each container owns a reference to its children. The root
-    object (typically a `GtkWindow`) is owned by GTK. GTK will drop its reference
-    when you call [method@Gtk.Window.destroy].
-
     For strings returned from functions, they will be declared "const" if they should
     not be freed. Non-const strings should be freed with `g_free()`. Arrays follow the
     same rule. If you find an undocumented exception to the rules, please
@@ -59,7 +46,7 @@ the question you have, this list is a good place to start.
     The transfer annotations for gobject-introspection that are part of the
     documentation can provide useful hints for memory handling semantics as well.
 
-*  Why does my program leak memory, if I destroy a widget immediately
+5.  Why does my program leak memory, if I destroy a widget immediately
     after creating it?
 
     If `GtkFoo` isn't a toplevel window, then
@@ -82,7 +69,7 @@ the question you have, this list is a good place to start.
     the initial floating reference and you don't have to worry about reference
     counting at all ... just remove the widget from the container to get rid of it.
 
-*  How do I use GTK with threads?
+6.  How do I use GTK with threads?
 
     GTK requires that all GTK API calls are made from the same thread in which
     the `GtkApplication` was created, or `gtk_init()` was called (the _main thread_).
@@ -92,7 +79,7 @@ the question you have, this list is a good place to start.
     the results back to the main thread using `g_idle_add()` or `GAsyncQueue`. GIO
     offers useful tools for such an approach such as `GTask`.
 
-*  How do I internationalize a GTK program?
+7.  How do I internationalize a GTK program?
 
     Most people use [GNU gettext](https://www.gnu.org/software/gettext/),
     already required in order to install GLib. On a UNIX or Linux system with
@@ -147,7 +134,7 @@ the question you have, this list is a good place to start.
 
         #define _(x) dgettext (GETTEXT_PACKAGE, x)
 
-*  How do I use non-ASCII characters in GTK programs ?
+8.  How do I use non-ASCII characters in GTK programs ?
 
     GTK uses [Unicode](http://www.unicode.org) (more exactly UTF-8) for all text.
     UTF-8 encodes each Unicode codepoint as a sequence of one to six bytes and
@@ -230,7 +217,7 @@ the question you have, this list is a good place to start.
     to call bind_textdomain_codeset() to ensure that translated strings
     are returned in UTF-8 encoding.
 
-*  How do I use GTK with C++?
+9.  How do I use GTK with C++?
 
     There are two ways to approach this. The GTK header files use the subset
     of C that's also valid C++, so you can simply use the normal GTK API
@@ -255,26 +242,19 @@ the question you have, this list is a good place to start.
 
     There are very few functions that require this cast, however.
 
-*  How do I use GTK with other non-C languages?
+10. How do I use GTK with other non-C languages?
 
     See the list of [language bindings](https://www.gtk.org/language-bindings.php)
     on the GTK [website](https://www.gtk.org).
 
-*  How do I load an image or animation from a file?
+11. How do I load an image or animation from a file?
 
     To load an image file straight into a display widget, use
-    [ctor@Gtk.Picture.new_for_file] or [ctor@Gtk.Picture.new_for_filename].
-    To load an image for another purpose, use [ctor@Gdk.Texture.new_from_file].
-    To load a video from a file, use [ctor@Gtk.MediaFile.new_for_file].
+    [ctor@Gtk.Image.new_from_file]. To load an image for another purpose, use
+    [ctor@Gdk.Texture.new_from_file]. To load a video from a file, use
+    [ctor@Gtk.MediaFile.new_for_file].
 
-    Note that [class@Gtk.Image] is meant for fixed-size icons. For arbitrary
-    image files, you should use [class@Gtk.Picture].
-
-*  How do I draw text?
-
-    If you just want to put text into your user interface somewhere, it is
-    usually easiest to just use one of ready-made widgets for this purpose,
-    such as [class@Gtk.Label].
+12. How do I draw text?
 
     To draw a piece of text onto a cairo surface, use a Pango layout and
     [func@PangoCairo.show_layout].
@@ -286,13 +266,13 @@ the question you have, this list is a good place to start.
         pango_font_description_free (fontdesc);
         g_object_unref (layout);
 
-    See also the [Cairo Rendering](https://docs.gtk.org/PangoCairo/pango_cairo.html)
-    section of the [Pango documentation](https://docs.gtk.org/Pango/).
+    See also the [Cairo Rendering](https://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html)
+    section of the [Pango documentation](https://developer.gnome.org/pango/stable/).
 
     To draw a piece of text in a widget [vfunc@Gtk.Widget.snapshot] implementation,
     use [method@Gtk.Snapshot.append_layout].
 
-*  How do I measure the size of a piece of text?
+13. How do I measure the size of a piece of text?
 
     To obtain the size of a piece of text, use a Pango layout and
     [method@Pango.Layout.get_pixel_size], using code like the following:
@@ -304,10 +284,10 @@ the question you have, this list is a good place to start.
         pango_font_description_free (fontdesc);
         g_object_unref (layout);
 
-    See also the [Layout Objects](https://docs.gtk.org/Pango/class.Layout.html)
-    section of the [Pango documentation](https://docs.gtk.org/Pango/).
+    See also the [Layout Objects](https://developer.gnome.org/pango/stable/pango-Layout-Objects.html)
+    section of the [Pango documentation](https://developer.gnome.org/pango/stable/).
 
-*  Why are types not registered if I use their `GTK_TYPE_BLAH` macro?
+14. Why are types not registered if I use their `GTK_TYPE_BLAH` macro?
 
     The %GTK_TYPE_BLAH macros are defined as calls to gtk_blah_get_type(), and
     the `_get_type()` functions are declared as %G_GNUC_CONST which allows the
@@ -318,14 +298,14 @@ the question you have, this list is a good place to start.
 
         g_type_ensure (GTK_TYPE_BLAH);
 
-*  How do I create a transparent toplevel window?
+15. How do I create a transparent toplevel window?
 
     Any toplevel window can be transparent. It is just a matter of setting a
     transparent background in the CSS style for it.
 
 ## Which widget should I use...
 
-*  ...for lists and trees?
+16. ...for lists and trees?
 
     This question has different answers, depending on the size of the dataset
     and the required formatting flexibility.
@@ -341,7 +321,7 @@ the question you have, this list is a good place to start.
     and widgetry inside the list, then you probably want to use a [class@Gtk.ListBox],
     which uses regular widgets for display.
 
-*  ...for multi-line text display or editing?
+17. ...for multi-line text display or editing?
 
     See the [text widget overview](#TextWidget) -- you should use the
     [class@Gtk.TextView] widget.
@@ -350,7 +330,7 @@ the question you have, this list is a good place to start.
     of course. It can be made selectable with [method@Gtk.Label.set_selectable]. For a
     single-line text entry, see [class@Gtk.Entry].
 
-*  ...to display an image or animation?
+18. ...to display an image or animation?
 
     GTK has two widgets that are dedicated to displaying images. [class@Gtk.Image], for
     small, fixed-size icons and [class@Gtk.Picture] for content images.
@@ -366,14 +346,17 @@ the question you have, this list is a good place to start.
         mediafile = gtk_media_file_new_for_filename ("example.webm");
         picture = gtk_picture_new_for_paintable (GDK_PAINTABLE (mediafile));
 
-*  ...for presenting a set of mutually-exclusive choices, where Windows
+19. ...for presenting a set of mutually-exclusive choices, where Windows
     would use a combo box?
 
-    With GTK, a [class@Gtk.DropDown] is the recommended widget to use for this use case.
+    With GTK, a [class@Gtk.ComboBox] is the recommended widget to use for this use case.
+    If you need an editable text entry, use the [property@Gtk.ComboBox:has-entry] property.
+
+    A newer alternative is [class@Gtk.DropDown].
 
 ## Questions about GtkWidget
 
-*  How do I change the color of a widget?
+20. How do I change the color of a widget?
 
     The background color of a widget is determined by the CSS style that applies
     to it. To change that, you can set style classes on the widget, and provide
@@ -381,7 +364,7 @@ the question you have, this list is a good place to start.
     [method@Gtk.CssProvider.load_from_file] and its variants.
     See [method@Gtk.StyleContext.add_provider].
 
-*  How do I change the font of a widget?
+21. How do I change the font of a widget?
 
     If you want to make the text of a label larger, you can use
     gtk_label_set_markup():
@@ -405,14 +388,14 @@ the question you have, this list is a good place to start.
     of this approach is that users can then override the font you have chosen.
     See the `GtkStyleContext` documentation for more discussion.
 
-*  How do I disable/ghost/desensitize a widget?
+22. How do I disable/ghost/desensitize a widget?
 
     In GTK a disabled widget is termed _insensitive_.
     See [method@Gtk.Widget.set_sensitive].
 
 ## GtkTextView questions
 
-*  How do I get the contents of the entire text widget as a string?
+23. How do I get the contents of the entire text widget as a string?
 
     See [method@Gtk.TextBuffer.get_bounds] and [method@Gtk.TextBuffer.get_text]
     or [method@Gtk.TextIter.get_text].
@@ -427,14 +410,14 @@ the question you have, this list is a good place to start.
         /* use text */
         g_free (text);
 
-*  How do I make a text widget display its complete contents in a specific font?
+24. How do I make a text widget display its complete contents in a specific font?
 
     If you use [method@Gtk.TextBuffer.insert_with_tags] with appropriate tags to
     select the font, the inserted text will have the desired appearance, but
     text typed in by the user before or after the tagged block will appear in
     the default style.
 
-*  How do I make a text view scroll to the end of the buffer automatically ?
+25. How do I make a text view scroll to the end of the buffer automatically ?
 
     A good way to keep a text buffer scrolled to the end is to place a
     [mark](#GtkTextMark) at the end of the buffer, and give it right gravity.
@@ -449,21 +432,21 @@ the question you have, this list is a good place to start.
 
 ## GtkTreeView questions
 
-*  How do I associate some data with a row in the tree?
+26. How do I associate some data with a row in the tree?
 
     Remember that the [iface@Gtk.TreeModel] columns don't necessarily have to be
     displayed. So you can put non-user-visible data in your model just
     like any other data, and retrieve it with [method@Gtk.TreeModel.get].
     See the [tree widget overview](#TreeWidget).
 
-*  How do I put an image and some text in the same column?
+27. How do I put an image and some text in the same column?
 
     You can pack more than one [class@Gtk.CellRenderer] into a single [class@Gtk.TreeViewColumn]
     using [method@Gtk.TreeViewColumn.pack_start] or [method@Gtk.TreeViewColumn.pack_end].
     So pack both a [class@Gtk.CellRendererPixbuf] and a [class@Gtk.CellRendererText] into the
     column.
 
-*  I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
+28. I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
     [method@Gtk.ListStore.set] and [method@Gtk.TreeStore.set], but can't read it back?
 
     Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [iface@Gtk.TreeModel]
@@ -471,7 +454,7 @@ the question you have, this list is a good place to start.
     implements. The easiest way to read a set of data back is to use
     [method@Gtk.TreeModel.get].
 
-*  How do I change the way that numbers are formatted by `GtkTreeView`?
+29. How do I change the way that numbers are formatted by `GtkTreeView`?
 
     Use [method@Gtk.TreeView.insert_column_with_data_func] or
     [method@Gtk.TreeViewColumn.set_cell_data_func] and do the conversion
@@ -545,21 +528,19 @@ the question you have, this list is a good place to start.
                                                    (gpointer)DOUBLE_COLUMN, NULL);
         }
 
-*  How do I hide the expander arrows in my tree view?
+30. How do I hide the expander arrows in my tree view?
 
     Set the expander-column property of the tree view to a hidden column.
     See [method@Gtk.TreeView.set_expander_column] and [method@Gtk.TreeViewColumn.set_visible].
 
 ## Using cairo with GTK
 
-*  How do I use cairo to draw in GTK applications?
+31. How do I use cairo to draw in GTK applications?
 
-    [class@Gtk.DrawingArea] is a ready-made widget for drawing with cairo.
+    Use [method@Gtk.Snapshot.append_cairo] in your [vfunc@Gtk.Widget.snapshot] vfunc
+    to obtain a cairo context and draw with that.
 
-    If you implement a custom widget, use [method@Gtk.Snapshot.append_cairo]
-    in your [vfunc@Gtk.Widget.snapshot] vfunc to obtain a cairo context and draw with that.
-
-*  Can I improve the performance of my application by using another backend
+32. Can I improve the performance of my application by using another backend
     of cairo (such as GL)?
 
     No. Most drawing in GTK is not done via cairo anymore (but instead
@@ -570,7 +551,7 @@ the question you have, this list is a good place to start.
 
     If you are interested in using GL for your own drawing, see [class@Gtk.GLArea].
 
-*  Can I use cairo to draw on a `GdkPixbuf`?
+33. Can I use cairo to draw on a `GdkPixbuf`?
 
     No. The cairo image surface does not support the pixel format used by `GdkPixbuf`.
 

docs/reference/gtk/running.md

@@ -211,9 +211,6 @@ A number of options affect behavior instead of logging:
 `gl-disable`
 : Disable OpenGL support
 
-`gl-fractional`
-: Enable fractional scaling for OpenGL. This is experimental
-
 `gl-legacy`
 : Use a legacy OpenGL context
 
@@ -371,13 +368,6 @@ to rememdy this on the GTK side; the best bet before trying the above
 workarounds is to try to update your graphics drivers and Nahimic
 installation.
 
-### `GSK_MAX_TEXTURE_SIZE`
-
-Limit texture size to the minimum of this value and the OpenGL limit
-for texture sizes. This can be used to debug issues with texture slicing
-on systems where the OpenGL texture size limit would otherwise make
-texture slicing difficult to test.
-
 ### `GTK_CSD`
 
 The default value of this environment variable is `1`. If changed

docs/reference/gtk/section-accessibility.md

@@ -128,7 +128,6 @@ Each state name is part of the `GtkAccessibleState` enumeration.
 | %GTK_ACCESSIBLE_STATE_INVALID | “aria-invalid” | `GtkAccessibleInvalidState` | Set when a widget is showing an error |
 | %GTK_ACCESSIBLE_STATE_PRESSED | “aria-pressed” | `GtkAccessibleTristate` | Indicates the current state of a [class@Gtk.ToggleButton] |
 | %GTK_ACCESSIBLE_STATE_SELECTED | “aria-selected” | boolean or undefined | Set when a widget is selected |
-| %GTK_ACCESSIBLE_STATE_VISITED | N/A | boolean or undefined | Set when a link-like widget is visited |
 
 #### List of accessible properties
 

docs/reference/gtk/section-list-widget.md

@@ -9,9 +9,9 @@ Lists are intended to be used whenever developers want to display many objects
 in roughly the same way.
 
 Lists are perfectly fine to be used for very short list of only 2 or 3 elements,
-but generally scale to millions of items. Of course, the larger the list grows,
-the more care needs to be taken to choose the right data structures to keep things
-running well.
+but generally scale fine to millions of items. Of course, the larger the list
+grows, the more care needs to be taken to choose the right data structures to
+keep things running well.
 
 Lists are meant to be used with changing data, both with the items itself changing
 as well as the list adding and removing items. Of course, they work just as well
@@ -26,14 +26,12 @@ have a specific meaning in this context.
 **_Views_** or **_list widgets_** are the widgets that hold and manage the lists.
 Examples of these widgets would be [`class@Gtk.ListView`] or [`class@Gtk.GridView`].
 
-Views display data from a **_model_**. Models implement the [`iface@Gio.ListModel`]
-interface and can be provided in a variety of ways:
+Views display data from a **_model_**. A model is a [`iface@Gio.ListModel`] and
+models can be provided in 3 ways or combinations thereof:
 
- * List model implementations for many specific types of data already exist, for
-   example `GtkDirectoryList` or `GtkStringList`.
-
- * There are generic list model implementations like`GListStore` that allow building
-   lists of arbitrary objects.
+ * Many list models implementations already exist. There are models that provide
+   specific data, like `GtkDirectoryList`. And there are models like `GListStore`
+   that allow building lists manually.
 
  * Wrapping list models like `GtkFilterListModel` or `GtkSortListModel`
    modify, adapt or combine other models.
@@ -49,8 +47,8 @@ The elements in a model are called **_items_**. All items are
 
 Every item in a model has a **_position_** which is the unsigned integer that
 describes where in the model the item is located. The first item in a model is
-at position 0. The position of an item can change as other items are added or
-removed from the model.
+at position 0. The position of an item can of course change as other items are
+added or removed from the model.
 
 It is important to be aware of the difference between items and positions
 because the mapping from position to item is not permanent, so developers
@@ -73,10 +71,10 @@ with the item managed by the listitem. Finding a suitable factory implementation
 for the data displayed, the programming language and development environment
 is an important task that can simplify setting up the view tremendously.
 
-Views support selections via a **_selection model_**. A selection model is
-an implementation of the [`iface@Gtk.SelectionModel`] interface on top of the
-[`iface@Gio.ListModel`] interface that allows marking each item in a model as
-either selected or not selected. Just like regular models, this can be implemented
+Views support selections via a **_selection model_**. A selection model is an
+implementation of the [`iface@Gtk.SelectionModel`] interface on top of the
+[`iface@Gio.ListModel`] interface that allows marking each item in a model as either
+selected or not selected. Just like regular models, this can be implemented
 either by implementing `GtkSelectionModel` directly or by wrapping a model with
 one of the GTK models provided for this purposes, such as [`class@Gtk.NoSelection`]
 or [`class@Gtk.SingleSelection`].
@@ -89,18 +87,19 @@ item is exposed in the listitem via the [`property@Gtk.ListItem:selected`] prope
 
 Views and listitems also support activation. Activation means that double
 clicking or pressing enter while inside a focused row will cause the view
-to emit a signal such as [`signal@Gtk.ListView::activate`]. This provides an
-easy way to set up lists, but can also be turned off on listitems if undesired.
+to emit and activation signal such as [`signal@Gtk.ListView::activate`]. This
+provides an easy way to set up lists, but can also be turned off on listitems
+if undesired.
 
 Both selections and activation are supported among other things via widget
 [actions](#actions-overview). This allows developers to add widgets to their
-lists that cause selections to change or to trigger activation via the
-[`iface@Gtk.Actionable`] interface. For a list of all supported actions
-see the relevant documentation.
+lists that cause selections to change or to trigger activation via
+the [`iface@Gtk.Actionable`] interface. For a list of all supported actions see
+the relevant documentation.
 
 ## Behind the scenes
 
-While it is not a problem for short lists to instantiate widgets for every
+While for short lists it is not a problem to instantiate widgets for every
 item in the model, once lists grow to thousands or millions of elements, this
 gets less feasible. Because of this, the views only create a limited amount of
 listitems and recycle them by binding them to new items. In general, views try
@@ -108,7 +107,7 @@ to keep listitems available only for the items that can actually be seen on
 screen.
 
 While this behavior allows views to scale effortlessly to huge lists, it has a
-few implications for what can be done with views. For example, it is not possible
+few implication on what can be done with views. For example, it is not possible
 to query a view for a listitem used for a certain position - there might not be
 one and even if there is, that listitem might soon be recycled for a new
 position.
@@ -162,9 +161,9 @@ in particular `GListModel` do not. This was a design choice because the common
 use case is displaying lists and not trees and it greatly simplifies the API
 interface provided.
 
-However, GTK provides functionality to make lists look and behave like trees
-for use cases that require trees. This is achieved by using the
-[`class@Gtk.TreeListModel`] model to flatten a tree into a list. The
+However, GTK provides functionality to make trees look and behave like lists
+for the people who still want to display lists. This is achieved by using
+the [`class@Gtk.TreeListModel`] model to flatten a tree into a list. The
 [`class@Gtk.TreeExpander`] widget can then be used inside a listitem to allow
 users to expand and collapse rows and provide a similar experience to
 `GtkTreeView`.
@@ -175,26 +174,26 @@ on the topic.
 ## List styles
 
 One of the advantages of the new list widgets over `GtkTreeView` and cell
-renderers is that they are styleable using GTK CSS. This provides a lot of
-flexibility. The themes that ship with GTK provide a few predefined list
-styles that can be used in many situations:
+renderers is that they are fully themable using GTK CSS. This provides a
+lot of flexibility. The themes that ship with GTK provide a few predefined
+list styles that can be used in many situations:
 
 ![Rich list](rich-list.png)
 
-This _rich list_ style is low density, spacious and uses an outline focus
-ring. It is suitable for lists of controls, e.g. in preference dialogs or
+This style of list is low density, spacious and uses an outline focus ring.
+It is suitable for lists of controls, e.g. in preference dialogs or
 settings panels. Use the `.rich-list` style class.
 
 ![Navigation sidebar](navigation-sidebar.png)
 
-The _sidebar_ style of list is medium density, using a full background to
-indicate focus and selection. Use the `.navigation-sidebar` style class.
+This style of list is medium density, using a full background to indicate
+focus and selection. Use the `.navigation-sidebar` style class.
 
 ![Data table](data-table.png)
 
-The _data table_ style of list is a high density table, similar in style to a
-traditional treeview. Individual cells can be selectable and editable. Use
-the `.data-table` style class.
+This style of list is a high density table, similar in style to a traditional
+treeview. Individual cells can be selectable and editable. Use the `.data-table`
+style class.
 
 ## Comparison to GtkTreeView
 
@@ -203,19 +202,20 @@ compares to the way they know. This section will try to outline the similarities
 and differences between the two.
 
 This new approach tries to provide roughly the same functionality as the old
-approach but often uses a very different way to achieve these goals.
+approach but often uses a very different approach to achieve these goals.
 
 The main difference and one of the primary reasons for this new development is
-that items can be displayed using regular widgets and the separate cell renderer
-machinery is no longer necessary. This allows all benefits that widgets provide,
-such as complex layout, animations and CSS styling.
+that items can be displayed using regular widgets and `GtkCellRenderer` is no
+longer necessary. This allows all benefits that widgets provide, such as complex
+layout and animating widgets and not only makes cell renderers obsolete, but
+also `GtkCellArea`.
 
 The other big difference is the massive change to the data model. `GtkTreeModel`
-was a rather complex interface for a tree data structure. `GListModel` is
-deliberately designed to be a very simple data structure for lists only. (See
+was a rather complex interface for a tree data structure and `GListModel` was
+deliberately designed to be a simple data structure for lists only. (See
 [above](#displaying-trees)) for how to still do trees with this new model.)
-Another big change is that the new model allows for bulk changes via the
-`GListModel::items-changed` signal while `GtkTreeModel` only allows a single
+Another big change is that the new model allows for bulk changes via
+the `GListModel::items-changed` signal while `GtkTreeModel` only allows a single
 item to change at once. The goal here is of course to encourage implementation
 of custom list models.
 
@@ -231,8 +231,8 @@ via custom code in each widget, selection state is now meant to be managed by
 the selection models. In particular this allows for complex use cases with
 specialized requirements.
 
-Finally here's a quick comparison chart of equivalent functionality to look for
-when transitioning code:
+Finally here's a quick list of equivalent functionality to look for when
+transitioning code for easy lookup:
 
 | Old                  | New                                                     |
 | -------------------- | ------------------------------------------------------- |

docs/reference/gtk/x11.md

@@ -1,4 +1,4 @@
-Title: Using GTK with X11
+Title: GTK for the X Window System
 Slug: gtk-x11
 
 On UNIX, the X backend is enabled by default, so you don't need to do anything

docs/reference/meson.build

@@ -1,7 +1,7 @@
 toml_conf = configuration_data()
 toml_conf.set('version', meson.project_version())
 
-gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'), native: true)
+gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
 
 gidocgen_common_args = [
   '--quiet',

examples/action-namespace.c

@@ -106,7 +106,7 @@ activate (GApplication *app,
   gtk_widget_set_halign (GTK_WIDGET (button), GTK_ALIGN_CENTER);
   gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_START);
   gtk_window_set_child (GTK_WINDOW (window), button);
-  gtk_window_present (GTK_WINDOW (win));
+  gtk_widget_show (win);
 
   g_object_unref (button_menu);
   g_object_unref (doc_actions);

examples/application2/meson.build

@@ -1,6 +1,6 @@
 app2_resources = gnome.compile_resources('exampleapp2_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 executable('exampleapp2',
   'exampleapp.c', 'exampleappwin.c', 'main.c', app2_resources,

examples/application3/meson.build

@@ -1,6 +1,6 @@
 app3_resources = gnome.compile_resources('exampleapp3_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 executable('exampleapp3',
   'exampleapp.c', 'exampleappwin.c', 'main.c', app3_resources,

examples/application4/meson.build

@@ -1,6 +1,6 @@
 app4_resources = gnome.compile_resources('exampleapp4_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 executable('exampleapp4',
   'exampleapp.c', 'exampleappwin.c', 'main.c', app4_resources,

examples/application5/meson.build

@@ -1,6 +1,6 @@
 app5_resources = gnome.compile_resources('exampleapp5_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app5_schemas = gnome.compile_schemas()
 

examples/application6/meson.build

@@ -1,6 +1,6 @@
 app6_resources = gnome.compile_resources('exampleapp6_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app6_schemas = gnome.compile_schemas()
 

examples/application7/meson.build

@@ -1,6 +1,6 @@
 app7_resources = gnome.compile_resources('exampleapp7_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app7_schemas = gnome.compile_schemas()
 

examples/application8/meson.build

@@ -1,6 +1,6 @@
 app8_resources = gnome.compile_resources('exampleapp8 resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app8_schemas = gnome.compile_schemas()
 

examples/application9/meson.build

@@ -1,6 +1,6 @@
 app9_resources = gnome.compile_resources('exampleapp9_resources',
   'exampleapp.gresource.xml',
-  source_dir: meson.current_source_dir())
+  source_dir: '.')
 
 app9_schemas = gnome.compile_schemas()
 

examples/bp/bloatpad.c

@@ -292,7 +292,7 @@ new_window (GApplication *app,
                     G_CALLBACK (text_buffer_changed_cb), window);
   text_buffer_changed_cb (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)), window);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (GTK_WIDGET (window));
 }
 
 static void
@@ -465,7 +465,7 @@ edit_accels (GSimpleAction *action,
 
   gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), 0);
 
-  gtk_window_present (GTK_WINDOW (dialog));
+  gtk_widget_show (dialog);
 }
 
 static gboolean

examples/bp/meson.build

@@ -1,5 +1,5 @@
 bp_resources = gnome.compile_resources('bloatpad_resources',
                                        'bloatpad.gresources.xml',
-                                       source_dir: meson.current_source_dir())
+                                       source_dir: '.')
 
 executable('bloatpad', 'bloatpad.c', bp_resources, dependencies: libgtk_dep, c_args: common_cflags)

examples/builder.c

@@ -37,7 +37,7 @@ activate (GtkApplication *app,
   button = gtk_builder_get_object (builder, "quit");
   g_signal_connect_swapped (button, "clicked", G_CALLBACK (quit_cb), window);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (GTK_WIDGET (window));
   g_object_unref (builder);
 }
 

examples/drawing.c

@@ -31,9 +31,10 @@ resize_cb (GtkWidget *widget,
 
   if (gtk_native_get_surface (gtk_widget_get_native (widget)))
     {
-      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                            gtk_widget_get_width (widget),
-                                            gtk_widget_get_height (widget));
+      surface = gdk_surface_create_similar_surface (gtk_native_get_surface (gtk_widget_get_native (widget)),
+                                                   CAIRO_CONTENT_COLOR,
+                                                   gtk_widget_get_width (widget),
+                                                   gtk_widget_get_height (widget));
 
       /* Initialize the surface to white */
       clear_surface ();
@@ -163,7 +164,7 @@ activate (GtkApplication *app,
 
   g_signal_connect (press, "pressed", G_CALLBACK (pressed), drawing_area);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }
 
 int

examples/grid-packing.c

@@ -49,7 +49,7 @@ activate (GtkApplication *app,
    */
   gtk_grid_attach (GTK_GRID (grid), button, 0, 1, 2, 1);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 
 }
 

examples/hello/hello-world.c

@@ -27,7 +27,7 @@ activate (GtkApplication *app,
 
   gtk_window_set_child (GTK_WINDOW (window), button);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }
 
 int
@@ -37,7 +37,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);

examples/plugman.c

@@ -112,7 +112,7 @@ new_window (GApplication *app,
         }
     }
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (GTK_WIDGET (window));
 }
 
 static void

examples/search-bar.c

@@ -2,7 +2,7 @@
 
 static void
 activate_cb (GtkApplication *app,
-             gpointer        user_data)
+    gpointer user_data)
 {
   GtkWidget *window;
   GtkWidget *search_bar;
@@ -11,11 +11,12 @@ activate_cb (GtkApplication *app,
   GtkWidget *menu_button;
 
   window = gtk_application_window_new (app);
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 
   search_bar = gtk_search_bar_new ();
   gtk_widget_set_valign (search_bar, GTK_ALIGN_START);
   gtk_window_set_child (GTK_WINDOW (window), search_bar);
+  gtk_widget_show (search_bar);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_search_bar_set_child (GTK_SEARCH_BAR (search_bar), box);

examples/sunny.c

@@ -43,7 +43,7 @@ new_window (GApplication *app,
         }
     }
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (GTK_WIDGET (window));
 }
 
 static void

examples/window-default.c

@@ -9,7 +9,7 @@ activate (GtkApplication* app,
   window = gtk_application_window_new (app);
   gtk_window_set_title (GTK_WINDOW (window), "Window");
   gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }
 
 int

gdk/broadway/broadway-output.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __BROADWAY_H__
+#define __BROADWAY_H__
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -73,3 +74,4 @@ void            broadway_output_pong                (BroadwayOutput *output);
 void            broadway_output_set_show_keyboard   (BroadwayOutput *output,
                                                      gboolean        show);
 
+#endif /* __BROADWAY_H__ */

gdk/broadway/broadway-protocol.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __BROADWAY_PROTOCOL_H__
+#define __BROADWAY_PROTOCOL_H__
 
 #include <glib.h>
 
@@ -212,7 +213,6 @@ typedef enum {
   BROADWAY_REQUEST_RELEASE_TEXTURE,
   BROADWAY_REQUEST_SET_NODES,
   BROADWAY_REQUEST_ROUNDTRIP,
-  BROADWAY_REQUEST_SET_MODAL_HINT,
 } BroadwayRequestType;
 
 typedef struct {
@@ -293,12 +293,6 @@ typedef struct {
   guint32 show_keyboard;
 } BroadwayRequestSetShowKeyboard;
 
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-  gboolean modal_hint;
-} BroadwayRequestSetModalHint;
-
 typedef union {
   BroadwayRequestBase base;
   BroadwayRequestNewSurface new_surface;
@@ -318,7 +312,6 @@ typedef union {
   BroadwayRequestUploadTexture upload_texture;
   BroadwayRequestReleaseTexture release_texture;
   BroadwayRequestSetNodes set_nodes;
-  BroadwayRequestSetModalHint set_modal_hint;
 } BroadwayRequest;
 
 typedef enum {
@@ -369,3 +362,4 @@ typedef union {
   BroadwayReplyUngrabPointer ungrab_pointer;
 } BroadwayReply;
 
+#endif /* __BROADWAY_PROTOCOL_H__ */

gdk/broadway/broadway-server.c

@@ -124,7 +124,6 @@ struct BroadwaySurface {
   gboolean visible;
   gint32 transient_for;
   guint32 texture;
-  gboolean modal_hint;
   BroadwayNode *nodes;
   GHashTable *node_lookup;
 };
@@ -422,14 +421,6 @@ update_event_state (BroadwayServer *server,
       {
         surface->x = message->configure_notify.x;
         surface->y = message->configure_notify.y;
-
-	if (server->focused_surface_id != message->configure_notify.id &&
-	    server->pointer_grab_surface_id == -1 && surface->modal_hint)
-	{
-	  broadway_server_surface_raise (server, message->configure_notify.id);
-	  broadway_server_focus_surface (server, message->configure_notify.id);
-	  broadway_server_flush (server);
-	}
       }
     break;
   case BROADWAY_EVENT_ROUNDTRIP_NOTIFY:
@@ -1574,11 +1565,9 @@ broadway_server_query_mouse (BroadwayServer *server,
 
 void
 broadway_server_destroy_surface (BroadwayServer *server,
-                                 int id,
-                                 gboolean disconnected)
+                                 int id)
 {
   BroadwaySurface *surface;
-  gint32 transient_for = -1;
 
   if (server->mouse_in_surface_id == id)
     {
@@ -1590,29 +1579,17 @@ broadway_server_destroy_surface (BroadwayServer *server,
     server->pointer_grab_surface_id = -1;
 
   if (server->output)
-    broadway_output_destroy_surface (server->output, id);
+    broadway_output_destroy_surface (server->output,
+                                     id);
 
   surface = broadway_server_lookup_surface (server, id);
   if (surface != NULL)
     {
-      if (server->focused_surface_id == id)
-	transient_for = surface->transient_for;
-
       server->surfaces = g_list_remove (server->surfaces, surface);
       g_hash_table_remove (server->surface_id_hash,
                            GINT_TO_POINTER (id));
       broadway_surface_free (server, surface);
     }
-
-  if (transient_for != -1 && !disconnected)
-    {
-      surface = broadway_server_lookup_surface (server, transient_for);
-      if (surface != NULL)
-        {
-	  broadway_server_focus_surface (server, transient_for);
-	  broadway_server_flush (server);
-	}
-    }
 }
 
 gboolean
@@ -1733,19 +1710,6 @@ broadway_server_surface_set_transient_for (BroadwayServer *server,
     }
 }
 
-void
-broadway_server_surface_set_modal_hint (BroadwayServer *server,
-                                        int id, gboolean modal_hint)
-{
-  BroadwaySurface *surface;
-
-  surface = broadway_server_lookup_surface (server, id);
-  if (surface == NULL)
-    return;
-
-  surface->modal_hint = modal_hint;
-}
-
 gboolean
 broadway_server_has_client (BroadwayServer *server)
 {

gdk/broadway/broadway-server.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __BROADWAY_SERVER__
+#define __BROADWAY_SERVER__
 
 #include "broadway-protocol.h"
 #include <glib-object.h>
@@ -92,8 +93,7 @@ guint32             broadway_server_new_surface               (BroadwayServer  *
                                                                int              width,
                                                                int              height);
 void                broadway_server_destroy_surface           (BroadwayServer  *server,
-                                                               int              id,
-                                                               gboolean         disconnected);
+                                                               int              id);
 gboolean            broadway_server_surface_show              (BroadwayServer  *server,
                                                                int              id);
 gboolean            broadway_server_surface_hide              (BroadwayServer  *server,
@@ -130,8 +130,6 @@ gboolean            broadway_server_surface_move_resize       (BroadwayServer  *
                                                                int              height);
 void                broadway_server_focus_surface             (BroadwayServer  *server,
                                                                int              new_focused_surface);
-void                broadway_server_surface_set_modal_hint    (BroadwayServer *server,
-                                                               int             id,
-                                                               gboolean        modal_hint);
 
 
+#endif /* __BROADWAY_SERVER__ */

gdk/broadway/broadwayd.c

@@ -101,7 +101,8 @@ client_disconnected (BroadwayClient *client)
     }
 
   for (l = client->surfaces; l != NULL; l = l->next)
-    broadway_server_destroy_surface (server, GPOINTER_TO_UINT (l->data), TRUE);
+    broadway_server_destroy_surface (server,
+                                     GPOINTER_TO_UINT (l->data));
   g_list_free (client->surfaces);
   client->surfaces = NULL;
 
@@ -267,7 +268,7 @@ client_handle_request (BroadwayClient *client,
       client->surfaces =
         g_list_remove (client->surfaces,
                        GUINT_TO_POINTER (request->destroy_surface.id));
-      broadway_server_destroy_surface (server, request->destroy_surface.id, FALSE);
+      broadway_server_destroy_surface (server, request->destroy_surface.id);
       break;
     case BROADWAY_REQUEST_SHOW_SURFACE:
       broadway_server_surface_show (server, request->show_surface.id);
@@ -379,11 +380,6 @@ client_handle_request (BroadwayClient *client,
     case BROADWAY_REQUEST_SET_SHOW_KEYBOARD:
       broadway_server_set_show_keyboard (server, request->set_show_keyboard.show_keyboard);
       break;
-    case BROADWAY_REQUEST_SET_MODAL_HINT:
-      broadway_server_surface_set_modal_hint (server,
-                                              request->set_modal_hint.id,
-                                              request->set_modal_hint.modal_hint);
-      break;
     default:
       g_warning ("Unknown request of type %d", request->base.type);
     }

gdk/broadway/gdkbroadway-server.c

@@ -561,18 +561,6 @@ _gdk_broadway_server_surface_set_transient_for (GdkBroadwayServer *server,
                                     BROADWAY_REQUEST_SET_TRANSIENT_FOR);
 }
 
-void
-_gdk_broadway_server_surface_set_modal_hint (GdkBroadwayServer *server,
-                                             int id, gboolean modal_hint)
-{
-  BroadwayRequestSetModalHint msg;
-
-  msg.id = id;
-  msg.modal_hint = modal_hint;
-  gdk_broadway_server_send_message (server, msg,
-				    BROADWAY_REQUEST_SET_MODAL_HINT);
-}
-
 static int
 open_shared_memory (void)
 {

gdk/broadway/gdkbroadway-server.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GDK_BROADWAY_SERVER__
+#define __GDK_BROADWAY_SERVER__
 
 #include <gdk/gdktypes.h>
 
@@ -77,7 +78,5 @@ gboolean           _gdk_broadway_server_surface_move_resize       (GdkBroadwaySe
 								  int                 y,
 								  int                 width,
 								  int                 height);
-void               _gdk_broadway_server_surface_set_modal_hint   (GdkBroadwayServer *server,
-                                                                  int                id,
-                                                                  gboolean           modal_hint);
 
+#endif /* __GDK_BROADWAY_SERVER__ */

gdk/broadway/gdkbroadway.h

@@ -22,7 +22,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#pragma once
+#ifndef __GDK_BROADWAY_H__
+#define __GDK_BROADWAY_H__
 
 #include <gdk/gdk.h>
 
@@ -35,3 +36,4 @@
 
 #undef __GDKBROADWAY_H_INSIDE__
 
+#endif /* __GDK_BROADWAY_H__ */