wip: Add spirv dependencies for shaderc

This doesn't build, because spirv-tools wants the source location
for spirv-headers. Roll eyes

.gitlab-ci.yml

@@ -26,7 +26,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v48"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v49"
 
 workflow:
   rules:
@@ -66,7 +66,8 @@ style-check-diff:
       junit:
         - "${CI_PROJECT_DIR}/_build/report-x11.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland_gles2.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
@@ -103,8 +104,9 @@ fedora-x86_64:
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
-    - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
+    - .gitlab-ci/run-tests.sh _build x11 gtk
+    # only repeat test runs that are likely affected by test setups
+    - .gitlab-ci/run-tests.sh _build wayland_gl gtk:gdk,gtk:gsk-gl
 
 release-build:
   extends: .build-fedora-default
@@ -129,7 +131,9 @@ release-build:
     - meson install -C _build
     - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
-    - .gitlab-ci/run-tests.sh _build x11
+    - .gitlab-ci/run-tests.sh _build wayland gtk
+    # only repeat test runs that are likely affected by test setups
+    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk:gdk,gtk:gsk-gl
 
 fedora-clang:
   extends: .build-fedora-default
@@ -217,25 +221,32 @@ macos-x86_64:
     MESON_FORCE_BACKTRACKE: 1
     TMPDIR: /Users/Shared/work/tmp
     SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
-    CCACHE_DIR: /Users/Shared/work/ccache
     PIP_CACHE_DIR: /Users/Shared/build/cache
     PIPENV_CACHE_DIR: $PIP_CACHE_DIR
     PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
+    EXTRA_MESON_FLAGS: "-Dgobject-introspection:werror=false"
   before_script:
+    # Not using ccache on purpose as it accelerates the build so much that it
+    # can trigger race conditions in the gobject-introspection subproject.
     - bash .gitlab-ci/show-info-osx.sh
-    - python3 -m venv .venv
+    - /opt/macports/bin/python3.10 -m venv .venv
     - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
-    - ln -s /opt/ccache/ccache .venv/bin
+    - ln -s /opt/pkg-config/bin/pkg-config .venv/bin
+    - ln -s /opt/bison/bin/bison .venv/bin
     - source .venv/bin/activate
     - pip3 install meson==1.2.0
     - pip3 install ninja==1.11.1
+    - pip3 install /Users/Shared/build/pkgs/PyGObject-3.44.0-cp310-cp310-macosx_10_13_x86_64.whl
+                   /Users/Shared/build/pkgs/pycairo-1.23.0-cp310-cp310-macosx_10_13_x86_64.whl
   script:
-    - meson setup ${COMMON_MESON_FLAGS}
+    - meson setup
+            ${COMMON_MESON_FLAGS}
+            ${EXTRA_MESON_FLAGS}
             -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
             -Dmedia-gstreamer=disabled
-            -Dintrospection=disabled
+            -Dintrospection=enabled
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled
@@ -416,11 +427,12 @@ asan-build:
             -Df16c=disabled
             _build
     - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
-    - .gitlab-ci/run-tests.sh _build x11
+    - .gitlab-ci/run-tests.sh _build wayland gtk
   artifacts:
     when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:39
 
 RUN dnf -y install \
     adwaita-icon-theme \

.gitlab-ci/meson-html-report.py

@@ -324,7 +324,7 @@ for line in args.infile:
     units.append(unit)
 
 report = {}
-report['date'] = datetime.datetime.utcnow()
+report['date'] = datetime.datetime.now(datetime.UTC)
 report['locale_date'] = report['date'].strftime("%c")
 report['project_name'] = args.project_name
 report['backend'] = args.backend

.gitlab-ci/meson-junit-report.py

@@ -44,7 +44,7 @@ outfile = args.output
 testsuites = ET.Element('testsuites')
 testsuites.set('id', '{}/{}'.format(args.job_id, args.branch))
 testsuites.set('package', args.project_name)
-testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes'))
+testsuites.set('timestamp', datetime.datetime.now(datetime.UTC).isoformat(timespec='minutes'))
 
 suites = {}
 for line in args.infile:

.gitlab-ci/run-tests.sh

@@ -1,28 +1,31 @@
 #!/bin/bash
 
-set +x
+set -x
 set +e
 
 srcdir=$( pwd )
 builddir=$1
-backend=$2
+setup=$2
+suite=$3
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 
 # Ignore memory leaks lower in dependencies
 export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
 export G_SLICE=always-malloc
 
-case "${backend}" in
-  x11)
+case "${setup}" in
+  x11*)
     xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
+                --setup=${setup} \
+                --suite=${suite//,/ --suite=} \
                 --no-suite=failing \
+                --no-suite=${setup}_failing \
                 --no-suite=flaky \
+                --no-suite=headless \
                 --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
@@ -41,18 +44,19 @@ case "${backend}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
+                --setup=${setup} \
+                --suite=${suite//,/ --suite=} \
                 --no-suite=failing \
+                --no-suite=${setup}_failing \
                 --no-suite=flaky \
-                --no-suite=${backend}_failing \
+                --no-suite=headless \
                 --no-suite=gsk-compare-broadway
     exit_code=$?
 
     kill ${compositor}
     ;;
 
-  broadway)
+  broadway*)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
     ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
@@ -63,17 +67,19 @@ case "${backend}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
+                --setup=${setup} \
+                --suite=${suite//,/ --suite=} \
                 --no-suite=failing \
+                --no-suite=${setup}_failing \
                 --no-suite=flaky \
+                --no-suite=headless \
                 --no-suite=gsk-compare-opengl
 
     kill ${server}
     ;;
 
   *)
-    echo "Failed to add ${backend} to .gitlab-ci/run-tests.sh"
+    echo "Failed to add ${setup} to .gitlab-ci/run-tests.sh"
     exit 1
     ;;
 
@@ -83,17 +89,17 @@ cd ${builddir}
 
 $srcdir/.gitlab-ci/meson-junit-report.py \
             --project-name=gtk \
-            --backend="${backend}" \
+            --backend="${setup}" \
             --job-id="${CI_JOB_NAME}" \
-            --output="report-${backend}.xml" \
-            "meson-logs/testlog-${backend}.json"
+            --output="report-${setup}.xml" \
+            "meson-logs/testlog-${setup}.json"
 
 $srcdir/.gitlab-ci/meson-html-report.py \
             --project-name=gtk \
-            --backend="${backend}" \
+            --backend="${setup}" \
             --job-id="${CI_JOB_NAME}" \
