Use glib's gi-docgen documentation

The commit chosen is just the current HEAD, there is no release with the
port to gi-docgen.

.clang-format

@@ -1,4 +1,4 @@
-# See https://www.apertis.org/policies/coding_conventions/#code-formatting
+# See https://wiki.apertis.org/Guidelines/Coding_conventions#Code_formatting
 BasedOnStyle: GNU
 AlwaysBreakAfterDefinitionReturnType: All
 BreakBeforeBinaryOperators: None

.gitlab-ci.yml

@@ -78,7 +78,6 @@ style-check-diff:
       - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.node"
       - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
       - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.node"
       - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
       - "${CI_PROJECT_DIR}/_build/testsuite/headless/*/*.log"
       - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
@@ -210,54 +209,51 @@ msys2-mingw64:
     paths:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
-macos:
+macos-x86_64:
   rules:
     # Do not run in forks as the runner is not available there.
-    # (except for dehesselle who maintains the runner)
-    - if: $CI_PROJECT_NAMESPACE != "GNOME" && $CI_PROJECT_NAMESPACE != "dehesselle"
-      when: never
-    - if: $RUNNER == "macosintel"
-      variables:
-        SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
-        NINJA_PKG: $CI_API_V4_URL/projects/30745/packages/generic/ninja_macos/v1.11.1.1+9/ninja-1.11.1.1-cp38-cp38-macosx_11_0_x86_64.whl
-      when: manual
-      allow_failure: true
-    - if: $RUNNER == "macosarm"
-      variables:
-        SDKROOT: /opt/sdks/MacOSX11.3.sdk
-        NINJA_PKG: ninja==1.11.1.1
+    - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
-  parallel:
-    matrix:
-      - RUNNER: [ "macosintel", "macosarm" ]
   tags:
-    - ${RUNNER}
+    - macosintel
   needs: []
   variables:
-    EXTRA_MESON_FLAGS: ""
-    BACKEND_FLAGS: "-Dx11-backend=false -Dbroadway-backend=true"
-    FEATURE_FLAGS: "-Dmedia-gstreamer=disabled -Dintrospection=enabled -Dgobject-introspection:werror=false"
+    MESON_FORCE_BACKTRACKE: 1
     TMPDIR: /Users/Shared/work/tmp
+    SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
     PIP_CACHE_DIR: /Users/Shared/build/cache
     PIPENV_CACHE_DIR: $PIP_CACHE_DIR
     PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
+    EXTRA_MESON_FLAGS: "-Dgobject-introspection:werror=false"
   before_script:
-    - .gitlab-ci/show-info-macos.sh
-    - python3 -m venv .venv
-    # Building the introspection feature requires pkg-config and bison.
-    - curl -L $CI_API_V4_URL/projects/30437/packages/generic/pkgconfig/v0.29.2+10/pkg-config-0.29.2+10_$(uname -m).tar.xz | tar -C .venv -xJ
-    - curl -L $CI_API_V4_URL/projects/30438/packages/generic/bison/v3.8.2+3/bison-3.8.2+3_$(uname -m).tar.xz | tar -C .venv -xJ
+    # Not using ccache on purpose as it accelerates the build so much that it
+    # can trigger race conditions in the gobject-introspection subproject.
+    - bash .gitlab-ci/show-info-osx.sh
+    - /opt/macports/bin/python3.10 -m venv .venv
+    - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
+    - ln -s /opt/pkg-config/bin/pkg-config .venv/bin
+    - ln -s /opt/bison/bin/bison .venv/bin
     - source .venv/bin/activate
-    - pip3 install meson==1.3.2 $NINJA_PKG
-    # We're not setting up ccache here on purpose as it accelerates the build
-    # so much that it triggers race conditions in the gobject-introspection
-    # subproject.
+    - pip3 install meson==1.2.0
+    - pip3 install ninja==1.11.1
+    - pip3 install /Users/Shared/build/pkgs/PyGObject-3.44.0-cp310-cp310-macosx_10_13_x86_64.whl
+                   /Users/Shared/build/pkgs/pycairo-1.23.0-cp310-cp310-macosx_10_13_x86_64.whl
   script:
     - meson setup
             ${COMMON_MESON_FLAGS}
             ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
+            -Dx11-backend=false
+            -Dbroadway-backend=true
+            -Dmacos-backend=true
+            -Dmedia-gstreamer=disabled
+            -Dintrospection=enabled
+            -Dcpp_std=c++11
+            -Dpixman:tests=disabled
+            -Dlibjpeg-turbo:simd=disabled
+            -Dbuild-demos=false
+            -Dbuild-tests=false
+            -Dbuild-examples=false
+            -Dbuild-testsuite=false
             _build
     - meson compile -C _build
   artifacts:
@@ -432,6 +428,13 @@ asan-build:
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland gtk
+  artifacts:
+    when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 reference:
   image: $FEDORA_IMAGE
@@ -445,8 +448,8 @@ reference:
             --force-fallback-for=gdk-pixbuf,pango
             -Dintrospection=enabled
             -Ddocumentation=true
-            -Dgtk_doc=true
             -Dgdk-pixbuf:gtk_doc=true
+            -Dglib:documentation=true
             -Dpango:gtk_doc=true
             -Dbuild-demos=false
             -Dbuild-examples=false
@@ -481,4 +484,3 @@ publish-docs:
     - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
   rules:
     - if: $CI_COMMIT_REF_NAME == "main"
-

.gitlab-ci/flatpak-build.sh

@@ -19,7 +19,6 @@ flatpak build ${builddir} meson \
                 --buildtype=debugoptimized \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
-                -Dvulkan=disabled \
                 -Dbuild-tests=false \
                 -Dbuild-testsuite=false \
                 -Dbuild-examples=false \
@@ -28,7 +27,7 @@ flatpak build ${builddir} meson \
                 -Ddemo-profile=devel \
                 _flatpak_build
 
-flatpak build --env=CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA ${builddir} ninja -C _flatpak_build install
+flatpak build ${builddir} ninja -C _flatpak_build install
 
 flatpak-builder \
         --user --disable-rofiles-fuse \

.gitlab-ci/show-info-osx.sh

@@ -3,11 +3,6 @@
 set -eux -o pipefail
 
 xcodebuild -version || :
-
-if [ -z "$SDKROOT" ]; then
-  xcodebuild -showsdks || :
-else
-  echo "SDKROOT = $SDKROOT"
-fi
+xcodebuild -showsdks || :
 
 system_profiler SPSoftwareDataType || :

.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 -Dvulkan=disabled _build || goto :error
+meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 
 goto :EOF

.gitlab-ci/test-msys2.sh

@@ -33,8 +33,7 @@ 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-vulkan
+    mingw-w64-$MSYS2_ARCH-shaderc
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -48,6 +47,7 @@ meson \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \
+    -Dvulkan=disabled \
     -Dintrospection=enabled \
     -Dgtk:werror=true \
     _build

CONTRIBUTING.md

@@ -213,7 +213,7 @@ Closes #1234
  `git commit -a --author "Joe Coder <joe@coder.org>"` and `--signoff`.
 
  - If your commit is addressing an issue, use the
