textview: Don't validate during snapshot

Do it during size_allocate, and go back there
if needed.

.gitlab-ci.yml

@@ -22,29 +22,35 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false -Dwayland:werror=false"
+  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"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
+  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38"
-  FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v41"
 
-.only-default:
-  only:
-    - branches
-  except:
-    - tags
+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
 
 style-check-diff:
-  extends: .only-default
   image: $FEDORA_IMAGE
   stage: check
-  allow_failure: true
+  when: manual
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
-  extends: .only-default
   image: $FEDORA_IMAGE
   artifacts:
     when: always
@@ -71,11 +77,6 @@ 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
@@ -85,10 +86,17 @@ fedora-x86_64:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - meson subprojects update
+    - export PATH="$HOME/.local/bin:$PATH"
+    - pip3 install --user meson~=0.64
+    - meson subprojects download
+    - meson subprojects update --reset
     - mkdir _install
-    - meson --prefix=${CI_PROJECT_DIR}/_install
-            ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+    - meson setup
+            --prefix=${CI_PROJECT_DIR}/_install
+            ${COMMON_MESON_FLAGS}
+            ${EXTRA_MESON_FLAGS}
+            ${BACKEND_FLAGS}
+            ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
     - meson install -C _build
@@ -107,10 +115,17 @@ release-build:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - meson subprojects update
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+    - 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}
             _build
-    - ninja -C _build
+    - meson compile -C _build
     - .gitlab-ci/run-tests.sh _build x11
 
 fedora-mingw64:
@@ -131,37 +146,26 @@ fedora-mingw64:
             # mingw64-graphene (rawhide)
   script:
     - .gitlab-ci/show-info-linux.sh
-    - 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
+    - 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
     - 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
@@ -191,21 +195,23 @@ msys2-mingw64:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
 macos:
-  extends: .only-default
-  only:
-    - branches@GNOME/gtk
+  # Sadly, this fails regularly, and its failure is never enlightening
+  allow_failure: true
+  rules:
+    - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
   tags:
     - macos
   needs: []
   before_script:
     - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson==0.60.3
+    - pip3 install --user meson~=0.64
     - pip3 install --user ninja
     - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
     - export MESON_FORCE_BACKTRACE=1
   script:
-    - meson -Dx11-backend=false
+    - meson setup ${COMMON_MESON_FLAGS}
+            -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
             -Dmedia-gstreamer=disabled
@@ -213,18 +219,21 @@ macos:
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled
+            -Ddemos=false
+            -Dbuild-tests=false
+            -Dbuild-examples=false
+            -Dbuild-testsuite=false
             _build
-    - ninja -C _build
+    - meson compile -C _build
   artifacts:
     when: always
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 vs2017-x64:
-  extends: .only-default
   # TODO: Uncomment this when ready to merge.
-  #only:
-  #  - branches@GNOME/gtk
+  # rules:
+  #   - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
   tags:
     - win32-ps
@@ -237,7 +246,7 @@ vs2017-x64:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 .flatpak-defaults:
-  image: $FLATPAK_IMAGE
+  image: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
   stage: flatpak
   allow_failure: true
   tags:
@@ -247,65 +256,67 @@ 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}"
 
-# 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
+flatpak:demo:
+  extends: '.flatpak-defaults'
   needs: []
   variables:
     APPID: org.gtk.Demo4
 
-flatpak-main:demo:
-  extends: .flatpak-main
+flatpak:demo:aarch64:
+  extends: '.flatpak-defaults'
   needs: []
+  tags:
+    - flatpak-aarch64
   variables:
     APPID: org.gtk.Demo4
 
-flatpak-manual:widget-factory:
-  extends: .flatpak-manual
+flatpak:widget-factory:
+  extends: '.flatpak-defaults'
   needs: []
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak-main:widget-factory:
-  extends: .flatpak-main
+flatpak:widget-factory:aarch64:
+  extends: '.flatpak-defaults'
   needs: []
+  tags:
+    - flatpak-aarch64
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak-manual:icon-browser:
-  extends: .flatpak-manual
+flatpak:icon-browser:
+  extends: '.flatpak-defaults'
   needs: []
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak-main:icon-browser:
-  extends: .flatpak-main
+flatpak:icon-browser:aarch64:
+  extends: '.flatpak-defaults'
   needs: []
+  tags:
+    - flatpak-aarch64
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak-manual:node-editor:
-  extends: .flatpak-manual
+flatpak:node-editor:
+  extends: '.flatpak-defaults'
   needs: []
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
-flatpak-main:node-editor:
-  extends: .flatpak-main
+flatpak:node-editor:aarch64:
+  extends: '.flatpak-defaults'
   needs: []
+  tags:
+    - flatpak-aarch64
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
@@ -314,23 +325,35 @@ flatpak-main:node-editor:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
     extends: '.publish_nightly'
-    dependencies: ['flatpak-main:demo']
-    needs: ['flatpak-main:demo']
+    needs: ['flatpak:demo']
+
+nightly demo aarch64:
+    extends: '.publish_nightly'
+    needs: ['flatpak:demo:aarch64']
 
 nightly factory:
     extends: '.publish_nightly'
-    dependencies: ['flatpak-main:widget-factory']
-    needs: ['flatpak-main:widget-factory']
+    needs: ['flatpak:widget-factory']
+
+nightly factory aarch64:
+    extends: '.publish_nightly'
+    needs: ['flatpak:widget-factory:aarch64']
 
 nightly icon-browser:
     extends: '.publish_nightly'
-    dependencies: ['flatpak-main:icon-browser']
-    needs: ['flatpak-main:icon-browser']
+    needs: ['flatpak:icon-browser']
+
+nightly icon-browser aarch64:
+    extends: '.publish_nightly'
+    needs: ['flatpak:icon-browser:aarch64']
 
 nightly node-editor:
     extends: '.publish_nightly'
-    dependencies: ['flatpak-main:node-editor']
-    needs: ['flatpak-main:node-editor']
+    needs: ['flatpak:node-editor']
+
+nightly node-editor aarch64:
+    extends: '.publish_nightly'
+    needs: ['flatpak:node-editor:aarch64']
 
 static-scan:
   image: $FEDORA_IMAGE