-            --reftest-output-dir="testsuite/reftests/output/${backend}" \
-            --output="report-${backend}.html" \
-            "meson-logs/testlog-${backend}.json"
+            --reftest-output-dir="testsuite/reftests/output/${setup}" \
+            --output="report-${setup}.html" \
+            "meson-logs/testlog-${setup}.json"
 
 exit $exit_code

.gitlab-ci/test-msvc.bat

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

.gitlab-ci/test-msys2.sh

@@ -33,7 +33,8 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-python-gobject \
-    mingw-w64-$MSYS2_ARCH-shaderc
+    mingw-w64-$MSYS2_ARCH-shaderc \
+    mingw-w64-$MSYS2_ARCH-vulkan
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -47,7 +48,6 @@ meson \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \
-    -Dvulkan=disabled \
     -Dintrospection=enabled \
     -Dgtk:werror=true \
     _build

NEWS

@@ -1,4 +1,177 @@
-Overview of Changes in 4.13.1, xx-xx-xxxx
+Overview of Changes in 4.13.6, xx-xx-xxxx
+=========================================
+
+Overview of Changes in 4.13.5, 07-01-2024
+=========================================
+
+This release adds two new GSK renderers called vulkan and ngl,
+that are built from the same sources. The new renderers can
+handle many corner cases correctly that the current gl renderer
+does not handle, and they offer advantages such as antialiasing
+and supersampled gradients.
+
+The new renderers are still considered experimental, and GTK
+will only use them if they are explicitly selected using the
+GSK_RENDERER environment variable.
+
+As part of this work, the GSK include files have been rearranged.
+It is no longer necessary to include renderer-specific headers for
+ngl and vulkan (and doing so will trigger deprecation warnings),
+and their constructors are always available.
+
+The previously available experimental GdkVulkanContext APIs and
+the old Vulkan renderer have been removed.
+
+Vulkan is now enabled by default, and Linux distributions should
+build GTK with Vulkan support. This requires the glslc shader
+compiler as a new dependency.
+
+Vulkan is now also used for dmabuf support.
+
+* GtkDropdown:
+ - Fix display of initial selection
+
+* GtkShortcutsWindow:
+ - Make the window adapt to smaller screen widths
+
+* GtkTextView:
+ - Fix a possible NULL dereference in history
+
+* GDK:
+ - Make the png loader safer against overflows
+
+* GL:
+ - Fix some errors in handling of texture formats and mipmaps
+
+
+Overview of Changes in 4.13.4, 30-12-2023
+=========================================
+
+* GtkFileDialog:
+ - Return an error if no file is selected
+
+* GtkFileLauncher:
+ - Add a writable property
+
+* GtkFileChooserNative:
+ - Make closing portal file dialogs work
+
+* GtkEmojiChooser:
+ - Update Emoji data to CLDR v43
+
+* GtkStringList:
+ - Add item-type and n-itmes properties
+
+* Input:
+ - Respect GTK grabs on DND events
+ - Fix crossing event generation for enter/leave
+
+* Wayland:
+ - Avoid recreating wl_buffers needlessly
+ - Be more careful when loading cursors
+
+* Dmabuf:
+ - Add support for all Dmabuf formats
+ - Tweak the offload code a bit, allow offloading translucent
+   textures, as long as they are raised. Decline to offload
+   with fractional scales.
+
+* Accessibility:
+ - Add a few more accessible roles
+
+* GL:
+ - Use GLES by default
+ - Tweak GDK_DEBUG values. The new values are
+   gl-disable-gl, gl-disable-gles and gl-prefer-gl.
+   The gl-legacy and nograbs values have been dropped.
+
+* Css:
+ - Reduce memory consumption during theme loading
+ - Fix opacity handling
+
+* Theme:
+ - Refresh some of the included symbolic icons
+
+* MacOs:
+ - Silence secure-restore message
+
+* Build:
+ - Require Vulkan 1.3
+
+* Translation updates:
+ Chinese (China)
+ Czech
+ Hebrew
+ Icelandic
+ Polish
+ Russian
+
+
+Overview of Changes in 4.13.3, 15-11-2023
+=========================================
+
+* GtkGraphicsOffload: A new widget to support passthrough
+  of dmabuf textures with subsurfaces on Wayland
+
+* GtkListView:
+ - reduce tree indentation
+
+* GtkInspector:
+ - Show more GL information
+ - Add a subsurface overlay
+ - Improve the fps overlay
+
+* GDK
+ - Allow implicit modifiers for dmabufs
+ - Support more dmabuf formats: NV16, NV61, NV24, NV42
+   and 3-plane YUV formats
+
+* GSK
+ - Fix padding of icons in the GL atlas
+ - Fix handling of texture-scale nodes in cairo
+ - Treat texture-scale nodes more faithfully in GL
+
+* Accessibility:
+ - Tweak the accessible name computation for corner cases
+
+* The GTK/GDK/GSK_DEBUG environment variables now
+  work in productions as well as in debug builds
+
+* Translation updates
+ Catalan
+ French
+ Russian
+
+
+Overview of Changes in 4.13.2, 22-10-2023
+=========================================
+
+* GtkPrintdialog:
+ - New async-style api to replace GtkPrintOperation
+
+* GtkEmojiChooser:
+ - Add more languages: Bengali, Hindi, Japanese, Finnish,
+   Thai and Norwegian bokmål
+
+* Accessibility:
+ - Fix some utf8 handling issues
+
+* GDK:
+ - Add support for dmabuf textures, with GdkDmabufTextureBuilder
+ - Add a few more supported memory formats for textures
+
+* GSK:
+ - Add a fast-path for masking color
+ - Add support for importing dmabuf textures
+ - Handle GLES better by using some extensions
+
+* Translation updates:
+ Catalan
+ Russian
+ Turkish
+
+
+Overview of Changes in 4.13.1, 28-09-2023
 =========================================
 
 * GtkTooltip:
@@ -7,20 +180,32 @@ Overview of Changes in 4.13.1, xx-xx-xxxx
 * GtkCenterLayout, GtkEntry, GtkSearchEntry:
  - Fix some issues with baseline handling
 
+* GtkColorButton, GtkFontButton:
+ - Propagate focus-on-click
+
 * GtkFileChooser:
  - Make "Visit file" scroll to the file
 
 * GtkSwitch:
  - Respect text direction
 
+* GtkWindow:
+ - Don't assume titlebars are GtkHeaderBars
+
+* Printing:
+ - Fix some problems with the portal implementation
+ - Add a new simple print API: GtkPrintDialog
+
 * Paths:
  - GskPathMeasure performance has been improved
  - Add custom contours for circles, rounded rectangles and rectangles
  - Simplify GskPathPoint handling
  - gsk_path_point_get_closest_point now returns the distance as well
+ - Make GskPathBuilder simplify curves
 
 * Input:
  - Handle (some) single-key compose sequences