- [GitLab syntax](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
+ [GitLab syntax](https://docs.gitlab.com/ce/user/project/issues/automatic_issue_closing.html)
  to automatically close the issue when merging the commit with the upstream
  repository:
 

NEWS

@@ -1,392 +1,6 @@
-Overview of Changes in 4.14.1, xx-xx-xxxx
+Overview of Changes in 4.13.4, xx-xx-xxxx
 =========================================
 
-
-Overview of Changes in 4.14.0, 12-03-2024
-=========================================
-
-Note: The new renderers and dmabuf support are using graphics drivers
-in different ways than the old gl renderer, and trigger new driver bugs,
-(see for example https://gitlab.gnome.org/GNOME/gtk/-/issues/6418 and
-https://gitlab.gnome.org/GNOME/gtk/-/issues/6388). Therefore, it is
-recommended to use the latest mesa release (24.x) with the new renderers.
-
-* GtkTextView:
- - Don't snapshot children twice
- - Don't blink the cursor when hidden
-
-* GtkEmojiChooser:
- - Fix presentation selector handling
-
-* GtkSnapshot:
- - Fix wrong nodes with transformed shadows
-
-* GtkIMContext:
- - Make gtk_im_context_activate_osk public
-
-* Accessibility:
- - Implement get_contents_at for all our text widgets
- - Add GtkAccessibleText.get_default_attributes
-
-* GSK:
- - Don't fall back to cairo for software rendering. gl+llvmpipe is better
- - Round vertical glyph position to a device pixel position if the font is hinted
- - Fix problems with clip handling
- - Make vulkan and ngl match their font handling
- - Fix some corner-cases with offloading and clips
- - Fix problem with rendering of missing glyphs in hinted fonts
-
-* MacOs:
- - Implement cursor-from-texture
-
-* Translation updates:
- Basque
- British English
- French
- Indonesian
- Kazakh
- Latvian
- Lithuanian
- Norwegian Bokmål
- Slovenian
- Spanish
- Turkish
-
-
-Overview of Changes in 4.13.9, 02-03-2024
-=========================================
-
-* GtkEditable:
- - Fix preconditions to be not too strict
-
-* GtkEmojiChooser:
- - Support search in the locale as well as in English
-
-* GtkIconTheme:
- - Make gtk_icon_paintable_new_for_file support symbolics
-
-* GtkVideo:
- - Fix a problem with cursor handling that could lead to crashes
-
-* Accessibility:
- - Fix GetCharacterAtOffset implementation
- - Add a Terminal role
- - Make TextCaretMoved match gtk3
- - Support multiple levels of GtkEditable delegates
-
-* GSK:
- - Make the node parser more flexible for text nodes
- - Change the way font scaling is handled to avoid clipping
- - Fix handling of missing glyphs in the new renderers
-
-* X11:
- - Don't claim to support shadows without a compositor
-
-* Wayland:
- - Fix handling of output scales
-
-* Tools:
- - Add a compare command to gtk4-rendernode-tool
-
-* Build:
- - Fix some ubsan complaints
-
-* Translation updates:
- Basque
- British English
- Catalan
- Finnish
- Galician
- Georgian
- Hebrew
- Indonesian
- Kazakh
- Latvian
- Lithuanian
- Persian
- Polish
- Russian
- Slovenian
- Spanish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.13.8, 20-02-2024
-=========================================
-
-* Accessibility:
- - Add a GtkAccessibleText interface for allowing 3rd party
-   text widgets (notably vte) to be accessible
- - Avoid duplicate accessible descriptions
- - Fix GetAccessibleAtPoint
-
-* GSK:
- - Avoid offscreens for disjoint containers
- - Don't use the gpu renderers with llvmpipe
- - Fix various rendering issues found by tests
- - Allow unnormalized node bounds again
- - Fix a broken case of rounded-rect intersection
- - Fix handling of external textures in gpu renderers
- - Make gpu renderers work with WGL on Windows
-
-* build:
- - Allow building without dmabuf support on (old) Linux
-
-* X11:
- - Fix monitor enter/leave signals
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Czech
- Galician
- Georgian
- Hebrew
- Lithuanian
- Persian
- Russian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.13.7, 11-02-2024
-=========================================
-
-* GtkFileChooser:
- - Speed up opening
-
-* GtkCalendar:
- - Add some missing setters and getters
-
-* Accessibility:
- - Add socket support for webkit accessibility
- - Implement AT-SPI text for GtkText
- - Implement AT-SPI component generically
- - Add an announce API
-
-* GSK:
- - Make the ngl renderer work on macOS
- - Fix a crash in the vulkan renderer
- - Make nodeparser allow aliases for fonts again
- - Implement cache eviction for glyph and texture caches
- - Fix ngl shaders to work on GL < 4.0
- - Require GL 3.3 for the ngl renderer
- - Fix problems with scaled shadows
- - Fix problems with holes for underlaid subsurfaces
- - Improve handling of scales and glyph cache efficiency
-
-* Media:
- - Support dmabufs in the gstreamer backend. This allows
-   zero-copy video playback on Wayland when paired with
-   hardware video decoding
- - Drop the experimental ffmpeg backend. It hasn't been
-   building for a year
-
-* Wayland:
- - Commit empty frames if and double-buffered state is pending
- - Fix monitor size information when using mutter without
-   the scale-monitor-framebuffer setting
- - Clear the current tablet on tab leave, fixing a crash
-
-* macOS:
- - Propagate unhandled input events back to the OS
-
-* Tools:
- - Make the crash handling in gtk4-node-editor more robust
-
-* Translation updates
- Galician
- Georgian
- Occitan
- Turkish
-
-
-Overview of Changes in 4.13.6, 25-01-2024
-=========================================
-
-This release changes the ngl renderer to be the default renderer.
-
-The intent of this change is to get wider testing and verify that
-the new renderers are production-ready. If significant problems
-show up, we will revert this change for 4.14.
-
-You can still override the renderer choice using the GSK_RENDERER
-environment variable.
-
-Since ngl can handle fractional scaling much better than the old gl
-renderer, we allow fractional scaling by default with gl now. If you
-are using the old gl renderer (e.g. because your system is limited to
-GLES2), you can disable fractional scaling by setting the GDK_DEBUG
-environment variable to include the gl-no-fractional key.
-
-* GtkColumnView:
- - Fix infinite loops in dispose
- - Fix problems with weak ref cycles in GtkExpression
-
-* GtkListView:
- - Fix some corner cases with sections during insertions and deletions
- - Don't double-recycle widgets
-
-* GtkStack:
- - Add automatic cleanup for GtkStackPage
-
-* GDK:
- - Use standard cursor names for drag cursors
- - Enable fractional scaling with gl by default
-
-* GSK:
- - Many fixes and improvements to the unified renderers:
-   - Fix text rendering with the uber shader
-   - Fix rounding issues with fractional scales
-   - Fix some memory leaks
-   - Many text rendering fixes
-   - Implement subpixel positioning for glyphs
-   - Support custom fonts in node files
-   - Add tests for font rendering
-   - Fix drawing of repeat nodes
-   - Implement subpixels positioning
-   - Evict stale textures, glyphs and atlases from the cache
- - Some fixes and improvements to the GL renderer:
-   - Fix problems with GLES on Nvidia
-   - Avoid a crash in the mask demo
-   - Respect opacity of the first child node in containers
- - Some fixes and improvements to the fallback renderer:
-   - Fix drawing of repeat nodes
- - Make ngl the default renderer
-
-* Wayland:
- - Fix problems with tablet cursors
- - Fix problems without seats
-
-* Accessibility:
- - Respect a separate "show-status-shapes setting
- - Fix change notification for accessible names on some widgets
-
-* Inspector:
- - Show the git commit in devel builds
-
-* Tools:
- - Make gtk4-node-editor autosave its contents
- - Add a benchmark command to gtk4-rendernode-tool
-
-* Translation updates:
- French
- Galician
- Georgian
- Occitan
- Persian
- Russian
- Vietnamese
-
-
-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
 =========================================
 
@@ -802,7 +416,7 @@ Overview of Changes in 4.11.4, 03-07-2023
  - Center newly created transient windows
 
 * Vulkan:
- - Add antialiasing for gradients
+ - Add antialising for gradients
  - Do less work on clipped away nodes
  - Redo image uploading
  - Support different image depths and formats
@@ -1786,7 +1400,7 @@ Overview of Changes in 4.7.0, 07-05-2022
  - Event handling fixes
  - Fix keyboard input on popovers
  - Support OpenGL-based video playback
- - Support fullscreen
+ - Suport fullscreen
  - Improve native filechoooser size allocation
  - Use CALayer and IOSurface for rendering
  - Use a per-monitor CVDisplayLink
@@ -2183,7 +1797,7 @@ Overview of Changes in 4.4.0
  - Activate when moving focus
 
 * GtkLabel:
- - Properly ignore double underscores for mnemonics
+ - Propertly ignore double underscores for mnemonics
 
 * GtkPopoverMenu:
  - Fix focus cycling
@@ -2730,7 +2344,7 @@ Overview of Changes in 4.1.0
  - Set sort arrows in CSS
  - Set menu button arrows in CSS
  - Make scrollbars larger
- - Support circular menubuttons
+ - Supprt circular menubuttons
 
 * CSS:
  - Implement transform-origin

demos/gtk-demo/bluroverlay.h

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

demos/gtk-demo/demotaggedentry.h

@@ -18,7 +18,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __DEMO_TAGGED_ENTRY_H__
+#define __DEMO_TAGGED_ENTRY_H__
 
 #include <gtk/gtk.h>
 
@@ -56,3 +57,5 @@ 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/font_features.c

@@ -600,8 +600,8 @@ update_display (void)
   if (s->len > 0)
     {
       pango_font_description_set_variations (desc, s->str);
+      g_string_free (s, TRUE);
     }
-  g_string_free (s, TRUE);
 
   font_desc = pango_font_description_to_string (desc);
 
@@ -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::selected", G_CALLBACK (instance_changed), NULL);
+      g_signal_connect (combo, "notify::selecte", G_CALLBACK (instance_changed), NULL);
       demo->instance_combo = combo;
    }
 

demos/gtk-demo/fontplane.h

@@ -15,7 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __GTK_FONT_PLANE_H__
+#define __GTK_FONT_PLANE_H__
 
 #include <gtk/gtk.h>
 
@@ -59,3 +60,5 @@ 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,7 +17,8 @@
  * Authors: Matthias Clasen <mclasen@redhat.com>
  */
 
-#pragma once
+#ifndef __GSK_SHADER_PAINTABLE_H__
+#define __GSK_SHADER_PAINTABLE_H__
 
 #include <gdk/gdk.h>
 #include <gsk/gsk.h>
@@ -41,3 +42,5 @@ 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,7 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __GTK_FISHBOWL_H__
+#define __GTK_FISHBOWL_H__
 
 #include <gtk/gtk.h>
 
@@ -64,3 +65,5 @@ void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
                                            GtkFishCreationFunc creation_func);
 
 G_END_DECLS
+
+#endif /* __GTK_FISHBOWL_H__ */

demos/gtk-demo/gtkgears.h

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

demos/gtk-demo/gtkshaderbin.h

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

demos/gtk-demo/gtkshadertoy.c

@@ -116,9 +116,7 @@ static gboolean gtk_shadertoy_tick          (GtkWidget     *widget,
 GtkWidget *
 gtk_shadertoy_new (void)
 {
-  return g_object_new (gtk_shadertoy_get_type (),
-                       "allowed-apis", GDK_GL_API_GL,
-                       NULL);
+  return g_object_new (gtk_shadertoy_get_type (), NULL);
 }
 
 static void

demos/gtk-demo/gtkshadertoy.h

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

demos/gtk-demo/images.c

@@ -354,7 +354,6 @@ do_images (GtkWidget *do_widget)
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon);
       gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-      g_object_unref (gicon);
 
       gtk_frame_set_child (GTK_FRAME (frame), image);
 

demos/gtk-demo/language-names.h

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

demos/gtk-demo/listview_selections.c

@@ -1,5 +1,4 @@
 /* Lists/Selections
- * #Keywords: suggestion, completion
  *
  * The GtkDropDown widget is a modern alternative to GtkComboBox.
  * It uses list models instead of tree models, and the content is

demos/gtk-demo/main.c

@@ -24,7 +24,7 @@
 #include "demos.h"
 #include "fontify.h"
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static GtkWidget *info_view;
 static GtkWidget *source_view;

demos/gtk-demo/meson.build

@@ -236,7 +236,7 @@ foreach flag: common_cflags
   endif
 endforeach
 
-gtkdemo_deps += [ profile_conf_h ]
+gtkdemo_deps += [ demo_conf_h ]
 
 executable('gtk4-demo',
   sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],

demos/gtk-demo/paintable.c

@@ -53,9 +53,7 @@ gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
                       double         rotation)
 {
 #define RADIUS 0.3
-  GskPathBuilder *builder;
-  GskPath *path;
-  GskStroke *stroke;
+  cairo_t *cr;
   double size;
 
   gtk_snapshot_append_color (snapshot,
@@ -63,29 +61,24 @@ 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);
 
-  gtk_snapshot_save (snapshot);
+  cairo_arc (cr, 0, 0, 0.1, - G_PI, G_PI);
+  cairo_fill (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_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);
 
-  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);
+  cairo_destroy (cr);
 }
 
 /* Here, we implement the functionality required by the GdkPaintable interface */

demos/gtk-demo/paintable.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __PAINTABLE_H__
+#define __PAINTABLE_H__
 
 #include <gtk/gtk.h>
 
@@ -12,3 +13,5 @@ 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,
-                        360 * nuclear->progress / MAX_PROGRESS);
+                        2 * G_PI * 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 (360 * nuclear->progress / MAX_PROGRESS);
+  return gtk_nuclear_icon_new (2 * G_PI * 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,
-                        360 * nuclear->progress / DURATION);
+                        2 * G_PI * 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 (360 * nuclear->progress / DURATION);
+  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / DURATION);
 }
 
 static GdkPaintableFlags

demos/gtk-demo/puzzlepiece.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __PUZZLE_PIECE_H__
+#define __PUZZLE_PIECE_H__
 
 #include <gtk/gtk.h>
 
@@ -18,3 +19,5 @@ 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,4 +1,5 @@
-#pragma once
+#ifndef SCRIPT_NAMES_H
+#define SCRIPT_NAMES_H
 
 #include <glib.h>
 
@@ -8,3 +9,5 @@ const char * get_script_name (GUnicodeScript script);
 const char * get_script_name_for_tag (guint32 tag);
 
 G_END_DECLS
+
+#endif

demos/icon-browser/iconbrowserapp.c

@@ -4,7 +4,7 @@
 #include "iconbrowserapp.h"
 #include "iconbrowserwin.h"
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 struct _IconBrowserApp
 {

demos/icon-browser/iconbrowserapp.h

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

demos/icon-browser/meson.build

@@ -14,7 +14,7 @@ iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
 executable('gtk4-icon-browser',
   sources: [iconbrowser_sources, iconbrowser_resources],
   c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,

demos/meson.build

@@ -1,3 +1,16 @@
+gen_demo_header = find_program('../build-aux/meson/gen-demo-header.py')
+demo_profile = get_option('demo-profile')
+
+demo_conf_h = declare_dependency(
+  sources: custom_target('demo-header',
+    command: [gen_demo_header, meson.project_source_root(), demo_profile],
+    capture: true,
+    output: 'demo_conf.h',
+    build_by_default: true,
+    build_always_stale: true,
+  )
+)
+
 # appdata
 
 appdata_config = configuration_data()

demos/node-editor/gtkrendererpaintableprivate.h

@@ -17,7 +17,8 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#pragma once
+#ifndef __GTK_RENDERER_PAINTABLE_H__
+#define __GTK_RENDERER_PAINTABLE_H__
 
 #include <gsk/gsk.h>
 
@@ -38,3 +39,5 @@ 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/meson.build

@@ -12,7 +12,7 @@ node_editor_resources = gnome.compile_resources('node_editor_resources',
 
 executable('gtk4-node-editor',
   sources: [node_editor_sources, node_editor_resources],
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   c_args: common_cflags,
   win_subsystem: 'windows',

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

@@ -19,13 +19,11 @@
 
 #include "config.h"
 
-#include <glib/gstdio.h>
-
 #include "node-editor-application.h"
 
 #include "node-editor-window.h"
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static const char *css =
 "textview.editor {"
@@ -249,63 +247,11 @@ node_editor_application_class_init (NodeEditorApplicationClass *class)
   application_class->open = node_editor_application_open;
 }
 
-static void
-print_version (void)
-{
-  g_print ("gtk4-node-editor %s%s%s\n",
-           PACKAGE_VERSION,
-           g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-           g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "");
-}
-
-static int
-local_options (GApplication *app,
-               GVariantDict *options,
-               gpointer      data)
-{
-  gboolean version = FALSE;
-  gboolean reset = FALSE;
-
-  g_variant_dict_lookup (options, "version", "b", &version);
-
-  if (version)
-    {
-      print_version ();
-      return 0;
-    }
-
-  g_variant_dict_lookup (options, "reset", "b", &reset);
-
-  if (reset)
-    {
-      char *path;
-
-      path = get_autosave_path ("-unsafe");
-      g_remove (path);
-      g_free (path);
-      path = get_autosave_path (NULL);
-      g_remove (path);
-      g_free (path);
-    }
-
-  return -1;
-}
-
-
 NodeEditorApplication *
 node_editor_application_new (void)
 {
-  NodeEditorApplication *app;
-
-  app = g_object_new (NODE_EDITOR_APPLICATION_TYPE,
-                      "application-id", "org.gtk.gtk4.NodeEditor",
-                      "flags", G_APPLICATION_HANDLES_OPEN,
-                      NULL);
-
-  g_application_add_main_option (G_APPLICATION (app), "version", 0, 0,G_OPTION_ARG_NONE, "Show program version", NULL);
-  g_application_add_main_option (G_APPLICATION (app), "reset", 0, 0,G_OPTION_ARG_NONE, "Remove autosave content", NULL);
-
-  g_signal_connect (app, "handle-local-options", G_CALLBACK (local_options), NULL);
-
-  return app;
+  return g_object_new (NODE_EDITOR_APPLICATION_TYPE,
+                       "application-id", "org.gtk.gtk4.NodeEditor",
+                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       NULL);
 }

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

@@ -17,7 +17,8 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#pragma once
+#ifndef __NODE_EDITOR_APPLICATION_H__
+#define __NODE_EDITOR_APPLICATION_H__
 
 #include <gtk/gtk.h>
 
@@ -32,3 +33,6 @@ 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,11 +24,13 @@
 #include "gtkrendererpaintableprivate.h"
 
 #include "gsk/gskrendernodeparserprivate.h"
+#include "gsk/gl/gskglrenderer.h"
 #ifdef GDK_WINDOWING_BROADWAY
 #include "gsk/broadway/gskbroadwayrenderer.h"
 #endif
-
-#include <glib/gstdio.h>
+#ifdef GDK_RENDERING_VULKAN
+#include "gsk/vulkan/gskvulkanrenderer.h"
+#endif
 
 #include <cairo.h>
 #ifdef CAIRO_HAS_SVG_SURFACE
@@ -57,7 +59,6 @@ struct _NodeEditorWindow
   GtkWidget *testcase_name_entry;
   GtkWidget *testcase_save_button;
   GtkWidget *scale_scale;
-  GtkWidget *crash_warning;
 
   GtkWidget *renderer_listbox;
   GListStore *renderers;
@@ -67,10 +68,6 @@ struct _NodeEditorWindow
   GFileMonitor *file_monitor;
 
   GArray *errors;
-
-  gboolean auto_reload;
-  gboolean mark_as_safe_pending;
-  gulong after_paint_handler;
 };
 
 struct _NodeEditorWindowClass
@@ -78,13 +75,6 @@ struct _NodeEditorWindowClass
   GtkApplicationWindowClass parent_class;
 };
 
-enum {
-  PROP_AUTO_RELOAD = 1,
-  NUM_PROPERTIES
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-
 G_DEFINE_TYPE(NodeEditorWindow, node_editor_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
@@ -177,121 +167,19 @@ text_iter_skip_whitespace_backward (GtkTextIter *iter)
 }
 
 static void
-highlight_text (NodeEditorWindow *self)
-{
-  GtkTextIter iter;
-  GtkTextIter start, end;
-
-  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);
-
-  while (!gtk_text_iter_is_end (&iter))
-    {
-      gunichar c = gtk_text_iter_get_char (&iter);
-
-      if (c == '{')
-        {
-          GtkTextIter word_end = iter;
-          GtkTextIter word_start;
-
-          gtk_text_iter_backward_char (&word_end);
-          text_iter_skip_whitespace_backward (&word_end);
-
-          word_start = word_end;
-          gtk_text_iter_backward_word_start (&word_start);
-          text_iter_skip_alpha_backward (&word_start);
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "nodename", &word_start, &word_end);
-        }
-      else if (c == ':')
-        {
-          GtkTextIter word_end = iter;
-          GtkTextIter word_start;
-
-          gtk_text_iter_backward_char (&word_end);
-          text_iter_skip_whitespace_backward (&word_end);
-
-          word_start = word_end;
-          gtk_text_iter_backward_word_start (&word_start);
-          text_iter_skip_alpha_backward (&word_start);
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "propname", &word_start, &word_end);
-        }
-      else if (c == '"')
-        {
-          GtkTextIter string_start = iter;
-          GtkTextIter string_end = iter;
-
-          gtk_text_iter_forward_char (&iter);
-          while (!gtk_text_iter_is_end (&iter))
-            {
-              c = gtk_text_iter_get_char (&iter);
-
-              if (c == '"')
-                {
-                  gtk_text_iter_forward_char (&iter);
-                  string_end = iter;
-                  break;
-                }
-
-              gtk_text_iter_forward_char (&iter);
-            }
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "string", &string_start, &string_end);
-        }
-
-      gtk_text_iter_forward_char (&iter);
-    }
-
-  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens", &start, &end);
-}
-
-static void
-mark_autosave_as_unsafe (void)
-{
-  char *path1 = NULL;
-  char *path2 = NULL;
-
-  path1 = get_autosave_path ("-unsafe");
-  path2 = get_autosave_path (NULL);
-
-  g_rename (path2, path1);
-}
-
-static void
-mark_autosave_as_safe (void)
-{
-  char *path1 = NULL;
-  char *path2 = NULL;
-
-  path1 = get_autosave_path ("-unsafe");
-  path2 = get_autosave_path (NULL);
-
-  g_rename (path1, path2);
-}
-
-static void
-after_paint (GdkFrameClock    *clock,
-             NodeEditorWindow *self)
-{
-  if (self->mark_as_safe_pending)
-    {
-      self->mark_as_safe_pending = FALSE;
-      mark_autosave_as_safe ();
-    }
-}
-
-static void
-reload (NodeEditorWindow *self)
+text_changed (GtkTextBuffer    *buffer,
+              NodeEditorWindow *self)
 {
   char *text;
   GBytes *bytes;
+  GtkTextIter iter;
+  GtkTextIter start, end;
   float scale;
   GskRenderNode *big_node;
 
-  mark_autosave_as_unsafe ();
-
+  g_array_remove_range (self->errors, 0, self->errors->len);
   text = get_current_text (self->text_buffer);
+  text_buffer_remove_all_tags (self->text_buffer);
   bytes = g_bytes_new_take (text, strlen (text));
 
   g_clear_pointer (&self->node, gsk_render_node_unref);
@@ -353,20 +241,72 @@ reload (NodeEditorWindow *self)
 
   g_clear_pointer (&big_node, gsk_render_node_unref);
 
-  self->mark_as_safe_pending = TRUE;
-}
+  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);
 