@@ -339,23 +362,31 @@ static-scan:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _scan_build
+    - export PATH="$HOME/.local/bin:$PATH"
+    - pip3 install --user meson~=0.64
+    - meson setup
+            ${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,
-# since it is incompatible with asan
+# Run tests with the address sanitizer. We need to turn off introspection
+# and f16c, since they are incompatible with asan
 asan-build:
   image: $FEDORA_IMAGE
   tags: [ asan ]
   stage: analysis
   needs: []
+  when: manual
   variables:
   script:
-    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
+    - 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
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland
   artifacts:
@@ -367,10 +398,22 @@ reference:
   image: $FEDORA_IMAGE
   stage: docs
   needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release --force-fallback-for=gdk-pixbuf,pango"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true -Dgdk-pixbuf:gtk_doc=true -Dpango:gtk_doc=true _build
+    - 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 compile -C _build
     - mkdir -p _reference/
     - mv _build/docs/reference/gdk/gdk4/ _reference/gdk4/
@@ -393,9 +436,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"
-  only:
-    refs:
-      - main
+  rules:
+    - if: $CI_COMMIT_REF_NAME == "main"

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:37
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -18,7 +18,9 @@ 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++ \
@@ -31,6 +33,7 @@ RUN dnf -y install \
     glibc-devel \
     glibc-headers \
     gnome-desktop-testing \
+    gnupg2 \
     gobject-introspection-devel \
     graphene-devel \
     graphviz \
@@ -70,7 +73,6 @@ RUN dnf -y install \
     mesa-dri-drivers \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
-    meson \
     ninja-build \
     pango-devel \
     pcre-devel \
@@ -80,9 +82,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 \
@@ -94,8 +96,6 @@ 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/run-docker.sh

@@ -23,6 +23,7 @@ push=0
 list=0
 print_help=0
 no_login=0
+no_cache=0
 
 while (($# > 0)); do
         case "${1%%=*}" in
@@ -34,6 +35,7 @@ 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
@@ -103,11 +105,21 @@ TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
 
 if [ $build == 1 ]; then
         echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        ${CMD} build \
-                ${format} \
-                --build-arg HOST_USER_ID="$UID" \
-                --tag "${TAG}" \
-                --file "${base}.Dockerfile" .
+        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
+
         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
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:verbosity=1:log_threads=1
 export G_SLICE=always-malloc
 
 case "${backend}" in

.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.60.3 || goto :error
+pip3 install --upgrade --user meson~=0.64 || 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` IRC channel on irc.gnome.org
+ - the `gtk` [room on matrix](https://matrix.to/#/#gtk: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,6 +44,7 @@ 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,6 +1,181 @@
-Overview of Changes in 4.9.2, xx-xx-xxxx
+Overview of Changes in 4.9.5, xx-xx-xxxx
 ========================================
 
+Overview of Changes in 4.9.4, 12-02-2023
+========================================
+
+* 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_current_folder (dialog, cwd);
+  gtk_file_dialog_set_initial_folder (dialog, cwd);
   g_object_unref (cwd);
-  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, NULL, open_response_cb, self);
+  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, open_response_cb, self);
   g_object_unref (dialog);
 }
 
@@ -337,11 +337,10 @@ 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_current_folder (dialog, cwd);
+  gtk_file_dialog_set_initial_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/gtk-demo/application.c

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

demos/gtk-demo/assistant.c

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

demos/gtk-demo/builder.c

@@ -37,6 +37,8 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static gboolean
 pop_status (gpointer data)
 {
@@ -57,6 +59,8 @@ 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,8 +244,9 @@ 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
@@ -277,9 +278,11 @@ 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

@@ -215,6 +215,12 @@
     <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>
@@ -311,6 +317,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>

demos/gtk-demo/demo3widget.c

@@ -3,7 +3,8 @@
 
 enum
 {
-  PROP_PAINTABLE = 1,
+  PROP_TEXTURE = 1,
+  PROP_FILTER,
   PROP_SCALE
 };
 
@@ -11,8 +12,9 @@ struct _Demo3Widget
 {
   GtkWidget parent_instance;
 
-  GdkPaintable *paintable;
+  GdkTexture *texture;
   float scale;
+  GskScalingFilter filter;
 
   GtkWidget *menu;
 };
@@ -28,6 +30,7 @@ static void
 demo3_widget_init (Demo3Widget *self)
 {
   self->scale = 1.f;
+  self->filter = GSK_SCALING_FILTER_LINEAR;
   gtk_widget_init_template (GTK_WIDGET (self));
 }
 
@@ -36,7 +39,7 @@ demo3_widget_dispose (GObject *object)
 {
   Demo3Widget *self = DEMO3_WIDGET (object);
 
-  g_clear_object (&self->paintable);
+  g_clear_object (&self->texture);
 
   gtk_widget_dispose_template (GTK_WIDGET (self), DEMO3_TYPE_WIDGET);
 
@@ -50,12 +53,13 @@ demo3_widget_snapshot (GtkWidget   *widget,
   Demo3Widget *self = DEMO3_WIDGET (widget);
   int x, y, width, height;
   double w, h;
+  GskRenderNode *node;
 
   width = gtk_widget_get_width (widget);
   height = gtk_widget_get_height (widget);
 
-  w = self->scale * gdk_paintable_get_intrinsic_width (self->paintable);
-  h = self->scale * gdk_paintable_get_intrinsic_height (self->paintable);
+  w = self->scale * gdk_texture_get_width (self->texture);
+  h = self->scale * gdk_texture_get_height (self->texture);
 
   x = MAX (0, (width - ceil (w)) / 2);
   y = MAX (0, (height - ceil (h)) / 2);
@@ -63,7 +67,11 @@ demo3_widget_snapshot (GtkWidget   *widget,
   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));
-  gdk_paintable_snapshot (self->paintable, snapshot, w, h);
+  node = gsk_texture_scale_node_new (self->texture,
+                                     &GRAPHENE_RECT_INIT (0, 0, w, h),
+                                     self->filter);
+  gtk_snapshot_append_node (snapshot, node);
+  gsk_render_node_unref (node);
   gtk_snapshot_restore (snapshot);
   gtk_snapshot_pop (snapshot);
 }
@@ -81,9 +89,9 @@ demo3_widget_measure (GtkWidget      *widget,
   int size;
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    size = gdk_paintable_get_intrinsic_width (self->paintable);
+    size = gdk_texture_get_width (self->texture);
   else
-    size = gdk_paintable_get_intrinsic_height (self->paintable);
+    size = gdk_texture_get_height (self->texture);
 
   *minimum = *natural = self->scale * size;
 }
@@ -113,9 +121,9 @@ demo3_widget_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_PAINTABLE:
-      g_clear_object (&self->paintable);
-      self->paintable = g_value_dup_object (value);
+    case PROP_TEXTURE:
+      g_clear_object (&self->texture);
+      self->texture = g_value_dup_object (value);
       gtk_widget_queue_resize (GTK_WIDGET (object));
       break;
 
@@ -124,6 +132,11 @@ demo3_widget_set_property (GObject      *object,
       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;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -140,14 +153,18 @@ demo3_widget_get_property (GObject     *object,
 
   switch (prop_id)
     {
-    case PROP_PAINTABLE:
-      g_value_set_object (value, self->paintable);
+    case PROP_TEXTURE:
+      g_value_set_object (value, self->texture);
       break;
 
     case PROP_SCALE:
       g_value_set_float (value, self->scale);
       break;
 
+    case PROP_FILTER:
+      g_value_set_enum (value, self->filter);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -205,16 +222,21 @@ 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_PAINTABLE,
-      g_param_spec_object ("paintable", "Paintable", "Paintable",
-                           GDK_TYPE_PAINTABLE,
+  g_object_class_install_property (object_class, PROP_TEXTURE,
+      g_param_spec_object ("texture", NULL, NULL,
+                           GDK_TYPE_TEXTURE,
                            G_PARAM_READWRITE));
 
   g_object_class_install_property (object_class, PROP_SCALE,
-      g_param_spec_float ("scale", "Scale", "Scale",
+      g_param_spec_float ("scale", NULL, NULL,
                           0.0, 10.0, 1.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);
@@ -229,16 +251,13 @@ GtkWidget *
 demo3_widget_new (const char *resource)
 {
   Demo3Widget *self;
-  GdkPixbuf *pixbuf;
-  GdkPaintable *paintable;
+  GdkTexture *texture;
 
-  pixbuf = gdk_pixbuf_new_from_resource (resource, NULL);
-  paintable = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (pixbuf));
+  texture = gdk_texture_new_from_resource (resource);
 
-  self = g_object_new (DEMO3_TYPE_WIDGET, "paintable", paintable, NULL);
+  self = g_object_new (DEMO3_TYPE_WIDGET, "texture", texture, NULL);
 
-  g_object_unref (pixbuf);
-  g_object_unref (paintable);
+  g_object_unref (texture);
 
   return GTK_WIDGET (self);
 }

demos/gtk-demo/demo4widget.c

@@ -0,0 +1,226 @@
+#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

@@ -0,0 +1,8 @@
+#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

@@ -356,6 +356,10 @@ canvas_item_start_editing (CanvasItem *item)
 
 }
 
+typedef struct {
+  double x, y;
+} Hotspot;
+
 static GdkContentProvider *
 prepare (GtkDragSource *source,
          double         x,
@@ -363,6 +367,7 @@ prepare (GtkDragSource *source,
 {
   GtkWidget *canvas;
   GtkWidget *item;
+  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
@@ -373,6 +378,10 @@ prepare (GtkDragSource *source,
 
   g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
 
+  hotspot = g_new (Hotspot, 1);
+  gtk_widget_translate_coordinates (canvas, item, x, y, &hotspot->x, &hotspot->y);
+  g_object_set_data_full (G_OBJECT (canvas), "hotspot", hotspot, g_free);
+
   return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
 }
 
@@ -383,12 +392,14 @@ 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, item->r, item->r);
+  gtk_drag_source_set_icon (source, paintable, hotspot->x, hotspot->y);
   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), GDK_BUTTON_PRIMARY);
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), 0);
       gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
 
       g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);

demos/gtk-demo/gtkgears.c

@@ -48,14 +48,16 @@
 #define VERTICES_PER_TOOTH 34
 #define GEAR_VERTEX_STRIDE 6
 
-#ifndef HAVE_SINCOS
-static void
-sincos (double x, double *_sin, double *_cos)
+static inline void
+_sincos (double x, double *_sin, double *_cos)
 {
+#ifdef HAVE_SINCOS
+  sincos (x, _sin, _cos);
+#else
   *_sin = sin (x);
   *_cos = cos (x);
-}
 #endif
+}
 
 /**
  * Struct describing the vertices in triangle strip
@@ -307,11 +309,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);
@@ -520,7 +522,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;

demos/gtk-demo/hsla.c

@@ -0,0 +1,146 @@
+#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

@@ -0,0 +1,15 @@
+#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/listview_words.c

@@ -167,7 +167,6 @@ 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/mask.c

@@ -0,0 +1,53 @@
+/* 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

@@ -22,9 +22,11 @@ do_menu (GtkWidget *do_widget)
   if (!window)
     {
       GtkWidget *box;
+      GtkWidget *box2;
       GtkWidget *sw;
       GtkWidget *widget;
       GtkWidget *scale;
+      GtkWidget *dropdown;
 
       window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Menu");
@@ -43,10 +45,19 @@ do_menu (GtkWidget *do_widget)
       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);
+
       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);
+      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_box_append (GTK_BOX (box2), dropdown);
+
+      g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);
+ 
       g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
                               widget, "scale",
                               G_BINDING_BIDIRECTIONAL);

demos/gtk-demo/meson.build

@@ -46,6 +46,7 @@ demos = files([
   'links.c',
   'listbox.c',
   'listbox_controls.c',
+  'mask.c',
   'menu.c',
   'flowbox.c',
   'list_store.c',
@@ -114,6 +115,7 @@ extra_demo_sources = files([
   'gtkshadertoy.c',
   'gtkshaderstack.c',
   'gskshaderpaintable.c',
+  'hsla.c',
   'puzzlepiece.c',
   'bluroverlay.c',
   'demoimage.c',
@@ -126,6 +128,7 @@ extra_demo_sources = files([
   'four_point_transform.c',
   'demo2widget.c',
   'demo3widget.c',
+  'demo4widget.c',
   'pixbufpaintable.c',
   'script-names.c',
   'unicode-names.c',
@@ -156,7 +159,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').stdout().contains('--add-symbol')
+  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
 endif
 
 ld = find_program('ld', required : false)

demos/gtk-demo/paintable_svg.c

@@ -55,7 +55,6 @@ 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,15 +1,17 @@
-/* Pickers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog
+/* Pickers and Launchers
+ * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkFileLauncher, GtkUriLauncher
  *
- * These widgets are mainly intended for use in preference dialogs.
+ * The dialogs are mainly intended for use in preference dialogs.
  * They allow to select colors, fonts and applications.
  *
- * This demo shows both the default appearance for these dialogs,
- * as well as some of the customizations that are possible.
+ * The launchers let you open files or URIs in applications that
+ * can handle them.
  */
 
 #include <gtk/gtk.h>
 
+static GtkWidget *app_picker;
+
 static void
 file_opened (GObject *source,
              GAsyncResult *result,
@@ -25,12 +27,17 @@ file_opened (GObject *source,
     {
       g_print ("%s\n", error->message);
       g_error_free (error);
+      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 gboolean
@@ -59,12 +66,70 @@ open_file (GtkButton *picker,
                               20,
                               abort_mission, g_object_ref (cancellable), g_object_unref);
 
-  gtk_file_dialog_open (dialog, parent, NULL, cancellable, file_opened, label);
+  gtk_file_dialog_open (dialog, parent, 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);
+}
+
 GtkWidget *
 do_pickers (GtkWidget *do_widget)
 {
@@ -76,7 +141,7 @@ do_pickers (GtkWidget *do_widget)
     window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Pickers");
+    gtk_window_set_title (GTK_WINDOW (window), "Pickers and Launchers");
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
     table = gtk_grid_new ();
@@ -84,8 +149,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), 3);
-    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
+    gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+    gtk_grid_set_column_spacing (GTK_GRID (table), 6);
     gtk_window_set_child (GTK_WINDOW (window), table);
 
     label = gtk_label_new ("Color:");
@@ -112,7 +177,7 @@ 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, 10);
+    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
     button = gtk_button_new_from_icon_name ("document-open-symbolic");
     label = gtk_label_new ("None");
     gtk_label_set_xalign (GTK_LABEL (label), 0.);
@@ -121,21 +186,22 @@ do_pickers (GtkWidget *do_widget)
     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 ("Mail:");
+    label = gtk_label_new ("URI:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);
     gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     gtk_widget_set_hexpand (label, TRUE);
-
-    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
-    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
-
-G_GNUC_END_IGNORE_DEPRECATIONS
-
     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);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
   }
 

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_current_filter (dialog, filter);
+  gtk_file_dialog_set_default_filter (dialog, filter);
   g_object_unref (filter);
 
   gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
@@ -65,7 +65,6 @@ 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/node-editor/meson.build

@@ -14,9 +14,7 @@ executable('gtk4-node-editor',
   sources: [node_editor_sources, node_editor_resources],
   dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
-  c_args: [
-    '-DNODE_EDITOR_SOURCE_DIR="testsuite/gsk/compare/"'
-  ] + common_cflags,
+  c_args: common_cflags,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,
   install: true,

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

@@ -32,10 +32,6 @@
 #include "gsk/vulkan/gskvulkanrenderer.h"
 #endif
 
-#ifndef NODE_EDITOR_SOURCE_DIR
-#define NODE_EDITOR_SOURCE_DIR "." /* Fallback */
-#endif
-
 typedef struct
 {
   gsize  start_chars;
@@ -573,10 +569,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_current_folder (dialog, cwd);
+  gtk_file_dialog_set_initial_folder (dialog, cwd);
   g_object_unref (cwd);
   gtk_file_dialog_open (dialog, GTK_WINDOW (self),
-                        NULL, NULL, open_response_cb, self);
+                        NULL, open_response_cb, self);
   g_object_unref (dialog);
 }
 
@@ -637,13 +633,12 @@ 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_current_folder (dialog, cwd);
+  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  gtk_file_dialog_set_initial_name (dialog, "demo.node");
   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);
 }
@@ -746,11 +741,10 @@ export_image_cb (GtkWidget        *button,
 
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "");
+  gtk_file_dialog_set_initial_name (dialog, "example.png");
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
                         NULL,
-                        "example.png",
-                        NULL,
                         export_image_response_cb, texture);
   g_object_unref (dialog);
 }
@@ -788,12 +782,52 @@ 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 = g_canonicalize_filename (NODE_EDITOR_SOURCE_DIR, NULL);
+  char *source_dir = get_source_dir ();
   char *node_file_name;
   char *node_file;
   char *png_file_name;
@@ -806,6 +840,8 @@ 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);

demos/node-editor/node-format.md

@@ -178,6 +178,16 @@ 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     |
@@ -297,6 +307,21 @@ 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,6 +6,8 @@
 
 #include "demo_conf.h"
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;
@@ -508,8 +510,6 @@ 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,7 +553,6 @@ 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').stdout().contains('--add-symbol')
+  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
 endif
 
 ld = find_program('ld', required : false)

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, NULL, file_chooser_response, NULL);
+  gtk_file_dialog_open (dialog, NULL, NULL, file_chooser_response, NULL);
   g_object_unref (dialog);
 }
 
@@ -2056,6 +2056,67 @@ 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)
 {
@@ -2155,6 +2216,13 @@ 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");
 
@@ -2184,11 +2252,13 @@ 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"));
@@ -2362,6 +2432,7 @@ 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);
@@ -2379,6 +2450,7 @@ G_GNUC_END_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,8 +1263,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/sunset.jpg</property>
+                                  <object class="GtkPicture" id="notebook_sunset">
                                     <property name="content-fit">cover</property>
                                     <child>
                                       <object class="GtkDragSource">
@@ -1290,8 +1289,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/nyc.jpg</property>
+                                  <object class="GtkPicture" id="notebook_nyc">
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
@@ -1316,8 +1314,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/beach.jpg</property>
+                                  <object class="GtkPicture" id="notebook_beach">
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>

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/building.md

@@ -236,23 +236,17 @@ 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.
 
-### `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`
+### `media-gstreamer` and `media-ffmpeg`
 
 By default, GTK will try to build the gstreamer backend for
-media playback support. This option can be used to explicitly
+media playback support. These options can be used to explicitly
 control which media backends should be built.
 
-### `print`
+### `print-cups` and `print-cpdb`
 
-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.
+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.
 
 ### `cloudproviders`
 
@@ -274,18 +268,13 @@ support in the file chooser.
 This option controls whether GTK should use colord for color
 calibration support in the cups print backend.
 
-### `gtk_doc` and `man-pages`
+### `gtk_doc`, `man-pages` and `update_screenshots`
 
-The *gtk-doc* package is used to generate the reference documentation
-included with GTK. By default support for *gtk-doc* is disabled
+The *gi-docgen* package is used to generate the reference documentation
+included with GTK. By default support for *gi-docgen* is disabled
 because it requires various extra dependencies to be installed.
-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 needs to be enabled, since the documentation is generated
+from introspection data.
 
 ### `introspection`
 
@@ -294,9 +283,14 @@ is mainly useful for shortening turnaround times on developer
 systems. Installed builds of GTK should always have introspection
 support.
 
-### `build-tests`, `install-tests`, `demos`
+### `build-testsuite`
 
-By default, GTK will build quite a few tests and 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.
 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/getting_started.md

@@ -51,7 +51,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
@@ -189,7 +189,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
@@ -338,7 +338,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
@@ -377,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-4.c`.
+Create a new file with the following content named `example-3.c`.
 
 ```c
 #include <gtk/gtk.h>
@@ -560,7 +560,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
@@ -572,7 +572,7 @@ main (int    argc,
 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 )
 ```
 
 ## Building user interfaces
@@ -587,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-3.c`.
+Create a new file with the following content named `example-4.c`.
 
 ```c
 #include <gtk/gtk.h>
@@ -641,7 +641,7 @@ main (int   argc,
   g_chdir (GTK_SRCDIR);
 #endif
 
-  GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
   int status = g_application_run (G_APPLICATION (app), argc, argv);
@@ -697,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-3 example-3.c $( pkg-config --libs gtk4 )
+gcc $( pkg-config --cflags gtk4 ) -o example-4 example-4.c $( pkg-config --libs gtk4 )
 ```
 
 Note that `GtkBuilder` can also be used to construct objects that are
@@ -1018,6 +1018,10 @@ 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,6 +33,11 @@ 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/"
 

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

@@ -105,3 +105,17 @@ 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,37 +7,50 @@ the question you have, this list is a good place to start.
 
 ## General Questions
 
-1.  How do I get started with GTK?
+*  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
-    (most of it about GTK 2.x and 3.x, but still somewhat applicable). This
-    reference manual also contains a introductory
+    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.
 
-2.  Where can I get help with GTK, submit a bug report, or make a feature request?
+*  Where can I get help with GTK, submit a bug report, or make a feature request?
 
     See the [documentation](#gtk-resources) on this topic.
 
-3.  How do I port from one GTK version to another?
+*  How do I port from one GTK version to another?
 
-    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
+    Every major version of GTK comes with a [migration guide](#migrating). You may also
+    find useful information in the documentation for specific widgets and functions. If
+    you have a question not covered in the manual, feel free to ask, and please
     [file a bug report](https://gitlab.gnome.org/GNOME/gtk/issues/new) against the
     documentation.
 
-4.  How does memory management work in GTK? Should I free data returned from functions?
+*  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?
 
     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
@@ -46,7 +59,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.
 
-5.  Why does my program leak memory, if I destroy a widget immediately
+*  Why does my program leak memory, if I destroy a widget immediately
     after creating it?
 
     If `GtkFoo` isn't a toplevel window, then
@@ -69,7 +82,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.
 
-6.  How do I use GTK with threads?
+*  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_).
@@ -79,7 +92,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`.
 
-7.  How do I internationalize a GTK program?
+*  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
@@ -134,7 +147,7 @@ the question you have, this list is a good place to start.
 
         #define _(x) dgettext (GETTEXT_PACKAGE, x)
 
-8.  How do I use non-ASCII characters in GTK programs ?
+*  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
@@ -217,7 +230,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.
 
-9.  How do I use GTK with C++?
+*  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
@@ -242,19 +255,23 @@ the question you have, this list is a good place to start.
 
     There are very few functions that require this cast, however.
 
-10. How do I use GTK with other non-C languages?
+*  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).
 
-11. How do I load an image or animation from a file?
+*  How do I load an image or animation from a file?
 
     To load an image file straight into a display widget, use
-    [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].
+    [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].
 
-12. How do I draw text?
+*  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].
 
     To draw a piece of text onto a cairo surface, use a Pango layout and
     [func@PangoCairo.show_layout].
@@ -272,7 +289,7 @@ the question you have, this list is a good place to start.
     To draw a piece of text in a widget [vfunc@Gtk.Widget.snapshot] implementation,
     use [method@Gtk.Snapshot.append_layout].
 
-13. How do I measure the size of a piece of text?
+*  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:
@@ -287,7 +304,7 @@ the question you have, this list is a good place to start.
     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/).
 
-14. Why are types not registered if I use their `GTK_TYPE_BLAH` macro?
+*  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
@@ -298,14 +315,14 @@ the question you have, this list is a good place to start.
 
         g_type_ensure (GTK_TYPE_BLAH);
 
-15. How do I create a transparent toplevel window?
+*  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...
 
-16. ...for lists and trees?
+*  ...for lists and trees?
 
     This question has different answers, depending on the size of the dataset
     and the required formatting flexibility.
@@ -321,7 +338,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.
 
-17. ...for multi-line text display or editing?
+*  ...for multi-line text display or editing?
 
     See the [text widget overview](#TextWidget) -- you should use the
     [class@Gtk.TextView] widget.
@@ -330,7 +347,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].
 
-18. ...to display an image or animation?
+*  ...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.
@@ -346,17 +363,14 @@ 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));
 