+ - Fix active state tracking with sensitivity changes and grabs
 
 * GSK:
  - Make the repeated gradients match between GL and cairo
@@ -29,6 +214,13 @@ Overview of Changes in 4.13.1, xx-xx-xxxx
  - Restrict an optimization to the cases where it is crrect
  - Fix rendering of shadows with opacity
  - The Vulkan renderer now requires Vulkan 1.2
+ - GL: Transition gradients unpremultiplied
+ - GL: Fix clipping of shadows
+ - GL: Some optimizations
+ - Broadway: Fix memory leaks in the renderer
+
+* Wayland:
+ - Make activation more reliable
 
 * macOS:
  - Clamp damage regions to the surface size
@@ -43,20 +235,29 @@ Overview of Changes in 4.13.1, xx-xx-xxxx
 * Build:
  - Fix build problems with C++ compilers
 
+* Deprecations:
+ - gtk_window_present_with_time
+
 * Translation updates
  Brazilian Portuguese
  British English
  Catalan
+ Chinese (China)
  Czech
  Danish
+ Dutch
+ Esperanto
  Galician
  Georgian
  Italian
  Korean
+ Latvian
  Lithuanian
+ Persian
  Polish
  Punjabi
  Slovenian
+ Turkish
 
 
 Overview of Changes in 4.13.0, 25-08-2023
@@ -321,7 +522,7 @@ Overview of Changes in 4.11.4, 03-07-2023
  - Center newly created transient windows
 
 * Vulkan:
- - Add antialising for gradients
+ - Add antialiasing for gradients
  - Do less work on clipped away nodes
  - Redo image uploading
  - Support different image depths and formats
@@ -1305,7 +1506,7 @@ Overview of Changes in 4.7.0, 07-05-2022
  - Event handling fixes
  - Fix keyboard input on popovers
  - Support OpenGL-based video playback
- - Suport fullscreen
+ - Support fullscreen
  - Improve native filechoooser size allocation
  - Use CALayer and IOSurface for rendering
  - Use a per-monitor CVDisplayLink
@@ -1702,7 +1903,7 @@ Overview of Changes in 4.4.0
  - Activate when moving focus
 
 * GtkLabel:
- - Propertly ignore double underscores for mnemonics
+ - Properly ignore double underscores for mnemonics
 
 * GtkPopoverMenu:
  - Fix focus cycling
@@ -2249,7 +2450,7 @@ Overview of Changes in 4.1.0
  - Set sort arrows in CSS
  - Set menu button arrows in CSS
  - Make scrollbars larger
- - Supprt circular menubuttons
+ - Support circular menubuttons
 
 * CSS:
  - Implement transform-origin

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

@@ -63,6 +63,70 @@
                 }
             ]
         },
+        {
+            "name": "spirv-headers",
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "cleanup": [ "/bin", "/lib/cmake", "/lib/pkgconfig", "/include" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/KhronosGroup/SPIRV-Headers.git",
+                    "branch": "main"
+                }
+            ]
+        },
+        {
+            "name": "spirv-tools",
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "config-opts": [
+                "-DCMAKE_SKIP_RPATH:BOOL=yes",
+                "-DSPIRV_WERROR=Off",
+                "-DSPIRV-Headers_SOURCE_DIR=\"/app/include\"",
+                "-DSPIRV_TOOLS_BUILD_STATIC:BOOL=ON"
+            ],
+            "cleanup": [ "/bin", "/lib/cmake", "/lib/pkgconfig", "/include" ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/KhronosGroup/SPIRV-Tools.git",
+                    "branch": "main"
+                }
+            ]
+        },
+        {
+            "name": "shaderc",
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "config-opts": [
+                "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON",
+                "-DSHADERC_SKIP_EXAMPLES=ON",
+                "-DSHADERC_SKIP_TESTS=ON"
+            ],
+            "cleanup": [ "/bin", "/lib/cmake", "/lib/pkgconfig", "/include" ],
+            "post-install": [
+                "install -D /lib/$(gcc --print-multiarch)/libSPIRV*.so /app/lib"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "archive-type": "tar",
+                    "url": "https://api.github.com/repos/google/shaderc/tarball/refs/tags/v2021.3",
+                    "sha256": "b7e54b23a83343d5e2da836d8833ae0db11926141955edf845e35d4dc1eb88d1"
+                },
+                {
+                    "type": "shell",
+                    "commands": [
+                        "sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/src/compiler.cc",
+                        "sed -i 's|add_subdirectory(third_party)||' CMakeLists.txt",
+                        "sed -i 's|add_custom_target(build-version|set(NOT_USE|' CMakeLists.txt",
+                        "LIB=/lib/$(gcc --print-multiarch)\nVER_MATCH=\"[0-9]+\\.[^\\. ]+\"\nSHADERC=$(grep -m1 -oP \"^v$VER_MATCH\" CHANGES)\nSPIRV=v$(grep -oP \"(?<=Version:.)$VER_MATCH\" $LIB/pkgconfig/SPIRV-Tools-shared.pc)\nGLSLANG=v$(realpath $LIB/libglslang.so | grep -oP \"(?<=so.)$VER_MATCH\")\ncat <<- EOF > glslc/src/build-version.inc\n  \"shaderc $SHADERC\"\n  \"spirv-tools $SPIRV\"\n  \"glslang $GLSLANG\"\nEOF",
+                        "cat glslc/src/build-version.inc"
+                    ]
+                }
+            ]
+        },
         {
             "name" : "libsass",
             "buildsystem" : "meson",
@@ -185,7 +249,6 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
-                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],
@@ -200,7 +263,6 @@
     ],
     "build-options" : {
         "env" : {
-            "GSK_RENDERER" : "opengl"
         }
     }
 }

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

@@ -114,7 +114,6 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
-                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],

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

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

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

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

build-aux/msvc/msvc_recommended_pragmas.h