-static void
-text_changed (GtkTextBuffer    *buffer,
-              NodeEditorWindow *self)
-{
-  g_array_remove_range (self->errors, 0, self->errors->len);
-  text_buffer_remove_all_tags (self->text_buffer);
+  while (!gtk_text_iter_is_end (&iter))
+    {
+      gunichar c = gtk_text_iter_get_char (&iter);
 
-  if (self->auto_reload)
-    reload (self);
+      if (c == '{')
+        {
+          GtkTextIter word_end = iter;
+          GtkTextIter word_start;
 
-  highlight_text (self);
+          gtk_text_iter_backward_char (&word_end);
+          text_iter_skip_whitespace_backward (&word_end);
+
+          word_start = word_end;
+          gtk_text_iter_backward_word_start (&word_start);
+          text_iter_skip_alpha_backward (&word_start);
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "nodename",
+                                             &word_start, &word_end);
+        }
+      else if (c == ':')
+        {
+          GtkTextIter word_end = iter;
+          GtkTextIter word_start;
+
+          gtk_text_iter_backward_char (&word_end);
+          text_iter_skip_whitespace_backward (&word_end);
+
+          word_start = word_end;
+          gtk_text_iter_backward_word_start (&word_start);
+          text_iter_skip_alpha_backward (&word_start);
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "propname",
+                                             &word_start, &word_end);
+        }
+      else if (c == '"')
+        {
+          GtkTextIter string_start = iter;
+          GtkTextIter string_end = iter;
+
+          gtk_text_iter_forward_char (&iter);
+          while (!gtk_text_iter_is_end (&iter))
+            {
+              c = gtk_text_iter_get_char (&iter);
+
+              if (c == '"')
+                {
+                  gtk_text_iter_forward_char (&iter);
+                  string_end = iter;
+                  break;
+                }
+
+              gtk_text_iter_forward_char (&iter);
+            }
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "string",
+                                             &string_start, &string_end);
+        }
+
+      gtk_text_iter_forward_char (&iter);
+    }
+
+  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
+  gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens",
+                                     &start, &end);
 }
 
 static void
@@ -854,7 +794,7 @@ create_cairo_texture (NodeEditorWindow *self)
     return NULL;
 
   renderer = gsk_cairo_renderer_new ();
-  gsk_renderer_realize_for_display (renderer, gtk_widget_get_display (GTK_WIDGET (self)), NULL);
+  gsk_renderer_realize (renderer, NULL, NULL);
 
   texture = gsk_renderer_render_texture (renderer, node, NULL);
   gsk_render_node_unref (node);