-19. ...for presenting a set of mutually-exclusive choices, where Windows
+*  ...for presenting a set of mutually-exclusive choices, where Windows
     would use a combo box?
 
-    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].
+    With GTK, a [class@Gtk.DropDown] is the recommended widget to use for this use case.
 
 ## Questions about GtkWidget
 
-20. How do I change the color of a widget?
+*  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
@@ -364,7 +378,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].
 
-21. How do I change the font of a widget?
+*  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():
@@ -388,14 +402,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.
 
-22. How do I disable/ghost/desensitize a widget?
+*  How do I disable/ghost/desensitize a widget?
 
     In GTK a disabled widget is termed _insensitive_.
     See [method@Gtk.Widget.set_sensitive].
 
 ## GtkTextView questions
 
-23. How do I get the contents of the entire text widget as a string?
+*  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].
@@ -410,14 +424,14 @@ the question you have, this list is a good place to start.
         /* use text */
         g_free (text);
 
-24. How do I make a text widget display its complete contents in a specific font?
+*  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.
 
-25. How do I make a text view scroll to the end of the buffer automatically ?
+*  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.
@@ -432,21 +446,21 @@ the question you have, this list is a good place to start.
 
 ## GtkTreeView questions
 
-26. How do I associate some data with a row in the tree?
+*  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).
 
-27. How do I put an image and some text in the same column?
+*  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.
 
-28. I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
+*  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]
@@ -454,7 +468,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].
 
-29. How do I change the way that numbers are formatted by `GtkTreeView`?
+*  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
@@ -528,19 +542,21 @@ the question you have, this list is a good place to start.
                                                    (gpointer)DOUBLE_COLUMN, NULL);
         }
 
-30. How do I hide the expander arrows in my tree view?
+*  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
 
-31. How do I use cairo to draw in GTK applications?
+*  How do I use cairo to draw in GTK applications?
 
-    Use [method@Gtk.Snapshot.append_cairo] in your [vfunc@Gtk.Widget.snapshot] vfunc
-    to obtain a cairo context and draw with that.
+    [class@Gtk.DrawingArea] is a ready-made widget for drawing with cairo.
 
-32. Can I improve the performance of my application by using another backend
+    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
     of cairo (such as GL)?
 
     No. Most drawing in GTK is not done via cairo anymore (but instead
@@ -551,7 +567,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].
 
-33. Can I use cairo to draw on a `GdkPixbuf`?
+*  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/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'))
+gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'), native: true)
 
 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_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   g_object_unref (button_menu);
   g_object_unref (doc_actions);

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_widget_show (GTK_WIDGET (window));
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -465,7 +465,7 @@ edit_accels (GSimpleAction *action,
 
   gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), 0);
 
-  gtk_widget_show (dialog);
+  gtk_window_present (GTK_WINDOW (dialog));
 }
 
 static gboolean

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_widget_show (GTK_WIDGET (window));
+  gtk_window_present (GTK_WINDOW (window));
   g_object_unref (builder);
 }
 

examples/drawing.c