@@ -0,0 +1,41 @@
+#ifndef _MSC_VER
+#pragma error "This header is for Microsoft VC or clang-cl only."
+#endif /* _MSC_VER */
+
+/* Make MSVC more pedantic, this is a recommended pragma list
+ * from _Win32_Programming_ by Rector and Newcomer.
+ */
+#ifndef __clang__
+#pragma warning(error:4002) /* too many actual parameters for macro */
+#pragma warning(error:4003) /* not enough actual parameters for macro */
+#pragma warning(1:4010)     /* single-line comment contains line-continuation character */
+#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
+#pragma warning(1:4016)     /* no function return type; using int as default */
+#pragma warning(error:4020) /* too many actual parameters */
+#pragma warning(error:4021) /* too few actual parameters */
+#pragma warning(error:4027) /* function declared without formal parameter list */
+#pragma warning(error:4029) /* declared formal parameter list different from definition */
+#pragma warning(error:4033) /* 'function' must return a value */
+#pragma warning(error:4035) /* 'function' : no return value */
+#pragma warning(error:4045) /* array bounds overflow */
+#pragma warning(error:4047) /* different levels of indirection */
+#pragma warning(error:4049) /* terminating line number emission */
+#pragma warning(error:4053) /* An expression of type void was used as an operand */
+#pragma warning(error:4071) /* no function prototype given */
+#pragma warning(disable:4101) /* unreferenced local variable */
+#pragma warning(error:4150)
+
+/* G_NORETURN */
+#pragma warning(error:4646) /* function declared with __declspec(noreturn) has non-void return type */
+#pragma warning(error:4715) /* 'function': not all control paths return a value */
+#pragma warning(error:4098) /* 'void' function returning a value */
+
+#pragma warning(disable:4244)	/* No possible loss of data warnings */
+#pragma warning(disable:4305)   /* No truncation from int to char warnings */
+
+#pragma warning(error:4819) /* The file contains a character that cannot be represented in the current code page */
+#endif                      /* __clang__ */
+
+/* work around Microsoft's premature attempt to deprecate the C-Library */
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_WARNINGS

demos/gtk-demo/application.c

@@ -35,7 +35,7 @@ show_action_dialog (GSimpleAction *action)
 {
   GtkAlertDialog *dialog;
 
-  dialog = gtk_alert_dialog_new ("You activated action: \"%s\n",
+  dialog = gtk_alert_dialog_new ("You activated action: \"%s\"",
                                  g_action_get_name (G_ACTION (action)));
   gtk_alert_dialog_show (dialog, NULL);
   g_object_unref (dialog);

demos/gtk-demo/bluroverlay.h

@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __BLUR_OVERLAY_H__
-#define __BLUR_OVERLAY_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -60,5 +59,3 @@ void       blur_overlay_set_child   (BlurOverlay *overlay,
                                      GtkWidget   *widget);
 
 G_END_DECLS
-
-#endif /* __BLUR_OVERLAY_H__ */

demos/gtk-demo/demo3widget.c

@@ -75,7 +75,9 @@ query_tooltip (GtkWidget  *widget,
   gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
 
   precision = 1;
+  s = NULL;
   do {
+    g_free (s);
     s = g_strdup_printf ("%.*f", precision, self->scale);
     l = strlen (s) - 1;
     while (s[l] == '0')

demos/gtk-demo/demotaggedentry.h

@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DEMO_TAGGED_ENTRY_H__
-#define __DEMO_TAGGED_ENTRY_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -57,5 +56,3 @@ void            demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *
                                                             gboolean            has_close_button);
 
 G_END_DECLS
-
-#endif /* __DEMO_TAGGED_ENTRY_H__ */

demos/gtk-demo/demowidget.c

@@ -34,7 +34,7 @@ transition (GtkWidget     *widget,
 {
   DemoWidget *self = DEMO_WIDGET (widget);
   DemoLayout *demo_layout = DEMO_LAYOUT (gtk_widget_get_layout_manager (widget));
-  gint64 now = g_get_monotonic_time ();
+  gint64 now = gdk_frame_clock_get_frame_time (frame_clock);
 
   gtk_widget_queue_allocate (widget);
 
@@ -66,11 +66,13 @@ clicked (GtkGestureClick *gesture,
          gpointer         data)
 {
   DemoWidget *self = data;
+  GdkFrameClock *frame_clock;
 
   if (self->tick_id != 0)
     return;
 
-  self->start_time = g_get_monotonic_time ();
+  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (self));
+  self->start_time = gdk_frame_clock_get_frame_time (frame_clock);
   self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self), transition, NULL, NULL);
 }
 

demos/gtk-demo/fishbowl.c

@@ -74,14 +74,7 @@ create_blurred_button (void)
 static GtkWidget *
 create_font_button (void)
 {
-  GtkFontDialog *dialog;
-  GtkWidget *button;
-
-  dialog = gtk_font_dialog_new ();
-  button = gtk_font_dialog_button_new (dialog);
-  g_object_unref (dialog);
-
-  return button;
+  return gtk_font_dialog_button_new (gtk_font_dialog_new ());
 }
 
 static GtkWidget *

demos/gtk-demo/font_features.c

@@ -1586,7 +1586,7 @@ update_font_variations (void)
         }
 
       gtk_grid_attach (GTK_GRID (demo->variations_grid), combo, 1, -1, 3, 1);
-      g_signal_connect (combo, "notify::selecte", G_CALLBACK (instance_changed), NULL);
+      g_signal_connect (combo, "notify::selected", G_CALLBACK (instance_changed), NULL);
       demo->instance_combo = combo;
    }
 

demos/gtk-demo/fontplane.h

@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_FONT_PLANE_H__
-#define __GTK_FONT_PLANE_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -60,5 +59,3 @@ GtkWidget * gtk_font_plane_new      (GtkAdjustment *width_adj,
                                      GtkAdjustment *weight_adj);
 
 G_END_DECLS
-
-#endif /* __GTK_FONT_PLANE_H__ */

demos/gtk-demo/gskshaderpaintable.h

@@ -17,8 +17,7 @@
  * Authors: Matthias Clasen <mclasen@redhat.com>
  */
 
-#ifndef __GSK_SHADER_PAINTABLE_H__
-#define __GSK_SHADER_PAINTABLE_H__
+#pragma once
 
 #include <gdk/gdk.h>
 #include <gsk/gsk.h>
@@ -42,5 +41,3 @@ void             gsk_shader_paintable_update_time      (GskShaderPaintable *self
                                                         int                 time_idx,
                                                         gint64              frame_time);
 G_END_DECLS
-
-#endif /* __GSK_SHADER_PAINTABLE_H__ */

demos/gtk-demo/gtkfishbowl.h

@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_FISHBOWL_H__
-#define __GTK_FISHBOWL_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -65,5 +64,3 @@ void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
                                            GtkFishCreationFunc creation_func);
 
 G_END_DECLS
-
-#endif /* __GTK_FISHBOWL_H__ */

demos/gtk-demo/gtkgears.h

@@ -1,5 +1,4 @@
-#ifndef __GTK_GEARS_H__
-#define __GTK_GEARS_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -44,5 +43,3 @@ void       gtk_gears_set_fps_label (GtkGears *gears,
 
 
 G_END_DECLS
-
-#endif /* __GTK_GEARS_H__ */

demos/gtk-demo/gtkshaderbin.h

