Add more fill and stroke node tests

.gitlab-ci.yml

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

.gitlab-ci/fedora.Dockerfile

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

.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/meson-html-report.py

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

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

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

.gitlab-ci/run-tests.sh

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

.gitlab-ci/test-msvc.bat

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

@@ -35,7 +35,8 @@ The issue tracker is meant to be used for actionable issues only.
 
 You should not open a new issue for security related questions.
 
-When in doubt, follow [security](https://security.gnome.org/).
+When in doubt, send an email to the [security](mailto:security@gnome.org)
+mailing list.
 
 ### Bug reports
 
@@ -213,7 +214,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:
 
@@ -243,11 +244,13 @@ people committing to GTK to follow a few rules:
    code, you should always ask. If your change is minor and you've been
    working on GTK for a while it probably isn't necessary to ask. But when
    in doubt, ask. Even if your change is correct, somebody may know a
-   better way to do things.
-   The `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org) is also a
-   good place to find GTK developers to discuss changes, but if you live
-   outside of the EU/US time zones, the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
-   is the most certain and preferred method.
+   better way to do things. If you are making changes to GTK, you should
+   be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
+   mailing list; this is a good place to ask about intended changes.
+   The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK
+   developers to discuss changes, but if you live outside of the EU/US time
+   zones, an email to the gtk-devel mailing list is the most certain and
+   preferred method.
 
 0. Ask _first_.
 

NEWS

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

build-aux/msvc/msvc_recommended_pragmas.h

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

demos/gtk-demo/application.c

@@ -35,7 +35,7 @@ show_action_dialog (GSimpleAction *action)
 {
   GtkAlertDialog *dialog;
 
-  dialog = gtk_alert_dialog_new ("You activated action: \"%s\"",
+  dialog = gtk_alert_dialog_new ("You activated action: \"%s\n",
                                  g_action_get_name (G_ACTION (action)));
   gtk_alert_dialog_show (dialog, NULL);
   g_object_unref (dialog);
@@ -223,7 +223,7 @@ delete_messages (gpointer data)
 static void
 pop_message (GtkWidget *status)
 {
-  GList *messages = (GList *) g_object_steal_data (G_OBJECT (status), "messages");
+  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
 
   if (messages)
     {
@@ -241,7 +241,7 @@ static void
 push_message (GtkWidget  *status,
               const char *message)
 {
-  GList *messages = (GList *) g_object_steal_data (G_OBJECT (status), "messages");
+  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
 
   gtk_label_set_label (GTK_LABEL (status), message);
   messages = g_list_prepend (messages, g_strdup (message));

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/demo.gresource.xml

@@ -127,7 +127,6 @@
     <file>fishbowl.ui</file>
     <file>gtkfishbowl.c</file>
     <file>gtkfishbowl.h</file>
-    <file>tiger.node</file>
   </gresource>
   <gresource prefix="/frames">
     <file>frames.ui</file>
@@ -337,7 +336,6 @@
     <file>panes.c</file>
     <file>password_entry.c</file>
     <file>path_fill.c</file>
-    <file>path_maze.c</file>
     <file>path_spinner.c</file>
     <file>path_walk.c</file>
     <file>path_text.c</file>

demos/gtk-demo/demo3widget.c

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

demos/gtk-demo/demotaggedentry.h

@@ -18,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/demowidget.c

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

demos/gtk-demo/fishbowl.c

@@ -11,9 +11,6 @@
 #include "gtkgears.h"
 #include "gskshaderpaintable.h"
 
-#include "nodewidget.h"
-#include "graphwidget.h"
-
 const char *const css =
 ".blurred-button {"
 "  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
@@ -74,7 +71,14 @@ create_blurred_button (void)
 static GtkWidget *
 create_font_button (void)
 {
-  return gtk_font_dialog_button_new (gtk_font_dialog_new ());
+  GtkFontDialog *dialog;
+  GtkWidget *button;
+
+  dialog = gtk_font_dialog_new ();
+  button = gtk_font_dialog_button_new (dialog);
+  g_object_unref (dialog);
+
+  return button;
 }
 
 static GtkWidget *
@@ -204,18 +208,6 @@ create_menu_button (void)
   return w;
 }
 
-static GtkWidget *
-create_tiger (void)
-{
-  return node_widget_new ("/fishbowl/tiger.node");
-}
-
-static GtkWidget *
-create_graph (void)
-{
-  return graph_widget_new ();
-}
-
 static const struct {
   const char *name;
   GtkWidget * (*create_func) (void);
@@ -233,8 +225,6 @@ static const struct {
   { "Switch",     create_switch         },
   { "Menubutton", create_menu_button    },
   { "Shader",     create_cogs           },
-  { "Tiger",      create_tiger          },
-  { "Graph",      create_graph          },
 };
 
 static int selected_widget_type = -1;

demos/gtk-demo/font_features.c

@@ -1586,7 +1586,7 @@ update_font_variations (void)
         }
 
       gtk_grid_attach (GTK_GRID (demo->variations_grid), combo, 1, -1, 3, 1);
-      g_signal_connect (combo, "notify::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/graphwidget.c

@@ -1,153 +0,0 @@
-#include "graphwidget.h"
-
-struct _GraphWidget
-{
-  GtkWidget parent_instance;
-
-  GskPath *path;
-  GskStroke *stroke;
-  GdkRGBA color;
-
-  guint tick_cb;
-  guint64 start_time;
-
-  double period;
-  double amplitude;
-};
-
-struct _GraphWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GraphWidget, graph_widget, GTK_TYPE_WIDGET)
-
-static void
-update_path (GraphWidget *self,
-             float        amplitude)
-{
-  graphene_point_t p[20];
-  GskPathBuilder *builder;
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-
-  for (int i = 0; i < 20; i++)
-    {
-      p[i].x = 10 * i;
-      p[i].y = 50;
-
-      if (i % 4 == 1 || i % 4 == 2)
-        {
-          if (i % 8 < 4)
-            p[i].y += amplitude;
-          else
-            p[i].y -= amplitude;
-        }
-    }
-
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_move_to (builder, p[0].x, p[0].y);
-
-  for (int i = 0; i < 20; i += 4)
-    gsk_path_builder_cubic_to (builder,
-                               p[i+1].x, p[i+1].y,
-                               p[i+2].x, p[i+2].y,
-                               p[i+3].x, p[i+3].y);
-
-  self->path = gsk_path_builder_free_to_path (builder);
-}
-
-static gboolean
-tick_cb (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       user_data)
-{
-  GraphWidget *self = GRAPH_WIDGET (widget);
-  guint64 now;
-  double angle;
-
-  now = gdk_frame_clock_get_frame_time (frame_clock);
-
-  if (self->start_time == 0)
-    self->start_time = now;
-
-  angle = 360 * (now - self->start_time) / (double)(self->period * G_TIME_SPAN_MINUTE);
-  update_path (self, sin (angle) * self->amplitude);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-graph_widget_init (GraphWidget *self)
-{
-  self->color.red = g_random_double_range (0, 1);
-  self->color.green = g_random_double_range (0, 1);
-  self->color.blue = g_random_double_range (0, 1);
-  self->color.alpha = 1;
-
-  self->period = g_random_double_range (0.5, 1);
-  self->amplitude = g_random_double_range (10, 25);
-
-  self->stroke = gsk_stroke_new (2);
-
-  update_path (self, 0);
-
-  self->start_time = 0;
-  self->tick_cb = gtk_widget_add_tick_callback (GTK_WIDGET (self), tick_cb, NULL, NULL);
-}
-
-static void
-graph_widget_dispose (GObject *object)
-{
-  GraphWidget *self = GRAPH_WIDGET (object);
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-  gsk_stroke_free (self->stroke);
-
-  G_OBJECT_CLASS (graph_widget_parent_class)->dispose (object);
-}
-
-static void
-graph_widget_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  GraphWidget *self = GRAPH_WIDGET (widget);
-
-  gtk_snapshot_append_stroke (snapshot, self->path, self->stroke, &self->color);
-}
-
-static void
-graph_widget_measure (GtkWidget      *widget,
-                      GtkOrientation  orientation,
-                      int             for_size,
-                      int            *minimum,
-                      int            *natural,
-                      int            *minimum_baseline,
-                      int            *natural_baseline)
-{
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum = *natural = 200;
-  else
-    *minimum = *natural = 100;
-}
-
-
-static void
-graph_widget_class_init (GraphWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = graph_widget_dispose;
-
-  widget_class->snapshot = graph_widget_snapshot;
-  widget_class->measure = graph_widget_measure;
-}
-
-GtkWidget *
-graph_widget_new (void)
-{
-  return g_object_new (GRAPH_TYPE_WIDGET, NULL);
-}

demos/gtk-demo/graphwidget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define GRAPH_TYPE_WIDGET (graph_widget_get_type ())
-G_DECLARE_FINAL_TYPE (GraphWidget, graph_widget, GRAPH, WIDGET, GtkWidget)
-
-GtkWidget * graph_widget_new       (void);

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

@@ -73,7 +73,6 @@ demos = files([
   'panes.c',
   'password_entry.c',
   'path_fill.c',
-  'path_maze.c',
   'path_spinner.c',
   'path_walk.c',
   'path_text.c',
@@ -141,8 +140,6 @@ extra_demo_sources = files([
   'unicode-names.c',
   'suggestionentry.c',
   'language-names.c',
-  'nodewidget.c',
-  'graphwidget.c',
 ])
 
 if os_unix
@@ -236,7 +233,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/nodewidget.c

@@ -1,76 +0,0 @@
-#include "nodewidget.h"
-
-struct _NodeWidget
-{
-  GtkWidget parent_instance;
-
-  GskRenderNode *node;
-};
-
-struct _NodeWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (NodeWidget, node_widget, GTK_TYPE_WIDGET)
-
-static void
-node_widget_init (NodeWidget *self)
-{
-}
-
-static void
-node_widget_dispose (GObject *object)
-{
-  NodeWidget *self = NODE_WIDGET (object);
-
-  gsk_render_node_unref (self->node);
-
-  G_OBJECT_CLASS (node_widget_parent_class)->dispose (object);
-}
-
-static void
-node_widget_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  NodeWidget *self = NODE_WIDGET (widget);
-
-  gtk_snapshot_append_node (snapshot, self->node);
-}
-
-static void
-node_widget_class_init (NodeWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = node_widget_dispose;
-
-  widget_class->snapshot = node_widget_snapshot;
-}
-
-GtkWidget *
-node_widget_new (const char *resource)
-{
-  NodeWidget *self;
-  GBytes *bytes;
-  GskRenderNode *node;
-  graphene_rect_t bounds;
-  float scale;
-  GskTransform *transform;
-
-  self = g_object_new (NODE_TYPE_WIDGET, NULL);
-
-  bytes = g_resources_lookup_data (resource, 0, NULL);
-  node = gsk_render_node_deserialize (bytes, NULL, NULL);
-  g_bytes_unref (bytes);
-
-  gsk_render_node_get_bounds (node, &bounds);
-  scale = MIN (100.0/bounds.size.width, 100.0/bounds.size.height);
-  transform = gsk_transform_scale (NULL, scale, scale);
-  self->node = gsk_transform_node_new (node, transform);
-  gsk_transform_unref (transform);
-  gsk_render_node_unref (node);
-
-  return GTK_WIDGET (self);
-}

demos/gtk-demo/nodewidget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define NODE_TYPE_WIDGET (node_widget_get_type ())
-G_DECLARE_FINAL_TYPE (NodeWidget, node_widget, NODE, WIDGET, GtkWidget)
-
-GtkWidget * node_widget_new       (const char *file);

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/path_fill.c

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

demos/gtk-demo/path_maze.c

@@ -1,369 +0,0 @@
-/* Path/Maze
- *
- * This demo shows how to use a GskPath to create a maze and use
- * gsk_path_get_closest_point() to check the mouse stays
- * on the path.
- *
- * It also shows off the performance of GskPath (or not) as this
- * is a rather complex path.
- */
-
-#include "config.h"
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "paintable.h"
-
-#define MAZE_GRID_SIZE 20
-#define MAZE_STROKE_SIZE_ACTIVE (MAZE_GRID_SIZE - 4)
-#define MAZE_STROKE_SIZE_INACTIVE (MAZE_GRID_SIZE - 12)
-#define MAZE_WIDTH 31
-#define MAZE_HEIGHT 21
-
-#define GTK_TYPE_MAZE (gtk_maze_get_type ())
-G_DECLARE_FINAL_TYPE (GtkMaze, gtk_maze, GTK, MAZE, GtkWidget)
-
-struct _GtkMaze
-{
-  GtkWidget parent_instance;
-
-  int width;
-  int height;
-  GskPath *path;
-  GskPathMeasure *measure;
-  GdkPaintable *background;
-
-  gboolean active;
-};
-
-struct _GtkMazeClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GtkMaze, gtk_maze, GTK_TYPE_WIDGET)
-
-static void
-gtk_maze_measure (GtkWidget      *widget,
-                  GtkOrientation  orientation,
-                  int             for_size,
-                  int            *minimum,
-                  int            *natural,
-                  int            *minimum_baseline,
-                  int            *natural_baseline)
-{
-  GtkMaze *self = GTK_MAZE (widget);
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum = *natural = self->width;
-  else
-    *minimum = *natural = self->height;
-}
-
-static void
-gtk_maze_snapshot (GtkWidget   *widget,
-                   GdkSnapshot *snapshot)
-{
-  GtkMaze *self = GTK_MAZE (widget);
-  double width = gtk_widget_get_width (widget);
-  double height = gtk_widget_get_height (widget);
-  GskStroke *stroke;
-
-  stroke = gsk_stroke_new (MAZE_STROKE_SIZE_INACTIVE);
-  if (self->active)
-    gsk_stroke_set_line_width (stroke, MAZE_STROKE_SIZE_ACTIVE);
-  gsk_stroke_set_line_join (stroke, GSK_LINE_JOIN_ROUND);
-  gsk_stroke_set_line_cap (stroke, GSK_LINE_CAP_ROUND);
-  gtk_snapshot_push_stroke (snapshot, self->path, stroke);
-  gsk_stroke_free (stroke);
-
-  if (self->background)
-    {
-      gdk_paintable_snapshot (self->background, snapshot, width, height);
-    }
-  else
-    {
-      gtk_snapshot_append_linear_gradient (snapshot,
-                                           &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                           &GRAPHENE_POINT_INIT (0, 0),
-                                           &GRAPHENE_POINT_INIT (width, height),
-                                           (GskColorStop[8]) {
-                                             { 0.0, { 1.0, 0.0, 0.0, 1.0 } },
-                                             { 0.2, { 1.0, 0.0, 0.0, 1.0 } },
-                                             { 0.3, { 1.0, 1.0, 0.0, 1.0 } },
-                                             { 0.4, { 0.0, 1.0, 0.0, 1.0 } },
-                                             { 0.6, { 0.0, 1.0, 1.0, 1.0 } },
-                                             { 0.7, { 0.0, 0.0, 1.0, 1.0 } },
-                                             { 0.8, { 1.0, 0.0, 1.0, 1.0 } },
-                                             { 1.0, { 1.0, 0.0, 1.0, 1.0 } }
-                                           },
-                                           8);
-    }
-
-  gtk_snapshot_pop (snapshot);
-
-}
-
-static void
-gtk_maze_dispose (GObject *object)
-{
-  GtkMaze *self = GTK_MAZE (object);
-
-  g_clear_pointer (&self->path, gsk_path_unref);
-  g_clear_pointer (&self->measure, gsk_path_measure_unref);
-  if (self->background)
-    {
-      g_signal_handlers_disconnect_matched (self->background, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
-      g_clear_object (&self->background);
-    }
-
-  G_OBJECT_CLASS (gtk_maze_parent_class)->dispose (object);
-}
-
-static void
-gtk_maze_class_init (GtkMazeClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = gtk_maze_dispose;
-
-  widget_class->measure = gtk_maze_measure;
-  widget_class->snapshot = gtk_maze_snapshot;
-}
-
-static void
-celebrate (gboolean win)
-{
-  char *path;
-  GtkMediaStream *stream;
-
-  if (win)
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "complete.oga", NULL);
-  else
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "suspend-error.oga", NULL);
-  stream = gtk_media_file_new_for_filename (path);
-  gtk_media_stream_set_volume (stream, 1.0);
-  gtk_media_stream_play (stream);
-
-  g_signal_connect (stream, "notify::ended", G_CALLBACK (g_object_unref), NULL);
-  g_free (path);
-}
-
-static void
-pointer_motion (GtkEventControllerMotion *controller,
-                double                    x,
-                double                    y,
-                GtkMaze                  *self)
-{
-  GskPathPoint point;
-  float distance;
-
-  if (!self->active)
-    return;
-
-  if (gsk_path_get_closest_point (self->path,
-                                  &GRAPHENE_POINT_INIT (x, y),
-                                  INFINITY,
-                                  &point,
-                                  &distance))
-    {
-      if (distance < MAZE_STROKE_SIZE_ACTIVE / 2.f)
-        return;
-    }
-
-  celebrate (FALSE);
-
-  self->active = FALSE;
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-pointer_leave (GtkEventControllerMotion *controller,
-               GtkMaze                  *self)
-{
-  if (!self->active)
-    {
-      self->active = TRUE;
-      gtk_widget_queue_draw (GTK_WIDGET (self));
-    }
-}
-
-static void
-gtk_maze_init (GtkMaze *self)
-{
-  GtkEventController *controller;
-
-  controller = GTK_EVENT_CONTROLLER (gtk_event_controller_motion_new ());
-  g_signal_connect (controller, "motion", G_CALLBACK (pointer_motion), self);
-  g_signal_connect (controller, "leave", G_CALLBACK (pointer_leave), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
-
-  self->active = TRUE;
-}
-
-static void
-gtk_maze_set_path (GtkMaze *self,
-                   GskPath *path)
-{
-  g_clear_pointer (&self->path, gsk_path_unref);
-  g_clear_pointer (&self->measure, gsk_path_measure_unref);
-  self->path = gsk_path_ref (path);
-  self->measure = gsk_path_measure_new (path);
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-GtkWidget *
-gtk_maze_new (GskPath      *path,
-              GdkPaintable *background,
-              int           width,
-              int           height)
-{
-  GtkMaze *self;
-
-  self = g_object_new (GTK_TYPE_MAZE, NULL);
-
-  gtk_maze_set_path (self, path);
-  gsk_path_unref (path);
-  self->background = background;
-  if (self->background)
-    {
-      g_signal_connect_swapped (self->background, "invalidate-contents", G_CALLBACK (gtk_widget_queue_draw), self);
-      g_signal_connect_swapped (self->background, "invalidate-size", G_CALLBACK (gtk_widget_queue_resize), self);
-    }
-  self->width = width;
-  self->height = height;
-
-  return GTK_WIDGET (self);
-}
-
-static void
-add_point_to_maze (GtkBitset      *maze,
-                   GskPathBuilder *builder,
-                   guint           x,
-                   guint           y)
-{
-  gboolean set[4] = { FALSE, FALSE, FALSE, FALSE };
-  guint dir;
-
-  gtk_bitset_add (maze, y * MAZE_WIDTH + x);
-
-  while (TRUE)
-    {
-      set[0] = set[0] || x == 0 || gtk_bitset_contains (maze, y * MAZE_WIDTH + x - 1);
-      set[1] = set[1] || y == 0 || gtk_bitset_contains (maze, (y - 1) * MAZE_WIDTH + x);
-      set[2] = set[2] || x + 1 == MAZE_WIDTH || gtk_bitset_contains (maze, y * MAZE_WIDTH + x + 1);
-      set[3] = set[3] || y + 1 == MAZE_HEIGHT || gtk_bitset_contains (maze, (y + 1) * MAZE_WIDTH + x);
-
-      if (set[0] && set[1] && set[2] && set[3])
-        return;
-      
-      do
-        {
-          dir = g_random_int_range (0, 4);
-        }
-      while (set[dir]);
-
-      switch (dir)
-        {
-          case 0:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x - 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x - 1, y);
-            break;
-
-          case 1:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y - 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x, y - 1);
-            break;
-
-          case 2:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 1.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x + 1, y);
-            break;
-
-          case 3:
-            gsk_path_builder_move_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 0.5) * MAZE_GRID_SIZE);
-            gsk_path_builder_line_to (builder, (x + 0.5) * MAZE_GRID_SIZE, (y + 1.5) * MAZE_GRID_SIZE);
-            add_point_to_maze (maze, builder, x, y + 1);
-            break;
-
-          default:
-            g_assert_not_reached ();
-            break;
-        }
-    }
-}
-
-static GskPath *
-create_path_for_maze (GtkWidget *widget)
-{
-  GskPathBuilder *builder;
-  GtkBitset *maze;
-
-  builder = gsk_path_builder_new ();
-  maze = gtk_bitset_new_empty ();
-  /* make sure the outer lines are unreachable:
-   * Set the full range, then remove the center again. */
-  gtk_bitset_add_range (maze, 0, MAZE_WIDTH * MAZE_HEIGHT);
-  gtk_bitset_remove_rectangle (maze, MAZE_WIDTH + 1, MAZE_WIDTH - 2, MAZE_HEIGHT - 2, MAZE_WIDTH);
-
-  /* Fill the maze */
-  add_point_to_maze (maze, builder, MAZE_WIDTH / 2, MAZE_HEIGHT / 2);
-
-  /* Add start and stop lines */
-  gsk_path_builder_move_to (builder, 1.5 * MAZE_GRID_SIZE, -0.5 * MAZE_GRID_SIZE);
-  gsk_path_builder_line_to (builder, 1.5 * MAZE_GRID_SIZE, 1.5 * MAZE_GRID_SIZE);
-  gsk_path_builder_move_to (builder, (MAZE_WIDTH - 1.5) * MAZE_GRID_SIZE, (MAZE_HEIGHT - 1.5) * MAZE_GRID_SIZE);
-  gsk_path_builder_line_to (builder, (MAZE_WIDTH - 1.5) * MAZE_GRID_SIZE, (MAZE_HEIGHT + 0.5) * MAZE_GRID_SIZE);
-
-
-  gtk_bitset_unref (maze);
-
-  return gsk_path_builder_free_to_path (builder);
-}
-
-GtkWidget *
-do_path_maze (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *maze;
-      GtkMediaStream *stream;
-      GskPath *path;
-
-      window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_window_set_title (GTK_WINDOW (window), "Follow the maze with the mouse");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-#if 0
-      stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-#else
-      stream = gtk_nuclear_media_stream_new ();
-#endif
-      gtk_media_stream_play (stream);
-      gtk_media_stream_set_loop (stream, TRUE);
-
-      path = create_path_for_maze (window);
-
-      maze = gtk_maze_new (path,
-                           GDK_PAINTABLE (stream),
-                           MAZE_WIDTH * MAZE_GRID_SIZE,
-                           MAZE_HEIGHT * MAZE_GRID_SIZE);
-
-      gtk_window_set_child (GTK_WINDOW (window), maze);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/path_spinner.c

@@ -9,8 +9,6 @@
 
 #include "paintable.h"
 
-#undef SHOW_CONTROLS
-
 #define GTK_TYPE_SPINNER_PAINTABLE (gtk_spinner_paintable_get_type ())
 G_DECLARE_FINAL_TYPE (GtkSpinnerPaintable, gtk_spinner_paintable, GTK, SPINNER_PAINTABLE, GObject)
 
@@ -58,9 +56,9 @@ gtk_spinner_paintable_get_intrinsic_height (GdkPaintable *paintable)
 
 static void
 gtk_spinner_paintable_snapshot (GdkPaintable *paintable,
-                                GdkSnapshot  *snapshot,
-                                double        width,
-                                double        height)
+                             GdkSnapshot  *snapshot,
+                             double        width,
+                             double        height)
 {
   GtkSpinnerPaintable *self = GTK_SPINNER_PAINTABLE (paintable);
 
@@ -152,7 +150,6 @@ static gboolean
 add_controls (GskPathOperation        op,
               const graphene_point_t *pts,
               gsize                   n_pts,
-              float                   weight,
               gpointer                data)
 {
   GskPathBuilder *builder = data;
@@ -169,7 +166,7 @@ add_controls (GskPathOperation        op,
       break;
 
     case GSK_PATH_QUAD:
-    case GSK_PATH_CONIC:
+    case GSK_PATH_ARC:
       gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
       gsk_path_builder_line_to (builder, pts[2].x, pts[2].y);
       break;
@@ -193,21 +190,32 @@ update_path (GtkSpinnerPaintable *self)
 {
   GskPathBuilder *builder;
   GskPathPoint start, end;
-  graphene_point_t p0, p1;
+  GskTransform *t;
+  graphene_point_t p, p0, p1;
   float start_angle, end_angle;
 
+  p = GRAPHENE_POINT_INIT (40, 0);
   start_angle = self->angle;
   end_angle = fmod (self->angle + 360 * self->completion / 100, 360);
 
-  p0 = GRAPHENE_POINT_INIT (50 + 40 * cos (M_PI * start_angle / 180),
-                            50 + 40 * sin (M_PI * start_angle / 180));
-  p1 = GRAPHENE_POINT_INIT (50 + 40 * cos (M_PI * end_angle / 180),
-                            50 + 40 * sin (M_PI * end_angle / 180));
+  t = gsk_transform_translate (
+        gsk_transform_rotate (
+          gsk_transform_translate (NULL, &GRAPHENE_POINT_INIT (50, 50)),
+          start_angle),
+        &GRAPHENE_POINT_INIT (-50, -50));
+  gsk_transform_transform_point (t, &p, &p0);
+
+  t = gsk_transform_translate (
+        gsk_transform_rotate (
+          gsk_transform_translate (NULL, &GRAPHENE_POINT_INIT (50, 50)),
+          end_angle),
+        &GRAPHENE_POINT_INIT (-50, -50));
+  gsk_transform_transform_point (t, &p, &p1);
 
   g_clear_pointer (&self->path, gsk_path_unref);
 
-  gsk_path_get_closest_point (self->circle, &p0, INFINITY, &start, NULL);
-  gsk_path_get_closest_point (self->circle, &p1, INFINITY, &end, NULL);
+  gsk_path_get_closest_point (self->circle, &p0, INFINITY, &start);
+  gsk_path_get_closest_point (self->circle, &p1, INFINITY, &end);
 
   builder = gsk_path_builder_new ();
   gsk_path_builder_add_segment (builder, self->circle, &start, &end);

demos/gtk-demo/path_text.c

@@ -501,13 +501,15 @@ pointer_motion (GtkEventControllerMotion *controller,
                 GtkPathWidget            *self)
 {
   GskPathPoint point;
+  graphene_point_t pos;
 
   if (gsk_path_get_closest_point (self->line_path,
                                   &GRAPHENE_POINT_INIT (x, y),
                                   INFINITY,
-                                  &point,
-                                  NULL))
+                                  &point))
     {
+      gsk_path_point_get_position (&point, self->line_path, &pos);
+
       gtk_widget_queue_draw (GTK_WIDGET (self));
     }
 }

demos/gtk-demo/path_walk.ui

@@ -11,8 +11,6 @@
                 <property name="lower">0</property>
                 <property name="upper">5000</property>
                 <property name="value">500</property>
-                <property name="step-increment">1</property>
-                <property name="page-increment">10</property>
               </object>
             </property>
           </object>

demos/gtk-demo/pickers.c

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

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/gtk-demo/video_player.c

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

demos/icon-browser/iconbrowserapp.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,9 +68,6 @@ struct _NodeEditorWindow
   GFileMonitor *file_monitor;
 
   GArray *errors;
-
-  guint update_timeout;
-  gboolean auto_reload;
 };
 
 struct _NodeEditorWindowClass
@@ -77,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
@@ -176,84 +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
-reload (NodeEditorWindow *self)
+text_changed (GtkTextBuffer    *buffer,
+              NodeEditorWindow *self)
 {
   char *text;
   GBytes *bytes;
+  GtkTextIter iter;
+  GtkTextIter start, end;
   float scale;
   GskRenderNode *big_node;
 
+  g_array_remove_range (self->errors, 0, self->errors->len);
   text = get_current_text (self->text_buffer);
+  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);
@@ -314,19 +240,73 @@ reload (NodeEditorWindow *self)
     }
 
   g_clear_pointer (&big_node, gsk_render_node_unref);
-}
 
-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);
+  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);
 
-  if (self->auto_reload)
-    reload (self);
+  while (!gtk_text_iter_is_end (&iter))
+    {
+      gunichar c = gtk_text_iter_get_char (&iter);
 
-  highlight_text (self);
+      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
@@ -814,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);
@@ -886,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 ();
             }
@@ -1125,9 +1105,6 @@ node_editor_window_finalize (GObject *object)
 {
   NodeEditorWindow *self = (NodeEditorWindow *)object;
 
-  if (self->update_timeout)
-    g_source_remove (self->update_timeout);
-
   g_array_free (self->errors, TRUE);
 
   g_clear_pointer (&self->node, gsk_render_node_unref);
@@ -1144,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);
@@ -1183,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 (),
@@ -1567,79 +1538,6 @@ edit_action_cb (GtkWidget  *widget,
   node_editor_window_edit (self, &start);
 }
 
-static void
-node_editor_window_map (GtkWidget *widget)
-{
-  char *path;
-
-  GTK_WIDGET_CLASS (node_editor_window_parent_class)->map (widget);
-
-  path = get_autosave_path (NULL);
-  if (g_file_test (path, G_FILE_TEST_EXISTS))
-    {
-      g_free (path);
-      return;
-    }
-
-  g_free (path);
-}
-
-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)
 {
@@ -1651,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");
@@ -1660,14 +1556,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   widget_class->realize = node_editor_window_realize;
   widget_class->unrealize = node_editor_window_unrealize;
 
-  widget_class->map = node_editor_window_map;
-
-  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);
@@ -1677,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);
@@ -1690,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);
 
@@ -1742,133 +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 (path, &initial_text, &len, NULL))
-    {
-      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
-      g_free (initial_text);
-    }
-  else 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
-    {
-      /* 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
-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 gboolean
-update_timeout_cb (gpointer data)
-{
-  NodeEditorWindow *self = data;
-
-  self->update_timeout = 0;
-
-  mark_autosave_as_safe ();
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-initiate_autosave (NodeEditorWindow *self)
-{
-  autosave_contents (self);
-
-  if (self->update_timeout != 0)
-    g_source_remove (self->update_timeout);
-
-  self->update_timeout = g_timeout_add (100, update_timeout_cb, self);
-}
-
 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),
@@ -1881,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,
@@ -1922,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 (initiate_autosave), 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,14 +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>
-      </item>
       <item>
         <attribute name="label" translatable="yes">_Help</attribute>
         <attribute name="action">app.help</attribute>
@@ -32,6 +24,7 @@
       </item>
     </section>
   </menu>
+
   <object class="GtkPopover" id="testcase_popover">
     <child>
       <object class="GtkGrid">
@@ -46,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>
@@ -59,6 +52,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkLabel">
             <property name="wrap">1</property>
@@ -72,6 +66,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkLabel" id="testcase_error_label">
             <property name="wrap">1</property>
@@ -83,6 +78,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkButton" id="testcase_save_button">
             <property name="label">Save</property>
@@ -90,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>
@@ -104,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>
@@ -188,128 +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.
-</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

@@ -149,16 +149,15 @@ Creates a node like `gsk_debug_node_new()` with the given properties.
 
 ### fill
 
-| property  | syntax          | default                | printed     |
-| --------- | --------------- | ---------------------- | ----------- |
-| child     | `<node>`        | *see below*            | always      |
-| path      | `<string>`      | ""                     | always      |
-| fill-rule | `<fill-rule>`   | winding                | always      |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| child    | `<node>`         | *see below*            | always      |
+| path     | `<string>`       | ""                     | always      |
+| fill-rule| `<fill-rule>`    | winding                | always      |
 
 Creates a node like `gsk_fill_node_new()` with the given properties.
 
-The default child node is the default color node, but created with the
-bounds of the path.
+The default child node is created with the bounds of the path.
 
 ### glshader
 
@@ -317,44 +316,31 @@ Creates a node like `gsk_shadow_node_new()` with the given properties.
 
 Creates a node like `gsk_stroke_node_new()` with the given properties.
 
-The default child node is the default color node, but created with the
-stroke bounds of the path.
+The default child node is created with the stroke bounds of the path.
 
 ### text
 
-| property | syntax              | default             | printed     |
-| -------- | ------------------- | ------------------- | ----------- |
-| color    | `<color>`           | black               | non-default |
-| font     | `<string>` `<url>`? | "Cantarell 11"      | always      |
-| glyphs   | `<glyphs>`          | "Hello"             | always      |
-| offset   | `<point>`           | 0 0                 | 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 ID and advance width. Optionally, 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.
 
 ### 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;