@@ -164,7 +164,7 @@ activate (GtkApplication *app,
 
   g_signal_connect (press, "pressed", G_CALLBACK (pressed), drawing_area);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (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_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
 }
 

examples/hello/hello-world.c

@@ -27,7 +27,7 @@ activate (GtkApplication *app,
 
   gtk_window_set_child (GTK_WINDOW (window), button);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 int
@@ -37,7 +37,7 @@ main (int    argc,
   GtkApplication *app;
   int status;
 
-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
   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_widget_show (GTK_WIDGET (window));
+  gtk_window_present (GTK_WINDOW (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,12 +11,11 @@ activate_cb (GtkApplication *app,
   GtkWidget *menu_button;
 
   window = gtk_application_window_new (app);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (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_widget_show (GTK_WIDGET (window));
+  gtk_window_present (GTK_WINDOW (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_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 int

gdk/broadway/broadway-protocol.h

@@ -213,6 +213,7 @@ typedef enum {
   BROADWAY_REQUEST_RELEASE_TEXTURE,
   BROADWAY_REQUEST_SET_NODES,
   BROADWAY_REQUEST_ROUNDTRIP,
+  BROADWAY_REQUEST_SET_MODAL_HINT,
 } BroadwayRequestType;
 
 typedef struct {
@@ -293,6 +294,12 @@ typedef struct {
   guint32 show_keyboard;
 } BroadwayRequestSetShowKeyboard;
 
+typedef struct {
+  BroadwayRequestBase base;
+  guint32 id;
+  gboolean modal_hint;
+} BroadwayRequestSetModalHint;
+
 typedef union {
   BroadwayRequestBase base;
   BroadwayRequestNewSurface new_surface;
@@ -312,6 +319,7 @@ typedef union {
   BroadwayRequestUploadTexture upload_texture;
   BroadwayRequestReleaseTexture release_texture;
   BroadwayRequestSetNodes set_nodes;
+  BroadwayRequestSetModalHint set_modal_hint;
 } BroadwayRequest;
 
 typedef enum {

gdk/broadway/broadway-server.c

@@ -124,6 +124,7 @@ struct BroadwaySurface {
   gboolean visible;
   gint32 transient_for;
   guint32 texture;
+  gboolean modal_hint;
   BroadwayNode *nodes;
   GHashTable *node_lookup;
 };
@@ -421,6 +422,14 @@ 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:
@@ -1568,6 +1577,7 @@ broadway_server_destroy_surface (BroadwayServer *server,
                                  int id)
 {
   BroadwaySurface *surface;
+  gint32 transient_for = -1;
 
   if (server->mouse_in_surface_id == id)
     {
@@ -1585,11 +1595,24 @@ broadway_server_destroy_surface (BroadwayServer *server,
   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)
+    {
+      surface = broadway_server_lookup_surface (server, transient_for);
+      if (surface != NULL)
+        {
+	  broadway_server_focus_surface (server, transient_for);
+	  broadway_server_flush (server);
+	}
+    }
 }
 
 gboolean
@@ -1710,6 +1733,19 @@ 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

@@ -130,6 +130,9 @@ 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

@@ -380,6 +380,11 @@ 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,6 +561,18 @@ _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

@@ -78,5 +78,8 @@ 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/gdkeventsource.c

@@ -82,6 +82,27 @@ gdk_event_source_check (GSource *source)
   return retval;
 }
 
+static void
+handle_focus_change (GdkEvent *event)
+{
+  GdkEvent *focus_event;
+  gboolean focus_in = (gdk_event_get_event_type (event) == GDK_ENTER_NOTIFY);
+
+  if (gdk_crossing_event_get_detail (event) == GDK_NOTIFY_INFERIOR)
+    return;
+
+  if (!gdk_crossing_event_get_focus (event) )
+    return;
+
+  focus_event = gdk_focus_event_new (gdk_event_get_surface (event),
+				     gdk_event_get_device (event),
+				     focus_in);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+  gdk_display_put_event (gdk_event_get_display (event), focus_event);
+G_GNUC_END_IGNORE_DEPRECATIONS
+  gdk_event_unref (focus_event);
+}
+
 void
 _gdk_broadway_events_got_input (GdkDisplay *display,
                                 BroadwayInputMsg *message)
@@ -110,6 +131,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
 
         node = _gdk_event_queue_append (display, event);
         _gdk_windowing_got_event (display, node, event, message->base.serial);
+
+	handle_focus_change (event);
       }
     break;
   case BROADWAY_EVENT_LEAVE:
@@ -126,6 +149,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
                                         message->crossing.mode,
                                         GDK_NOTIFY_ANCESTOR);
 
+	handle_focus_change (event);
+
         node = _gdk_event_queue_append (display, event);
         _gdk_windowing_got_event (display, node, event, message->base.serial);
       }

gdk/broadway/gdksurface-broadway.c

@@ -709,6 +709,21 @@ gdk_broadway_surface_set_transient_for (GdkSurface *surface,
   _gdk_broadway_server_surface_set_transient_for (display->server, impl->id, impl->transient_for);
 }
 
+static void
+gdk_broadway_surface_set_modal_hint (GdkSurface *surface,
+                                     gboolean   modal)
+ {
+  GdkBroadwayDisplay *display;
+  GdkBroadwaySurface *impl;
+
+  impl = GDK_BROADWAY_SURFACE (surface);
+
+  impl->modal_hint = modal;
+
+  display = GDK_BROADWAY_DISPLAY (gdk_surface_get_display (surface));
+  _gdk_broadway_server_surface_set_modal_hint (display->server, impl->id, impl->modal_hint);
+ }
+
 static void
 gdk_broadway_surface_get_geometry (GdkSurface *surface,
                                    int        *x,
@@ -1433,6 +1448,8 @@ gdk_broadway_toplevel_set_property (GObject      *object,
       break;
 
     case LAST_PROP + GDK_TOPLEVEL_PROP_MODAL:
+      gdk_broadway_surface_set_modal_hint (surface, g_value_get_boolean (value));
+      g_object_notify_by_pspec (G_OBJECT (surface), pspec);
       break;
 
     case LAST_PROP + GDK_TOPLEVEL_PROP_ICON_LIST:
@@ -1479,6 +1496,10 @@ gdk_broadway_toplevel_get_property (GObject    *object,
       g_value_set_object (value, surface->transient_for);
       break;
 
+    case LAST_PROP + GDK_TOPLEVEL_PROP_MODAL:
+      g_value_set_boolean (value, surface->modal_hint);
+      break;
+
     case LAST_PROP + GDK_TOPLEVEL_PROP_ICON_LIST:
       g_value_set_pointer (value, NULL);
       break;

gdk/broadway/gdksurface-broadway.h

@@ -54,6 +54,7 @@ struct _GdkBroadwaySurface
 
   gboolean dirty;
   gboolean last_synced;
+  gboolean modal_hint;
 
   GdkGeometry geometry_hints;
   GdkSurfaceHints geometry_hints_mask;

gdk/filetransferportal.c

@@ -26,6 +26,7 @@
 #include "gdkcontentformats.h"
 #include "gdkcontentserializer.h"
 #include "gdkcontentdeserializer.h"
+#include "gdkdebugprivate.h"
 
 #include <gio/gio.h>
 
@@ -213,6 +214,8 @@ file_transfer_portal_register_files (const char          **files,
   afd->len = g_strv_length ((char **)files);
   afd->start = 0;
 
+  GDK_DEBUG (DND, "file transfer portal: registering %d files", afd->len);
+
   g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
   g_variant_builder_add (&options, "{sv}", "writable", g_variant_new_boolean (writable));
   g_variant_builder_add (&options, "{sv}", "autostop", g_variant_new_boolean (TRUE));
@@ -348,9 +351,8 @@ portal_ready (GObject *object,
 static void
 portal_file_serializer (GdkContentSerializer *serializer)
 {
-  GFile *file;
-  const GValue *value;
   GPtrArray *files;
+  const GValue *value;
 
   files = g_ptr_array_new_with_free_func (g_free);
 
@@ -358,9 +360,24 @@ portal_file_serializer (GdkContentSerializer *serializer)
 
   if (G_VALUE_HOLDS (value, G_TYPE_FILE))
     {
+      GFile *file;
+
       file = g_value_get_object (gdk_content_serializer_get_value (serializer));
-      if (file)
-        g_ptr_array_add (files, g_file_get_path (file));
+
+      if (file && g_file_peek_path (file))
+        {
+          GDK_DEBUG (DND, "file transfer portal: Adding %s", g_file_peek_path (file));
+          g_ptr_array_add (files, g_file_get_path (file));
+        }
+#ifdef G_ENABLE_DEBUG
+      else if (GDK_DEBUG_CHECK (DND))
+        {
+          char *uri = g_file_get_uri (file);
+          gdk_debug_message ("file transfer portal: %s has no path, dropping\n", uri);
+          g_free (uri);
+        }
+#endif
+
       g_ptr_array_add (files, NULL);
     }
   else if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST))
@@ -368,7 +385,21 @@ portal_file_serializer (GdkContentSerializer *serializer)
       GSList *l;
 
       for (l = g_value_get_boxed (value); l; l = l->next)
-        g_ptr_array_add (files, g_file_get_path (l->data));
+        {
+          GFile *file = l->data;
+
+          if (file && g_file_peek_path (file))
+            {
+              GDK_DEBUG (DND, "file transfer portal: Adding %s", g_file_peek_path (file));
+              g_ptr_array_add (files, g_file_get_path (file));
+            }
+          else
+            {
+              char *uri = g_file_get_uri (file);
+              gdk_debug_message ("file transfer portal: %s has no path, dropping", uri);
+              g_free (uri);
+            }
+        }
 
       g_ptr_array_add (files, NULL);
     }
@@ -395,6 +426,15 @@ portal_finish (GObject *object,
       return;
     }
 
+#ifdef G_ENABLE_DEBUG
+  if (GDK_DEBUG_CHECK (DND))
+    {
+      char *s = g_strjoinv (", ", files);
+      gdk_debug_message ("file transfer portal: Receiving files: %s", s);
+      g_free (s);
+    }
+#endif
+
   value = gdk_content_deserializer_get_value (deserializer);
   if (G_VALUE_HOLDS (value, G_TYPE_FILE))
     {

gdk/gdk.c

@@ -118,7 +118,8 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "selection",       GDK_DEBUG_SELECTION, "Information about selections" },
   { "clipboard",       GDK_DEBUG_CLIPBOARD, "Information about clipboards" },
   { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)", TRUE },
-  { "portals",         GDK_DEBUG_PORTALS, "Force the use of portals", TRUE },
+  { "portals",         GDK_DEBUG_PORTALS, "Force use of portals", TRUE },
+  { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals", TRUE },
   { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support", TRUE },
   { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL", TRUE },
   { "gl-legacy",       GDK_DEBUG_GL_LEGACY, "Use a legacy OpenGL context", TRUE },
@@ -359,6 +360,9 @@ gdk_should_use_portal (void)
   if (gdk_display_get_debug_flags (NULL) & GDK_DEBUG_PORTALS)
     return TRUE;
 
+  if (gdk_display_get_debug_flags (NULL) & GDK_DEBUG_NO_PORTALS)
+    return FALSE;
+
   if (gdk_running_in_sandbox ())
     return TRUE;
 

gdk/gdk.h

@@ -69,6 +69,7 @@
 #include <gdk/gdksnapshot.h>
 #include <gdk/gdksurface.h>
 #include <gdk/gdktexture.h>
+#include <gdk/gdktexturedownloader.h>
 #include <gdk/gdktoplevel.h>
 #include <gdk/gdktoplevellayout.h>
 #include <gdk/gdktoplevelsize.h>

gdk/gdkcontentserializer.c

@@ -795,6 +795,22 @@ file_serializer_finish (GObject      *source,
     gdk_content_serializer_return_success (serializer);
 }
 
+static char *
+file_get_native_uri (GFile *file)
+{
+  char *path;
+
+  path = g_file_get_path (file);
+  if (path != NULL)
+    {
+      char *uri = g_filename_to_uri (path, NULL, NULL);
+      g_free (path);
+      return uri;
+    }
+
+  return g_file_get_uri (file);
+}
+
 static void
 file_uri_serializer (GdkContentSerializer *serializer)
 {
@@ -811,7 +827,7 @@ file_uri_serializer (GdkContentSerializer *serializer)
       file = g_value_get_object (gdk_content_serializer_get_value (serializer));
       if (file)
         {
-          uri = g_file_get_uri (file);
+          uri = file_get_native_uri (file);
           g_string_append (str, uri);
           g_free (uri);
         }
@@ -827,7 +843,7 @@ file_uri_serializer (GdkContentSerializer *serializer)
 
       for (l = g_value_get_boxed (value); l; l = l->next)
         {
-          uri = g_file_get_uri (l->data);
+          uri = file_get_native_uri (l->data);
           g_string_append (str, uri);
           g_free (uri);
           g_string_append (str, "\r\n");

gdk/gdkdebugprivate.h

@@ -40,7 +40,8 @@ typedef enum {
   /* flags below are influencing behavior */
   GDK_DEBUG_NOGRABS         = 1 << 11,
   GDK_DEBUG_PORTALS         = 1 << 12,
-  GDK_DEBUG_GL_DISABLE      = 1 << 13,
+  GDK_DEBUG_NO_PORTALS      = 1 << 13,
+  GDK_DEBUG_GL_DISABLE      = 1 << 14,
   GDK_DEBUG_GL_LEGACY       = 1 << 16,
   GDK_DEBUG_GL_GLES         = 1 << 17,
   GDK_DEBUG_GL_DEBUG        = 1 << 18,

gdk/gdkdevicetool.c

@@ -197,7 +197,7 @@ gdk_device_tool_get_serial (GdkDeviceTool *tool)
  *
  * Gets the hardware ID of this tool, or 0 if it's not known.
  *
- * When non-zero, the identificator is unique for the given tool model,
+ * When non-zero, the identifier is unique for the given tool model,
  * meaning that two identical tools will share the same @hardware_id,
  * but will have different serial numbers (see
  * [method@Gdk.DeviceTool.get_serial]).
@@ -205,9 +205,9 @@ gdk_device_tool_get_serial (GdkDeviceTool *tool)
  * This is a more concrete (and device specific) method to identify
  * a `GdkDeviceTool` than [method@Gdk.DeviceTool.get_tool_type],
  * as a tablet may support multiple devices with the same
- * `GdkDeviceToolType`, but different hardware identificators.
+ * `GdkDeviceToolType`, but different hardware identifiers.
  *
- * Returns: The hardware identificator of this tool.
+ * Returns: The hardware identifier of this tool.
  */
 guint64
 gdk_device_tool_get_hardware_id (GdkDeviceTool *tool)

gdk/gdkdisplay.c

@@ -471,8 +471,8 @@ gdk_display_get_event (GdkDisplay *display)
  * Appends the given event onto the front of the event
  * queue for @display.
  *
- * This function is only useful in very special situations
- * and should not be used by applications.
+ * Deprecated: 4.10: This function is only useful in very
+ * special situations and should not be used by applications.
  **/
 void
 gdk_display_put_event (GdkDisplay *display,
@@ -1114,7 +1114,7 @@ gdk_display_get_app_launch_context (GdkDisplay *display)
 
 /**
  * gdk_display_open:
- * @display_name: the name of the display to open
+ * @display_name: (nullable): the name of the display to open
  *
  * Opens a display.
  *
@@ -1148,6 +1148,8 @@ _gdk_display_get_next_serial (GdkDisplay *display)
  * with custom startup-notification identifier unless
  * [method@Gtk.Window.set_auto_startup_notification]
  * is called to disable that feature.
+ *
+ * Deprecated: 4.10: Using [method@Gdk.Toplevel.set_startup_id] is sufficient
  */
 void
 gdk_display_notify_startup_complete (GdkDisplay  *display,
@@ -1166,6 +1168,8 @@ gdk_display_notify_startup_complete (GdkDisplay  *display,
  * if no ID has been defined.
  *
  * Returns: (nullable): the startup notification ID for @display
+ *
+ * Deprecated: 4.10
  */
 const char *
 gdk_display_get_startup_notification_id (GdkDisplay *display)
@@ -1775,11 +1779,11 @@ gdk_display_init_egl (GdkDisplay  *self,
 gpointer
 gdk_display_get_egl_display (GdkDisplay *self)
 {
+#ifdef HAVE_EGL
   GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
 
   g_return_val_if_fail (GDK_IS_DISPLAY (self), NULL);
 
-#ifdef HAVE_EGL
   if (!priv->egl_display &&
       !gdk_display_prepare_gl (self, NULL))
     return NULL;
@@ -2013,10 +2017,7 @@ gdk_display_get_monitors (GdkDisplay *self)
  * Gets the monitor in which the largest area of @surface
  * resides.
  *
- * Returns a monitor close to @surface if it is outside
- * of all monitors.
- *
- * Returns: (transfer none): the monitor with the largest
+ * Returns: (transfer none) (nullable): the monitor with the largest
  *   overlap with @surface
  */
 GdkMonitor *

gdk/gdkdisplay.h

@@ -83,10 +83,10 @@ GdkClipboard *          gdk_display_get_clipboard               (GdkDisplay
 GDK_AVAILABLE_IN_ALL
 GdkClipboard *          gdk_display_get_primary_clipboard       (GdkDisplay     *display);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10_FOR(gdk_toplevel_set_startup_id)
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
                                                 const char    *startup_id);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 const char * gdk_display_get_startup_notification_id (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
@@ -104,7 +104,7 @@ GDK_AVAILABLE_IN_ALL
 GdkMonitor * gdk_display_get_monitor_at_surface (GdkDisplay *display,
                                                 GdkSurface  *surface);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 void      gdk_display_put_event  (GdkDisplay     *display,
                                   GdkEvent       *event);
 

gdk/gdkevents.c

@@ -1174,9 +1174,16 @@ gdk_event_get_axes (GdkEvent  *event,
                     double   **axes,
                     guint     *n_axes)
 {
+  gboolean ret;
+
   g_return_val_if_fail (GDK_IS_EVENT (event), FALSE);
 
-  return GDK_EVENT_GET_CLASS (event)->get_axes (event, axes, n_axes);
+  ret = GDK_EVENT_GET_CLASS (event)->get_axes (event, axes, n_axes);
+
+  if (*axes == NULL)
+    return FALSE;
+
+  return ret;
 }
 
 double *
@@ -1504,7 +1511,6 @@ gdk_button_event_get_button (GdkEvent *event)
 }
 
 /* }}} */
-
 /* {{{ GdkKeyEvent */
 
 /**
@@ -1965,7 +1971,6 @@ gdk_key_event_get_match (GdkEvent        *event,
 }
 
 /* }}} */
-
 /* {{{ GdkTouchEvent */
 
 /**
@@ -2102,7 +2107,6 @@ gdk_touch_event_get_emulating_pointer (GdkEvent *event)
 }
 
 /* }}} */
-
 /* {{{ GdkCrossingEvent */
 
 /**
@@ -2246,7 +2250,6 @@ gdk_crossing_event_get_detail (GdkEvent *event)
 }
 
 /* }}} */
-
 /* {{{ GdkDeleteEvent */
 
 /**
@@ -2277,7 +2280,6 @@ gdk_delete_event_new (GdkSurface *surface)
 }
 
 /* }}} */
-
 /* {{{ GdkFocusEvent */
 
 /**
@@ -2334,7 +2336,6 @@ gdk_focus_event_get_in (GdkEvent *event)
 }
 
 /* }}} */
-
 /* {{{ GdkScrollEvent */
 
 /**
@@ -2593,7 +2594,6 @@ gdk_scroll_event_get_unit (GdkEvent *event)
 }
 
 /* }}} */
-
 /* {{{ GdkTouchpadEvent */
 
 /**
@@ -2852,7 +2852,6 @@ gdk_touchpad_event_get_pinch_scale (GdkEvent *event)
 }
 
 /* }}} */
-
 /* {{{ GdkPadEvent */
 
 /**
@@ -3026,7 +3025,6 @@ gdk_pad_event_get_group_mode (GdkEvent *event,
 }
 
 /* }}} */
-
 /* {{{ GdkMotionEvent */
 
 /**
@@ -3188,7 +3186,6 @@ gdk_event_get_history (GdkEvent *event,
 }
 
 /* }}} */
-
 /* {{{ GdkProximityEvent */
 
 /**
@@ -3251,7 +3248,6 @@ gdk_proximity_event_new (GdkEventType   type,
 }
 
 /* }}} */
-
 /* {{{ GdkDNDEvent */
 
 /**
@@ -3357,7 +3353,6 @@ gdk_dnd_event_get_drop (GdkEvent *event)
 }
 
 /* }}} */
-
 /* {{{ GdkGrabBrokenEvent */
 
 /**
@@ -3435,3 +3430,5 @@ gdk_grab_broken_event_get_implicit (GdkEvent *event)
 }
 
 /* }}} */
+
+/* vim:set foldmethod=marker expandtab: */

gdk/gdkframeclockidle.c

@@ -584,6 +584,8 @@ gdk_frame_clock_paint_idle (void *data)
                 {
                   priv->requested &= ~GDK_FRAME_CLOCK_PHASE_LAYOUT;
                   _gdk_frame_clock_emit_layout (clock);
+                  if (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT)
+                    g_print ("looping in layout %d\n", iter);
                 }
 	      if (iter == 5)
 		g_warning ("gdk-frame-clock: layout continuously requested, giving up after 4 tries");
@@ -621,8 +623,11 @@ gdk_frame_clock_paint_idle (void *data)
               priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
             }
 #ifdef G_ENABLE_DEBUG
-            if (GDK_DEBUG_CHECK (FRAMES))
-              timings->frame_end_time = g_get_monotonic_time ();
+          if (GDK_DEBUG_CHECK (FRAMES))
+            {
+              if (timings)
+                timings->frame_end_time = g_get_monotonic_time ();
+            }
 #endif /* G_ENABLE_DEBUG */
           G_GNUC_FALLTHROUGH;
 
@@ -806,3 +811,12 @@ _gdk_frame_clock_idle_new (void)
 
   return GDK_FRAME_CLOCK (clock);
 }
+
+GdkFrameClockPhase
+gdk_frame_clock_get_current_phase (GdkFrameClock *clock)
+{
+  GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
+  GdkFrameClockIdlePrivate *priv = clock_idle->priv;
+
+  return priv->phase;
+}

gdk/gdkframeclockprivate.h

@@ -127,6 +127,8 @@ void _gdk_frame_clock_emit_paint         (GdkFrameClock *frame_clock);
 void _gdk_frame_clock_emit_after_paint   (GdkFrameClock *frame_clock);
 void _gdk_frame_clock_emit_resume_events (GdkFrameClock *frame_clock);
 
+GdkFrameClockPhase gdk_frame_clock_get_current_phase (GdkFrameClock *frame_clock);
+
 G_END_DECLS
 
 #endif /* __GDK_FRAME_CLOCK_PRIVATE_H__ */

gdk/gdkglcontext.c

@@ -501,11 +501,23 @@ gdk_gl_context_real_is_shared (GdkGLContext *self,
   return TRUE;
 }
 
+static gboolean
+gdk_gl_context_real_is_current (GdkGLContext *self)
+{
+#ifdef HAVE_EGL
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
+
+  return priv->egl_context == eglGetCurrentContext ();
+#else
+  return TRUE;
+#endif
+}
+
 static gboolean
 gdk_gl_context_real_clear_current (GdkGLContext *context)
 {
-  GdkDisplay *display = gdk_gl_context_get_display (context);
 #ifdef HAVE_EGL
+  GdkDisplay *display = gdk_gl_context_get_display (context);
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
 
   if (priv->egl_context == NULL)
@@ -670,6 +682,7 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
   klass->is_shared = gdk_gl_context_real_is_shared;
   klass->make_current = gdk_gl_context_real_make_current;
   klass->clear_current = gdk_gl_context_real_clear_current;
+  klass->is_current = gdk_gl_context_real_is_current;
   klass->get_default_framebuffer = gdk_gl_context_real_get_default_framebuffer;
 
   draw_context_class->begin_frame = gdk_gl_context_real_begin_frame;
@@ -1551,6 +1564,12 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
   priv->extensions_checked = TRUE;
 }
 
+static gboolean
+gdk_gl_context_check_is_current (GdkGLContext *context)
+{
+  return GDK_GL_CONTEXT_GET_CLASS (context)->is_current (context);
+}
+
 /**
  * gdk_gl_context_make_current:
  * @context: a `GdkGLContext`
@@ -1569,7 +1588,7 @@ gdk_gl_context_make_current (GdkGLContext *context)
   masked_context = mask_context (context, surfaceless);
 
   current = g_private_get (&thread_current_context);
-  if (current == masked_context)
+  if (current == masked_context && gdk_gl_context_check_is_current (context))
     return;
 
   /* we need to realize the GdkGLContext if it wasn't explicitly realized */
@@ -1740,10 +1759,18 @@ GdkGLContext *
 gdk_gl_context_get_current (void)
 {
   MaskedContext *current;
+  GdkGLContext *context;
 
   current = g_private_get (&thread_current_context);
+  context = unmask_context (current);
 
-  return unmask_context (current);
+  if (context && !gdk_gl_context_check_is_current (context))
+    {
+      g_private_replace (&thread_current_context, NULL);
+      context = NULL;
+    }
+
+  return context;
 }
 
 gboolean

gdk/gdkglcontextprivate.h

@@ -83,6 +83,7 @@ struct _GdkGLContextClass
   gboolean              (* make_current)                        (GdkGLContext          *context,
                                                                  gboolean               surfaceless);
   gboolean              (* clear_current)                       (GdkGLContext          *context);
+  gboolean              (* is_current)                          (GdkGLContext          *context);
   cairo_region_t *      (* get_damage)                          (GdkGLContext          *context);
 
   gboolean              (* is_shared)                           (GdkGLContext          *self,

gdk/gdkgltexture.c

@@ -24,7 +24,6 @@
 #include "gdkglcontextprivate.h"
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
-#include "gdktextureprivate.h"
 
 #include <epoxy/gl.h>
 
@@ -53,10 +52,8 @@ struct _GdkGLTextureClass {
 G_DEFINE_TYPE (GdkGLTexture, gdk_gl_texture, GDK_TYPE_TEXTURE)
 
 static void
-gdk_gl_texture_dispose (GObject *object)
+drop_gl_resources (GdkGLTexture *self)
 {
-  GdkGLTexture *self = GDK_GL_TEXTURE (object);
-
   if (self->destroy)
     {
       self->destroy (self->data);
@@ -66,17 +63,29 @@ gdk_gl_texture_dispose (GObject *object)
 
   g_clear_object (&self->context);
   self->id = 0;
+}
+
+static void
+gdk_gl_texture_dispose (GObject *object)
+{
+  GdkGLTexture *self = GDK_GL_TEXTURE (object);
+
+  drop_gl_resources (self);
 
   g_clear_object (&self->saved);
 
   G_OBJECT_CLASS (gdk_gl_texture_parent_class)->dispose (object);
 }
 
+typedef void (* GLFunc) (GdkGLTexture *self,
+                         GdkGLContext *context,
+                         gpointer      data);
+
 typedef struct _InvokeData
 {
   GdkGLTexture *self;
   volatile int spinlock;
-  GFunc func;
+  GLFunc func;
   gpointer data;
 } InvokeData;
 
@@ -91,7 +100,7 @@ gdk_gl_texture_invoke_callback (gpointer data)
   gdk_gl_context_make_current (context);
   glBindTexture (GL_TEXTURE_2D, invoke->self->id);
 
-  invoke->func (invoke->self, invoke->data);
+  invoke->func (invoke->self, context, invoke->data);
 
   g_atomic_int_set (&invoke->spinlock, 1);
 
@@ -100,7 +109,7 @@ gdk_gl_texture_invoke_callback (gpointer data)
 
 static void
 gdk_gl_texture_run (GdkGLTexture *self,
-                    GFunc         func,
+                    GLFunc        func,
                     gpointer      data)
 {
   InvokeData invoke = { self, 0, func, data };
@@ -145,19 +154,19 @@ gdk_gl_texture_find_format (gboolean         use_es,
 }
 
 static inline void
-gdk_gl_texture_do_download (gpointer texture_,
-                            gpointer download_)
+gdk_gl_texture_do_download (GdkGLTexture *self,
+                            GdkGLContext *context,
+                            gpointer      download_)
 {
+  GdkTexture *texture = GDK_TEXTURE (self);
   gsize expected_stride;
-  GdkGLTexture *self = texture_;
-  GdkTexture *texture = texture_;
   Download *download = download_;
   GLenum gl_internal_format, gl_format, gl_type;
 
   expected_stride = texture->width * gdk_memory_format_bytes_per_pixel (download->format);
 
   if (download->stride == expected_stride &&
-      !gdk_gl_context_get_use_es (self->context) && 
+      !gdk_gl_context_get_use_es (context) &&
       gdk_memory_format_gl_format (download->format, TRUE, &gl_internal_format, &gl_format, &gl_type))
     {
       glGetTexImage (GL_TEXTURE_2D,
@@ -175,11 +184,11 @@ gdk_gl_texture_do_download (gpointer texture_,
       glGenFramebuffers (1, &fbo);
       glBindFramebuffer (GL_FRAMEBUFFER, fbo);
       glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->id, 0);
-      if (gdk_gl_context_check_version (self->context, 4, 3, 3, 1))
+      if (gdk_gl_context_check_version (context, 4, 3, 3, 1))
         {
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_FORMAT, &gl_read_format);
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_TYPE, &gl_read_type);
-          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (self->context), gl_read_format, gl_read_type, &actual_format))
+          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (context), gl_read_format, gl_read_type, &actual_format))
             actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
         }
       else
@@ -193,7 +202,7 @@ gdk_gl_texture_do_download (gpointer texture_,
           (download->stride == expected_stride))
         {
           glReadPixels (0, 0,
-                        texture->width, texture->height, 
+                        texture->width, texture->height,
                         gl_read_format,
                         gl_read_type,
                         download->data);
@@ -204,7 +213,7 @@ gdk_gl_texture_do_download (gpointer texture_,
           guchar *pixels = g_malloc_n (texture->width * actual_bpp, texture->height);
 
           glReadPixels (0, 0,
-                        texture->width, texture->height, 
+                        texture->width, texture->height,
                         gl_read_format,
                         gl_read_type,
                         pixels);
@@ -297,15 +306,7 @@ gdk_gl_texture_release (GdkGLTexture *self)
   self->saved = GDK_TEXTURE (gdk_memory_texture_from_texture (texture,
                                                               gdk_texture_get_format (texture)));
 
-  if (self->destroy)
-    {
-      self->destroy (self->data);
-      self->destroy = NULL;
-      self->data = NULL;
-    }
-
-  g_clear_object (&self->context);
-  self->id = 0;
+  drop_gl_resources (self);
 }
 
 static void

gdk/gdkmemorytexture.c

@@ -222,7 +222,7 @@ gdk_memory_texture_from_texture (GdkTexture      *texture,
   data = g_malloc_n (stride, texture->height);
 
   gdk_texture_do_download (texture, format, data, stride);
-  bytes = g_bytes_new_take (data, stride);
+  bytes = g_bytes_new_take (data, stride * texture->height);
   result = gdk_memory_texture_new (texture->width,
                                    texture->height,
                                    format,
@@ -233,15 +233,11 @@ gdk_memory_texture_from_texture (GdkTexture      *texture,
   return GDK_MEMORY_TEXTURE (result);
 }
 
-const guchar *
-gdk_memory_texture_get_data (GdkMemoryTexture *self)
+GBytes *
+gdk_memory_texture_get_bytes (GdkMemoryTexture *self,
+                              gsize            *out_stride)
 {
-  return g_bytes_get_data (self->bytes, NULL);
-}
-
-gsize
-gdk_memory_texture_get_stride (GdkMemoryTexture *self)
-{
-  return self->stride;
+  *out_stride = self->stride;
+  return self->bytes;
 }
 

gdk/gdkmemorytextureprivate.h

@@ -37,8 +37,8 @@ GdkTexture *            gdk_memory_texture_new_subtexture   (GdkMemoryTexture  *
                                                              int                width,
                                                              int                height);
 
-const guchar *          gdk_memory_texture_get_data         (GdkMemoryTexture  *self);
-gsize                   gdk_memory_texture_get_stride       (GdkMemoryTexture  *self);
+GBytes *                gdk_memory_texture_get_bytes        (GdkMemoryTexture  *self,
+                                                             gsize             *out_stride);
 
 
 G_END_DECLS

gdk/gdkmonitor.c

@@ -39,6 +39,7 @@
 
 enum {
   PROP_0,
+  PROP_DESCRIPTION,
   PROP_DISPLAY,
   PROP_MANUFACTURER,
   PROP_MODEL,
@@ -81,6 +82,10 @@ gdk_monitor_get_property (GObject    *object,
 
   switch (prop_id)
     {
+    case PROP_DESCRIPTION:
+      g_value_set_string (value, monitor->description);
+      break;
+
     case PROP_DISPLAY:
       g_value_set_object (value, monitor->display);
       break;
@@ -154,6 +159,7 @@ gdk_monitor_finalize (GObject *object)
 {
   GdkMonitor *monitor = GDK_MONITOR (object);
 
+  g_free (monitor->description);
   g_free (monitor->connector);
   g_free (monitor->manufacturer);
   g_free (monitor->model);
@@ -170,6 +176,18 @@ gdk_monitor_class_init (GdkMonitorClass *class)
   object_class->get_property = gdk_monitor_get_property;
   object_class->set_property = gdk_monitor_set_property;
 
+  /**
+   * GdkMonitor:description: (attributes org.gtk.Property.get=gdk_monitor_get_description)
+   *
+   * A short description of the monitor, meant for display to the user.
+   *
+   * Since: 4.10
+   */
+  props[PROP_DESCRIPTION] =
+    g_param_spec_string ("description", NULL, NULL,
+                         NULL,
+                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
   /**
    * GdkMonitor:display: (attributes org.gtk.Property.get=gdk_monitor_get_display)
    *
@@ -377,6 +395,10 @@ gdk_monitor_get_height_mm (GdkMonitor *monitor)
  *
  * Gets the name of the monitor's connector, if available.
  *
+ * These are strings such as "eDP-1", or "HDMI-2". They depend
+ * on software and hardware configuration, and should not be
+ * relied on as stable identifiers of a specific monitor.
+ *
  * Returns: (transfer none) (nullable): the name of the connector
  */
 const char *
@@ -619,3 +641,33 @@ gdk_monitor_is_valid (GdkMonitor *monitor)
 
   return monitor->valid;
 }
+
+/**
+ * gdk_monitor_get_description: (attributes org.gtk.Method.get_property=description)
+ * @monitor: a `GdkMonitor`
+ *
+ * Gets a string describing the monitor, if available.
+ *
+ * This can be used to identify a monitor in the UI.
+ *
+ * Returns: (transfer none) (nullable): the monitor description
+ *
+ * Since: 4.10
+ */
+const char *
+gdk_monitor_get_description (GdkMonitor *monitor)
+{
+  g_return_val_if_fail (GDK_IS_MONITOR (monitor), NULL);
+
+  return monitor->description;
+}
+
+void
+gdk_monitor_set_description (GdkMonitor *monitor,
+                             const char *description)
+{
+  g_free (monitor->description);
+  monitor->description = g_strdup (description);
+  g_object_notify_by_pspec (G_OBJECT (monitor), props[PROP_DESCRIPTION]);
+}
+

gdk/gdkmonitor.h

@@ -86,6 +86,8 @@ GDK_AVAILABLE_IN_ALL
 GdkSubpixelLayout gdk_monitor_get_subpixel_layout (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_ALL
 gboolean          gdk_monitor_is_valid            (GdkMonitor   *monitor);
+GDK_AVAILABLE_IN_4_10
+const char *      gdk_monitor_get_description     (GdkMonitor   *monitor);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
 

gdk/gdkmonitorprivate.h

@@ -37,6 +37,7 @@ struct _GdkMonitor {
   char *manufacturer;
   char *model;
   char *connector;
+  char *description;
   GdkRectangle geometry;
   int width_mm;
   int height_mm;
@@ -70,6 +71,8 @@ void            gdk_monitor_set_refresh_rate    (GdkMonitor *monitor,
 void            gdk_monitor_set_subpixel_layout (GdkMonitor        *monitor,
                                                  GdkSubpixelLayout  subpixel);
 void            gdk_monitor_invalidate          (GdkMonitor *monitor);
+void            gdk_monitor_set_description     (GdkMonitor *monitor,
+                                                 const char *description);
 
 G_END_DECLS
 

gdk/gdkpixbuf.c

@@ -27,7 +27,7 @@
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdksurface.h"
-#include "gdktextureprivate.h"
+#include "gdktexturedownloaderprivate.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -218,9 +218,9 @@ gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
 
 static void
 pixbuf_texture_unref_cb (guchar   *pixels,
-                         gpointer  texture)
+                         gpointer  bytes)
 {
-  g_object_unref (texture);
+  g_bytes_unref (bytes);
 }
 
 /**
@@ -238,22 +238,27 @@ pixbuf_texture_unref_cb (guchar   *pixels,
 GdkPixbuf *
 gdk_pixbuf_get_from_texture (GdkTexture *texture)
 {
-  GdkMemoryTexture *memtex;
+  GdkTextureDownloader downloader;
+  GBytes *bytes;
+  gsize stride;
   gboolean alpha;
 
   alpha = gdk_memory_format_alpha (gdk_texture_get_format (texture)) != GDK_MEMORY_ALPHA_OPAQUE;
 
-  memtex = gdk_memory_texture_from_texture (texture,
-                                            alpha ? GDK_MEMORY_GDK_PIXBUF_ALPHA
-                                                  : GDK_MEMORY_GDK_PIXBUF_OPAQUE);
+  gdk_texture_downloader_init (&downloader, texture);
+  gdk_texture_downloader_set_format (&downloader, 
+                                     alpha ? GDK_MEMORY_GDK_PIXBUF_ALPHA
+                                           : GDK_MEMORY_GDK_PIXBUF_OPAQUE);
+  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
+  gdk_texture_downloader_finish (&downloader);
 
-  return gdk_pixbuf_new_from_data (gdk_memory_texture_get_data (memtex),
+  return gdk_pixbuf_new_from_data (g_bytes_get_data (bytes, NULL),
                                    GDK_COLORSPACE_RGB,
                                    alpha,
                                    8,
-                                   gdk_texture_get_width (GDK_TEXTURE (memtex)),
-                                   gdk_texture_get_height (GDK_TEXTURE (memtex)),
-                                   gdk_memory_texture_get_stride (memtex),
+                                   gdk_texture_get_width (texture),
+                                   gdk_texture_get_height (texture),
+                                   stride,
                                    pixbuf_texture_unref_cb,
-                                   memtex);
+                                   bytes);
 }

gdk/gdkprivate.h

@@ -23,4 +23,23 @@ void gdk_source_set_static_name_by_id (guint       tag,
 #define I_(string) g_intern_static_string (string)
 #endif
 
+#if !GLIB_CHECK_VERSION (2, 75, 1)
+static inline gboolean
+g_set_str (char       **str_pointer,
+           const char  *new_str)
+{
+  char *copy;
+
+  if (*str_pointer == new_str ||
+      (*str_pointer && new_str && strcmp (*str_pointer, new_str) == 0))
+    return FALSE;
+
+  copy = g_strdup (new_str);
+  g_free (*str_pointer);
+  *str_pointer = copy;
+
+  return TRUE;
+}
+#endif
+
 #endif /* __GDK__PRIVATE_H__ */

gdk/gdkrgba.c

@@ -586,7 +586,7 @@ gdk_rgba_parser_parse (GtkCssParser *parser,
   else if (gtk_css_token_is (token, GTK_CSS_TOKEN_HASH_ID) ||
            gtk_css_token_is (token, GTK_CSS_TOKEN_HASH_UNRESTRICTED))
     {
-      const char *s = token->string.string;
+      const char *s = gtk_css_token_get_string (token);
 
       switch (strlen (s))
         {
@@ -637,13 +637,13 @@ gdk_rgba_parser_parse (GtkCssParser *parser,
         {
           *rgba = (GdkRGBA) { 0, 0, 0, 0 };
         }
-      else if (gdk_rgba_parse (rgba, token->string.string))
+      else if (gdk_rgba_parse (rgba, gtk_css_token_get_string (token)))
         {
           /* everything's fine */
         }
       else
         {
-          gtk_css_parser_error_syntax (parser, "\"%s\" is not a valid color name.", token->string.string);
+          gtk_css_parser_error_syntax (parser, "\"%s\" is not a valid color name.", gtk_css_token_get_string (token));
           return FALSE;
         }
 

gdk/gdksurface.c

@@ -2789,9 +2789,10 @@ check_autohide (GdkEvent *event)
 {
   GdkDisplay *display;
   GdkDevice *device;
-  GdkSurface *grab_surface;
+  GdkSurface *grab_surface, *event_surface;
+  GdkEventType evtype = gdk_event_get_event_type (event);
 
- switch ((guint) gdk_event_get_event_type (event))
+ switch ((guint) evtype)
     {
     case GDK_BUTTON_PRESS:
 #if 0
@@ -2810,13 +2811,15 @@ check_autohide (GdkEvent *event)
       device = gdk_event_get_device (event);
       if (gdk_device_grab_info (display, device, &grab_surface, NULL))
         {
-          GdkSurface *event_surface;
-
           event_surface = gdk_event_get_surface (event);
+          if (event_surface->autohide &&
+              !event_surface->has_pointer)
+            event_surface = NULL;
 
-          if (grab_surface != event_surface &&
-              grab_surface != event_surface->parent &&
-              grab_surface->autohide)
+          if (grab_surface->autohide &&
+              (!event_surface ||
+               (grab_surface != event_surface &&
+                grab_surface != event_surface->parent)))
             {
               GdkSurface *surface = grab_surface;
 
@@ -2831,6 +2834,13 @@ check_autohide (GdkEvent *event)
             }
         }
       break;
+    case GDK_ENTER_NOTIFY:
+    case GDK_LEAVE_NOTIFY:
+      event_surface = gdk_event_get_surface (event);
+      if (event_surface->autohide &&
+          gdk_crossing_event_get_mode (event) == GDK_CROSSING_NORMAL)
+        event_surface->has_pointer = evtype == GDK_ENTER_NOTIFY;
+      break;
     default:;
     }
 

gdk/gdksurfaceprivate.h

@@ -77,6 +77,7 @@ struct _GdkSurface
   guint autohide : 1;
   guint shortcuts_inhibited : 1;
   guint request_motion : 1;
+  guint has_pointer : 1;
 
   guint request_motion_id;
 

gdk/gdktexture.c

@@ -463,7 +463,7 @@ gdk_texture_new_from_resource (const char *resource_path)
  * Creates a new texture by loading an image from a file.
  *
  * The file format is detected automatically. The supported formats
- * are PNG and JPEG, though more formats might be available.
+ * are PNG, JPEG and TIFF, though more formats might be available.
  *
  * If %NULL is returned, then @error will be set.
  *
@@ -556,7 +556,7 @@ gdk_texture_new_from_bytes_pixbuf (GBytes  *bytes,
  * Creates a new texture by loading an image from memory,
  *
  * The file format is detected automatically. The supported formats
- * are PNG and JPEG, though more formats might be available.
+ * are PNG, JPEG and TIFF, though more formats might be available.
  *
  * If %NULL is returned, then @error will be set.
  *
@@ -602,7 +602,7 @@ gdk_texture_new_from_bytes (GBytes  *bytes,
  * Creates a new texture by loading an image from a file.
  *
  * The file format is detected automatically. The supported formats
- * are PNG and JPEG, though more formats might be available.
+ * are PNG, JPEG and TIFF, though more formats might be available.
  *
  * If %NULL is returned, then @error will be set.
  *
@@ -722,6 +722,9 @@ gdk_texture_download_surface (GdkTexture *texture)
  *                       cairo_image_surface_get_stride (surface));
  * cairo_surface_mark_dirty (surface);
  * ```
+ *
+ * For more flexible download capabilites, see
+ * [struct@Gdk.TextureDownloader].
  */
 void
 gdk_texture_download (GdkTexture *texture,
@@ -738,9 +741,29 @@ gdk_texture_download (GdkTexture *texture,
                            stride);
 }
 
+/**
+ * gdk_texture_get_format:
+ * @self: a GdkTexture
+ *
+ * Gets the memory format most closely associated with the data of
+ * the texture.
+ *
+ * Note that it may not be an exact match for texture data
+ * stored on the GPU or with compression.
+ *
+ * The format can give an indication about the bit depth and opacity
+ * of the texture and is useful to determine the best format for
+ * downloading the texture.
+ *
+ * Returns: the preferred format for the texture's data
+ *
+ * Since: 4.10
+ **/
 GdkMemoryFormat
 gdk_texture_get_format (GdkTexture *self)
 {
+  g_return_val_if_fail (GDK_IS_TEXTURE (self), GDK_MEMORY_DEFAULT);
+
   return self->format;
 }
 

gdk/gdktexture.h

@@ -24,6 +24,7 @@
 #endif
 
 #include <gdk/gdkversionmacros.h>
+#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -82,6 +83,8 @@ GDK_AVAILABLE_IN_ALL
 int                     gdk_texture_get_width                  (GdkTexture      *texture) G_GNUC_PURE;
 GDK_AVAILABLE_IN_ALL
 int                     gdk_texture_get_height                 (GdkTexture      *texture) G_GNUC_PURE;
+GDK_AVAILABLE_IN_4_10
+GdkMemoryFormat         gdk_texture_get_format                 (GdkTexture      *self) G_GNUC_PURE;
 
 GDK_AVAILABLE_IN_ALL
 void                    gdk_texture_download                   (GdkTexture      *texture,

gdk/gdktexturedownloader.c

@@ -0,0 +1,268 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2023 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * GdkTextureDownloader:
+ *
+ * The `GdkTextureDownloader` is used to download the contents of a
+ * [class@Gdk.Texture].
+ *
+ * It is intended to be created as a short-term object for a single download,
+ * but can be used for multipe downloads of different textures or with different
+ * settings.
+ *
+ * `GdkTextureDownloader` can be used to convert data between different formats.
+ * Create a `GdkTexture` for the existing format and then download it in a
+ * different format.
+ *
+ * Since: 4.10
+ */
+
+#include "config.h"
+
+#include "gdktexturedownloaderprivate.h"
+
+#include "gdkmemoryformatprivate.h"
+#include "gdkmemorytextureprivate.h"
+#include "gdktextureprivate.h"
+
+G_DEFINE_BOXED_TYPE (GdkTextureDownloader, gdk_texture_downloader,
+                     gdk_texture_downloader_copy,
+                     gdk_texture_downloader_free)
+
+
+void
+gdk_texture_downloader_init (GdkTextureDownloader *self,
+                             GdkTexture           *texture)
+{
+  self->texture = g_object_ref (texture);
+  self->format = GDK_MEMORY_DEFAULT;
+}
+
+void
+gdk_texture_downloader_finish (GdkTextureDownloader *self)
+{
+  g_object_unref (self->texture);
+}
+
+/**
+ * gdk_texture_downloader_new:
+ * @texture: texture to download
+ *
+ * Creates a new texture downloader for @texture.
+ *
+ * Returns: A new texture downloader
+ *
+ * Since: 4.10
+ **/
+GdkTextureDownloader *
+gdk_texture_downloader_new (GdkTexture *texture)
+{
+  GdkTextureDownloader *self;
+
+  g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
+
+  self = g_slice_new (GdkTextureDownloader);
+  gdk_texture_downloader_init (self, texture);
+
+  return self;
+}
+
+/**
+ * gdk_texture_downloader_copy:
+ * @self: the downloader to copy
+ *
+ * Creates a copy of the downloader.
+ *
+ * This function is meant for language bindings.
+ *
+ * Returns: A copy of the downloader
+ *
+ * Since: 4.10
+ **/
+GdkTextureDownloader *
+gdk_texture_downloader_copy (const GdkTextureDownloader *self)
+{
+  GdkTextureDownloader *copy;
+
+  g_return_val_if_fail (self != NULL, NULL);
+
+  copy = gdk_texture_downloader_new (self->texture);
+  gdk_texture_downloader_set_format (copy, self->format);
+
+  return copy;
+}
+
+/**
+ * gdk_texture_downloader_free:
+ * @self: texture downloader to free
+ *
+ * Frees the given downloader and all its associated resources.
+ *
+ * Since: 4.10
+ **/
+void
+gdk_texture_downloader_free (GdkTextureDownloader *self)
+{
+  g_return_if_fail (self != NULL);
+
+  gdk_texture_downloader_finish (self);
+  g_slice_free (GdkTextureDownloader, self);
+}
+
+/**
+ * gdk_texture_downloader_set_texture:
+ * @self: a texture downloader
+ * @texture: the new texture to download
+ *
+ * Changes the texture the downloader will download.
+ *
+ * Since: 4.10
+ **/
+void
+gdk_texture_downloader_set_texture (GdkTextureDownloader *self,
+                                    GdkTexture           *texture)
+{
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (GDK_IS_TEXTURE (texture));
+
+  g_set_object (&self->texture, texture);
+}
+
+/**
+ * gdk_texture_downloader_get_texture:
+ * @self: a texture downloader
+ *
+ * Gets the texture that the downloader will download.
+ *
+ * Returns: (transfer none): The texture to download
+ *
+ * Since: 4.10
+ **/
+GdkTexture *
+gdk_texture_downloader_get_texture (const GdkTextureDownloader *self)
+{
+  g_return_val_if_fail (self != NULL, NULL);
+
+  return self->texture;
+}
+
+/**
+ * gdk_texture_downloader_set_format:
+ * @self: a texture downloader
+ * @format: the format to use
+ *
+ * Sets the format the downloader will download.
+ *
+ * By default, GDK_MEMORY_DEFAULT is set.
+ *
+ * Since: 4.10
+ */
+void
+gdk_texture_downloader_set_format (GdkTextureDownloader *self,
+                                   GdkMemoryFormat       format)
+{
+  g_return_if_fail (self != NULL);
+
+  self->format = format;
+}
+
+/**
+ * gdk_texture_downloader_get_format:
+ * @self: a texture downloader
+ *
+ * Gets the format that the data will be downloaded in.
+ *
+ * Returns: The format of the download
+ *
+ * Since: 4.10
+ **/
+GdkMemoryFormat
+gdk_texture_downloader_get_format (const GdkTextureDownloader *self)
+{
+  g_return_val_if_fail (self != NULL, GDK_MEMORY_DEFAULT);
+
+  return self->format;
+}
+
+/**
+ * gdk_texture_downloader_download_into:
+ * @self: a texture downloader
+ * @data: (array): pointer to enough memory to be filled with the
+ *   downloaded data of the texture
+ * @stride: rowstride in bytes
+ *
+ * Downloads the @texture into local memory.
+ *
+ * Since: 4.10
+ **/
+void
+gdk_texture_downloader_download_into (const GdkTextureDownloader *self,
+                                      guchar                     *data,
+                                      gsize                       stride)
+{
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (data != NULL);
+  g_return_if_fail (stride >= gdk_texture_get_width (self->texture) * gdk_memory_format_bytes_per_pixel (self->format));
+
+  gdk_texture_do_download (self->texture, self->format, data, stride);
+}
+
+/**
+ * gdk_texture_downloader_download_bytes:
+ * @self: the downloader
+ * @out_stride: (out): The stride of the resulting data in bytes.
+ *
+ * Downloads the given texture pixels into a `GBytes`. The rowstride will
+ * be stored in the stride value.
+ *
+ * This function will abort if it tries to download a large texture and
+ * fails to allocate memory. If you think that may happen, you should
+ * handle memory allocation yourself and use
+ * gdk_texture_downloader_download_into() once allocation succeeded.
+ *
+ * Returns: The downloaded pixels.
+ *
+ * Since: 4.10
+ **/
+GBytes *
+gdk_texture_downloader_download_bytes (const GdkTextureDownloader *self,
+                                       gsize                      *out_stride)
+{
+  guchar *data;
+  gsize stride;
+
+  g_return_val_if_fail (self != NULL, NULL);
+  g_return_val_if_fail (out_stride != NULL, NULL);
+
+  if (GDK_IS_MEMORY_TEXTURE (self->texture) &&
+      gdk_texture_get_format (self->texture) == self->format)
+    {
+      GdkMemoryTexture *memtex = GDK_MEMORY_TEXTURE (self->texture);
+
+      return g_bytes_ref (gdk_memory_texture_get_bytes (memtex, out_stride));
+    }
+
+  stride = self->texture->width * gdk_memory_format_bytes_per_pixel (self->format);
+  data = g_malloc_n (stride, self->texture->height);
+
+  gdk_texture_do_download (self->texture, self->format, data, stride);
+
+  *out_stride = stride;
+  return g_bytes_new_take (data, stride * self->texture->height);
+}
+

gdk/gdktexturedownloader.h

@@ -0,0 +1,69 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2023 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_TEXTURE_DOWNLOADER_H__
+#define __GTK_TEXTURE_DOWNLOADER_H__
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+
+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdkenums.h>
+#include <gdk/gdktypes.h>
+
+G_BEGIN_DECLS
+
+#define GDK_TYPE_TEXTURE_DOWNLOADER    (gdk_texture_downloader_get_type ())
+
+GDK_AVAILABLE_IN_4_10
+GType                   gdk_texture_downloader_get_type         (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_4_10
+GdkTextureDownloader *  gdk_texture_downloader_new              (GdkTexture             *texture);
+
+GDK_AVAILABLE_IN_4_10
+GdkTextureDownloader *  gdk_texture_downloader_copy             (const GdkTextureDownloader     *self);
+GDK_AVAILABLE_IN_4_10
+void                    gdk_texture_downloader_free             (GdkTextureDownloader           *self);
+
+
+GDK_AVAILABLE_IN_4_10
+void                    gdk_texture_downloader_set_texture      (GdkTextureDownloader           *self,
+                                                                 GdkTexture                     *texture);
+GDK_AVAILABLE_IN_4_10
+GdkTexture *            gdk_texture_downloader_get_texture      (const GdkTextureDownloader     *self);
+GDK_AVAILABLE_IN_4_10
+void                    gdk_texture_downloader_set_format       (GdkTextureDownloader           *self,
+                                                                 GdkMemoryFormat                 format);
+GDK_AVAILABLE_IN_4_10
+GdkMemoryFormat         gdk_texture_downloader_get_format       (const GdkTextureDownloader     *self);
+
+
+GDK_AVAILABLE_IN_4_10
+void                    gdk_texture_downloader_download_into    (const GdkTextureDownloader     *self,
+                                                                 guchar                         *data,
+                                                                 gsize                           stride);
+GDK_AVAILABLE_IN_4_10
+GBytes *                gdk_texture_downloader_download_bytes   (const GdkTextureDownloader     *self,
+                                                                 gsize                          *out_stride);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTextureDownloader, gdk_texture_downloader_free)
+
+G_END_DECLS
+
+#endif /* __GTK_TEXTURE_DOWNLOADER_H__ */

gdk/gdktexturedownloaderprivate.h

@@ -0,0 +1,41 @@
+/* GTK - The GIMP Toolkit
+ *
+ * Copyright (C) 2023 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__
+#define __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__
+
+#include "gdktexturedownloader.h"
+
+G_BEGIN_DECLS
+
+struct _GdkTextureDownloader
+{
+  /*< private >*/
+  GdkTexture *texture;
+  GdkMemoryFormat format;
+};
+
+void                    gdk_texture_downloader_init              (GdkTextureDownloader           *self,
+                                                                  GdkTexture                     *texture);
+void                    gdk_texture_downloader_finish            (GdkTextureDownloader           *self);
+
+
+G_END_DECLS
+
+#endif /* __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__ */

gdk/gdktextureprivate.h

@@ -43,7 +43,6 @@ void                    gdk_texture_do_download         (GdkTexture
                                                          GdkMemoryFormat         format,
                                                          guchar                 *data,
                                                          gsize                   stride);
-GdkMemoryFormat         gdk_texture_get_format          (GdkTexture             *self);
 gboolean                gdk_texture_set_render_data     (GdkTexture             *self,
                                                          gpointer                key,
                                                          gpointer                data,

gdk/gdktypes.h

@@ -77,6 +77,7 @@ typedef struct _GdkContentFormats     GdkContentFormats;
 typedef struct _GdkContentProvider    GdkContentProvider;
 typedef struct _GdkCursor             GdkCursor;
 typedef struct _GdkTexture            GdkTexture;
+typedef struct _GdkTextureDownloader  GdkTextureDownloader;
 typedef struct _GdkDevice             GdkDevice;
 typedef struct _GdkDrag               GdkDrag;
 typedef struct _GdkDrop               GdkDrop;

gdk/gdkvulkancontext.c

@@ -94,7 +94,7 @@ gdk_vulkan_strerror (VkResult result)
    * Because the Vulkan people don't make adding this too easy, here's
    * the process to manage it:
    * 1. go to
-   *    https://github.com/KhronosGroup/Vulkan-Headers/blob/master/include/vulkan/vulkan_core.h
+   *    https://github.com/KhronosGroup/Vulkan-Headers/blob/main/include/vulkan/vulkan_core.h
    * 2. Find the line where this enum value was added.
    * 3. Click the commit that added this line.
    * 4. The commit you're looking at now should also change
@@ -215,6 +215,10 @@ gdk_vulkan_strerror (VkResult result)
     case VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT:
       return "A requested pipeline creation would have required compilation, but the application requested compilation to not be performed. (VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT)";
 #endif
+#if VK_HEADER_VERSION >= 213
+    case VK_ERROR_COMPRESSION_EXHAUSTED_EXT:
+      return "An image creation failed because internal resources required for compression are exhausted. (VK_ERROR_COMPRESSION_EXHAUSTED_EXT)";
+#endif
 #if VK_HEADER_VERSION < 140
     case VK_RESULT_RANGE_SIZE:
 #endif
@@ -488,7 +492,7 @@ gdk_vulkan_context_end_frame (GdkDrawContext *draw_context,
                                            priv->draw_semaphore
                                        },
                                        .swapchainCount = 1,
-                                       .pSwapchains = (VkSwapchainKHR[]) { 
+                                       .pSwapchains = (VkSwapchainKHR[]) {
                                            priv->swapchain
                                        },
                                        .pImageIndices = (uint32_t[]) {
@@ -608,7 +612,7 @@ gdk_vulkan_context_real_init (GInitable     *initable,
         {
           g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE,
                                "No supported image format found.");
-          goto out_surface;  
+          goto out_surface;
         }
       priv->image_format = formats[i];
       priv->has_present_region = device_supports_incremental_present (display->vk_physical_device);
@@ -1037,8 +1041,8 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
   GDK_VK_CHECK (vkEnumerateInstanceExtensionProperties, NULL, &n_extensions, extensions);
 
   used_extensions = g_ptr_array_new ();
-  g_ptr_array_add (used_extensions, (gpointer) VK_KHR_SURFACE_EXTENSION_NAME); 
-  g_ptr_array_add (used_extensions, (gpointer) GDK_DISPLAY_GET_CLASS (display)->vk_extension_name); 
+  g_ptr_array_add (used_extensions, (gpointer) VK_KHR_SURFACE_EXTENSION_NAME);
+  g_ptr_array_add (used_extensions, (gpointer) GDK_DISPLAY_GET_CLASS (display)->vk_extension_name);
 
   for (i = 0; i < n_extensions; i++)
     {
@@ -1118,7 +1122,7 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
   if (have_debug_report)
     {
       PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
-      
+
       vkCreateDebugReportCallbackEXT = (PFN_vkCreateDebugReportCallbackEXT) vkGetInstanceProcAddr (display->vk_instance, "vkCreateDebugReportCallbackEXT" );
       GDK_VK_CHECK (vkCreateDebugReportCallbackEXT, display->vk_instance,
                                                     &(VkDebugReportCallbackCreateInfoEXT) {
@@ -1167,7 +1171,7 @@ gdk_display_ref_vulkan (GdkDisplay *display,
     }
 
   display->vulkan_refcount++;
-    
+
   return TRUE;
 }
 
@@ -1180,7 +1184,7 @@ gdk_display_unref_vulkan (GdkDisplay *display)
   display->vulkan_refcount--;
   if (display->vulkan_refcount > 0)
     return;
-  
+
   vkDestroyDevice (display->vk_device, NULL);
   display->vk_device = VK_NULL_HANDLE;
   if (display->vk_debug_callback != VK_NULL_HANDLE)

gdk/loaders/gdkjpeg.c

@@ -23,7 +23,7 @@
 
 #include <glib/gi18n-lib.h>
 #include "gdktexture.h"
-#include "gdkmemorytextureprivate.h"
+#include "gdktexturedownloaderprivate.h"
 
 #include "gdkprofilerprivate.h"
 
@@ -251,7 +251,8 @@ gdk_save_jpeg (GdkTexture *texture)
   guchar *data = NULL;
   gulong size = 0;
   guchar *input = NULL;
-  GdkMemoryTexture *memtex = NULL;
+  GdkTextureDownloader downloader;
+  GBytes *texbytes;
   const guchar *texdata;
   gsize texstride;
   guchar *row;
@@ -270,7 +271,7 @@ gdk_save_jpeg (GdkTexture *texture)
       free (data);
       g_free (input);
       jpeg_destroy_compress (&info);
-      g_clear_object (&memtex);
+      g_clear_pointer (&texbytes, g_bytes_unref);
       return NULL;
     }
 
@@ -289,10 +290,11 @@ gdk_save_jpeg (GdkTexture *texture)
 
   jpeg_mem_dest (&info, &data, &size);
 
-  memtex = gdk_memory_texture_from_texture (texture,
-                                            GDK_MEMORY_R8G8B8);
-  texdata = gdk_memory_texture_get_data (memtex);
-  texstride = gdk_memory_texture_get_stride (memtex);
+  gdk_texture_downloader_init (&downloader, texture);
+  gdk_texture_downloader_set_format (&downloader, GDK_MEMORY_R8G8B8);
+  texbytes = gdk_texture_downloader_download_bytes (&downloader, &texstride);
+  gdk_texture_downloader_finish (&downloader);
+  texdata = g_bytes_get_data (texbytes, NULL);
 
   jpeg_start_compress (&info, TRUE);
 
@@ -304,7 +306,7 @@ gdk_save_jpeg (GdkTexture *texture)
 
   jpeg_finish_compress (&info);
 
-  g_object_unref (memtex);
+  g_bytes_unref (texbytes);
   g_free (input);
   jpeg_destroy_compress (&info);
 

gdk/loaders/gdkpng.c

@@ -21,10 +21,9 @@
 
 #include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
-#include "gdkmemorytextureprivate.h"
+#include "gdkmemorytexture.h"
 #include "gdkprofilerprivate.h"
-#include "gdktexture.h"
-#include "gdktextureprivate.h"
+#include "gdktexturedownloaderprivate.h"
 #include "gsk/gl/fp16private.h"
 #include <png.h>
 #include <stdio.h>
@@ -297,11 +296,12 @@ gdk_save_png (GdkTexture *texture)
   png_info *info;
   png_io io = { NULL, 0, 0 };
   int width, height;
+  int y;
+  GdkMemoryFormat format;
+  GdkTextureDownloader downloader;
+  GBytes *bytes;
   gsize stride;
   const guchar *data;
-  int y;
-  GdkMemoryTexture *memtex;
-  GdkMemoryFormat format;
   int png_format;
   int depth;
 
@@ -370,11 +370,15 @@ gdk_save_png (GdkTexture *texture)
       return NULL;
     }
 
-  memtex = gdk_memory_texture_from_texture (texture, format);
+  gdk_texture_downloader_init (&downloader, texture);
+  gdk_texture_downloader_set_format (&downloader, format);
+  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
+  gdk_texture_downloader_finish (&downloader);
+  data = g_bytes_get_data (bytes, NULL);
 
   if (sigsetjmp (png_jmpbuf (png), 1))
     {
-      g_object_unref (memtex);
+      g_bytes_unref (bytes);
       g_free (io.data);
       png_destroy_read_struct (&png, &info, NULL);
       return NULL;
@@ -394,8 +398,6 @@ gdk_save_png (GdkTexture *texture)
   png_set_swap (png);
 #endif
 
-  data = gdk_memory_texture_get_data (memtex);
-  stride = gdk_memory_texture_get_stride (memtex);
   for (y = 0; y < height; y++)
     png_write_row (png, data + y * stride);
 
@@ -403,7 +405,7 @@ gdk_save_png (GdkTexture *texture)
 
   png_destroy_write_struct (&png, &info);
 
-  g_object_unref (memtex);
+  g_bytes_unref (bytes);
 
   return g_bytes_new_take (io.data, io.size);
 }

gdk/loaders/gdktiff.c

@@ -21,10 +21,9 @@
 
 #include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
-#include "gdkmemorytextureprivate.h"
+#include "gdkmemorytexture.h"
 #include "gdkprofilerprivate.h"
-#include "gdktexture.h"
-#include "gdktextureprivate.h"
+#include "gdktexturedownloaderprivate.h"
 
 #include <tiffio.h>
 
@@ -260,11 +259,12 @@ GBytes *
 gdk_save_tiff (GdkTexture *texture)
 {
   TIFF *tif;
-  int width, height, stride;
+  int width, height;
+  gsize stride;
   const guchar *line;
   const guchar *data;
-  GBytes *result = NULL;
-  GdkMemoryTexture *memtex;
+  GBytes *bytes, *result = NULL;
+  GdkTextureDownloader downloader;
   GdkMemoryFormat format;
   const FormatData *fdata = NULL;
 
@@ -292,9 +292,11 @@ gdk_save_tiff (GdkTexture *texture)
   TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
   TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
 
-  memtex = gdk_memory_texture_from_texture (texture, fdata->format);
-  data = gdk_memory_texture_get_data (memtex);
-  stride = gdk_memory_texture_get_stride (memtex);
+  gdk_texture_downloader_init (&downloader, texture);
+  gdk_texture_downloader_set_format (&downloader, fdata->format);
+  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
+  gdk_texture_downloader_finish (&downloader);
+  data = g_bytes_get_data (bytes, NULL);
 
   line = (const guchar *)data;
   for (int y = 0; y < height; y++)
@@ -302,7 +304,7 @@ gdk_save_tiff (GdkTexture *texture)
       if (TIFFWriteScanline (tif, (void *)line, y, 0) == -1)
         {
           TIFFClose (tif);
-          g_object_unref (memtex);
+          g_bytes_unref (bytes);
           return NULL;
         }
 
@@ -314,7 +316,7 @@ gdk_save_tiff (GdkTexture *texture)
 
   g_assert (result);
 
-  g_object_unref (memtex);
+  g_bytes_unref (bytes);
 
   return result;
 }

gdk/macos/GdkMacosWindow.c

@@ -27,10 +27,12 @@
 #import "GdkMacosView.h"
 #import "GdkMacosWindow.h"
 
-#include "gdkmacosclipboard-private.h"
 #include "gdkmacosdisplay-private.h"
+#include "gdkmacosdrag-private.h"
 #include "gdkmacosdrop-private.h"
+#include "gdkmacoseventsource-private.h"
 #include "gdkmacosmonitor-private.h"
+#include "gdkmacospasteboard-private.h"
 #include "gdkmacossurface-private.h"
 #include "gdkmacospopupsurface-private.h"
 #include "gdkmacostoplevelsurface-private.h"
@@ -144,7 +146,7 @@ typedef NSString *CALayerContentsGravity;
        *
        * TODO: Can we improve grab breaking to fix this?
        */
-      _gdk_macos_display_send_button_event ([self gdkDisplay], event);
+      _gdk_macos_display_send_event ([self gdkDisplay], event);
 
       _gdk_macos_display_break_all_grabs (GDK_MACOS_DISPLAY (display), time);
 
@@ -246,7 +248,7 @@ typedef NSString *CALayerContentsGravity;
   [view release];
 
   /* TODO: We might want to make this more extensible at some point */
-  _gdk_macos_clipboard_register_drag_types (self);
+  _gdk_macos_pasteboard_register_drag_types (self);
 
   return self;
 }
@@ -576,6 +578,8 @@ typedef NSString *CALayerContentsGravity;
   initialResizeLocation = convert_nspoint_to_screen (self, [self mouseLocationOutsideOfEventStream]);
 }
 
+// NSDraggingDestination protocol
+
 -(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
 {
   NSPoint location = [sender draggingLocation];
@@ -665,10 +669,64 @@ typedef NSString *CALayerContentsGravity;
   return NO;
 }
 
--(void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
+// NSDraggingSource protocol
+
+- (NSDragOperation)draggingSession:(NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context
 {
+  NSInteger sequence_number = [session draggingSequenceNumber];
+  GdkDisplay *display = gdk_surface_get_display (GDK_SURFACE (gdk_surface));
+  GdkDrag *drag = _gdk_macos_display_find_drag (GDK_MACOS_DISPLAY (display), sequence_number);
+  GdkModifierType state = _gdk_macos_display_get_current_keyboard_modifiers (GDK_MACOS_DISPLAY (display));
+
+  _gdk_macos_drag_set_actions (GDK_MACOS_DRAG (drag), state);
+
+  return _gdk_macos_drag_operation (GDK_MACOS_DRAG (drag));
 }
 
+- (void)draggingSession:(NSDraggingSession *)session willBeginAtPoint:(NSPoint)screenPoint
+{
+  NSInteger sequence_number = [session draggingSequenceNumber];
+  GdkDisplay *display = gdk_surface_get_display (GDK_SURFACE (gdk_surface));
+  GdkDrag *drag = _gdk_macos_display_find_drag (GDK_MACOS_DISPLAY (display), sequence_number);
+  int x, y;
+
+  _gdk_macos_display_from_display_coords (GDK_MACOS_DISPLAY (display), screenPoint.x, screenPoint.y, &x, &y);
+  _gdk_macos_drag_set_start_position (GDK_MACOS_DRAG (drag), x, y);
+  _gdk_macos_drag_surface_move (GDK_MACOS_DRAG (drag), x, y);
+}
+
+- (void)draggingSession:(NSDraggingSession *)session movedToPoint:(NSPoint)screenPoint
+{
+  NSInteger sequence_number = [session draggingSequenceNumber];
+  GdkMacosDisplay *display = GDK_MACOS_DISPLAY (gdk_surface_get_display (GDK_SURFACE (gdk_surface)));
+  GdkDrag *drag = _gdk_macos_display_find_drag (GDK_MACOS_DISPLAY (display), sequence_number);
+  int x, y;
+
+  _gdk_macos_display_send_event (display, [NSApp currentEvent]);
+
+  _gdk_macos_display_from_display_coords (display, screenPoint.x, screenPoint.y, &x, &y);
+  _gdk_macos_drag_surface_move (GDK_MACOS_DRAG (drag), x, y);
+}
+
+- (void)draggingSession:(NSDraggingSession *)session endedAtPoint:(NSPoint)screenPoint operation:(NSDragOperation)operation
+{
+  NSInteger sequence_number = [session draggingSequenceNumber];
+  GdkMacosDisplay *display = GDK_MACOS_DISPLAY (gdk_surface_get_display (GDK_SURFACE (gdk_surface)));
+  GdkDrag *drag = _gdk_macos_display_find_drag (display, sequence_number);
+
+  _gdk_macos_display_send_event (display, [NSApp currentEvent]);
+  gdk_drag_set_selected_action (drag, _gdk_macos_drag_ns_operation_to_action (operation));
+
+  if (gdk_drag_get_selected_action (drag) != 0)
+    g_signal_emit_by_name (drag, "drop-performed");
+  else
+    gdk_drag_cancel (drag, GDK_DRAG_CANCEL_NO_TARGET);
+
+  _gdk_macos_display_set_drag (display, [session draggingSequenceNumber], NULL);
+}
+
+// end
+
 -(void)setStyleMask:(NSWindowStyleMask)styleMask
 {
   gboolean was_fullscreen;

gdk/macos/GdkMacosWindow.h

@@ -32,7 +32,7 @@
 
 #define GDK_IS_MACOS_WINDOW(obj) ([obj isKindOfClass:[GdkMacosWindow class]])
 
-@interface GdkMacosWindow : NSWindow {
+@interface GdkMacosWindow : NSWindow <NSDraggingSource, NSDraggingDestination> {
   GdkMacosSurface *gdk_surface;
 
   BOOL             inMove;