@@ -1,5 +1,4 @@
-#ifndef __GTK_SHADER_BIN_H__
-#define __GTK_SHADER_BIN_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -19,5 +18,3 @@ void       gtk_shader_bin_set_child   (GtkShaderBin *self,
 GtkWidget *gtk_shader_bin_get_child   (GtkShaderBin *self);
 
 G_END_DECLS
-
-#endif /* __GTK_SHADER_BIN_H__ */

demos/gtk-demo/gtkshaderstack.h

@@ -1,5 +1,4 @@
-#ifndef __GTK_SHADER_STACK_H__
-#define __GTK_SHADER_STACK_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -19,5 +18,3 @@ void        gtk_shader_stack_set_active   (GtkShaderStack *self,
                                            int             index);
 
 G_END_DECLS
-
-#endif /* __GTK_SHADER_STACK_H__ */

demos/gtk-demo/gtkshadertoy.h

@@ -1,5 +1,4 @@
-#ifndef __GTK_SHADERTOY_H__
-#define __GTK_SHADERTOY_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -30,5 +29,3 @@ void        gtk_shadertoy_set_image_shader (GtkShadertoy *shadertoy,
                                             const char   *shader);
 
 G_END_DECLS
-
-#endif /* __GTK_SHADERTOY_H__ */

demos/gtk-demo/language-names.h

@@ -1,5 +1,4 @@
-#ifndef LANGUAGE_NAMES_H
-#define LANGUAGE_NAMES_H
+#pragma once
 
 #include <pango/pango.h>
 
@@ -9,5 +8,3 @@ const char * get_language_name (PangoLanguage *language);
 const char * get_language_name_for_tag (guint32 tag);
 
 G_END_DECLS
-
-#endif

demos/gtk-demo/paintable.c

@@ -53,7 +53,9 @@ gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
                       double         rotation)
 {
 #define RADIUS 0.3
-  cairo_t *cr;
+  GskPathBuilder *builder;
+  GskPath *path;
+  GskStroke *stroke;
   double size;
 
   gtk_snapshot_append_color (snapshot,
@@ -61,24 +63,29 @@ gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
                              &GRAPHENE_RECT_INIT (0, 0, width, height));
 
   size = MIN (width, height);
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT ((width - size) / 2.0,
-                                                       (height - size) / 2.0,
-                                                       size, size));
-  gdk_cairo_set_source_rgba (cr, foreground);
-  cairo_translate (cr, width / 2.0, height / 2.0);
-  cairo_scale (cr, size, size);
-  cairo_rotate (cr, rotation);
 
-  cairo_arc (cr, 0, 0, 0.1, - G_PI, G_PI);
-  cairo_fill (cr);
+  gtk_snapshot_save (snapshot);
 
-  cairo_set_line_width (cr, RADIUS);
-  cairo_set_dash (cr, (double[1]) { RADIUS * G_PI / 3 }, 1, 0.0);
-  cairo_arc (cr, 0, 0, RADIUS, - G_PI, G_PI);
-  cairo_stroke (cr);
+  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2.0, height / 2.0));
+  gtk_snapshot_scale (snapshot, size, size);
+  gtk_snapshot_rotate (snapshot, rotation);
 
-  cairo_destroy (cr);
+  builder = gsk_path_builder_new ();
+  gsk_path_builder_add_circle (builder, graphene_point_zero (), 0.1);
+  path = gsk_path_builder_free_to_path (builder);
+  gtk_snapshot_append_fill (snapshot, path, GSK_FILL_RULE_WINDING, foreground);
+  gsk_path_unref (path);
+
+  stroke = gsk_stroke_new (RADIUS);
+  gsk_stroke_set_dash (stroke, (float[1]) { RADIUS * G_PI / 3 }, 1);
+  builder = gsk_path_builder_new ();
+  gsk_path_builder_add_circle (builder, graphene_point_zero(), RADIUS);
+  path = gsk_path_builder_free_to_path (builder);
+  gtk_snapshot_append_stroke (snapshot, path, stroke, foreground);
+  gsk_path_unref (path);
+  gsk_stroke_free (stroke);
+
+  gtk_snapshot_restore (snapshot);
 }
 
 /* Here, we implement the functionality required by the GdkPaintable interface */

demos/gtk-demo/paintable.h

@@ -1,5 +1,4 @@
-#ifndef __PAINTABLE_H__
-#define __PAINTABLE_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -13,5 +12,3 @@ void            gtk_nuclear_snapshot           (GtkSnapshot     *snapshot,
 GdkPaintable *  gtk_nuclear_icon_new            (double          rotation);
 GdkPaintable *  gtk_nuclear_animation_new       (gboolean        draw_background);
 GtkMediaStream *gtk_nuclear_media_stream_new    (void);
-
-#endif /* __PAINTABLE_H__ */

demos/gtk-demo/paintable_animated.c

@@ -70,7 +70,7 @@ gtk_nuclear_animation_snapshot (GdkPaintable *paintable,
                           ? &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 } /* yellow */
                           : &(GdkRGBA) { 0, 0, 0, 0 }, /* transparent */
                         width, height,
-                        2 * G_PI * nuclear->progress / MAX_PROGRESS);
+                        360 * nuclear->progress / MAX_PROGRESS);
 }
 
 static GdkPaintable *
@@ -85,7 +85,7 @@ gtk_nuclear_animation_get_current_image (GdkPaintable *paintable)
    * Luckily we added the rotation property to the nuclear icon
    * object previously, so we can just return an instance of that one.
    */
-  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / MAX_PROGRESS);
+  return gtk_nuclear_icon_new (360 * nuclear->progress / MAX_PROGRESS);
 }
 
 static GdkPaintableFlags

demos/gtk-demo/paintable_mediastream.c

@@ -76,7 +76,7 @@ gtk_nuclear_media_stream_snapshot (GdkPaintable *paintable,
                         &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
                         &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 }, /* yellow */
                         width, height,
-                        2 * G_PI * nuclear->progress / DURATION);
+                        360 * nuclear->progress / DURATION);
 }
 
 static GdkPaintable *
@@ -85,7 +85,7 @@ gtk_nuclear_media_stream_get_current_image (GdkPaintable *paintable)
   GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (paintable);
 
   /* Same thing as with the animation */
-  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / DURATION);
+  return gtk_nuclear_icon_new (360 * nuclear->progress / DURATION);
 }
 
 static GdkPaintableFlags

demos/gtk-demo/path_fill.c

@@ -2,10 +2,13 @@
  *
  * This demo shows how to use GskPath to draw shapes that are (a bit)
  * more complex than a rounded rectangle.
+ *
+ * It also demonstrates printing to a stream with GtkPrintDialog.
  */
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <cairo-pdf.h>
 
 #include "paintable.h"
 