@@ -926,11 +866,11 @@ export_image_response_cb (GObject      *source,
       GskRenderer *renderer;
 
       renderer = gsk_gl_renderer_new ();
-      if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
+      if (!gsk_renderer_realize (renderer, NULL, NULL))
         {
           g_object_unref (renderer);
           renderer = gsk_cairo_renderer_new ();
-          if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
+          if (!gsk_renderer_realize (renderer, NULL, NULL))
             {
               g_assert_not_reached ();
             }
@@ -1181,11 +1121,8 @@ node_editor_window_add_renderer (NodeEditorWindow *self,
                                  const char       *description)
 {
   GdkPaintable *paintable;
-  GdkDisplay *display;
 
-  display = gtk_widget_get_display (GTK_WIDGET (self));
-
-  if (!gsk_renderer_realize_for_display (renderer, display, NULL))
+  if (!gsk_renderer_realize (renderer, NULL, NULL))
     {
       GdkSurface *surface = gtk_native_get_surface (GTK_NATIVE (self));
       g_assert (surface != NULL);
@@ -1209,7 +1146,6 @@ static void
 node_editor_window_realize (GtkWidget *widget)
 {
   NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GdkFrameClock *frameclock;
 
   GTK_WIDGET_CLASS (node_editor_window_parent_class)->realize (widget);
 
@@ -1221,9 +1157,6 @@ 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 (),
@@ -1237,24 +1170,14 @@ node_editor_window_realize (GtkWidget *widget)
   node_editor_window_add_renderer (self,
                                    gsk_cairo_renderer_new (),
                                    "Cairo");
-
-  frameclock = gtk_widget_get_frame_clock (widget);
-  self->after_paint_handler = g_signal_connect (frameclock, "after-paint",
-                                                G_CALLBACK (after_paint), self);
-
 }
 
 static void
 node_editor_window_unrealize (GtkWidget *widget)
 {
   NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GdkFrameClock *frameclock;
   guint i;
 
-  frameclock = gtk_widget_get_frame_clock (widget);
-  g_signal_handler_disconnect (frameclock, self->after_paint_handler);
-  self->after_paint_handler = 0;
-
   for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i ++)
     {
       gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i);
@@ -1615,62 +1538,6 @@ edit_action_cb (GtkWidget  *widget,
   node_editor_window_edit (self, &start);
 }
 
-static void
-node_editor_window_set_property (GObject      *object,
-                                 guint         prop_id,
-                                 const GValue *value,
-                                 GParamSpec   *pspec)
-{
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (object);
-
-  switch (prop_id)
-    {
-    case PROP_AUTO_RELOAD:
-      {
-        gboolean auto_reload = g_value_get_boolean (value);
-        if (self->auto_reload != auto_reload)
-          {
-            self->auto_reload = auto_reload;
-
-            if (self->auto_reload)
-              reload (self);
-          }
-      }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-node_editor_window_get_property (GObject    *object,
-                                 guint       prop_id,
-                                 GValue     *value,
-                                 GParamSpec *pspec)
-{
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (object);
-
-  switch (prop_id)
-    {
-    case PROP_AUTO_RELOAD:
-      g_value_set_boolean (value, self->auto_reload);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-close_crash_warning (GtkButton        *button,
-                     NodeEditorWindow *self)
-{
-  gtk_revealer_set_reveal_child (GTK_REVEALER (self->crash_warning), FALSE);
-}
-
 static void
 node_editor_window_class_init (NodeEditorWindowClass *class)
 {
@@ -1682,8 +1549,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
 
   object_class->dispose = node_editor_window_dispose;
   object_class->finalize = node_editor_window_finalize;
-  object_class->set_property = node_editor_window_set_property;
-  object_class->get_property = node_editor_window_get_property;
 
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/org/gtk/gtk4/node-editor/node-editor-window.ui");
@@ -1691,12 +1556,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   widget_class->realize = node_editor_window_realize;
   widget_class->unrealize = node_editor_window_unrealize;
 
-  properties[PROP_AUTO_RELOAD] = g_param_spec_boolean ("auto-reload", NULL, NULL,
-                                                       TRUE,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME);
-
-  g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
-
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, text_view);
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, picture);
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, renderer_listbox);
@@ -1706,7 +1565,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_name_entry);
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_save_button);
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, scale_scale);
-  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, crash_warning);
 
   gtk_widget_class_bind_template_callback (widget_class, text_view_query_tooltip_cb);
   gtk_widget_class_bind_template_callback (widget_class, open_cb);
@@ -1719,7 +1577,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   gtk_widget_class_bind_template_callback (widget_class, on_picture_drag_prepare_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_picture_drop_cb);
   gtk_widget_class_bind_template_callback (widget_class, click_gesture_pressed);
-  gtk_widget_class_bind_template_callback (widget_class, close_crash_warning);
 
   gtk_widget_class_install_action (widget_class, "smart-edit", NULL, edit_action_cb);
 
@@ -1771,98 +1628,11 @@ static GActionEntry win_entries[] = {
   { "open", window_open, NULL, NULL, NULL },
 };
 
-char *
-get_autosave_path (const char *suffix)
-{
-  char *path;
-  char *name;
-
-  name = g_strconcat ("autosave", suffix, NULL);
-  path = g_build_filename (g_get_user_cache_dir (), "gtk4-node-editor", name, NULL);
-  g_free (name);
-
-  return path;
-}
-
-static void
-set_initial_text (NodeEditorWindow *self)
-{
-  char *path, *path1;
-  char *initial_text;
-  gsize len;
-
-  path = get_autosave_path (NULL);
-  path1 = get_autosave_path ("-unsafe");
-
-  if (g_file_get_contents (path1, &initial_text, &len, NULL))
-    {
-      self->auto_reload = FALSE;
-      gtk_revealer_set_reveal_child (GTK_REVEALER (self->crash_warning), TRUE);
-
-      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
-      g_free (initial_text);
-    }
-  else if (g_file_get_contents (path, &initial_text, &len, NULL))
-    {
-      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
-      g_free (initial_text);
-    }
-  else
-    {
-      /* Default */
-      gtk_text_buffer_set_text (self->text_buffer,
-         "shadow {\n"
-         "  child: texture {\n"
-         "    bounds: 0 0 128 128;\n"
-         "    texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n"
-         "  }\n"
-         "  shadows: rgba(0,0,0,0.5) 0 1 12;\n"
-         "}\n"
-         "\n"
-         "transform {\n"
-         "  child: text {\n"
-         "    color: rgb(46,52,54);\n"
-         "    font: \"Cantarell Bold 11\";\n"
-         "    glyphs: \"GTK Node Editor\";\n"
-         "    offset: 8 14.418;\n"
-         "  }\n"
-         "  transform: translate(0, 140);\n"
-         "}", -1);
-    }
-
-  g_free (path);
-  g_free (path1);
-}
-
-static void
-autosave_contents (NodeEditorWindow *self)
-{
-  char *path = NULL;
-  char *dir = NULL;
-  char *contents;
-  GtkTextIter start, end;
-
-  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
-  contents = gtk_text_buffer_get_text (self->text_buffer, &start, &end, TRUE);
-  path = get_autosave_path ("-unsafe");
-  dir = g_path_get_dirname (path);
-  g_mkdir_with_parents (dir, 0755);
-  g_file_set_contents (path, contents, -1, NULL);
-
-  g_free (dir);
-  g_free (path);
-  g_free (contents);
-}
-
 static void
 node_editor_window_init (NodeEditorWindow *self)
 {
-  GAction *action;
-
   gtk_widget_init_template (GTK_WIDGET (self));
 
-  self->auto_reload = TRUE;
-
   self->renderers = g_list_store_new (GDK_TYPE_PAINTABLE);
   gtk_list_box_bind_model (GTK_LIST_BOX (self->renderer_listbox),
                            G_LIST_MODEL (self->renderers),
@@ -1875,10 +1645,6 @@ node_editor_window_init (NodeEditorWindow *self)
 
   g_action_map_add_action_entries (G_ACTION_MAP (self), win_entries, G_N_ELEMENTS (win_entries), self);
 
-  action = G_ACTION (g_property_action_new ("auto-reload", self, "auto-reload"));
-  g_action_map_add_action (G_ACTION_MAP (self), action);
-  g_object_unref (action);
-
   self->tag_table = gtk_text_tag_table_new ();
   gtk_text_tag_table_add (self->tag_table,
                           g_object_new (GTK_TYPE_TEXT_TAG,
@@ -1916,9 +1682,25 @@ node_editor_window_init (NodeEditorWindow *self)
   g_signal_connect (self->scale_scale, "notify::value", G_CALLBACK (scale_changed), self);
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (self->text_view), self->text_buffer);
 
-  set_initial_text (self);
-
-  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (autosave_contents), self);
+  /* Default */
+  gtk_text_buffer_set_text (self->text_buffer,
+         "shadow {\n"
+         "  child: texture {\n"
+         "    bounds: 0 0 128 128;\n"
+         "    texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n"
+         "  }\n"
+         "  shadows: rgba(0,0,0,0.5) 0 1 12;\n"
+         "}\n"
+         "\n"
+         "transform {\n"
+         "  child: text {\n"
+         "    color: rgb(46,52,54);\n"
+         "    font: \"Cantarell Bold 11\";\n"
+         "    glyphs: \"GTK Node Editor\";\n"
+         "    offset: 8 14.418;\n"
+         "  }\n"
+         "  transform: translate(0, 140);\n"
+         "}", -1);
 
   if (g_getenv ("GSK_RENDERER"))
     {

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

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

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

@@ -2,10 +2,6 @@
 <interface>
   <menu id="gear_menu">
     <section>
-      <item>
-        <attribute name="label" translatable="yes">_Reload automatically</attribute>
-        <attribute name="action">win.auto-reload</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">_Help</attribute>
         <attribute name="action">app.help</attribute>
@@ -28,6 +24,7 @@
       </item>
     </section>
   </menu>
+
   <object class="GtkPopover" id="testcase_popover">
     <child>
       <object class="GtkGrid">
@@ -42,7 +39,7 @@
           <object class="GtkEntry" id="testcase_name_entry">
             <property name="hexpand">1</property>
             <property name="activates-default">1</property>
-            <signal name="notify::text" handler="testcase_name_entry_changed_cb"/>
+            <signal name="notify::text" handler="testcase_name_entry_changed_cb" />
           </object>
         </child>
         <child>
@@ -55,6 +52,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkLabel">
             <property name="wrap">1</property>
@@ -68,6 +66,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkLabel" id="testcase_error_label">
             <property name="wrap">1</property>
@@ -79,6 +78,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkButton" id="testcase_save_button">
             <property name="label">Save</property>
@@ -86,9 +86,9 @@
             <property name="halign">end</property>
             <property name="receives-default">1</property>
             <property name="sensitive">0</property>
-            <signal name="clicked" handler="testcase_save_clicked_cb"/>
+            <signal name="clicked" handler="testcase_save_clicked_cb" />
             <style>
-              <class name="suggested-action"/>
+              <class name="suggested-action" />
             </style>
             <layout>
               <property name="row">4</property>
@@ -100,6 +100,7 @@
       </object>
     </child>
   </object>
+
   <template class="NodeEditorWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">GTK Node Editor</property>
     <property name="default-width">1024</property>
@@ -184,129 +185,83 @@
       </object>
     </child>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkRevealer" id="crash_warning">
-            <property name="transition-type">slide-down</property>
-            <property name="halign">center</property>
-            <property name="valign">start</property>
-            <property name="child">
-              <object class="GtkFrame">
+      <object class="GtkPaned">
+        <property name="shrink-start-child">false</property>
+        <property name="shrink-end-child">false</property>
+        <property name="position">400</property>
+        <property name="start-child">
+          <object class="GtkScrolledWindow">
+            <property name="hscrollbar-policy">never</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <child>
+              <object class="GtkTextView" id="text_view">
+                <property name="wrap-mode">word</property>
+                <property name="monospace">1</property>
+                <property name="top-margin">6</property>
+                <property name="left-margin">6</property>
+                <property name="right-margin">6</property>
+                <property name="bottom-margin">6</property>
+                <property name="has-tooltip">1</property>
+                <property name="extra-menu">extra_menu</property>
+                <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/>
                 <style>
-                  <class name="app-notification"/>
+                  <class name="editor" />
                 </style>
-                <property name="child">
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">20</property>
-                    <property name="margin-start">10</property>
-                    <property name="margin-end">10</property>
-                    <property name="margin-top">10</property>
-                    <property name="margin-bottom">10</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="hexpand">1</property>
-                        <property name="halign">1</property>
-                        <property name="label" translatable="1">The application may have crashed.
-As a precaution, auto-loading has been turned off.
-You can turn it back on in the menu.
-</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="valign">3</property>
-                        <property name="use-underline">1</property>
-                        <property name="label" translatable="1">_Close</property>
-                        <signal name="clicked" handler="close_crash_warning"/>
-                      </object>
-                    </child>
+                <child>
+                  <object class="GtkGestureClick">
+                    <property name="button">1</property>
+                    <signal name="pressed" handler="click_gesture_pressed"/>
                   </object>
-                </property>
+                </child>
               </object>
-            </property>
+            </child>
           </object>
-        </child>
-        <property name="child">
-          <object class="GtkPaned">
-            <property name="shrink-start-child">false</property>
-            <property name="shrink-end-child">false</property>
-            <property name="position">400</property>
-            <property name="start-child">
+        </property>
+        <property name="end-child">
+          <object class="GtkBox">
+            <child>
               <object class="GtkScrolledWindow">
-                <property name="hscrollbar-policy">never</property>
                 <property name="hexpand">1</property>
                 <property name="vexpand">1</property>
+                <property name="min-content-height">100</property>
+                <property name="min-content-width">100</property>
                 <child>
-                  <object class="GtkTextView" id="text_view">
-                    <property name="wrap-mode">word</property>
-                    <property name="monospace">1</property>
-                    <property name="top-margin">6</property>
-                    <property name="left-margin">6</property>
-                    <property name="right-margin">6</property>
-                    <property name="bottom-margin">6</property>
-                    <property name="has-tooltip">1</property>
-                    <property name="extra-menu">extra_menu</property>
-                    <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/>
-                    <style>
-                      <class name="editor"/>
-                    </style>
+                  <object class="GtkViewport">
                     <child>
-                      <object class="GtkGestureClick">
-                        <property name="button">1</property>
-                        <signal name="pressed" handler="click_gesture_pressed"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </property>
-            <property name="end-child">
-              <object class="GtkBox">
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="hexpand">1</property>
-                    <property name="vexpand">1</property>
-                    <property name="min-content-height">100</property>
-                    <property name="min-content-width">100</property>
-                    <child>
-                      <object class="GtkViewport">
+                      <object class="GtkPicture" id="picture">
+                        <property name="can-shrink">0</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                         <child>
-                          <object class="GtkPicture" id="picture">
-                            <property name="can-shrink">0</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <property name="actions">copy</property>
-                                <signal name="prepare" handler="on_picture_drag_prepare_cb" swapped="no"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkDropTargetAsync">
+                          <object class="GtkDragSource">
                             <property name="actions">copy</property>
-                            <property name="formats">application/x-gtk-render-node</property>
-                            <signal name="drop" handler="on_picture_drop_cb" swapped="no"/>
+                            <signal name="prepare" handler="on_picture_drag_prepare_cb" swapped="no"/>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="hscrollbar-policy">never</property>
                     <child>
-                      <object class="GtkListBox" id="renderer_listbox">
-                        <property name="selection-mode">none</property>
+                      <object class="GtkDropTargetAsync">
+                        <property name="actions">copy</property>
+                        <property name="formats">application/x-gtk-render-node</property>
+                        <signal name="drop" handler="on_picture_drop_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="hscrollbar-policy">never</property>
+                <child>
+                  <object class="GtkListBox" id="renderer_listbox">
+                    <property name="selection-mode">none</property>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </property>
       </object>

demos/node-editor/node-format.md

@@ -322,44 +322,27 @@ stroke bounds of the path.
 
 ### text
 
-| property     | syntax              | default             | printed     |
-| ------------ | ------------------- | ------------------- | ----------- |
-| color        | `<color>`           | black               | non-default |
-| font         | `<string>` `<url>`? | "Cantarell 15px"    | always      |
-| glyphs       | `<glyphs>`          | "Hello"             | always      |
-| offset       | `<point>`           | 0 0                 | non-default |
-| hint-style   | `<hint style>`      | slight              | non-default |
-| antialias    | `<antialias>`       | gray                | non-default |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| color    | `<color>`        | black                  | non-default |
+| font     | `<string>`       | "Cantarell 11"         | always      |
+| glyphs   | `<glyphs>`       | "Hello"                | always      |
+| offset   | `<point>`        | 0 0                    | non-default |
 
 Creates a node like `gsk_text_node_new()` with the given properties.
 
-If a url is specified for the font, it must point to a font file for the
-font that is specified in the string. It can be either a data url containing
-a base64-encoded font file, or a regular url that points to a font file.
-
-Glyphs can be specified as an ASCII string, or as a comma-separated list of
-their glyph IDs. Optionally, the advance width, x and y offsets and flags can
-be specified as well, like this: 40 10 0 0 color.
-
 If the given font does not exist or the given glyphs are invalid for the given
 font, an error node will be returned.
 
-Possible values for hint-style are none, slight or full.
-Possible value for antialias are none or gray.
-
 ### texture
 
-| property | syntax              | default                | printed     |
-| -------- | ------------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`            | 50                     | always      |
-| texture  | `<string>`?`<url>`? | *see below*            | always      |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| bounds   | `<rect>`         | 50                     | always      |
+| texture  | `<url>`          | *see below*            | always      |
 
 Creates a node like `gsk_texture_node_new()` with the given properties.
 
-If a string is specified for the texture, it will be used as a name for the text.
-Textures can be reused by specifying the name of a previously used texture. In
-that case, the url can be omitted.
-
 The default texture is a 10x10 checkerboard with the top left and bottom right
 5x5 being in the color #FF00CC and the other part being transparent. A possible
 representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")

demos/print-editor/meson.build

@@ -1,7 +1,7 @@
 executable('gtk4-print-editor',
   sources: ['print-editor.c'],
   c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,

demos/print-editor/print-editor.c

@@ -4,7 +4,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static GtkWidget *main_window;
 static GFile *filename = NULL;

demos/widget-factory/meson.build

@@ -66,7 +66,7 @@ endif
 executable('gtk4-widget-factory',
   sources: ['widget-factory.c', widgetfactory_resources],
   c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,

demos/widget-factory/widget-factory.c

@@ -25,7 +25,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static void
 change_dark_state (GSimpleAction *action,

docs/iconcache.txt

@@ -69,9 +69,9 @@ Image:
 4			CARD32		IMAGE_DATA_OFFSET	
 
 ICON_FLAGS
-HAS_SUFFIX_XPM	1
-HAS_SUFFIX_SVG	2
-HAS_SUFFIX_PNG	4
+HAS_SUFFIX_PNG	1
+HAS_SUFFIX_XPM	2
+HAS_SUFFIX_SVG	4
 HAS_ICON_FILE	8
 
 ImageData:

docs/reference/gdk/gdk4-wayland.toml.in

@@ -25,8 +25,6 @@ base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
 
 [extra]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "images/gtk-logo.svg",
 ]
 urlmap_file = "urlmap.js"

docs/reference/gdk/gdk4-x11.toml.in

@@ -24,8 +24,6 @@ base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
 
 [extra]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "images/gtk-logo.svg",
 ]
 urlmap_file = "urlmap.js"

docs/reference/gdk/gdk4.toml.in

@@ -67,8 +67,6 @@ content_files = [
   "macos.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "images/gtk-logo.svg",
   "images/rotated-text.png",
   "images/default_cursor.png",

docs/reference/gsk/gsk4.toml.in

@@ -36,8 +36,6 @@ content_files = [
   "paths.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "gtk-logo.svg",
   "images/arc-dark.png",
   "images/arc-light.png",

docs/reference/gtk/building.md

@@ -234,7 +234,7 @@ By default, GTK will try to build with support for the Vulkan graphics
 API in addition to cairo and OpenGL. This option can be used to explicitly
 control whether Vulkan should be used.
 
-### `media-gstreamer`
+### `media-gstreamer` and `media-ffmpeg`
 
 By default, GTK will try to build the gstreamer backend for
 media playback support. These options can be used to explicitly

docs/reference/gtk/css-properties.md

@@ -75,7 +75,7 @@ define colors. Color expressions resemble functions, taking 1 or more colors
 and in some cases a number as arguments.
 
 `lighter(Color)`
- : produces a brighter variant of Color
+ : produces a brigher variant of Color
 
 `darker(Color)`
  : produces a darker variant of Color

docs/reference/gtk/gtk4-node-editor.rst

@@ -11,17 +11,13 @@ Editor render nodes
 SYNOPSIS
 --------
 
-|   **gtk4-node-editor** [OPTIONS...] [FILE]
+|   **gtk4-node-editor** [OPTIONS...]
 
 DESCRIPTION
 -----------
 
 ``gtk4-node-editor`` is a utility to show and edit render node files.
-Such render node files can be obtained e.g. from the GTK inspector or
-as part of the testsuite in the GTK sources.
-
-``gtk4-node-editor`` is used by GTK developers for debugging and testing,
-and it has built-in support for saving testcases as part of the GTK testsuite.
+Such render node files can be obtained e.g. from the GTK inspector.
 
 OPTIONS
 -------
@@ -29,21 +25,3 @@ OPTIONS
 ``-h, --help``
 
   Show the application help.
-
-``--version``
-
-  Show the program version.
-
-``--reset``
-
-  Don't restore autosaved content and remove autosave files.
-
-ENVIRONMENT
------------
-
-``GTK_SOURCE_DIR``
-
-  can be set to point to the location where the GTK sources reside, so that
-  testcases can be saved to the right location. If unsed, `gtk4-node-editor``
-  checks if the current working directory looks like a GTK checkout, and failing
-  that, saves testcase in the the current working directory.

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

@@ -12,11 +12,9 @@ SYNOPSIS
 --------
 |   **gtk4-rendernode-tool** <COMMAND> [OPTIONS...] <FILE>
 |
-|   **gtk4-rendernode-tool** benchmark [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** compare [OPTIONS...] <FILE1> <FILE2>
 |   **gtk4-rendernode-tool** info [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
 |   **gtk4-rendernode-tool** show [OPTIONS...] <FILE>
+|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
 
 DESCRIPTION
 -----------
@@ -52,45 +50,3 @@ The name of the file to write can be specified as a second FILE argument.
 
   Use the given renderer. Use ``--renderer=help`` to get a information
   about poassible values for the ``RENDERER``.
-
-Benchmark
-^^^^^^^^^
-
-The ``benchmark`` command benchmarks rendering of a node with the existing renderers
-and prints the runtimes.
-
-``--renderer=RENDERER``
-
-  Add the given renderer. This argument can be passed multiple times to test multiple
-  renderers. By default, all major GTK renderers are run.
-
-``--runs=RUNS``
-
-  Number of times to render the node on each renderer. By default, this is 3 times.
-  Keep in mind that the first run is often used to populate caches and might be
-  significantly slower.
-
-``--no-download``
-
-  Do not attempt to download the result. This may cause the measurement to not include
-  the execution of the commands on the GPU. It can be useful to use this flag to test
-  command submission performance.
-
-Compare
-^^^^^^^
-
-The ``compare`` command compares the rendering of a node with a reference image,
-or the renderings of two nodes, or two images. If any differences are found, the
-exit code is 1. If the images are identical, it is 0.
-
-``--renderer=RENDERER``
-
-  Use the given renderer.
-
-``--output=FILE``
-
-  Save the differences as a png image in ``FILE``.
-
-``--quiet``
-
-  Don't write results to stdout.`

docs/reference/gtk/gtk4.toml.in

@@ -85,8 +85,6 @@ content_files = [
   "visual_index.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
   "images/aboutdialog.png",
   "images/action-bar.png",
   "images/appchooserbutton.png",

docs/reference/gtk/running.md

@@ -62,7 +62,7 @@ are only available when GTK has been configured with `-Ddebug=true`.
 `layout`
 : Layout managers
 
-`accessibility`
+`acccessibility`
 : Accessibility state changs
 
 A number of keys are influencing behavior instead of just logging:
@@ -126,8 +126,8 @@ available on the system.
 ### `GTK_MEDIA`
 
 Specifies what backend to load for [class@Gtk.MediaFile]. The possible values
-depend on what options GTK was built with, and can include 'gstreamer'
-and 'none'. If set to 'none', media playback will be unavailable.
+depend on what options GTK was built with, and can include 'gstreamer',
+'ffmpeg' and 'none'. If set to 'none', media playback will be unavailable.
 The special value 'help' can be used to obtain a list of all supported
 media backends.
 
@@ -220,8 +220,8 @@ A number of options affect behavior instead of logging:
 `gl-disable`
 : Disable OpenGL support
 
-`gl-no-fractional`
-: Disable fractional scaling for OpenGL.
+`gl-fractional`
+: Enable fractional scaling for OpenGL. This is experimental
 
 `gl-debug`
 : Insert debugging information in OpenGL
@@ -274,46 +274,49 @@ are only available when GTK has been configured with `-Ddebug=true`.
 `renderer`
 : General renderer information
 
+`cairo`
+: cairo renderer information
+
 `opengl`
 : OpenGL renderer information
 
+`shaders`
+: Shaders
+
+`surface`
+: Surfaces
+
 `vulkan`
 : Vulkan renderer information
 
-`shaders`
-: Information about shaders
-
-`surface`
-: Information about surfaces
-
 `fallback`
-: Information about fallback usage in renderers
+: Information about fallbacks
 
 `glyphcache`
 : Information about glyph caching
 
-`verbose`
-: Print verbose output while rendering
-
 A number of options affect behavior instead of logging:
 
+`diff`
+: Show differences
+
 `geometry`
-: Show borders (when using cairo)
+: Show borders
 
 `full-redraw`
-: Force full redraws
+: Force full redraws for every frame
 
 `sync`
 : Sync after each frame
 
-`staging`
-: Use a staging image for texture upload (Vulkan only)
-
 `offload-disable`
 : Disable graphics offload to subsurfaces
 
-`cairo`
-: Overlay error pattern over cairo drawing (finds fallbacks)
+`vulkan-staging-image`
+: Use a staging image for Vulkan texture upload
+
+`vulkan-staging-buffer`
+: Use a staging buffer for Vulkan texture upload
 
 The special value `all` can be used to turn on all debug options. The special
 value `help` can be used to obtain a list of all supported debug options.
@@ -354,40 +357,6 @@ the default selection of the device that is used for Vulkan rendering.
 The special value `list` can be used to obtain a list of all Vulkan
 devices.
 
-### `GDK_VULKAN_SKIP`
-
-This variable can be set to a list of values, which cause GDK to
-disable features of the Vulkan support.
-Note that these features may already be disabled if the Vulkan driver
-does not support them.
-
-`dmabuf`
-: Never import Dmabufs
-
-`ycbr`
-: Do not support Ycbcr textures
-
-`descriptor-indexing`
-: Force slow descriptor set layout codepath
-
-`dynamic-indexing`
-: Hardcode small number of buffer and texture arrays
-
-`nonuniform-indexing`
-: Split draw calls to ensure uniform texture accesses
-
-`semaphore-export`
-: Disable sync of exported dmabufs
-
-`semaphore-import`
-: Disable sync of imported dmabufs
-
-`incremental-present`
-: Do not send damage regions
-
-The special value `all` can be used to turn on all values. The special
-value `help` can be used to obtain a list of all supported values.
-
 ### `GSK_RENDERER`
 
 If set, selects the GSK renderer to use. The following renderers can
@@ -409,63 +378,22 @@ using and the GDK backend supports them:
 `gl`
 : Selects the "gl" OpenGL renderer
 
-`ngl`
-: Selects the "ngl" OpenGL renderer
-
 `vulkan`
 : Selects the Vulkan renderer
 
+Note that on Windows, if one is running Nahimic 3 on a system with
+nVidia graphics, one needs to stop the "Nahimic service" or insert
+the GTK application into the Nahimic blacklist, as noted in
+https://www.nvidia.com/en-us/geforce/forums/game-ready-drivers/13/297952/nahimic-and-nvidia-drivers-conflict/2334568/, or use the cairo renderer (at the cost of being unable to use
+OpenGL features), or use GDK_DEBUG=gl-gles if you know that GLES
+support is enabled for the build.
 
-::: note
-    If you are running the Nahimic 3 service on a Windows system with
-    nVidia graphics, you need to perform one of the following:
-
-     - stop the "Nahimic service"
-     - insert the GTK application into the Nahimic blocklist, as noted in the
-       [nVidia forums](https://www.nvidia.com/en-us/geforce/forums/game-ready-drivers/13/297952/nahimic-and-nvidia-drivers-conflict/2334568/)
-     - use the cairo renderer (at the cost of being unable to use OpenGL features)
-     - use `GDK_DEBUG=gl-gles`, if you know that GLES support is enabled for the build.
-
-    This is a known issue, as the above link indicates, and affects quite
-    a number of applications—sadly, since this issue lies within the
-    nVidia graphics driver and/or the Nahimic 3 code, we are not able
-    to rememdy this on the GTK side; the best bet before trying the above
-    workarounds is to try to update your graphics drivers and Nahimic
-    installation.
-
-
-### `GSK_GPU_SKIP`
-
-This variable can be set to a list of values, which cause GSK to
-disable certain optimizations of the "ngl" and "vulkan" renderer.
-
-`uber`
-: Don't use the uber shader
-
-`clear`
-: Use shaders instead of vkCmdClearAttachment()/glClear()
-
-`blit`
-: Use shaders instead of vkCmdBlit()/glBlitFramebuffer()
-
-`gradients`
-: Don't supersample gradients
-
-`mipmap`
-: Avoid creating mipmaps
-
-`gl-baseinstance`
-: Assume no ARB/EXT_base_instance support
-
-The special value `all` can be used to turn on all values. The special
-value `help` can be used to obtain a list of all supported values.
-
-### `GSK_CACHE_TIMEOUT`
-
-Overrides the timeout for cache GC in the "ngl" and "vulkan" renderers.
-The value can be -1 to disable GC entirely, 0 to force GC to happen
-before every frame, or a positive number to do GC in a timeout every
-n seconds. The default timeout is 15 seconds.
+This is a known issue, as the above link indicates, and affects quite
+a number of applications--sadly, since this issue lies within the
+nVidia graphics driver and/or the Nahimic 3 code, we are not able
+to rememdy this on the GTK side; the best bet before trying the above
+workarounds is to try to update your graphics drivers and Nahimic
+installation.
 
 ### `GSK_MAX_TEXTURE_SIZE`
 

docs/reference/gtk/section-accessibility.md

@@ -207,7 +207,7 @@ you should ensure that:
 GTK will try to fill in some information by using ancillary UI control properties,
 for instance the accessible name will be taken from the label used by the UI control,
 or from its tooltip, if the `GTK_ACCESSIBLE_PROPERTY_LABEL` property or the
-`GTK_ACCESSIBLE_RELATION_LABELLED_BY` relation are unset. Similarly for the accessible
+`GTK_ACCESSIBLE_RELATION_LABELLED_BY` relation are unset. Similary for the accessible
 description. Nevertheless, it is good practice and project hygiene to explicitly specify
 the accessible properties, just like it's good practice to specify tooltips and style classes.
 

docs/reference/images/favicon.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="88.572334" height="96.050743" id="svg6843">
-  <defs id="defs6845"/>
-  <g transform="translate(-19.822308,-16.115941)" id="layer1">
-    <path d="M 20.88413,30.82696 53.816977,55.527708 107.33282,39.060543 70.587303,17.177763 20.88413,30.82696 z" id="path6976" style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="m 22.94243,82.287118 -2.0583,-51.460158 32.932847,24.700748 0,55.577152 L 22.94243,82.287118 z" id="path6978" style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="m 53.816977,111.10486 49.399213,-20.58416 4.11663,-51.460157 -53.515843,16.467165 0,55.577152 z" id="path6980" style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="M 23.216626,81.319479 70.48573,67.361442 103.38422,90.444516" id="path6982" style="fill:none;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
-    <path d="m 70.434539,17.875593 0,49.109284" id="path6984" style="fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
-  </g>
-</svg>

examples/application1/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -7,3 +8,6 @@
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application1/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application2/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application2/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application3/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application3/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application4/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application4/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application5/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application5/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application6/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application6/exampleappprefs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPPREFS_H
+#define __EXAMPLEAPPPREFS_H
 
 #include <gtk/gtk.h>
 #include "exampleappwin.h"
@@ -9,3 +10,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt
 
 
 ExampleAppPrefs        *example_app_prefs_new          (ExampleAppWindow *win);
+
+
+#endif /* __EXAMPLEAPPPREFS_H */

examples/application6/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application7/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application7/exampleappprefs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPPREFS_H
+#define __EXAMPLEAPPPREFS_H
 
 #include <gtk/gtk.h>
 #include "exampleappwin.h"
@@ -9,3 +10,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt
 
 
 ExampleAppPrefs        *example_app_prefs_new          (ExampleAppWindow *win);
+
+
+#endif /* __EXAMPLEAPPPREFS_H */

examples/application7/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application8/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application8/exampleappprefs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPPREFS_H
+#define __EXAMPLEAPPPREFS_H
 
 #include <gtk/gtk.h>
 #include "exampleappwin.h"
@@ -9,3 +10,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt
 
 
 ExampleAppPrefs        *example_app_prefs_new          (ExampleAppWindow *win);
+
+
+#endif /* __EXAMPLEAPPPREFS_H */

examples/application8/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application9/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application9/exampleappprefs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPPREFS_H
+#define __EXAMPLEAPPPREFS_H
 
 #include <gtk/gtk.h>
 #include "exampleappwin.h"
@@ -9,3 +10,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt
 
 
 ExampleAppPrefs        *example_app_prefs_new          (ExampleAppWindow *win);
+
+
+#endif /* __EXAMPLEAPPPREFS_H */

examples/application9/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

gdk/gdk.c

@@ -123,7 +123,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "portals",         GDK_DEBUG_PORTALS, "Force use of portals" },
   { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals" },
   { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
-  { "gl-no-fractional", GDK_DEBUG_GL_NO_FRACTIONAL, "Disable fractional scaling for OpenGL" },
+  { "gl-fractional",   GDK_DEBUG_GL_FRACTIONAL, "Enable fractional scaling for OpenGL (experimental)" },
   { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
   { "gl-disable-gl",   GDK_DEBUG_GL_DISABLE_GL, "Only allow OpenGL GLES API" },
   { "gl-disable-gles", GDK_DEBUG_GL_DISABLE_GLES, "Don't allow OpenGL GLES API" },
@@ -222,6 +222,7 @@ gdk_parse_debug_var (const char        *variable,
         }
       else
         {
+          char *val = g_strndup (p, q - p);
           for (i = 0; i < nkeys; i++)
             {
               if (strlen (keys[i].key) == q - p &&
@@ -232,7 +233,8 @@ gdk_parse_debug_var (const char        *variable,
                 }
             }
           if (i == nkeys)
-            fprintf (stderr, "Unrecognized value \"%.*s\". Try %s=help\n", (int) (q - p), p, variable);
+            fprintf (stderr, "Unrecognized value \"%s\". Try %s=help\n", val, variable);
+          g_free (val);
          }
 
       p = q;

gdk/gdkclipboard.c

@@ -529,9 +529,8 @@ gdk_clipboard_get_content (GdkClipboard *clipboard)
  * exit. Depending on the platform, the functionality may not be available
  * unless a "clipboard manager" is running.
  *
- * This function is called automatically when a
- * [GtkApplication](../gtk4/class.Application.html)
- * is shut down, so you likely don't need to call it.
+ * This function is called automatically when a [class@Gtk.Application] is
+ * shut down, so you likely don't need to call it.
  */
 void
 gdk_clipboard_store_async (GdkClipboard        *clipboard,

gdk/gdkcursor.c

@@ -47,8 +47,7 @@
  * Cursors by themselves are not very interesting: they must be bound to a
  * window for users to see them. This is done with [method@Gdk.Surface.set_cursor]
  * or [method@Gdk.Surface.set_device_cursor]. Applications will typically
- * use higher-level GTK functions such as [gtk_widget_set_cursor()](../gtk4/method.Widget.set_cursor.html)
- * instead.
+ * use higher-level GTK functions such as [method@Gtk.Widget.set_cursor] instead.
  *
  * Cursors are not bound to a given [class@Gdk.Display], so they can be shared.
  * However, the appearance of cursors may vary when used on different

gdk/gdkdebugprivate.h

@@ -43,7 +43,7 @@ typedef enum {
   GDK_DEBUG_PORTALS         = 1 << 14,
   GDK_DEBUG_NO_PORTALS      = 1 << 15,
   GDK_DEBUG_GL_DISABLE      = 1 << 16,
-  GDK_DEBUG_GL_NO_FRACTIONAL= 1 << 17,
+  GDK_DEBUG_GL_FRACTIONAL   = 1 << 17,
 
   GDK_DEBUG_GL_DISABLE_GL   = 1 << 19,
   GDK_DEBUG_GL_DISABLE_GLES = 1 << 20,

gdk/gdkdevice.c

@@ -289,8 +289,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    */
   device_props[PROP_MODIFIER_STATE] =
       g_param_spec_flags ("modifier-state", NULL, NULL,
-                          GDK_TYPE_MODIFIER_TYPE,
-                          GDK_NO_MODIFIER_MASK,
+                          GDK_TYPE_MODIFIER_TYPE, 0,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, LAST_PROP, device_props);

gdk/gdkdisplay.c

@@ -31,7 +31,6 @@
 #include "gdkclipboardprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkdmabufeglprivate.h"
 #include "gdkdmabufformatsbuilderprivate.h"
 #include "gdkdmabufformatsprivate.h"
 #include "gdkdmabuftextureprivate.h"
@@ -40,7 +39,7 @@
 #include "gdkglcontextprivate.h"
 #include "gdkmonitorprivate.h"
 #include "gdkrectangle.h"
-#include "gdkvulkancontextprivate.h"
+#include "gdkvulkancontext.h"
 
 #ifdef HAVE_EGL
 #include <epoxy/egl.h>
@@ -77,7 +76,6 @@ enum
   PROP_0,
   PROP_COMPOSITED,
   PROP_RGBA,
-  PROP_SHADOW_WIDTH,
   PROP_INPUT_SHAPES,
   PROP_DMABUF_FORMATS,
   LAST_PROP
@@ -112,7 +110,6 @@ struct _GdkDisplayPrivate {
 
   guint rgba : 1;
   guint composited : 1;
-  guint shadow_width: 1;
   guint input_shapes : 1;
 
   GdkDebugFlags debug_flags;
@@ -146,10 +143,6 @@ gdk_display_get_property (GObject    *object,
       g_value_set_boolean (value, gdk_display_is_rgba (display));
       break;
 
-    case PROP_SHADOW_WIDTH:
-      g_value_set_boolean (value, gdk_display_supports_shadow_width (display));
-      break;
-
     case PROP_INPUT_SHAPES:
       g_value_set_boolean (value, gdk_display_supports_input_shapes (display));
       break;
@@ -249,18 +242,6 @@ gdk_display_class_init (GdkDisplayClass *class)
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  /**
-   * GdkDisplay:shadow-width: (attributes org.gtk.Property.get=gdk_display_supports_shadow_width)
-   *
-   * %TRUE if the display supports extensible frames.
-   *
-   * Since: 4.14
-   */
-  props[PROP_SHADOW_WIDTH] =
-    g_param_spec_boolean ("shadow-width", NULL, NULL,
-                          TRUE,
-                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
   /**
    * GdkDisplay:input-shapes: (attributes org.gtk.Property.get=gdk_display_supports_input_shapes)
    *
@@ -271,13 +252,6 @@ gdk_display_class_init (GdkDisplayClass *class)
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  /**
-   * GdkDisplay:dmabuf-formats: (attributes org.gtk.Property.get=gdk_display_get_dmabuf_formats)
-   *
-   * The dma-buf formats that are supported on this display
-   *
-   * Since: 4.14
-   */
   props[PROP_DMABUF_FORMATS] =
     g_param_spec_boxed ("dmabuf-formats", NULL, NULL,
                         GDK_TYPE_DMABUF_FORMATS,
@@ -409,7 +383,6 @@ gdk_display_init (GdkDisplay *display)
 
   priv->composited = TRUE;
   priv->rgba = TRUE;
-  priv->shadow_width = TRUE;
   priv->input_shapes = TRUE;
 }
 
@@ -418,30 +391,14 @@ gdk_display_dispose (GObject *object)
 {
   GdkDisplay *display = GDK_DISPLAY (object);
   GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-  gsize i;
-
-  for (i = 0; i < G_N_ELEMENTS (display->dmabuf_downloaders); i++)
-    {
-      if (display->dmabuf_downloaders[i] == NULL)
-        continue;
-
-      gdk_dmabuf_downloader_close (display->dmabuf_downloaders[i]);
-      g_clear_object (&display->dmabuf_downloaders[i]);
-    }
 
   _gdk_display_manager_remove_display (gdk_display_manager_get (), display);
 
   g_queue_clear (&display->queued_events);
 
+  g_clear_object (&display->egl_gsk_renderer);
   g_clear_pointer (&display->egl_dmabuf_formats, gdk_dmabuf_formats_unref);
   g_clear_pointer (&display->egl_external_formats, gdk_dmabuf_formats_unref);
-#ifdef GDK_RENDERING_VULKAN
-  if (display->vk_dmabuf_formats)
-    {
-      gdk_display_unref_vulkan (display);
-      g_assert (display->vk_dmabuf_formats == NULL);
-    }
-#endif
 
   g_clear_object (&priv->gl_context);
 #ifdef HAVE_EGL
@@ -1215,9 +1172,9 @@ _gdk_display_get_next_serial (GdkDisplay *display)
  * Indicates to the GUI environment that the application has
  * finished loading, using a given identifier.
  *
- * GTK will call this function automatically for [GtkWindow](../gtk4/class.Window.html)
+ * GTK will call this function automatically for [class@Gtk.Window]
  * with custom startup-notification identifier unless
- * [gtk_window_set_auto_startup_notification()](../gtk4/method.Window.set_auto_startup_notification.html)
+ * [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
@@ -1286,14 +1243,12 @@ gdk_display_get_keymap (GdkDisplay *display)
 /*<private>
  * gdk_display_create_vulkan_context:
  * @self: a `GdkDisplay`
- * @surface: (nullable): the `GdkSurface` to use or %NULL for a surfaceless
- *   context
  * @error: return location for an error
  *
  * Creates a new `GdkVulkanContext` for use with @display.
  *
- * If @surface is NULL, the context can not be used to draw to surfaces,
- * it can only be used for custom rendering or compute.
+ * The context can not be used to draw to surfaces, it can only be
+ * used for custom rendering or compute.
  *
  * If the creation of the `GdkVulkanContext` failed, @error will be set.
  *
@@ -1302,11 +1257,9 @@ gdk_display_get_keymap (GdkDisplay *display)
  */
 GdkVulkanContext *
 gdk_display_create_vulkan_context (GdkDisplay  *self,
-                                   GdkSurface  *surface,
                                    GError     **error)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (self), NULL);
-  g_return_val_if_fail (surface == NULL || GDK_IS_SURFACE (surface), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
   if (gdk_display_get_debug_flags (self) & GDK_DEBUG_VULKAN_DISABLE)
@@ -1323,33 +1276,11 @@ gdk_display_create_vulkan_context (GdkDisplay  *self,
       return FALSE;
     }
 
-  if (surface)
-    {
-      return g_initable_new (GDK_DISPLAY_GET_CLASS (self)->vk_context_type,
-                             NULL,
-                             error,
-                             "surface", surface,
-                             NULL);
-    }
-  else
-    {
-      return g_initable_new (GDK_DISPLAY_GET_CLASS (self)->vk_context_type,
-                             NULL,
-                             error,
-                             "display", self,
-                             NULL);
-    }
-}
-
-gboolean
-gdk_display_has_vulkan_feature (GdkDisplay        *self,
-                                GdkVulkanFeatures  feature)
-{
-#ifdef GDK_RENDERING_VULKAN
-  return !!(self->vulkan_features & feature);
-#else
-  return FALSE;
-#endif
+  return g_initable_new (GDK_DISPLAY_GET_CLASS (self)->vk_context_type,
+                         NULL,
+                         error,
+                         "display", self,
+                         NULL);
 }
 
 static void
@@ -1382,7 +1313,7 @@ gdk_display_init_gl (GdkDisplay *self)
       return;
     }
 
-  gdk_profiler_end_mark (before2, "Realize OpenGL context", NULL);
+  gdk_profiler_end_mark (before2, "realize OpenGL context", NULL);
 
   /* Only assign after realize, so GdkGLContext::realize() can use
    * gdk_display_get_gl_context() == NULL to differentiate between
@@ -1392,7 +1323,7 @@ gdk_display_init_gl (GdkDisplay *self)
 
   gdk_gl_backend_use (GDK_GL_CONTEXT_GET_CLASS (context)->backend_type);
 
-  gdk_profiler_end_mark (before, "Init OpenGL", NULL);
+  gdk_profiler_end_mark (before, "initialize OpenGL", NULL);
 }
 
 /**
@@ -1787,6 +1718,7 @@ gdk_display_init_egl (GdkDisplay  *self,
 {
   GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
   G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
+  G_GNUC_UNUSED gint64 start_time2;
   int major, minor;
 
   if (!gdk_gl_backend_can_be_used (GDK_GL_EGL, error))
@@ -1813,6 +1745,7 @@ gdk_display_init_egl (GdkDisplay  *self,
       return FALSE;
     }
 
+  start_time2 = GDK_PROFILER_CURRENT_TIME;
   if (!eglInitialize (priv->egl_display, &major, &minor))
     {
       priv->egl_display = NULL;
@@ -1821,6 +1754,7 @@ gdk_display_init_egl (GdkDisplay  *self,
                            _("Could not initialize EGL display"));
       return FALSE;
     }
+  gdk_profiler_end_mark (start_time2, "eglInitialize", NULL);
 
   if (major < GDK_EGL_MIN_VERSION_MAJOR ||
       (major == GDK_EGL_MIN_VERSION_MAJOR && minor < GDK_EGL_MIN_VERSION_MINOR))
@@ -1910,7 +1844,7 @@ gdk_display_init_egl (GdkDisplay  *self,
       g_free (ext);
     }
 
-  gdk_profiler_end_mark (start_time, "Init EGL", NULL);
+  gdk_profiler_end_mark (start_time, "init EGL", NULL);
 
   return TRUE;
 }
@@ -1947,12 +1881,13 @@ gdk_display_get_egl_display (GdkDisplay *self)
 
 #ifdef HAVE_DMABUF
 static void
-gdk_display_add_dmabuf_downloader (GdkDisplay          *display,
-                                   GdkDmabufDownloader *downloader)
+gdk_display_add_dmabuf_downloader (GdkDisplay                *display,
+                                   const GdkDmabufDownloader *downloader,
+                                   GdkDmabufFormatsBuilder   *builder)
 {
   gsize i;
 
-  if (downloader == NULL)
+  if (!downloader->add_formats (downloader, display, builder))
     return;
 
   /* dmabuf_downloaders is NULL-terminated */
@@ -1962,7 +1897,7 @@ gdk_display_add_dmabuf_downloader (GdkDisplay          *display,
         break;
     }
 
-  g_assert (i < G_N_ELEMENTS (display->dmabuf_downloaders) - 1);
+  g_assert (i < G_N_ELEMENTS (display->dmabuf_downloaders));
 
   display->dmabuf_downloaders[i] = downloader;
 }
@@ -1988,16 +1923,14 @@ gdk_display_init_dmabuf (GdkDisplay *self)
 #ifdef HAVE_DMABUF
   if (!GDK_DISPLAY_DEBUG_CHECK (self, DMABUF_DISABLE))
     {
-#ifdef GDK_RENDERING_VULKAN
-      gdk_display_add_dmabuf_downloader (self, gdk_vulkan_get_dmabuf_downloader (self, builder));
-#endif
+      gdk_display_prepare_gl (self, NULL);
+
+      gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_direct_downloader (), builder);
 
 #ifdef HAVE_EGL
-      gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_egl_downloader (self, builder));
+      if (gdk_display_prepare_gl (self, NULL))
+        gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_egl_downloader (), builder);
 #endif
-
-      gdk_dmabuf_formats_builder_add_formats (builder,
-                                              gdk_dmabuf_get_mmap_formats ());
     }
 #endif
 
@@ -2037,12 +1970,9 @@ gdk_display_get_dmabuf_formats (GdkDisplay *display)
 GdkDebugFlags
 gdk_display_get_debug_flags (GdkDisplay *display)
 {
-  if (display == NULL)
-    return _gdk_debug_flags;
-
   GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
 
-  return priv->debug_flags;
+  return display ? priv->debug_flags : _gdk_debug_flags;
 }
 
 void
@@ -2144,46 +2074,6 @@ gdk_display_set_rgba (GdkDisplay *display,
   g_object_notify_by_pspec (G_OBJECT (display), props[PROP_RGBA]);
 }
 
-/**
- * gdk_display_supports_shadow_width: (attributes org.gtk.Method.get_property=shadow-width)
- * @display: a `GdkDisplay`
- *
- * Returns whether it's possible for a surface to draw outside of the window area.
- *
- * If %TRUE is returned the application decides if it wants to draw shadows.
- * If %FALSE is returned, the compositor decides if it wants to draw shadows.
- *
- * Returns: %TRUE if surfaces can draw shadows or
- *   %FALSE if the display does not support this functionality.
- *
- * Since: 4.14
- */
-gboolean
-gdk_display_supports_shadow_width (GdkDisplay *display)
-{
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
-  return priv->shadow_width;
-}
-
-void
-gdk_display_set_shadow_width (GdkDisplay *display,
-                              gboolean    shadow_width)
-{
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-
-  if (priv->shadow_width == shadow_width)
-    return;
-
-  priv->shadow_width = shadow_width;
-
-  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_SHADOW_WIDTH]);
-}
-
 static void
 device_removed_cb (GdkSeat    *seat,
                    GdkDevice  *device,

gdk/gdkdisplay.h

@@ -63,8 +63,6 @@ GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_is_composited      (GdkDisplay  *display);
 GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_is_rgba            (GdkDisplay  *display);
-GDK_AVAILABLE_IN_4_14
-gboolean    gdk_display_supports_shadow_width (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_supports_input_shapes (GdkDisplay    *display);
 

gdk/gdkdisplayprivate.h

@@ -26,7 +26,6 @@
 #include "gdkkeysprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdmabufprivate.h"
-#include "gdkdmabufdownloaderprivate.h"
 
 #ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>
@@ -41,17 +40,6 @@ G_BEGIN_DECLS
 
 typedef struct _GdkDisplayClass GdkDisplayClass;
 
-typedef enum {
-  GDK_VULKAN_FEATURE_DMABUF                     = 1 << 0,
-  GDK_VULKAN_FEATURE_YCBCR                      = 1 << 1,
-  GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING        = 1 << 2,
-  GDK_VULKAN_FEATURE_DYNAMIC_INDEXING           = 1 << 3,
-  GDK_VULKAN_FEATURE_NONUNIFORM_INDEXING        = 1 << 4,
-  GDK_VULKAN_FEATURE_SEMAPHORE_EXPORT           = 1 << 5,
-  GDK_VULKAN_FEATURE_SEMAPHORE_IMPORT           = 1 << 6,
-  GDK_VULKAN_FEATURE_INCREMENTAL_PRESENT        = 1 << 7,
-} GdkVulkanFeatures;
-
 /* Tracks information about the device grab on this display */
 typedef struct
 {
@@ -118,8 +106,6 @@ struct _GdkDisplay
   char *vk_pipeline_cache_etag;
   guint vk_save_pipeline_cache_source;
   GHashTable *vk_shader_modules;
-  GdkDmabufFormats *vk_dmabuf_formats;
-  GdkVulkanFeatures vulkan_features;
 
   guint vulkan_refcount;
 #endif /* GDK_RENDERING_VULKAN */
@@ -132,9 +118,10 @@ struct _GdkDisplay
   guint have_egl_dma_buf_export : 1;
 
   GdkDmabufFormats *dmabuf_formats;
-  GdkDmabufDownloader *dmabuf_downloaders[4];
+  const GdkDmabufDownloader *dmabuf_downloaders[4];
 
    /* Cached data the EGL dmabuf downloader */
+  gpointer egl_gsk_renderer;
   GdkDmabufFormats *egl_dmabuf_formats;
   GdkDmabufFormats *egl_external_formats;
 };
@@ -233,10 +220,7 @@ void                _gdk_display_unpause_events       (GdkDisplay       *display
 
 void                gdk_display_init_dmabuf           (GdkDisplay       *self);
 
-gboolean            gdk_display_has_vulkan_feature    (GdkDisplay       *self,
-                                                       GdkVulkanFeatures feature);
 GdkVulkanContext *  gdk_display_create_vulkan_context (GdkDisplay       *self,
-                                                       GdkSurface       *surface,
                                                        GError          **error);
 
 GdkGLContext *      gdk_display_get_gl_context        (GdkDisplay       *display);
@@ -257,8 +241,6 @@ void                gdk_display_set_composited        (GdkDisplay       *display
                                                        gboolean          composited);
 void                gdk_display_set_input_shapes      (GdkDisplay       *display,
                                                        gboolean          input_shapes);
-void                gdk_display_set_shadow_width      (GdkDisplay       *display,
-                                                       gboolean          shadow_width);
 
 void                gdk_display_add_seat              (GdkDisplay       *display,
                                                        GdkSeat          *seat);

gdk/gdkdmabufdownloader.c

@@ -1,48 +0,0 @@
-#include "config.h"
-
-#include "gdkdmabufdownloaderprivate.h"
-
-G_DEFINE_INTERFACE (GdkDmabufDownloader, gdk_dmabuf_downloader, G_TYPE_OBJECT)
-
-static void
-gdk_dmabuf_downloader_default_init (GdkDmabufDownloaderInterface *iface)
-{
-}
-
-void
-gdk_dmabuf_downloader_close (GdkDmabufDownloader *self)
-{
-  GdkDmabufDownloaderInterface *iface;
-
-  iface = GDK_DMABUF_DOWNLOADER_GET_IFACE (self);
-  iface->close (self);
-}
-
-gboolean
-gdk_dmabuf_downloader_supports (GdkDmabufDownloader  *self,
-                                GdkDmabufTexture     *texture,
-                                GError              **error)
-{
-  GdkDmabufDownloaderInterface *iface;
-
-  g_return_val_if_fail (GDK_IS_DMABUF_DOWNLOADER (self), FALSE);
-
-  iface = GDK_DMABUF_DOWNLOADER_GET_IFACE (self);
-  return iface->supports (self, texture, error);
-}
-
-void
-gdk_dmabuf_downloader_download (GdkDmabufDownloader *self,
-                                GdkDmabufTexture    *texture,
-                                GdkMemoryFormat      format,
-                                guchar              *data,
-                                gsize                stride)
-{
-  GdkDmabufDownloaderInterface *iface;
-
-  g_return_if_fail (GDK_IS_DMABUF_DOWNLOADER (self));
-
-  iface = GDK_DMABUF_DOWNLOADER_GET_IFACE (self);
-  iface->download (self, texture, format, data, stride);
-}
-

gdk/gdkdmabufdownloaderprivate.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_DMABUF_DOWNLOADER               (gdk_dmabuf_downloader_get_type ())
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_INTERFACE (GdkDmabufDownloader, gdk_dmabuf_downloader, GDK, DMABUF_DOWNLOADER, GObject)
-
-struct _GdkDmabufDownloaderInterface
-{
-  GTypeInterface g_iface;
-
-  void                  (* close)                               (GdkDmabufDownloader            *downloader);
-  gboolean              (* supports)                            (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GError                        **error);
-  void                  (* download)                            (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GdkMemoryFormat                 format,
-                                                                 guchar                         *data,
-                                                                 gsize                           stride);
-};
-
-void                    gdk_dmabuf_downloader_close             (GdkDmabufDownloader            *downloader);
-gboolean                gdk_dmabuf_downloader_supports          (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GError                        **error);
-void                    gdk_dmabuf_downloader_download          (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GdkMemoryFormat                 format,
-                                                                 guchar                         *data,
-                                                                 gsize                           stride);
-
-
-G_END_DECLS
-

gdk/gdkdmabufegl.c

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #if defined(HAVE_DMABUF) && defined (HAVE_EGL)
-#include "gdkdmabufeglprivate.h"
+#include "gdkdmabufprivate.h"
 
 #include "gdkdmabufformatsbuilderprivate.h"
 #include "gdkdebugprivate.h"
@@ -31,13 +31,15 @@
 #include "gdktexturedownloader.h"
 
 #include <graphene.h>
+#include <epoxy/egl.h>
 
 /* A dmabuf downloader implementation that downloads buffers via
  * gsk_renderer_render_texture + GL texture download.
  */
 
 static gboolean
-gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
+gdk_dmabuf_egl_downloader_collect_formats (const GdkDmabufDownloader *downloader,
+                                           GdkDisplay                *display,
                                            GdkDmabufFormatsBuilder   *formats,
                                            GdkDmabufFormatsBuilder   *external)
 {
@@ -100,8 +102,9 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
               (!external_only[j] || gdk_gl_context_get_use_es (context)))
             {
               GDK_DISPLAY_DEBUG (display, DMABUF,
-                                 "%s EGL dmabuf format %.4s:%#" G_GINT64_MODIFIER "x",
+                                 "%s%s dmabuf format %.4s:%#" G_GINT64_MODIFIER "x",
                                  external_only[j] ? "external " : "",
+                                 downloader->name,
                                  (char *) &fourccs[i],
                                  modifiers[j]);
 
@@ -133,154 +136,211 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
   return TRUE;
 }
 
-/* Hack. We don't include gsk/gsk.h here to avoid a build order problem
- * with the generated header gskenumtypes.h, so we need to hack around
- * a bit to access the gsk api we need.
- */
-
-typedef struct _GskRenderer GskRenderer;
-
-extern GskRenderer *   gsk_gl_renderer_new                      (void);
-extern gboolean        gsk_renderer_realize_for_display         (GskRenderer  *renderer,
-                                                                 GdkDisplay   *display,
-                                                                 GError      **error);
-
-GdkDmabufDownloader *
-gdk_dmabuf_get_egl_downloader (GdkDisplay              *display,
-                               GdkDmabufFormatsBuilder *builder)
+static gboolean
+gdk_dmabuf_egl_downloader_add_formats (const GdkDmabufDownloader *downloader,
+                                       GdkDisplay                *display,
+                                       GdkDmabufFormatsBuilder   *builder)
 {
   GdkDmabufFormatsBuilder *formats;
   GdkDmabufFormatsBuilder *external;
   gboolean retval = FALSE;
-  GError *error = NULL;
-  GskRenderer *renderer;
-  GdkGLContext *previous;
 
   g_assert (display->egl_dmabuf_formats == NULL);
   g_assert (display->egl_external_formats == NULL);
 
-  if (!gdk_display_prepare_gl (display, NULL))
-    return NULL;
-
-  previous = gdk_gl_context_get_current ();
   formats = gdk_dmabuf_formats_builder_new ();
   external = gdk_dmabuf_formats_builder_new ();
 
-  retval = gdk_dmabuf_egl_downloader_collect_formats (display, formats, external);
+  retval = gdk_dmabuf_egl_downloader_collect_formats (downloader, display, formats, external);
 
   display->egl_dmabuf_formats = gdk_dmabuf_formats_builder_free_to_formats (formats);
   display->egl_external_formats = gdk_dmabuf_formats_builder_free_to_formats (external);
 
   gdk_dmabuf_formats_builder_add_formats (builder, display->egl_dmabuf_formats);
 
-  if (!retval)
+  return retval;
+}
+
+static gboolean
+gdk_dmabuf_egl_downloader_supports (const GdkDmabufDownloader  *downloader,
+                                    GdkDisplay                 *display,
+                                    const GdkDmabuf            *dmabuf,
+                                    gboolean                    premultiplied,
+                                    GdkMemoryFormat            *out_format,
+                                    GError                    **error)
+{
+  if (gdk_dmabuf_formats_contains (display->egl_dmabuf_formats, dmabuf->fourcc, dmabuf->modifier))
     {
-      if (previous)
-        gdk_gl_context_make_current (previous);
-      return NULL;
+      if (!gdk_dmabuf_get_memory_format (dmabuf->fourcc, premultiplied, out_format))
+        {
+          GDK_DISPLAY_DEBUG (display, DMABUF,
+                             "Falling back to generic ARGB for dmabuf format %.4s",
+                             (char *) &dmabuf->fourcc);
+          *out_format = premultiplied ? GDK_MEMORY_R8G8B8A8_PREMULTIPLIED
+                                      : GDK_MEMORY_R8G8B8A8;
+        }
+      return TRUE;
     }
 
-  renderer = gsk_gl_renderer_new ();
+  g_set_error (error,
+               GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT,
+               "Unsupported dmabuf format: %.4s:%#" G_GINT64_MODIFIER "x",
+               (char *) &dmabuf->fourcc, dmabuf->modifier);
 
-  if (!gsk_renderer_realize_for_display (renderer, display, &error))
-    {
-      g_warning ("Failed to realize GL renderer: %s", error->message);
-      g_error_free (error);
-      g_object_unref (renderer);
-      if (previous)
-        gdk_gl_context_make_current (previous);
+  return FALSE;
+}
 
-      return NULL;
-    }
+/* Hack. We don't include gsk/gsk.h here to avoid a build order problem
+ * with the generated header gskenumtypes.h, so we need to hack around
+ * a bit to access the gsk api we need.
+ */
+
+typedef gpointer GskRenderer;
+
+extern GskRenderer *   gsk_gl_renderer_new          (void);
+extern gboolean        gsk_renderer_realize         (GskRenderer  *renderer,
+                                                     GdkSurface   *surface,
+                                                     GError      **error);
+extern GdkTexture *    gsk_renderer_convert_texture (GskRenderer  *renderer,
+                                                     GdkTexture   *texture);
+
+typedef void (* InvokeFunc) (gpointer data);
+
+typedef struct _InvokeData
+{
+  volatile int spinlock;
+  InvokeFunc func;
+  gpointer data;
+} InvokeData;
+
+static gboolean
+gdk_dmabuf_egl_downloader_invoke_callback (gpointer data)
+{
+  InvokeData *invoke = data;
+  GdkGLContext *previous;
+
+  previous = gdk_gl_context_get_current ();
+
+  invoke->func (invoke->data);
 
   if (previous)
     gdk_gl_context_make_current (previous);
+  else
+    gdk_gl_context_clear_current ();
 
-  return GDK_DMABUF_DOWNLOADER (renderer);
+  g_atomic_int_set (&invoke->spinlock, 1);
+
+  return FALSE;
 }
 
-EGLImage
-gdk_dmabuf_egl_create_image (GdkDisplay      *display,
-                             int              width,
-                             int              height,
-                             const GdkDmabuf *dmabuf,
-                             int              target)
+/* Run func in the main thread, taking care not to disturb
+ * the current GL context of the caller.
+ */
+static void
+gdk_dmabuf_egl_downloader_run (InvokeFunc func,
+                               gpointer   data)
 {
-  EGLDisplay egl_display = gdk_display_get_egl_display (display);
-  EGLint attribs[64];
-  int i;
-  EGLImage image;
+  InvokeData invoke = { 0, func, data };
 
-  g_return_val_if_fail (width > 0, 0);
-  g_return_val_if_fail (height > 0, 0);
-  g_return_val_if_fail (1 <= dmabuf->n_planes && dmabuf->n_planes <= 4, 0);
-  g_return_val_if_fail (target == GL_TEXTURE_2D || target == GL_TEXTURE_EXTERNAL_OES, 0);
+  g_main_context_invoke (NULL, gdk_dmabuf_egl_downloader_invoke_callback, &invoke);
 
-  if (egl_display == EGL_NO_DISPLAY || !display->have_egl_dma_buf_import)
+  while (g_atomic_int_get (&invoke.spinlock) == 0) ;
+}
+
+typedef struct _Download Download;
+
+struct _Download
+{
+  GdkDmabufTexture *texture;
+  GdkMemoryFormat format;
+  guchar *data;
+  gsize stride;
+};
+
+static GskRenderer *
+get_gsk_renderer (GdkDisplay *display)
+{
+  if (!display->egl_gsk_renderer)
     {
-      GDK_DISPLAY_DEBUG (display, DMABUF,
-                         "Can't import dmabufs into GL, missing EGL or EGL_EXT_image_dma_buf_import_modifiers");
-      return EGL_NO_IMAGE;
+      GskRenderer *renderer;
+      GError *error = NULL;
+
+      renderer = gsk_gl_renderer_new ();
+
+      if (!gsk_renderer_realize (renderer, NULL, &error))
+        {
+          g_warning ("Failed to realize GL renderer: %s", error->message);
+          g_error_free (error);
+          g_object_unref (renderer);
+
+          return NULL;
+        }
+
+      display->egl_gsk_renderer = renderer;
     }
 
-  GDK_DISPLAY_DEBUG (display, DMABUF,
-                     "Importing dmabuf (format: %.4s:%#" G_GINT64_MODIFIER "x, planes: %u) into GL",
-                     (char *) &dmabuf->fourcc, dmabuf->modifier, dmabuf->n_planes);
+  return display->egl_gsk_renderer;
+}
 
-  i = 0;
-  attribs[i++] = EGL_IMAGE_PRESERVED_KHR;
-  attribs[i++] = EGL_TRUE;
-  attribs[i++] = EGL_WIDTH;
-  attribs[i++] = width;
-  attribs[i++] = EGL_HEIGHT;
-  attribs[i++] = height;
-  attribs[i++] = EGL_LINUX_DRM_FOURCC_EXT;
-  attribs[i++] = dmabuf->fourcc;
-  attribs[i++] = EGL_YUV_COLOR_SPACE_HINT_EXT;
-  attribs[i++] = EGL_ITU_REC601_EXT;
-  attribs[i++] = EGL_SAMPLE_RANGE_HINT_EXT;
-  attribs[i++] = EGL_YUV_FULL_RANGE_EXT;
+static void
+gdk_dmabuf_egl_downloader_do_download (gpointer data)
+{
+  Download *download = data;
+  GdkDisplay *display;
+  GskRenderer *renderer;
+  GdkTexture *native;
+  GdkTextureDownloader *downloader;
 
-#define ADD_PLANE(plane) \
-  { \
-    if (dmabuf->modifier != DRM_FORMAT_MOD_INVALID) \
-      { \
-        attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_MODIFIER_LO_EXT; \
-        attribs[i++] = dmabuf->modifier & 0xFFFFFFFF; \
-        attribs[i++] = EGL_DMA_BUF_PLANE## plane ## _MODIFIER_HI_EXT; \
-        attribs[i++] = dmabuf->modifier >> 32; \
-      } \
-    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_FD_EXT; \
-    attribs[i++] = dmabuf->planes[plane].fd; \
-    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_PITCH_EXT; \
-    attribs[i++] = dmabuf->planes[plane].stride; \
-    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_OFFSET_EXT; \
-    attribs[i++] = dmabuf->planes[plane].offset; \
-  }
+  display = gdk_dmabuf_texture_get_display (download->texture);
 
-  ADD_PLANE (0);
+  renderer = get_gsk_renderer (display);
 
-  if (dmabuf->n_planes > 1) ADD_PLANE (1);
-  if (dmabuf->n_planes > 2) ADD_PLANE (2);
-  if (dmabuf->n_planes > 3) ADD_PLANE (3);
+  native = gsk_renderer_convert_texture (renderer, GDK_TEXTURE (download->texture));
 
-  attribs[i++] = EGL_NONE;
+  downloader = gdk_texture_downloader_new (native);
+  gdk_texture_downloader_set_format (downloader, download->format);
+  gdk_texture_downloader_download_into (downloader, download->data, download->stride);
+  gdk_texture_downloader_free (downloader);
 
-  image = eglCreateImageKHR (egl_display,
-                             EGL_NO_CONTEXT,
-                             EGL_LINUX_DMA_BUF_EXT,
-                             (EGLClientBuffer)NULL,
-                             attribs);
+  g_object_unref (native);
+}
 
-  if (image == EGL_NO_IMAGE)
-    {
-      GDK_DISPLAY_DEBUG (display, DMABUF,
-                         "Creating EGLImage for dmabuf failed: %#x",
-                         eglGetError ());
-      return 0;
-    }
+static void
+gdk_dmabuf_egl_downloader_download (const GdkDmabufDownloader *downloader,
+                                    GdkTexture                *texture,
+                                    GdkMemoryFormat            format,
+                                    guchar                    *data,
+                                    gsize                      stride)
+{
+  Download download;
+  const GdkDmabuf *dmabuf;
 
-  return image;
+  download.texture = GDK_DMABUF_TEXTURE (texture);
+  download.format = format;
+  download.data = data;
+  download.stride = stride;
+
+  dmabuf = gdk_dmabuf_texture_get_dmabuf (GDK_DMABUF_TEXTURE (texture));
+
+  GDK_DISPLAY_DEBUG (gdk_dmabuf_texture_get_display (download.texture), DMABUF,
+                     "Using %s for downloading a dmabuf (format %.4s:%#" G_GINT64_MODIFIER "x)",
+                     downloader->name, (char *)&dmabuf->fourcc, dmabuf->modifier);
+
+
+  gdk_dmabuf_egl_downloader_run (gdk_dmabuf_egl_downloader_do_download, &download);
+}
+
+const GdkDmabufDownloader *
+gdk_dmabuf_get_egl_downloader (void)
+{
+  static const GdkDmabufDownloader downloader = {
+    "egl",
+    gdk_dmabuf_egl_downloader_add_formats,
+    gdk_dmabuf_egl_downloader_supports,
+    gdk_dmabuf_egl_downloader_download,
+  };
+
+  return &downloader;
 }
 
 #endif  /* HAVE_DMABUF && HAVE_EGL */

gdk/gdkdmabufeglprivate.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#if defined(HAVE_DMABUF) && defined (HAVE_EGL)
-
-#include "gdkdmabufprivate.h"
-#include "gdkdmabufdownloaderprivate.h"
-
-#include <epoxy/egl.h>
-
-GdkDmabufDownloader *       gdk_dmabuf_get_egl_downloader       (GdkDisplay                     *display,
-                                                                 GdkDmabufFormatsBuilder        *builder);
-EGLImage                    gdk_dmabuf_egl_create_image         (GdkDisplay                     *display,
-                                                                 int                             width,
-                                                                 int                             height,
-                                                                 const GdkDmabuf                *dmabuf,
-                                                                 int                             target);
-
-#endif  /* HAVE_DMABUF && HAVE_EGL */

gdk/gdkdmabufformats.c

@@ -25,7 +25,7 @@
 /**
  * GdkDmabufFormats:
  *
- * The `GdkDmabufFormats` struct provides information about
+ * The `GdkDmabufFormats struct provides information about
  * supported DMA buffer formats.
  *
  * You can query whether a given format is supported with
@@ -37,7 +37,7 @@
  * The list of supported formats is sorted by preference,
  * with the best formats coming first.
  *
- * The list may contains (format, modifier) pairs where the modifier
+ * The list may contains (format, modfier) pairs where the modifier
  * is `DMA_FORMAT_MOD_INVALID`, indicating that **_implicit modifiers_**
  * may be used with this format.
  *
@@ -152,10 +152,10 @@ gdk_dmabuf_formats_get_format (GdkDmabufFormats *formats,
 }
 
 /**
- * gdk_dmabuf_formats_contains:
+ * gdk_dmabuf_format_contains:
  * @formats: a `GdkDmabufFormats`
  * @fourcc: a format code
- * @modifier: a format modifier
+ * @modfier: a format modifier
  *
  * Returns whether a given format is contained in @formats.
  *
@@ -217,41 +217,3 @@ gdk_dmabuf_formats_peek_formats (GdkDmabufFormats *self)
 {
   return self->formats;
 }
-
-/**
- * gdk_dmabuf_formats_equal:
- * @formats1: (nullable): a `GdkDmabufFormats`
- * @formats2: (nullable): another `GdkDmabufFormats`
- *
- * Returns whether @formats1 and @formats2 contain the
- * same dmabuf formats, in the same order.
- *
- * Returns: `TRUE` if @formats1 and @formats2 are equal
- *
- * Since: 4.14
- */
-gboolean
-gdk_dmabuf_formats_equal (const GdkDmabufFormats *formats1,
-                          const GdkDmabufFormats *formats2)
-{
-  if (formats1 == formats2)
-    return TRUE;
-
-  if (formats1 == NULL || formats2 == NULL)
-    return FALSE;
-
-  if (formats1->n_formats != formats2->n_formats)
-    return FALSE;
-
-  for (gsize i = 0; i < formats1->n_formats; i++)
-    {
-      GdkDmabufFormat *f1 = &formats1->formats[i];
-      GdkDmabufFormat *f2 = &formats2->formats[i];
-
-      if (f1->fourcc != f2->fourcc ||
-          f1->modifier != f2->modifier)
-        return FALSE;
-    }
-
-  return TRUE;
-}

gdk/gdkdmabufformats.h

@@ -51,8 +51,4 @@ gboolean           gdk_dmabuf_formats_contains        (GdkDmabufFormats *formats
                                                        guint32           fourcc,
                                                        guint64           modifier) G_GNUC_PURE;
 
-GDK_AVAILABLE_IN_4_14
-gboolean           gdk_dmabuf_formats_equal           (const GdkDmabufFormats *formats1,
-                                                       const GdkDmabufFormats *formats2);
-
 G_END_DECLS

gdk/gdkdmabuffourccprivate.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "config.h"
-#ifdef HAVE_DRM_FOURCC_H
+#ifdef HAVE_DMABUF
 #include <drm_fourcc.h>
 #endif