@@ -165,6 +168,89 @@ gtk_logo_paintable_new (void)
   return GDK_PAINTABLE (self);
 }
 
+static cairo_status_t
+write_cairo (void                *closure,
+             const unsigned char *data,
+             unsigned int         length)
+{
+  GOutputStream *stream = closure;
+  gsize written;
+  GError *error = NULL;
+
+  if (!g_output_stream_write_all (stream, data, length, &written, NULL, &error))
+    {
+      g_print ("Error writing pdf stream: %s\n", error->message);
+      g_error_free (error);
+      return CAIRO_STATUS_WRITE_ERROR;
+    }
+
+  return CAIRO_STATUS_SUCCESS;
+}
+
+static void
+print_ready (GObject      *source,
+             GAsyncResult *result,
+             gpointer      data)
+{
+  GtkPrintDialog *dialog = GTK_PRINT_DIALOG (source);
+  GError *error = NULL;
+  GOutputStream *stream;
+  GtkSnapshot *snapshot;
+  GdkPaintable *paintable;
+  GskRenderNode *node;
+  cairo_surface_t *surface;
+  cairo_t *cr;
+
+  stream = gtk_print_dialog_print_finish (dialog, result, &error);
+  if (stream == NULL)
+    {
+      g_print ("Failed to get output stream: %s\n", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  snapshot = gtk_snapshot_new ();
+  paintable = gtk_picture_get_paintable (GTK_PICTURE (data));
+  gdk_paintable_snapshot (paintable, snapshot, 100, 100);
+  node = gtk_snapshot_free_to_node (snapshot);
+
+  surface = cairo_pdf_surface_create_for_stream (write_cairo, stream, 100, 100);
+  cr = cairo_create (surface);
+
+  gsk_render_node_draw (node, cr);
+
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+  gsk_render_node_unref (node);
+
+  if (!g_output_stream_close (stream, NULL, &error))
+    {
+      g_print ("Error from close: %s\n", error->message);
+      g_error_free (error);
+    }
+
+  g_object_unref (stream);
+}
+
+static void
+print (GtkButton *button,
+       gpointer   data)
+{
+  GtkWidget *picture = data;
+  GtkPrintDialog *dialog;
+
+  dialog = gtk_print_dialog_new ();
+
+  gtk_print_dialog_print (dialog,
+                          GTK_WINDOW (gtk_widget_get_root (picture)),
+                          NULL,
+                          NULL,
+                          print_ready,
+                          picture);
+
+  g_object_unref (dialog);
+}
+
 GtkWidget *
 do_path_fill (GtkWidget *do_widget)
 {
@@ -172,12 +258,21 @@ do_path_fill (GtkWidget *do_widget)
 
   if (!window)
     {
+      GtkWidget *header, *button, *label;
       GtkWidget *picture;
       GdkPaintable *paintable;
 
       window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      gtk_window_set_default_size (GTK_WINDOW (window), 100, 100);
       gtk_window_set_title (GTK_WINDOW (window), "Fill and Stroke");
+      header = gtk_header_bar_new ();
+      button = gtk_button_new_from_icon_name ("printer-symbolic");
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
+      label = gtk_label_new ("Fill and Stroke");
+      gtk_widget_add_css_class (label, "title");
+      gtk_header_bar_set_title_widget (GTK_HEADER_BAR (header), label);
+      gtk_window_set_titlebar (GTK_WINDOW (window), header);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paintable = gtk_logo_paintable_new ();
@@ -186,6 +281,8 @@ do_path_fill (GtkWidget *do_widget)
       gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
       g_object_unref (paintable);
 
+      g_signal_connect (button, "clicked", G_CALLBACK (print), picture);
+
       gtk_window_set_child (GTK_WINDOW (window), picture);
     }
 

demos/gtk-demo/path_spinner.c

@@ -9,6 +9,8 @@
 
 #include "paintable.h"
 
+#undef SHOW_CONTROLS
+
 #define GTK_TYPE_SPINNER_PAINTABLE (gtk_spinner_paintable_get_type ())
 G_DECLARE_FINAL_TYPE (GtkSpinnerPaintable, gtk_spinner_paintable, GTK, SPINNER_PAINTABLE, GObject)
 
@@ -150,6 +152,7 @@ static gboolean
 add_controls (GskPathOperation        op,
               const graphene_point_t *pts,
               gsize                   n_pts,
+              float                   weight,
               gpointer                data)
 {
   GskPathBuilder *builder = data;
@@ -166,7 +169,7 @@ add_controls (GskPathOperation        op,
       break;
 
     case GSK_PATH_QUAD:
-    case GSK_PATH_ARC:
+    case GSK_PATH_CONIC:
       gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
       gsk_path_builder_line_to (builder, pts[2].x, pts[2].y);
       break;

demos/gtk-demo/pickers.c

@@ -1,8 +1,9 @@
 /* Pickers and Launchers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkFileLauncher, GtkUriLauncher
+ * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkPrintDialog, GtkFileLauncher, GtkUriLauncher
  *
  * The dialogs are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts and applications.
+ * They allow to select colors, fonts and files. There is also a
+ * print dialog.
  *
  * The launchers let you open files or URIs in applications that
  * can handle them.
@@ -11,11 +12,13 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *app_picker;
+static GtkWidget *print_button;
 
 static void
 set_file (GFile    *file,
           gpointer  data)
 {
+  GFileInfo *info;
   char *name;
 
   if (!file)
@@ -31,6 +34,13 @@ set_file (GFile    *file,
 
   gtk_widget_set_sensitive (app_picker, TRUE);
   g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
+
+  info = g_file_query_info (file, "standard::content-type", 0, NULL, NULL);
+  if (strcmp (g_file_info_get_content_type (info), "application/pdf") == 0)
+    {
+      gtk_widget_set_sensitive (print_button, TRUE);
+      g_object_set_data_full (G_OBJECT (print_button), "file", g_object_ref (file), g_object_unref);
+    }
 }
 
 static void
@@ -47,6 +57,10 @@ 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);
+      gtk_widget_set_sensitive (print_button, FALSE);
+      g_object_set_data (G_OBJECT (print_button), "file", NULL);
     }
 
   set_file (file, data);
@@ -114,6 +128,53 @@ open_app (GtkButton *picker)
   g_object_unref (launcher);
 }
 
+static void
+print_file_done (GObject      *source,
+                 GAsyncResult *result,
+                 gpointer      data)
+{
+  GtkPrintDialog *dialog = GTK_PRINT_DIALOG (source);
+  GError *error = NULL;
+  GCancellable *cancellable;
+  unsigned int id;
+
+  cancellable = g_task_get_cancellable (G_TASK (result));
+  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (cancellable), "timeout"));
+  if (id)
+    g_source_remove (id);
+
+  if (!gtk_print_dialog_print_file_finish (dialog, result, &error))
+    {
+      g_print ("%s\n", error->message);
+      g_error_free (error);
+    }
+}
+
+static void
+print_file (GtkButton *picker)
+{
+  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
+  GtkPrintDialog *dialog;
+  GCancellable *cancellable;
+  GFile *file;
+  unsigned int id;
+
+  file = G_FILE (g_object_get_data (G_OBJECT (picker), "file"));
+  dialog = gtk_print_dialog_new ();
+
+  cancellable = g_cancellable_new ();
+
+  id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
+                                   20,
+                                   abort_mission, g_object_ref (cancellable), g_object_unref);
+  g_object_set_data (G_OBJECT (cancellable), "timeout", GUINT_TO_POINTER (id));
+
+  gtk_print_dialog_print_file (dialog, parent, NULL, file, cancellable, print_file_done, NULL);
+
+  g_object_unref (cancellable);
+  g_object_unref (dialog);
+}
+
 static void
 open_uri_done (GObject      *source,
                GAsyncResult *result,
@@ -234,8 +295,14 @@ do_pickers (GtkWidget *do_widget)
     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);
 
+    print_button = gtk_button_new_from_icon_name ("printer-symbolic");
+    gtk_widget_set_tooltip_text (print_button, "Print file");
+    gtk_widget_set_sensitive (print_button, FALSE);
+    g_signal_connect (print_button, "clicked", G_CALLBACK (print_file), NULL);
+    gtk_box_append (GTK_BOX (picker), print_button);
+
+    gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 
     label = gtk_label_new ("URI:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);

demos/gtk-demo/puzzlepiece.h

@@ -1,5 +1,4 @@
-#ifndef __PUZZLE_PIECE_H__
-#define __PUZZLE_PIECE_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -19,5 +18,3 @@ GdkPaintable *  gtk_puzzle_piece_new            (GdkPaintable           *puzzle,
 GdkPaintable *  gtk_puzzle_piece_get_puzzle     (GtkPuzzlePiece         *self);
 guint           gtk_puzzle_piece_get_x          (GtkPuzzlePiece         *self);
 guint           gtk_puzzle_piece_get_y          (GtkPuzzlePiece         *self);
-
-#endif /* __PUZZLE_PIECE_H__ */

demos/gtk-demo/script-names.h

@@ -1,5 +1,4 @@
-#ifndef SCRIPT_NAMES_H
-#define SCRIPT_NAMES_H
+#pragma once
 
 #include <glib.h>
 
@@ -9,5 +8,3 @@ const char * get_script_name (GUnicodeScript script);
 const char * get_script_name_for_tag (guint32 tag);
 
 G_END_DECLS
-
-#endif

demos/gtk-demo/video_player.c

@@ -139,6 +139,7 @@ do_video_player (GtkWidget *do_widget)
 
       video = gtk_video_new ();
       gtk_video_set_autoplay (GTK_VIDEO (video), TRUE);
+      gtk_video_set_graphics_offload (GTK_VIDEO (video), GTK_GRAPHICS_OFFLOAD_ENABLED);
       gtk_window_set_child (GTK_WINDOW (window), video);
 
       title = gtk_header_bar_new ();

demos/icon-browser/iconbrowserapp.h

@@ -1,5 +1,4 @@
-#ifndef __ICON_BROWSER_APP_H
-#define __ICON_BROWSER_APP_H
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -14,6 +13,3 @@ typedef struct _IconBrowserAppClass  IconBrowserAppClass;
 
 GType           icon_browser_app_get_type    (void);
 IconBrowserApp *icon_browser_app_new         (void);
-
-
-#endif /* __ICON_BROWSER_APP_H */

demos/icon-browser/iconbrowserwin.h

@@ -1,5 +1,4 @@
-#ifndef __ICON_BROWSER_WIN_H
-#define __ICON_BROWSER_WIN_H
+#pragma once
 
 #include <gtk/gtk.h>
 #include "iconbrowserapp.h"
@@ -15,6 +14,3 @@ typedef struct _IconBrowserWindowClass    IconBrowserWindowClass;
 
 GType              icon_browser_window_get_type     (void);
 IconBrowserWindow *icon_browser_window_new          (IconBrowserApp    *app);
-
-
-#endif /* __ICON_BROWSER_WIN_H */

demos/node-editor/gtkrendererpaintableprivate.h

@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __GTK_RENDERER_PAINTABLE_H__
-#define __GTK_RENDERER_PAINTABLE_H__
+#pragma once
 
 #include <gsk/gsk.h>
 
@@ -39,5 +38,3 @@ void            gtk_renderer_paintable_set_paintable      (GtkRendererPaintable
 GdkPaintable *  gtk_renderer_paintable_get_paintable      (GtkRendererPaintable *self) G_GNUC_PURE;
 
 G_END_DECLS
-
-#endif /* __GTK_RENDERER_PAINTABLE_H__ */

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

@@ -19,6 +19,10 @@
 
 #include "config.h"
 
+#ifdef HAVE_PANGOFT
+#include <pango/pangofc-fontmap.h>
+#endif
+
 #include "node-editor-application.h"
 
 #include "node-editor-window.h"
@@ -45,11 +49,47 @@ struct _NodeEditorApplicationClass
   GtkApplicationClass parent_class;
 };
 
-G_DEFINE_TYPE(NodeEditorApplication, node_editor_application, GTK_TYPE_APPLICATION);
+G_DEFINE_TYPE (NodeEditorApplication, node_editor_application, GTK_TYPE_APPLICATION);
+
+static void
+maybe_add_test_fonts (void)
+{
+#ifdef HAVE_PANGOFT
+  const char *subdir = "testsuite/gsk/fonts";
+  const char *source_dir;
+  char *dir;
+
+  source_dir = g_getenv ("GTK_SOURCE_DIR");
+
+  if (source_dir)
+    {
+      char *abs_source_dir = g_canonicalize_filename (source_dir, NULL);
+      dir = g_canonicalize_filename (subdir, abs_source_dir);
+      g_free (abs_source_dir);
+    }
+  else
+    {
+      char *current_dir = g_get_current_dir ();
+      dir = g_canonicalize_filename (subdir, current_dir);
+      g_free (current_dir);
+    }
+
+  if (g_file_test (dir, G_FILE_TEST_EXISTS))
+    {
+      FcConfig *config;
+
+      config = FcConfigGetCurrent ();
+      FcConfigAppFontAddDir (config, (const FcChar8 *) dir);
+    }
+
+  g_free (dir);
+#endif
+}
 
 static void
 node_editor_application_init (NodeEditorApplication *app)
 {
+  maybe_add_test_fonts ();
 }
 
 static void

demos/node-editor/node-editor-application.h

@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __NODE_EDITOR_APPLICATION_H__
-#define __NODE_EDITOR_APPLICATION_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -33,6 +32,3 @@ typedef struct _NodeEditorApplicationClass  NodeEditorApplicationClass;
 
 GType           node_editor_application_get_type    (void);
 NodeEditorApplication *node_editor_application_new         (void);
-
-
-#endif /* __NODE_EDITOR_APPLICATION_H__ */

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

@@ -24,13 +24,9 @@
 #include "gtkrendererpaintableprivate.h"
 
 #include "gsk/gskrendernodeparserprivate.h"
-#include "gsk/gl/gskglrenderer.h"
 #ifdef GDK_WINDOWING_BROADWAY
 #include "gsk/broadway/gskbroadwayrenderer.h"
 #endif
-#ifdef GDK_RENDERING_VULKAN
-#include "gsk/vulkan/gskvulkanrenderer.h"
-#endif
 
 #include <cairo.h>
 #ifdef CAIRO_HAS_SVG_SURFACE
@@ -794,7 +790,7 @@ create_cairo_texture (NodeEditorWindow *self)
     return NULL;
 
   renderer = gsk_cairo_renderer_new ();
-  gsk_renderer_realize (renderer, NULL, NULL);
+  gsk_renderer_realize_for_display (renderer, gtk_widget_get_display (GTK_WIDGET (self)), NULL);
 
   texture = gsk_renderer_render_texture (renderer, node, NULL);
   gsk_render_node_unref (node);
@@ -866,11 +862,11 @@ export_image_response_cb (GObject      *source,
       GskRenderer *renderer;
 
       renderer = gsk_gl_renderer_new ();
-      if (!gsk_renderer_realize (renderer, NULL, NULL))
+      if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
         {
           g_object_unref (renderer);
           renderer = gsk_cairo_renderer_new ();
-          if (!gsk_renderer_realize (renderer, NULL, NULL))
+          if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
             {
               g_assert_not_reached ();
             }
@@ -1121,8 +1117,11 @@ node_editor_window_add_renderer (NodeEditorWindow *self,
                                  const char       *description)
 {
   GdkPaintable *paintable;
+  GdkDisplay *display;
 
-  if (!gsk_renderer_realize (renderer, NULL, NULL))
+  display = gtk_widget_get_display (GTK_WIDGET (self));
+
+  if (!gsk_renderer_realize_for_display (renderer, display, NULL))
     {
       GdkSurface *surface = gtk_native_get_surface (GTK_NATIVE (self));
       g_assert (surface != NULL);
@@ -1157,6 +1156,9 @@ node_editor_window_realize (GtkWidget *widget)
   node_editor_window_add_renderer (self,
                                    gsk_gl_renderer_new (),
                                    "OpenGL");
+  node_editor_window_add_renderer (self,
+                                   gsk_ngl_renderer_new (),
+                                   "NGL");
 #ifdef GDK_RENDERING_VULKAN
   node_editor_window_add_renderer (self,
                                    gsk_vulkan_renderer_new (),

demos/node-editor/node-editor-window.h

@@ -17,8 +17,7 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#ifndef __NODE_EDITOR_WINDOW_H__
-#define __NODE_EDITOR_WINDOW_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -38,5 +37,3 @@ NodeEditorWindow *      node_editor_window_new          (NodeEditorApplication
 
 gboolean                node_editor_window_load         (NodeEditorWindow       *self,
                                                          GFile                  *file);
-
-#endif /* __NODE_EDITOR_WINDOW_H__ */

demos/widget-factory/icons/scalable/actions/view-grid-symbolic.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M3.384 3h3.231c.213 0 .385.224.385.502v2.996C7 6.776 6.828 7 6.615 7h-3.23C3.17 7 3 6.776 3 6.498V3.502C3 3.224 3.17 3 3.384 3zm6 0h3.231c.213 0 .385.224.385.502v2.996c0 .278-.172.502-.385.502h-3.23C9.17 7 9 6.776 9 6.498V3.502C9 3.224 9.17 3 9.384 3zm-6 6h3.231c.213 0 .385.224.385.502v2.996c0 .278-.172.502-.385.502h-3.23C3.17 13 3 12.776 3 12.498V9.502C3 9.224 3.17 9 3.384 9zm6 0h3.231c.213 0 .385.224.385.502v2.996c0 .278-.172.502-.385.502h-3.23C9.17 13 9 12.776 9 12.498V9.502C9 9.224 9.17 9 9.384 9z" style="marker:none" overflow="visible" color="#000" fill="#474747"/></svg>

demos/widget-factory/widget-factory.gresource.xml

@@ -25,14 +25,12 @@
     <file>icons/16x16/actions/format-justify-fill-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/format-justify-left-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/format-justify-right-symbolic.symbolic.png</file>
-    <file>icons/16x16/actions/insert-image.png</file>
     <file>icons/16x16/actions/insert-link-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/send-to-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/star-new-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/view-continuous-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/view-dual-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/view-fullscreen-symbolic.symbolic.png</file>
-    <file>icons/16x16/actions/view-grid-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/view-paged-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/zoom-in-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/zoom-in.png</file>
@@ -88,7 +86,6 @@
     <file>icons/scalable/actions/view-dual-symbolic.svg</file>
     <file>icons/scalable/actions/view-paged-symbolic.svg</file>
     <file>icons/scalable/actions/view-fullscreen-symbolic.svg</file>
-    <file>icons/scalable/actions/view-grid-symbolic.svg</file>
     <file>icons/scalable/actions/zoom-in-symbolic.svg</file>
     <file>icons/scalable/actions/zoom-original-symbolic.svg</file>
     <file>icons/scalable/actions/zoom-out-symbolic.svg</file>

docs/CODING-STYLE.md

@@ -685,6 +685,8 @@ stack-allocated using `g_newa()` or `g_alloca()`. But limit the amount
 of stack memory that you consume this way, in particular in recursive
 functions.
 
+On Windows, the default stack size we have to work with is 1M.
+
 ### Macros
 
 Try to avoid private macros unless strictly necessary. Remember to #undef

docs/reference/gdk/cairo.md

@@ -1,6 +1,4 @@
-----
 Title: Cairo interaction
-----
 
 ## Functions to support using cairo
 

docs/reference/gdk/gdk4.toml.in

@@ -107,4 +107,5 @@ content_images = [
   "images/popup-flip.png",
   "images/popup-slide.png",
 ]
+content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gdk/"
 urlmap_file = "urlmap.js"