tools: Add more commands to gtk4-path-tool

Add pathops.
gtk-demo: Add a demo for path ops
2023-07-25 08:23:52 +03:00 · 2023-07-25 08:23:52 +03:00 · 2023-07-25 08:23:52 +03:00 · 2023-07-25 08:23:52 +03:00 · 2023-07-25 08:23:52 +03:00 · 2023-07-25 08:23:52 +03:00
233 changed files with 29549 additions and 14961 deletions
@@ -418,11 +418,10 @@ reference:
            --buildtype=release
            --force-fallback-for=gdk-pixbuf,pango
            -Dintrospection=enabled
-            -Ddocumentation=true
            -Dgtk_doc=true
            -Dgdk-pixbuf:gtk_doc=true
            -Dpango:gtk_doc=true
-            -Dbuild-demos=false
+            -Ddemos=false
            -Dbuild-examples=false
            -Dbuild-tests=false
            -Dbuild-testsuite=false
@@ -1,32 +0,0 @@
-#!/usr/bin/sh
-#
-builddir=$1
-suite=$2
-unit=$3
-
-echo "** builddir: ${builddir}"
-echo "**    suite: ${suite}"
-echo "**     unit: ${unit}"
-
-export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-compositor=$!
-
-export WAYLAND_DISPLAY=wayland-5
-
-meson test -C ${builddir} \
-            --print-errorlogs \
-            --setup=wayland \
-            --suite=${suite} \
-            --no-suite=failing \
-            --no-suite=flaky \
-            --no-suite=wayland_failing \
-            --no-suite=gsk-compare-broadway \
-            --verbose \
-            "${unit}"
-
-exit_code=$?
-kill ${compositor}
-
-exit ${exit_code}
@@ -7,7 +7,7 @@ Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>

-The team that build GTK 2 (in alphabetical order)
+The Team that build GTK 2 (in alphabetical order)
 -------------------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
 Jerome Bolliet    <bolliet@gtk.org>
@@ -28,8 +28,9 @@ Jay Painter       <jpaint@gtk.org>
 Manish Singh      <manish@gtk.org>
 Owen Taylor       <otaylor@gtk.org>

-The team that built GTK 3
-------------------------
+The current team (GTK 3 and 4)
+------------------------------
+
 Jonas Ådahl       <jadahl@gmail.com>
 Tim Bäder         <mail@baedert.org>
 Emmanuele Bassi   <ebassi@gnome.org>
@@ -39,16 +40,6 @@ Carlos Garnacho   <mrgarnacho@gmail.com>
 Alexander Larsson <alexl@redhat.com>
 Benjamin Otte     <otte@gnome.org>

-The current team (GTK 4)
------------------------
-Jonas Ådahl       <jadahl@gmail.com>
-Emmanuele Bassi   <ebassi@gnome.org>
-Christian Hergert <chergert@gnome.org>
-Chun-wei Fan      <fanchunwei@src.gnome.org>
-Matthias Clasen   <mclasen@redhat.com>
-Carlos Garnacho   <mrgarnacho@gmail.com>
-Benjamin Otte     <otte@gnome.org>
-

 There are many others who have contributed patches; we thank them,
 GTK is much better because of them.
@@ -58,15 +49,35 @@ Over time, GTK has incorporated some pieces of software which
 started as independent projects. We list the original authors here:


+MS-Windows theme engine
+-----------------------
+Raymond Penners
+Dom Lachowicz
+
+
+Pixbuf theme engine
+-------------------
+Owen Taylor
+
+
 IME input method
 ----------------
 Takuro Ashie
 Kazuki IWAMOTO

-MacOS backend
-------------
+
+Mac OS X backend
+----------------
 Anders Carlsson

-GtkInspector (originally gtkparasite)
-------------------------------------
+
+DirectFB backend
+----------------
+Denis Oliver Kropp
+Sven Neumann
+Mike Emmel
+
+
+gtkparasite
+-----------
 Christian Hammond
@@ -1,150 +0,0 @@
-TAP version 13
-# random seed: R02S22611f6aefc1121b0ab2dc5286960449
-# GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dconf (DConfSettingsBackend) for ‘gsettings-backend’
-# GLib-GIO-DEBUG: Using cross-namespace EXTERNAL authentication (this will deadlock if server is GDBus < 2.73.3)
-# GLib-GIO-DEBUG: Using cross-namespace EXTERNAL authentication (this will deadlock if server is GDBus < 2.73.3)
-1..1
-# Start of ops tests
-# testcase 0 op 0
-collecting# 
-    Cubic 0: # M 100.000000 100.000000 C 150.000000 100.000000 200.000000 100.000000 250.000000 100.000000 
-    Cubic 1: # M 250.000000 100.000000 C 300.000000 100.000000 350.000000 100.000000 400.000000 100.000000 
-    Line 2: # M 400 100 L 200 300 
-    Line 3: # M 200 300 L 100 100 
-    Cubic 4: # M 200.000000 100.000000 C 250.000000 100.000000 300.000000 100.000000 350.000000 100.000000 
-    Cubic 5: # M 350.000000 100.000000 C 400.000000 100.000000 450.000000 100.000000 500.000000 100.000000 
-    Line 6: # M 500 100 L 300 300 
-    Line 7: # M 300 300 L 200 100 
-splitting# 
-1 intersections between Cubic 0 and Cubic 1# 
-1 intersections between Cubic 0 and Line 3# 
-9 intersections between Cubic 0 and Cubic 4# 
-# split Cubic 0.0 from Cubic 0 at 0.666666: M 100.000000 100.000000 C 133.333298 100.000000 166.666595 100.000000 199.999893 100.000000
-split Cubic 0.1 from Cubic 0 at 0.666666: M 199.999893 100.000000 C 216.666595 100.000000 233.333298 100.000000 250.000000 100.000000split Cubic 0.4 from Cubic 0 at 0.00600814: M 200.300323 100.000000 C 216.866882 100.000000 233.433441 100.000000 250.000000 100.000000split Cubic 0.7 from Cubic 0 at 0.00604445: M 200.600708 100.000000 C 217.067139 100.000000 233.533569 100.000000 250.000000 100.000000# split Cubic 4.9 from Cubic 4 at 0.00533867: M 200.800812 100.000000 C 250.533875 100.000000 300.266937 100.000000 350.000000 100.000000
-1 intersections between Cubic 0.1 and Line 7# 
-1 intersections between Cubic 1 and Line 2# 
-9 intersections between Cubic 1 and Cubic 4.9# 
-split Cubic 1.9 from Cubic 1 at 0.00534248: M 250.801361 100.000000 C 300.534241 100.000000 350.267120 100.000000 400.000000 100.000000# split Cubic 4.9.0 from Cubic 4.9 at 0.329756: M 200.800812 100.000000 C 217.200577 100.000000 233.600342 100.000000 250.000122 100.000000
-# split Cubic 4.9.1 from Cubic 4.9 at 0.329756: M 250.000122 100.000000 C 283.333435 100.000000 316.666718 100.000000 350.000000 100.000000
-# split Cubic 4.9.6 from Cubic 4.9 at 0.00500283: M 250.500412 100.000000 C 283.666931 100.000000 316.833466 100.000000 350.000000 100.000000
-9 intersections between Cubic 1.9 and Cubic 5# 
-# split Cubic 1.9.0 from Cubic 1.9 at 0.664877: M 250.801361 100.000000 C 283.867615 100.000000 316.933868 100.000000 350.000122 100.000000
-split Cubic 1.9.1 from Cubic 1.9 at 0.664877: M 350.000122 100.000000 C 366.666748 100.000000 383.333374 100.000000 400.000000 100.000000split Cubic 1.9.4 from Cubic 1.9 at 0.00601021: M 350.300598 100.000000 C 366.867065 100.000000 383.433533 100.000000 400.000000 100.000000split Cubic 1.9.7 from Cubic 1.9 at 0.00604655: M 350.601074 100.000000 C 367.067383 100.000000 383.533691 100.000000 400.000000 100.000000# split Cubic 5.9 from Cubic 5 at 0.00534248: M 350.801361 100.000000 C 400.534241 100.000000 450.267120 100.000000 500.000000 100.000000
-1 intersections between Line 2 and Line 3# 
-1 intersections between Line 2 and Line 7# 
-# split Line 2.0 from Line 2 at 0.666667: M 400 100 L 266.667 233.333
-split Line 2.1 from Line 2 at 0.666667: M 266.667 233.333 L 200 300# split Line 7.0 from Line 7 at 0.333333: M 300 300 L 266.667 233.333
-# split Line 7.1 from Line 7 at 0.333333: M 266.667 233.333 L 200 100
-1 intersections between Cubic 4 and Cubic 4.9.0# 
-1 intersections between Cubic 4 and Line 7.1# 
-1 intersections between Cubic 4.9.0 and Cubic 4.9.1# 
-1 intersections between Cubic 4.9.1 and Cubic 4.9.6# 
-1 intersections between Cubic 4.9.6 and Cubic 5# 
-1 intersections between Cubic 5 and Cubic 5.9# 
-1 intersections between Cubic 5.9 and Line 6# 
-1 intersections between Line 6 and Line 7.0# 
-    Cubic 0.0: # M 100.000000 100.000000 C 133.333298 100.000000 166.666595 100.000000 199.999893 100.000000 
-    Cubic 0.1: # M 199.999893 100.000000 C 200.100037 100.000000 200.200180 100.000000 200.300323 100.000000 
-    Cubic 0.4: # M 200.300323 100.000000 C 200.400452 100.000000 200.500580 100.000000 200.600708 100.000000 
-    Cubic 0.7: # M 200.600708 100.000000 C 217.067139 100.000000 233.533569 100.000000 250.000000 100.000000 
-    Cubic 1: # M 250.000000 100.000000 C 250.267120 100.000000 250.534241 100.000000 250.801361 100.000000 
-    Cubic 1.9.0: # M 250.801361 100.000000 C 283.867615 100.000000 316.933868 100.000000 350.000122 100.000000 
-    Cubic 1.9.1: # M 350.000122 100.000000 C 350.100281 100.000000 350.200439 100.000000 350.300598 100.000000 
-    Cubic 1.9.4: # M 350.300598 100.000000 C 350.400757 100.000000 350.500916 100.000000 350.601074 100.000000 
-    Cubic 1.9.7: # M 350.601074 100.000000 C 367.067383 100.000000 383.533691 100.000000 400.000000 100.000000 
-    Line 2.0: # M 400 100 L 266.667 233.333 
-    Line 2.1: # M 266.667 233.333 L 200 300 
-    Line 3: # M 200 300 L 100 100 
-    Cubic 4: # M 200.000000 100.000000 C 200.266937 100.000000 200.533875 100.000000 200.800812 100.000000 
-    Cubic 4.9.0: # M 200.800812 100.000000 C 217.200577 100.000000 233.600342 100.000000 250.000122 100.000000 
-    Cubic 4.9.1: # M 250.000122 100.000000 C 250.166885 100.000000 250.333649 100.000000 250.500412 100.000000 
-    Cubic 4.9.6: # M 250.500412 100.000000 C 283.666931 100.000000 316.833466 100.000000 350.000000 100.000000 
-    Cubic 5: # M 350.000000 100.000000 C 350.267120 100.000000 350.534241 100.000000 350.801361 100.000000 
-    Cubic 5.9: # M 350.801361 100.000000 C 400.534241 100.000000 450.267120 100.000000 500.000000 100.000000 
-    Line 6: # M 500 100 L 300 300 
-    Line 7.0: # M 300 300 L 266.667 233.333 
-    Line 7.1: # M 266.667 233.333 L 200 100 
-classifying# 
- 01 Cubic 0.0: # M 100.000000 100.000000 C 133.333298 100.000000 166.666595 100.000000 199.999893 100.000000 
-[11 Cubic 0.7: # M 200.600708 100.000000 C 217.067139 100.000000 233.533569 100.000000 250.000000 100.000000 ]
-[11 Cubic 1.9.0: # M 250.801361 100.000000 C 283.867615 100.000000 316.933868 100.000000 350.000122 100.000000 ]
-[11 Cubic 1.9.7: # M 350.601074 100.000000 C 367.067383 100.000000 383.533691 100.000000 400.000000 100.000000 ]
-[11 Line 2.0: # M 400 100 L 266.667 233.333 ]
- 01 Line 2.1: # M 266.667 233.333 L 200 300 
- 01 Line 3: # M 200 300 L 100 100 
-[11 Cubic 4: # M 200.000000 100.000000 C 200.266937 100.000000 200.533875 100.000000 200.800812 100.000000 ]
-[11 Cubic 4.9.0: # M 200.800812 100.000000 C 217.200577 100.000000 233.600342 100.000000 250.000122 100.000000 ]
-[11 Cubic 4.9.6: # M 250.500412 100.000000 C 283.666931 100.000000 316.833466 100.000000 350.000000 100.000000 ]
-[11 Cubic 5: # M 350.000000 100.000000 C 350.267120 100.000000 350.534241 100.000000 350.801361 100.000000 ]
- 01 Cubic 5.9: # M 350.801361 100.000000 C 400.534241 100.000000 450.267120 100.000000 500.000000 100.000000 
- 01 Line 6: # M 500 100 L 300 300 
- 01 Line 7.0: # M 300 300 L 266.667 233.333 
-[11 Line 7.1: # M 266.667 233.333 L 200 100 ]
-fixups# 
-# found 3 bad nodes
-# split Cubic 0/Cubic 4 BAD 200.600723 100.000000
-# 	[11 Line 7.1 ] 116.565
-# 	[11 Cubic 0.7 ] 180
-# 	[11 Cubic 4 ] 180
-# 	[11 Cubic 4 ] 180
-# 	[11 Cubic 4.9.0 ] 180
-# 	>01 Cubic 0.0  360
-# split Cubic 1/Cubic 4.9 BAD 250.801376 100.000000
-# 	[11 Cubic 1.9.0 ] 180
-# 	[11 Cubic 4.9.6 ] 180
-# 	[11 Cubic 0.7 ] 360
-# 	[11 Cubic 4.9.0 ] 360
-# split Cubic 1.9/Cubic 5 BAD 350.601105 100.000000
-# 	[11 Cubic 1.9.7 ] 180
-# 	[11 Cubic 5 ] 180
-# 	[11 Cubic 5 ] 180
-# 	<01 Cubic 5.9  180
-# 	[11 Cubic 1.9.0 ] 360
-# 	[11 Cubic 4.9.6 ] 360
-reassembling# 
-start new contour Cubic 0.0# 
-# Cubic 0.0 ends at: 
-# start 0 100.000000 100.000000
-# 	>01 Line 3  116.565
-# 	(10 Cubic 0.0 ) 180
-picking cw# 
-append Line 3# 
-# Line 3 ends at: 
-# end 2 200.000000 300.000000
-# 	>01 Line 2.1  225
-# 	(10 Line 3 ) 296.565
-picking cw# 
-append Line 2.1# 
-# Line 2.1 ends at: 
-# split Line 2/Line 7 266.666656 233.333344
-# 	(10 Line 2.1 ) 45
-# 	>01 Line 7.0  116.565
-# 	[11 Line 2.0 ] 225
-# 	[11 Line 7.1 ] 296.565
-picking cw# 
-append Line 7.0# 
-# Line 7.0 ends at: 
-# end 6 300.000000 300.000000
-# 	>01 Line 6  225
-# 	(10 Line 7.0 ) 296.565
-picking cw# 
-append Line 6# 
-# Line 6 ends at: 
-# end 5 500.000000 100.000000
-# 	(10 Line 6 ) 45
-# 	>01 Cubic 5.9  360
-picking cw# 
-append Cubic 5.9# 
-# Cubic 5.9 ends at: 
-# split Cubic 1.9/Cubic 5 BAD 350.601105 100.000000
-# 	[11 Cubic 1.9.7 ] 180
-# 	[11 Cubic 5 ] 180
-# 	[11 Cubic 5 ] 180
-# 	(10 Cubic 5.9 ) 180
-# 	[11 Cubic 1.9.0 ] 360
-# 	[11 Cubic 4.9.6 ] 360
-picking cw# 
-**
-ERROR:../testsuite/gsk/path-ops.c:359:test_ops_simple: assertion failed (s == tests[i].out): ("M 354.60110473632812 100 A 4 4 0 0 0 346.60110473632812 100 A 4 4 0 0 0 354.60110473632812 100 z M 252.80137634277344 100 A 2 2 0 0 0 248.80137634277344 100 A 2 2 0 0 0 252.80137634277344 100 z M 204.60072326660156 100 A 4 4 0 0 0 196.60072326660156 100 A 4 4 0 0 0 204.60072326660156 100 z" == "M 100 100 z")
-not ok /ops/simple - ERROR:../testsuite/gsk/path-ops.c:359:test_ops_simple: assertion failed (s == tests[i].out): ("M 354.60110473632812 100 A 4 4 0 0 0 346.60110473632812 100 A 4 4 0 0 0 354.60110473632812 100 z M 252.80137634277344 100 A 2 2 0 0 0 248.80137634277344 100 A 2 2 0 0 0 252.80137634277344 100 z M 204.60072326660156 100 A 4 4 0 0 0 196.60072326660156 100 A 4 4 0 0 0 204.60072326660156 100 z" == "M 100 100 z")
-Bail out!
@@ -1,138 +1,6 @@
-Overview of Changes in 4.13.0, xx-xx-xxxx
+Overview of Changes in 4.11.5, xx-xx-xxxx
 =========================================

-Overview of Changes in 4.12.0, 05-08-2023
-=========================================
-
-* List widgets:
- - Add scroll_to APIs
-
-* GtkFileLauncher:
- - Add an always-ask property
-
-* GtkTextView:
- - Make backspace behavior match GtkEntry
-
-* gsk:
- - Fix handling of luminance in mask nodes
-
-* Text rendering:
- - Automate the setting of gtk-hint-font-metrics from the
-   scale factor. This improves font rendering in flatpaks
-
-* Wayland:
- - Fix behavior of stylus buttons
- - Support suspended window state
-
-* Vulkan:
- - Many improvements
-
-* Tools:
- - Add gtk4-rendernode-tool
-
-* Debugging:
- - Drop the GTK_DEBUG_TOUCHSCREEN flag
-
-* Build:
- - Some build options have been renamed:
-     gtk_doc -> documentation
-     update_screenshots -> screenshots
-   The old names still work
-
-* Translation updates:
- Georgian
- Greek
- Hebrew
- Persian
- Vietnamese
-
-* Contributors:
- Aleksandr Melman
- Alexander Mikhaylenko
- Alexander Shopov
- Alexandre Franke
- Alice Mikhaylenko
- António Fernandes
- Arjan Molenaar
- Asier Sarasua Garmendia
- Balázs Meskó
- Balázs Úr
- Barnabás Pőcze
- Bart Jacobs
- Benjamin Otte
- Bilal Elmoussaoui
- Boyuan Yang
- Bruce Cowan
- Calvin Walton
- Cam Cook
- Chris Mayo
- Christian Hergert
- Christopher Davis
- Chun-wei Fan
- Corey Berla
- Danial Behzadi
- Daniel Boles
- Daniel Rusek
- Efstathios Iosifidis
- Ekaterine Papava
- Emin Tufan Çetin
- Emmanuele Bassi
- Erik Schilling
- Fabio Tomat
- FeRD (Frank Dana)
- Fina Wilke
- FineFindus
- Fran Dieguez
- G.Willems
- Georges Basile Stavracas Neto
- Guillaume Bernard
- Hugo Carvalho
- Ivan Molodetskikh
- Jason Francis
- Jonas Ådahl
- Jordan Petridis
- Jordi Mas
- José Expósito
- José Roberto de Souza
- Khalid Abu Shawarib
- Kévin Commaille
- Leônidas Araújo
- Luca Bacci
- Ludovico de Nittis
- Lukáš Tyrychtr
- Marc-André Lureau
- Marco Trevisan (Treviño)
- Matt Turner
- Matthias Clasen
- Maximiliano Sandoval R
- Michael Catanzaro
- Michel Dänzer
- Mohammed Sadiq
- Nathan Follens
- Nelson Benítez León
- Ngọc Quân Trần
- Niels De Graef
- Olivier Crête
- Patrick Griffis
- Piotr Drąg
- Sabri Ünal
- Sebastian Keller
- Sophie Herold
- Sébastien Le Roux
- Takao Fujiwara
- Thomas Lange
- Yiğit Burak
- Yosef Or Boczko
- Yuri Chornoivan
- Zander Brown
- al_SeveR
- dgsasha
- sumibi-yakitori
- tszymanski
- velsinki
- Алексей Шилин
- Арсений Засыпкин
-
 Overview of Changes in 4.11.4, 03-07-2023
 =========================================

@@ -67,13 +67,6 @@ building for:
  - [Graphene](https://github.com/ebassi/graphene)
  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)

-If you are building the Wayland backend, you will also need:
-
-  - Wayland-client
-  - Wayland-protocols
-  - Wayland-cursor
-  - Wayland-EGL
-
 If you are building the X11 backend, you will also need:

  - Xlib, and the following X extensions:
@@ -86,24 +79,32 @@ If you are building the X11 backend, you will also need:
    - xdamage
    - xcomposite

+If you are building the Wayland backend, you will also need:
+
+  - Wayland-client
+  - Wayland-protocols
+  - Wayland-cursor
+  - Wayland-EGL
+
 Once you have all the necessary dependencies, you can build GTK by using
 Meson:

 ```sh
-$ meson setup _build
-$ meson compile -C_build
+$ meson _build .
+$ cd _build
+$ ninja
 ```

 You can run the test suite using:

 ```sh
-$ meson test -C_build
+$ meson test
 ```

 And, finally, you can install GTK using:

 ```
-$ sudo meson install -C_build
+$ sudo ninja install
 ```

 Complete information about installing GTK and related libraries
@@ -483,8 +483,6 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
  GObjectClass *object_class = G_OBJECT_CLASS (class);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);

-  g_type_ensure (CONSTRAINT_VIEW_TYPE);
-
  object_class->dispose = constraint_editor_window_dispose;

  gtk_widget_class_set_template_from_resource (widget_class,
@@ -20,7 +20,8 @@
 #include "config.h"

 #include "constraint-editor.h"
-#include "constraint-view.h"
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS

 struct _ConstraintEditor
 {
@@ -65,7 +66,7 @@ static const char *
 get_target_name (GtkConstraintTarget *target)
 {
  if (target == NULL)
-    return "Super";
+    return "super";
  else if (GTK_IS_WIDGET (target))
    return gtk_widget_get_name (GTK_WIDGET (target));
  else if (GTK_IS_CONSTRAINT_GUIDE (target))
@@ -79,29 +80,62 @@ constraint_target_combo (GListModel *model,
                         GtkWidget  *combo,
                         gboolean    is_source)
 {
-  GtkStringList *targets;
  int i;

-  targets = gtk_string_list_new (NULL);
-
-  gtk_string_list_append (targets, "Super");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "super", "Super");

  if (model)
    {
      for (i = 0; i < g_list_model_get_n_items (model); i++)
        {
          GObject *item = g_list_model_get_object (model, i);
+          const char *name;

          if (GTK_IS_CONSTRAINT (item))
            continue;

-          gtk_string_list_append (targets, get_target_name (GTK_CONSTRAINT_TARGET (item)));
+          name = get_target_name (GTK_CONSTRAINT_TARGET (item));
+
+          gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), name, name);
          g_object_unref (item);
        }
    }
+}

-  gtk_drop_down_set_model (GTK_DROP_DOWN (combo), G_LIST_MODEL (targets));
-  g_object_unref (targets);
+static void
+constraint_attribute_combo (GtkWidget *combo,
+                            gboolean is_source)
+{
+  if (is_source)
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "none", "None");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "left", "Left");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "right", "Right");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "top", "Top");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "bottom", "Bottom");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "start", "Start");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "end", "End");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "width", "Width");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "height", "Height");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-x", "Center X");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-y", "Center Y");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "baseline", "Baseline");
+}
+
+static void
+constraint_relation_combo (GtkWidget *combo)
+{
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "le", "≤");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "eq", "=");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "ge", "≥");
+}
+
+static void
+constraint_strength_combo (GtkWidget *combo)
+{
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
 }

 static gpointer
@@ -113,7 +147,7 @@ get_target (GListModel *model,
  if (id == NULL)
    return NULL;

-  if (strcmp ("Super", id) == 0)
+  if (strcmp ("super", id) == 0)
    return NULL;

  for (i = 0; i < g_list_model_get_n_items (model); i++)
@@ -137,65 +171,16 @@ get_target (GListModel *model,
  return NULL;
 }

-static void
-select_target (GtkDropDown *combo,
-               const char  *target_name)
-{
-  GListModel *model = gtk_drop_down_get_model (combo);
-
-  for (unsigned int i = 0; i < g_list_model_get_n_items (model); i++)
-    {
-      GtkStringObject *s = g_list_model_get_item (model, i);
-
-      g_object_unref (s);
-      if (strcmp (target_name, gtk_string_object_get_string (s)) == 0)
-        {
-          gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), i);
-          return;
-        }
-    }
-}
-
 static GtkConstraintAttribute
-get_attr (unsigned int id)
+get_target_attr (const char *id)
 {
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_ATTRIBUTE_NONE;
-    case 1: return GTK_CONSTRAINT_ATTRIBUTE_LEFT;
-    case 2: return GTK_CONSTRAINT_ATTRIBUTE_RIGHT;
-    case 3: return GTK_CONSTRAINT_ATTRIBUTE_TOP;
-    case 4: return GTK_CONSTRAINT_ATTRIBUTE_BOTTOM;
-    case 5: return GTK_CONSTRAINT_ATTRIBUTE_START;
-    case 6: return GTK_CONSTRAINT_ATTRIBUTE_END;
-    case 7: return GTK_CONSTRAINT_ATTRIBUTE_WIDTH;
-    case 8: return GTK_CONSTRAINT_ATTRIBUTE_HEIGHT;
-    case 9: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_X;
-    case 10: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y;
-    case 11: return GTK_CONSTRAINT_ATTRIBUTE_BASELINE;
-    default: g_assert_not_reached ();
-    }
-}
+  GtkConstraintAttribute attr;
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
+  attr = value->value;
+  g_type_class_unref (class);

-static unsigned int
-get_attr_id (GtkConstraintAttribute attr)
-{
-  switch (attr)
-    {
-    case GTK_CONSTRAINT_ATTRIBUTE_NONE: return 0;
-    case GTK_CONSTRAINT_ATTRIBUTE_LEFT: return 1;
-    case GTK_CONSTRAINT_ATTRIBUTE_RIGHT: return 2;
-    case GTK_CONSTRAINT_ATTRIBUTE_TOP: return 3;
-    case GTK_CONSTRAINT_ATTRIBUTE_BOTTOM: return 4;
-    case GTK_CONSTRAINT_ATTRIBUTE_START: return 5;
-    case GTK_CONSTRAINT_ATTRIBUTE_END: return 6;
-    case GTK_CONSTRAINT_ATTRIBUTE_WIDTH: return 7;
-    case GTK_CONSTRAINT_ATTRIBUTE_HEIGHT: return 8;
-    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_X: return 9;
-    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y: return 10;
-    case GTK_CONSTRAINT_ATTRIBUTE_BASELINE: return 11;
-    default: g_assert_not_reached ();
-    }
+  return attr;
 }

 static const char *
@@ -210,27 +195,15 @@ get_attr_nick (GtkConstraintAttribute attr)
 }

 static GtkConstraintRelation
-get_relation (unsigned int id)
+get_relation (const char *id)
 {
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_RELATION_LE;
-    case 1: return GTK_CONSTRAINT_RELATION_EQ;
-    case 2: return GTK_CONSTRAINT_RELATION_GE;
-    default: g_assert_not_reached ();
-    }
-}
+  GtkConstraintRelation relation;
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
+  relation = value->value;
+  g_type_class_unref (class);

-static unsigned int
-get_relation_id (GtkConstraintRelation relation)
-{
-  switch (relation)
-    {
-    case GTK_CONSTRAINT_RELATION_LE: return 0;
-    case GTK_CONSTRAINT_RELATION_EQ: return 1;
-    case GTK_CONSTRAINT_RELATION_GE: return 2;
-    default: g_assert_not_reached ();
-    }
+  return relation;
 }

 static const char *
@@ -261,29 +234,15 @@ get_relation_display_name (GtkConstraintRelation relation)
 }

 static GtkConstraintStrength
-get_strength (unsigned int id)
-{ 
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
-    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
-    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
-    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
-    default: g_assert_not_reached ();
-    }
-}
-
-static unsigned int
-get_strength_id (GtkConstraintStrength strength)
+get_strength (const char *id)
 {
-  switch (strength)
-    {
-    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
-    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
-    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
-    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
-    default: g_assert_not_reached ();
-    }
+  GtkConstraintStrength strength;
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
+  strength = value->value;
+  g_type_class_unref (class);
+
+  return strength;
 }

 static const char *
@@ -335,7 +294,7 @@ static void
 create_constraint (GtkButton        *button,
                   ConstraintEditor *editor)
 {
-  gpointer obj;
+  const char *id;
  gpointer target;
  GtkConstraintAttribute target_attr;
  gpointer source;
@@ -346,27 +305,25 @@ create_constraint (GtkButton        *button,
  int strength;
  GtkConstraint *constraint;

-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
-  if (obj)
-    target = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
-  else
-    target = NULL;
-  target_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->target_attr)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
+  target = get_target (editor->model, id);
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
+  target_attr = get_target_attr (id);

-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
-  if (obj)
-    source = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
-  else
-    source = NULL;
-  source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN(editor->source_attr)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
+  source = get_target (editor->model, id);
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
+  source_attr = get_target_attr (id);

-  relation = get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->relation));
+  relation = get_relation (id);

  multiplier = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->multiplier)), NULL);

  constant = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->constant)), NULL);

-  strength = get_strength (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
+  strength = get_strength (id);

  constraint = gtk_constraint_new (target, target_attr,
                                   relation,
@@ -381,9 +338,12 @@ create_constraint (GtkButton        *button,
 static void
 source_attr_changed (ConstraintEditor *editor)
 {
-  if (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))) == GTK_CONSTRAINT_ATTRIBUTE_NONE)
+  const char *id;
+
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
+  if (strcmp (id, "none") == 0)
    {
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source), GTK_INVALID_LIST_POSITION);
+      gtk_combo_box_set_active (GTK_COMBO_BOX (editor->source), -1);
      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "");
      gtk_widget_set_sensitive (editor->source, FALSE);
      gtk_widget_set_sensitive (editor->multiplier, FALSE);
@@ -449,7 +409,7 @@ update_preview (ConstraintEditor *editor)
  GString *str;
  const char *name;
  const char *attr;
-  const char *relation;
+  char *relation;
  const char *multiplier;
  const char *constant;
  double c, m;
@@ -459,22 +419,23 @@ update_preview (ConstraintEditor *editor)

  str = g_string_new ("");

-  name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target))));
-  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected ((GTK_DROP_DOWN (editor->target_attr)))));
-  relation = get_relation_nick (get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation))));
+  name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
+  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
+  relation = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (editor->relation));

  if (name == NULL)
    name = "[ ]";

  g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
+  g_free (relation);

  constant = gtk_editable_get_text (GTK_EDITABLE (editor->constant));
  c = g_ascii_strtod (constant, NULL);

-  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))));
+  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
  if (strcmp (attr, "none") != 0)
    {
-       name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source))));
+      name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
      multiplier = gtk_editable_get_text (GTK_EDITABLE (editor->multiplier));
      m = g_ascii_strtod (multiplier, NULL);

@@ -502,18 +463,12 @@ update_preview (ConstraintEditor *editor)
 static void
 update_button (ConstraintEditor *editor)
 {
-  gpointer obj;
-  const char *target;
-  const char *source;
-  GtkConstraintAttribute source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr)));
+  const char *target = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
+  const char *source = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
+  const char *source_attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));

-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
-  target = obj ? gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
-
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
-  source = obj ?  gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
-
-  if (target && (source || (source_attr == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
+  if (target &&
+      (source || (source_attr && get_target_attr (source_attr) == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
    gtk_widget_set_sensitive (editor->button, TRUE);
  else
    gtk_widget_set_sensitive (editor->button, FALSE);
@@ -531,7 +486,12 @@ constraint_editor_constructed (GObject *object)
  ConstraintEditor *editor = CONSTRAINT_EDITOR (object);

  constraint_target_combo (editor->model, editor->target, FALSE);
+  constraint_attribute_combo (editor->target_attr, FALSE);
+  constraint_relation_combo (editor->relation);
  constraint_target_combo (editor->model, editor->source, TRUE);
+  constraint_attribute_combo (editor->source_attr, TRUE);
+
+  constraint_strength_combo (editor->strength);

  if (editor->constraint)
    {
@@ -539,24 +499,30 @@ constraint_editor_constructed (GObject *object)
      GtkConstraintAttribute attr;
      GtkConstraintRelation relation;
      GtkConstraintStrength strength;
+      const char *nick;
      char *val;
      double multiplier;
      double constant;

      target = gtk_constraint_get_target (editor->constraint);
-      select_target (GTK_DROP_DOWN (editor->target), get_target_name (target));
+      nick = get_target_name (target);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target), nick);

      attr = gtk_constraint_get_target_attribute (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (attr));
+      nick = get_attr_nick (attr);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), nick);

      target = gtk_constraint_get_source (editor->constraint);
-      select_target (GTK_DROP_DOWN (editor->source), get_target_name (target));
+      nick = get_target_name (target);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source), nick);

      attr = gtk_constraint_get_source_attribute (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (attr));
+      nick = get_attr_nick (attr);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), nick);

      relation = gtk_constraint_get_relation (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (relation));
+      nick = get_relation_nick (relation);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), nick);

      multiplier = gtk_constraint_get_multiplier (editor->constraint);
      val = g_strdup_printf ("%g", multiplier);
@@ -569,16 +535,17 @@ constraint_editor_constructed (GObject *object)
      g_free (val);

      strength = gtk_constraint_get_strength (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
+      nick = get_strength_nick (strength);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);

      gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
    }
  else
    {
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (GTK_CONSTRAINT_RELATION_EQ));
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_REQUIRED));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), "left");
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), "left");
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), "eq");
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "required");

      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1.0");
      gtk_editable_set_text (GTK_EDITABLE (editor->constant), "0.0");
@@ -1,21 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <object class="GtkStringList" id="targets">
-    <items>
-      <item>None</item>
-      <item>Left</item>
-      <item>Right</item>
-      <item>Top</item>
-      <item>Bottom</item>
-      <item>Start</item>
-      <item>End</item>
-      <item>Width</item>
-      <item>Height</item>
-      <item>Center X</item>
-      <item>Center Y</item>
-      <item>Baseline</item>
-    </items>
-  </object>
  <template class="ConstraintEditor" parent="GtkWidget">
    <child>
      <object class="GtkGrid" id="grid">
@@ -35,9 +19,9 @@
          </object>
        </child>
        <child>
-          <object class="GtkDropDown" id="target">
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
-            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+          <object class="GtkComboBoxText" id="target">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
+            <signal name="changed" handler="update_button" swapped="yes"/>
            <layout>
              <property name="column">1</property>
              <property name="row">1</property>
@@ -45,9 +29,8 @@
          </object>
        </child>
        <child>
-          <object class="GtkDropDown" id="target_attr">
-            <property name="model">targets</property>
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+          <object class="GtkComboBoxText" id="target_attr">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
              <property name="column">2</property>
              <property name="row">1</property>
@@ -64,17 +47,8 @@
          </object>
        </child>
        <child>
-          <object class="GtkDropDown" id="relation">
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
-            <property name="model">
-              <object class="GtkStringList">
-                <items>
-                  <item>≤</item>
-                  <item>=</item>
-                  <item>≥</item>
-                </items>
-              </object>
-            </property>
+          <object class="GtkComboBoxText" id="relation">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
              <property name="column">1</property>
              <property name="row">2</property>
@@ -91,9 +65,9 @@
          </object>
        </child>
        <child>
-          <object class="GtkDropDown" id="source">
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
-            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+          <object class="GtkComboBoxText" id="source">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
+            <signal name="changed" handler="update_button" swapped="yes"/>
            <layout>
              <property name="column">1</property>
              <property name="row">3</property>
@@ -101,11 +75,10 @@
          </object>
        </child>
        <child>
-          <object class="GtkDropDown" id="source_attr">
-            <property name="model">targets</property>
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
-            <signal name="notify::selected" handler="source_attr_changed" swapped="yes"/>
-            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+          <object class="GtkComboBoxText" id="source_attr">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
+            <signal name="changed" handler="source_attr_changed" swapped="yes"/>
+            <signal name="changed" handler="update_button" swapped="yes"/>
            <layout>
              <property name="column">2</property>
              <property name="row">3</property>
@@ -158,17 +131,7 @@
          </object>
        </child>
        <child>
-          <object class="GtkDropDown" id="strength">
-            <property name="model">
-              <object class="GtkStringList">
-                <items>
-                  <item>Weak</item>
-                  <item>Medium</item>
-                  <item>Strong</item>
-                  <item>Required</item>
-                </items>
-              </object>
-            </property>
+          <object class="GtkComboBoxText" id="strength">
            <layout>
              <property name="column">1</property>
              <property name="row">6</property>
@@ -21,6 +21,8 @@

 #include "guide-editor.h"

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 struct _GuideEditor
 {
  GtkWidget parent_instance;
@@ -57,30 +59,25 @@ static guint signals[LAST_SIGNAL];

 G_DEFINE_TYPE(GuideEditor, guide_editor, GTK_TYPE_WIDGET);

-static GtkConstraintStrength
-get_strength (unsigned int id)
+static void
+guide_strength_combo (GtkWidget *combo)
 {
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
-    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
-    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
-    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
-    default: g_assert_not_reached ();
-    }
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
 }

-static unsigned int
-get_strength_id (GtkConstraintStrength strength)
+static GtkConstraintStrength
+get_strength (const char *id)
 {
-  switch (strength)
-    {
-    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
-    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
-    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
-    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
-    default: g_assert_not_reached ();
-    }
+  GtkConstraintStrength strength;
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
+  strength = value->value;
+  g_type_class_unref (class);
+
+  return strength;
 }

 static const char *
@@ -121,11 +118,11 @@ static void
 create_guide (GtkButton   *button,
              GuideEditor *editor)
 {
+  const char *id;
  int strength;
  const char *name;
  int w, h;
  GtkConstraintGuide *guide;
-  unsigned int id;

  if (editor->guide)
    guide = g_object_ref (editor->guide);
@@ -147,7 +144,7 @@ create_guide (GtkButton   *button,
  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_height));
  gtk_constraint_guide_set_max_size (guide, w, h);

-  id = gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
  strength = get_strength (id);
  gtk_constraint_guide_set_strength (guide, strength);

@@ -194,9 +191,14 @@ guide_editor_constructed (GObject *object)
 {
  GuideEditor *editor = GUIDE_EDITOR (object);

+  guide_strength_combo (editor->strength);
+
  g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
+
  g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
+
  g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
+
  g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);

  if (editor->guide)
@@ -222,7 +224,8 @@ guide_editor_constructed (GObject *object)
      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), h);

      strength = gtk_constraint_guide_get_strength (editor->guide);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
+      nick = get_strength_nick (strength);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);

      gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
    }
@@ -242,7 +245,7 @@ guide_editor_constructed (GObject *object)
      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), G_MAXINT);
      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), G_MAXINT);

-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_MEDIUM));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "medium");

      gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
    }
@@ -167,17 +167,7 @@
          </object>
        </child>
        <child>
-          <object class="GtkDropDown" id="strength">
-            <property name="model">
-              <object class="GtkStringList">
-                <items>
-                  <item>Weak</item>
-                  <item>Medium</item>
-                  <item>Strong</item>
-                  <item>Required</item>
-                </items>
-              </object>
-            </property>
+          <object class="GtkComboBoxText" id="strength">
            <layout>
              <property name="column">1</property>
              <property name="row">4</property>
@@ -2,6 +2,8 @@

 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;

@@ -214,41 +216,6 @@ activate_quit (GSimpleAction *action,
    }
 }

-static void
-delete_messages (gpointer data)
-{
-  g_list_free_full ((GList *)data, g_free);
-}
-
-static void
-pop_message (GtkWidget *status)
-{
-  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
-
-  if (messages)
-    {
-      char *message = messages->data;
-      messages = g_list_remove (messages, message);
-
-      g_object_set_data_full (G_OBJECT (status), "messages",
-                              messages, delete_messages);
-
-      gtk_label_set_label (GTK_LABEL (status), message);
-    }
-}
-
-static void
-push_message (GtkWidget  *status,
-              const char *message)
-{
-  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));
-  g_object_set_data_full (G_OBJECT (status), "messages",
-                          messages, delete_messages);
-}
-
 static void
 update_statusbar (GtkTextBuffer         *buffer,
                  DemoApplicationWindow *window)
@@ -259,7 +226,7 @@ update_statusbar (GtkTextBuffer         *buffer,
  GtkTextIter iter;

  /* clear any previous message, underflow is allowed */
-  pop_message (window->status);
+  gtk_statusbar_pop (GTK_STATUSBAR (window->status), 0);

  count = gtk_text_buffer_get_char_count (buffer);

@@ -273,7 +240,7 @@ update_statusbar (GtkTextBuffer         *buffer,
  msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
                         row, col, count);

-  push_message (window->status, msg);
+  gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, msg);

  g_free (msg);
 }
@@ -76,13 +76,8 @@
          </object>
        </child>
        <child>
-          <object class="GtkLabel" id="status">
+          <object class="GtkStatusbar" id="status">
            <property name="hexpand">1</property>
-            <property name="xalign">0</property>
-            <property name="margin-start">2</property>
-            <property name="margin-end">2</property>
-            <property name="margin-top">2</property>
-            <property name="margin-bottom">2</property>
            <layout>
              <property name="column">0</property>
              <property name="row">3</property>
@@ -1,5 +1,5 @@
 /* Builder
- * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkShortcutController, toolbar
+ * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkStatusBar, GtkShortcutController, toolbar
 *
 * Demonstrates a traditional interface, loaded from a XML description,
 * and shows how to connect actions to the menu items and toolbar buttons.
@@ -37,34 +37,30 @@ remove_timeout (gpointer data)
  g_source_remove (id);
 }

-static int
-pop_message (gpointer data)
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+static gboolean
+pop_status (gpointer data)
 {
-  GtkWidget *status = data;
-
-  gtk_label_set_label (GTK_LABEL (status), "");
-  g_object_set_data (G_OBJECT (status), "timeout", GUINT_TO_POINTER (0));
-
+  gtk_statusbar_pop (GTK_STATUSBAR (data), 0);
+  g_object_set_data (G_OBJECT (data), "timeout", NULL);
  return G_SOURCE_REMOVE;
 }

 static void
-status_message (GtkWidget  *status,
-                const char *text)
+status_message (GtkStatusbar *status,
+                const char   *text)
 {
  guint id;

-  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (status), "timeout"));
-  if (id)
-    g_source_remove (id);
-
-  gtk_label_set_text (GTK_LABEL (status), text);
-
-  id = g_timeout_add (5000, pop_message, status);
+  gtk_statusbar_push (GTK_STATUSBAR (status), 0, text);
+  id = g_timeout_add (5000, pop_status, status);

  g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }

+G_GNUC_END_IGNORE_DEPRECATIONS
+
 static void
 help_activate (GSimpleAction *action,
               GVariant      *parameter,
@@ -73,7 +69,7 @@ help_activate (GSimpleAction *action,
  GtkWidget *status;

  status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (status, "Help not available");
+  status_message (GTK_STATUSBAR (status), "Help not available");
 }

 static void
@@ -86,7 +82,7 @@ not_implemented (GSimpleAction *action,

  text = g_strdup_printf ("Action “%s” not implemented", g_action_get_name (G_ACTION (action)));
  status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (status, text);
+  status_message (GTK_STATUSBAR (status), text);
  g_free (text);
 }

@@ -6,6 +6,8 @@

 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                    GtkCssSection  *section,
@@ -47,23 +49,20 @@ css_text_changed (GtkTextBuffer  *buffer,
  gtk_text_buffer_remove_all_tags (buffer, &start, &end);

  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
  g_free (text);
 }

-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+  GtkWidget *child;
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

 GtkWidget *
@@ -82,7 +81,6 @@ do_css_basics (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      text = gtk_text_buffer_new (NULL);
@@ -4,24 +4,23 @@
 * anymore. :)
 */

-/* This resets all properties to their defaults values
- * and overrides all user settings and the theme in use
- */
-@import url("resource://css_shadows/reset.css");
+/* This CSS resets all properties to their defaults values
+ *    and overrides all user settings and the theme in use */
+@import url("resource://css_basics/reset.css");

 /* Set a very futuristic style by default */
-.demo * {
+* {
  color: green;
  font-family: Monospace;
  border: 1px solid;
 }

-window.demo {
+window {
  background-color: white;
 }

 /* Make sure selections are visible */
-.demo selection {
+selection {
  background-color: darkGreen;
  color: black;
 }
@@ -6,6 +6,8 @@

 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                    GtkCssSection  *section,
@@ -48,23 +50,33 @@ css_text_changed (GtkTextBuffer  *buffer,
  gtk_text_buffer_remove_all_tags (buffer, &start, &end);

  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
  g_free (text);
 }

 static void
-clear_provider (gpointer data)
+drawing_area_draw (GtkDrawingArea *da,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
-  GtkStyleProvider *provider = data;
+  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (da));

-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+  gtk_render_background (context, cr, 0, 0, width, height);
+  gtk_render_frame (context, cr, 0, 0, width, height);
 }

 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+  GtkWidget *child;
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

 GtkWidget *
@@ -83,17 +95,16 @@ do_css_multiplebgs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      overlay = gtk_overlay_new ();
      gtk_window_set_child (GTK_WINDOW (window), overlay);

      child = gtk_drawing_area_new ();
-      /* Don't set a draw_func, since we are only interested in CSS drawing,
-       * which happens automatically.
-       */
      gtk_widget_set_name (child, "canvas");
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
+                                      drawing_area_draw,
+                                      NULL, NULL);
      gtk_overlay_set_child (GTK_OVERLAY (overlay), child);

      child = gtk_button_new ();
@@ -7,6 +7,8 @@

 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                    GtkCssSection  *section,
@@ -49,23 +51,20 @@ css_text_changed (GtkTextBuffer  *buffer,
  gtk_text_buffer_remove_all_tags (buffer, &start, &end);

  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
  g_free (text);
 }

-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+  GtkWidget *child;
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

 GtkWidget *
@@ -84,7 +83,6 @@ do_css_pixbufs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -50,7 +50,7 @@
    100% { background-size: 12px, 96px, 12px, 96px, 12px, 96px, 12px, 96px, auto; }
 }

-window.demo {
+window {
    background-image: url("resource://css_pixbufs/images/apple-red.png"),
                      url("resource://css_pixbufs/images/gnome-applets.png"),
                      url("resource://css_pixbufs/images/gnome-calendar.png"),
@@ -66,11 +66,11 @@ window.demo {
 }

 /* Make the text editor has a nice style */
-window.demo .view, scrollbar, separator {
+.view, scrollbar, separator {
  color: black;
  background-color: rgba(255,255,255,0.5);
 }

-window.demo .view:selected {
+.view:selected {
  background-color: rgba(127,127,255,0.5);
 }
@@ -5,6 +5,8 @@

 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                    GtkCssSection  *section,
@@ -46,23 +48,20 @@ css_text_changed (GtkTextBuffer  *buffer,
  gtk_text_buffer_remove_all_tags (buffer, &start, &end);

  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
  g_free (text);
 }

-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+  GtkWidget *child;
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

 static GtkWidget *
@@ -102,7 +101,6 @@ do_css_shadows (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Shadows");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -144,7 +142,7 @@ do_css_shadows (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_set_visible (window, TRUE);
  else
    gtk_window_destroy (GTK_WINDOW (window));

@@ -5,13 +5,12 @@
 */

 /* This CSS resets all properties to their defaults values
- * and overrides all user settings and the theme in use
- */
+ *    and overrides all user settings and the theme in use */
@import url("resource://css_shadows/reset.css");
@import url("resource://css_shadows/cssview.css");

 /* Get a nice background for the window */
-window.demo.background {
+.background {
  background-color: #4870bc;
  background-image: linear-gradient(to left, transparent, rgba(255,255,255,.07) 50%, transparent 50%),
                    linear-gradient(to left, transparent, rgba(255,255,255,.13) 50%, transparent 50%),
@@ -20,7 +19,7 @@ window.demo.background {
  background-size: 29px, 59px, 73px, 109px;
 }

-window.demo button {
+button {
  color: black;
  padding: 10px;
  border-radius: 5px;
@@ -28,15 +27,18 @@ window.demo button {
  border: 1px transparent solid;
 }

-window.demo button:hover {
+button:hover {
  text-shadow: 3px 3px 5px alpha(black, 0.75);
  -gtk-icon-shadow: 3px 3px 5px alpha(black, 0.75);
  box-shadow: 3px 3px 5px alpha(black, 0.5) inset;
  border: solid 1px alpha(black, 0.75);
 }

-window.demo button:active {
+button:active {
  padding: 11px 9px 9px 11px;
  text-shadow: 1px 1px 2.5px alpha(black, 0.6);
  -gtk-icon-shadow: 1px 1px 2.5px alpha(black, 0.6);
 }
+
+
+
@@ -1,21 +1,21 @@
 /* Make the text editor has a nice style */
-window.demo .view {
+.view {
  color: #2e3436;
  font-family: Monospace;
  background-color: alpha(white, 0.30);
 }

-window.demo .view:selected {
+.view:selected {
  color: white;
  background-color: #4a90d9;
 }

-window.demo scrollbar trough,
+scrollbar trough,
 .scrollbars-junction {
  background-color: alpha(white, 0.80);
 }

-window.demo scrollbar slider {
+scrollbar slider {
  border-width: 3px;
  border-style: solid;
  border-radius: 10px;
@@ -24,11 +24,11 @@ window.demo scrollbar slider {
  background-color: #999;
 }

-window.demo scrollbar slider:hover {
+scrollbar slider:hover {
  background-color: #555;
 }

-window.demo paned separator {
+paned separator {
  background-color: alpha(white, 0.80);
  background-image: linear-gradient(transparent, transparent 1px, #999 1px, #999 4px, transparent 4px);
  background-size: 40px auto;
@@ -36,6 +36,6 @@ window.demo paned separator {
  background-position: center;
 }

-window.demo paned separator:hover {
+paned separator:hover {
  background-image: linear-gradient(transparent, transparent 1px, #555 1px, #555 4px, transparent 4px);
 }
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define CURVE_TYPE_EDITOR (curve_editor_get_type ())
+G_DECLARE_FINAL_TYPE (CurveEditor, curve_editor, CURVE, EDITOR, GtkWidget)
+
+GtkWidget *       curve_editor_new              (void);
+
+void              curve_editor_set_edit         (CurveEditor *self,
+                                                 gboolean     edit);
+
+void              curve_editor_set_path         (CurveEditor *self,
+                                                 GskPath     *path);
+
+GskPath *         curve_editor_get_path         (CurveEditor *self);
+
+void              curve_editor_set_stroke       (CurveEditor *self,
+                                                 GskStroke   *stroke);
+
+const GskStroke * curve_editor_get_stroke       (CurveEditor *self);
+
+
+void              curve_editor_set_color        (CurveEditor   *self,
+                                                 const GdkRGBA *color);
+
+const GdkRGBA *   curve_editor_get_color        (CurveEditor *self);
+
+gboolean          curve_editor_get_show_outline (CurveEditor *self);
+
+void              curve_editor_set_show_outline (CurveEditor *self,
+                                                 gboolean     show_outline);
+
+G_END_DECLS
@@ -0,0 +1,269 @@
+/* Path/Curve Editor
+ *
+ * This demo shows an elaborate curve editor that you would expect to find
+ * in a vector graphics editor. It is built on top of GTK's path APIs.
+ */
+
+#include <gtk/gtk.h>
+#include "curve-editor.h"
+
+
+static GskPath *
+make_circle_path (void)
+{
+  float w = 310;
+  float h = 310;
+  float cx = w / 2;
+  float cy = h / 2;
+  float pad = 20;
+  float r = (w - 2 * pad) / 2;
+  float k = 0.55228;
+  float kr = k  * r;
+  GskPathBuilder *builder;
+
+  builder = gsk_path_builder_new ();
+
+  gsk_path_builder_move_to (builder,  cx, pad);
+  gsk_path_builder_cubic_to (builder, cx + kr, pad,
+                                      w - pad, cy - kr,
+                                      w - pad, cy);
+  gsk_path_builder_cubic_to (builder, w - pad, cy + kr,
+                                      cx + kr, h - pad,
+                                      cx, h - pad);
+  gsk_path_builder_cubic_to (builder, cx - kr, h - pad,
+                                      pad, cy + kr,
+                                      pad, cy);
+  gsk_path_builder_cubic_to (builder, pad, cy - kr,
+                                      cx - kr, pad,
+                                      cx, pad);
+  gsk_path_builder_close (builder);
+
+  return gsk_path_builder_free_to_path (builder);
+}
+
+static void
+edit_changed (GtkToggleButton *button,
+              GParamSpec      *pspec,
+              CurveEditor     *editor)
+{
+  curve_editor_set_edit (editor, gtk_toggle_button_get_active (button));
+}
+
+static void
+reset (GtkButton   *button,
+       CurveEditor *editor)
+{
+  GskPath *path;
+
+  path = make_circle_path ();
+  curve_editor_set_path (editor, path);
+  gsk_path_unref (path);
+}
+
+static void
+line_width_changed (GtkSpinButton *spin,
+                    CurveEditor   *editor)
+{
+  GskStroke *stroke;
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_line_width (stroke, gtk_spin_button_get_value (spin));
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+}
+
+static void
+cap_changed (GtkDropDown *combo,
+             GParamSpec  *pspec,
+             CurveEditor *editor)
+{
+  GskStroke *stroke;
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_line_cap (stroke, (GskLineCap)gtk_drop_down_get_selected (combo));
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+}
+
+static void
+join_changed (GtkDropDown *combo,
+              GParamSpec  *pspec,
+              CurveEditor *editor)
+{
+  GskStroke *stroke;
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_line_join (stroke, (GskLineJoin)gtk_drop_down_get_selected (combo));
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+}
+
+static void
+color_changed (GtkColorDialogButton *button,
+               GParamSpec           *pspec,
+               CurveEditor          *editor)
+{
+  curve_editor_set_color (editor, gtk_color_dialog_button_get_rgba (button));
+}
+
+static void
+stroke_toggled (GtkCheckButton *button,
+                CurveEditor    *editor)
+{
+  curve_editor_set_show_outline (editor, gtk_check_button_get_active (button));
+  gtk_widget_queue_draw (GTK_WIDGET (editor));
+}
+
+static void
+limit_changed (GtkSpinButton *spin,
+               CurveEditor   *editor)
+{
+  GskStroke *stroke;
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_miter_limit (stroke, gtk_spin_button_get_value (spin));
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+}
+
+static void
+dashes_changed (GtkEntry    *entry,
+                GParamSpec  *spec,
+                CurveEditor *editor)
+{
+  const char *text;
+  char **split;
+  GArray *dash;
+  GskStroke *stroke;
+
+  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  split = g_strsplit (text, " ", 0);
+
+  dash = g_array_new (FALSE, FALSE, sizeof (float));
+  for (int i = 0; split[i] != NULL; i++)
+    {
+      double d;
+      char *endp = 0;
+
+      d = g_strtod (split[i], &endp);
+      if (*endp == '\0')
+        g_array_append_vals (dash, (float[1]) { d }, 1);
+    }
+
+  g_strfreev (split);
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_dash (stroke, (const float *)dash->data, dash->len);
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+
+  g_array_free (dash, TRUE);
+}
+
+GtkWidget *
+do_curve (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *demo;
+  GtkWidget *edit_toggle;
+  GtkWidget *reset_button;
+  GtkWidget *titlebar;
+  GtkWidget *stroke_toggle;
+  GtkWidget *line_width_spin;
+  GtkWidget *stroke_button;
+  GtkWidget *popover;
+  GtkWidget *grid;
+  GtkWidget *cap_combo;
+  GtkWidget *join_combo;
+  GtkWidget *color_button;
+  GtkWidget *limit_spin;
+  GtkWidget *dash_entry;
+
+  if (!window)
+    {
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Curve Editor");
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      gtk_window_set_default_size (GTK_WINDOW (window), 315, 350);
+
+      edit_toggle = gtk_toggle_button_new ();
+      gtk_button_set_icon_name (GTK_BUTTON (edit_toggle), "document-edit-symbolic");
+
+      reset_button = gtk_button_new_from_icon_name ("edit-undo-symbolic");
+
+      stroke_button = gtk_menu_button_new ();
+      gtk_menu_button_set_icon_name (GTK_MENU_BUTTON (stroke_button), "open-menu-symbolic");
+      popover = gtk_popover_new ();
+      gtk_menu_button_set_popover (GTK_MENU_BUTTON (stroke_button), popover);
+
+      grid = gtk_grid_new ();
+      gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+      gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+      gtk_popover_set_child (GTK_POPOVER (popover), grid);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Color:"), 0, 0, 1, 1);
+      color_button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+      gtk_grid_attach (GTK_GRID (grid), color_button, 1, 0, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line width:"), 0, 1, 1, 1);
+      line_width_spin = gtk_spin_button_new_with_range (1, 20, 1);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (line_width_spin), 1);
+      gtk_grid_attach (GTK_GRID (grid), line_width_spin, 1, 1, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line cap:"), 0, 2, 1, 1);
+      cap_combo = gtk_drop_down_new_from_strings ((const char *[]){"Butt", "Round", "Square", NULL});
+      gtk_grid_attach (GTK_GRID (grid), cap_combo, 1, 2, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line join:"), 0, 3, 1, 1);
+      join_combo = gtk_drop_down_new_from_strings ((const char *[]){"Miter", "Miter-clip", "Round", "Bevel", "Arcs", NULL});
+      gtk_grid_attach (GTK_GRID (grid), join_combo, 1, 3, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Miter limit:"), 0, 4, 1, 1);
+      limit_spin = gtk_spin_button_new_with_range (0, 10, 1);
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (limit_spin), 1);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (limit_spin), 4);
+      gtk_grid_attach (GTK_GRID (grid), limit_spin, 1, 4, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Dashes:"), 0, 5, 1, 1);
+      dash_entry = gtk_entry_new ();
+      gtk_grid_attach (GTK_GRID (grid), dash_entry, 1, 5, 1, 1);
+
+      stroke_toggle = gtk_check_button_new_with_label ("Show outline");
+      gtk_grid_attach (GTK_GRID (grid), stroke_toggle, 1, 6, 1, 1);
+
+      titlebar = gtk_header_bar_new ();
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), edit_toggle);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), reset_button);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), stroke_button);
+
+      gtk_window_set_titlebar (GTK_WINDOW (window), titlebar);
+
+      demo = curve_editor_new ();
+
+      g_signal_connect (stroke_toggle, "toggled", G_CALLBACK (stroke_toggled), demo);
+      g_signal_connect (edit_toggle, "notify::active", G_CALLBACK (edit_changed), demo);
+      g_signal_connect (reset_button, "clicked", G_CALLBACK (reset), demo);
+      g_signal_connect (cap_combo, "notify::selected", G_CALLBACK (cap_changed), demo);
+      g_signal_connect (join_combo, "notify::selected", G_CALLBACK (join_changed), demo);
+      g_signal_connect (color_button, "notify::rgba", G_CALLBACK (color_changed), demo);
+      g_signal_connect (line_width_spin, "value-changed", G_CALLBACK (line_width_changed), demo);
+      g_signal_connect (limit_spin, "value-changed", G_CALLBACK (limit_changed), demo);
+      g_signal_connect (dash_entry, "notify::text", G_CALLBACK (dashes_changed), demo);
+
+      reset (NULL, CURVE_EDITOR (demo));
+
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (line_width_spin), 6);
+      gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (color_button), &(GdkRGBA) { 1, 0, 0, 1 });
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (cap_combo), GSK_LINE_CAP_ROUND);
+      gtk_editable_set_text (GTK_EDITABLE (dash_entry), "0 8");
+
+      gtk_window_set_child (GTK_WINDOW (window), demo);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_window_present (GTK_WINDOW (window));
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}
@@ -127,6 +127,7 @@
    <file>fishbowl.ui</file>
    <file>gtkfishbowl.c</file>
    <file>gtkfishbowl.h</file>
+    <file>tiger.node</file>
  </gresource>
  <gresource prefix="/frames">
    <file>frames.ui</file>
@@ -258,6 +259,10 @@
  <gresource prefix="/video-player">
    <file>bbb.png</file>
  </gresource>
+  <gresource prefix="/curve">
+    <file>curve-editor.c</file>
+    <file>curve-editor.h</file>
+  </gresource>
  <gresource prefix="/sources">
    <file>application_demo.c</file>
    <file>assistant.c</file>
@@ -275,6 +280,7 @@
    <file>css_pixbufs.c</file>
    <file>css_shadows.c</file>
    <file>cursors.c</file>
+    <file>curve.c</file>
    <file>dialog.c</file>
    <file>drawingarea.c</file>
    <file>dnd.c</file>
@@ -294,6 +300,7 @@
    <file>gears.c</file>
    <file>gestures.c</file>
    <file>glarea.c</file>
+    <file>glyphs.c</file>
    <file>gltransition.c</file>
    <file>headerbar.c</file>
    <file>hypertext.c</file>
@@ -336,6 +343,7 @@
    <file>panes.c</file>
    <file>password_entry.c</file>
    <file>path_fill.c</file>
+    <file>path_maze.c</file>
    <file>path_text.c</file>
    <file>peg_solitaire.c</file>
    <file>pickers.c</file>
@@ -208,13 +208,7 @@
          </object>
        </child>
        <child>
-          <object class="GtkLabel" id="statusbar1">
-            <property name="xalign">0</property>
-            <property name="margin-start">2</property>
-            <property name="margin-end">2</property>
-            <property name="margin-top">2</property>
-            <property name="margin-bottom">2</property>
-          </object>
+          <object class="GtkStatusbar" id="statusbar1"/>
        </child>
      </object>
    </child>
@@ -760,7 +760,9 @@ do_dnd (GtkWidget *do_widget)
      GtkCssProvider *provider;
      GString *css;

-      button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+      button = gtk_color_button_new ();
+G_GNUC_END_IGNORE_DEPRECATIONS
      g_object_unref (g_object_ref_sink (button));

      provider = gtk_css_provider_new ();
@@ -10,6 +10,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *window = NULL;

 static void
@@ -43,22 +45,21 @@ do_expander (GtkWidget *do_widget)
  if (!window)
    {
      toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Expander");
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (toplevel));
-      area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_widget_set_margin_start (area, 10);
-      gtk_widget_set_margin_end (area, 10);
-      gtk_widget_set_margin_top (area, 10);
-      gtk_widget_set_margin_bottom (area, 10);
-      gtk_window_set_child (GTK_WINDOW (window), area);
-      label = gtk_label_new ("<big><b>Something went wrong</b></big>");
-      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      gtk_box_append (GTK_BOX (area), label);
-      label = gtk_label_new ("Here are some more details but not the full story");
+      window = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
+                                                   0,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_CLOSE,
+                                                   "<big><b>%s</b></big>",
+                                                   "Something went wrong");
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (window),
+                                                "Here are some more details "
+                                                "but not the full story.");
+
+      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
+
+      label = gtk_widget_get_last_child (area);
      gtk_label_set_wrap (GTK_LABEL (label), FALSE);
      gtk_widget_set_vexpand (label, FALSE);
-      gtk_box_append (GTK_BOX (area), label);

      expander = gtk_expander_new ("Details:");
      gtk_widget_set_vexpand (expander, TRUE);
@@ -121,7 +122,7 @@ do_expander (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_set_visible (window, TRUE);
  else
    gtk_window_destroy (GTK_WINDOW (window));

@@ -11,6 +11,9 @@
 #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);"
@@ -68,18 +71,13 @@ create_blurred_button (void)
  return w;
 }

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static GtkWidget *
 create_font_button (void)
 {
-  GtkFontDialog *dialog;
-  GtkWidget *button;
-
-  dialog = gtk_font_dialog_new ();
-  button = gtk_font_dialog_button_new (dialog);
-  g_object_unref (dialog);
-
-  return button;
+  return gtk_font_button_new ();
 }
+G_GNUC_END_IGNORE_DEPRECATIONS

 static GtkWidget *
 create_level_bar (void)
@@ -208,6 +206,18 @@ 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);
@@ -225,6 +235,8 @@ 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;
@@ -315,20 +327,11 @@ do_fishbowl (GtkWidget *do_widget)
  if (!window)
    {
      GtkBuilder *builder;
-      GtkBuilderScope *scope;
      GtkWidget *bowl;

      g_type_ensure (GTK_TYPE_FISHBOWL);

-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_prev_button_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_next_button_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_changes_toggled_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), format_header_cb);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/fishbowl/fishbowl.ui", NULL);
+      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

@@ -340,7 +343,6 @@ do_fishbowl (GtkWidget *do_widget)

      gtk_widget_realize (window);
      g_object_unref (builder);
-      g_object_unref (scope);
    }

  if (!gtk_widget_get_visible (window))
@@ -0,0 +1,164 @@
+#include "graphwidget.h"
+
+struct _GraphWidget
+{
+  GtkWidget parent_instance;
+
+  GskPath *path;
+  GskStroke *stroke;
+  GdkRGBA color;
+  GskPath *stroke_path;
+
+  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);
+  g_clear_pointer (&self->stroke_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);
+  self->stroke_path = gsk_path_stroke (self->path, self->stroke);
+}
+
+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);
+
+  gsk_path_unref (self->path);
+  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);
+  int width, height;
+
+  width = gtk_widget_get_width (widget);
+  height = gtk_widget_get_height (widget);
+
+  gtk_snapshot_push_fill (snapshot, self->stroke_path, GSK_FILL_RULE_WINDING);
+  gtk_snapshot_append_color (snapshot,
+                             &self->color,
+                             &GRAPHENE_RECT_INIT (0, 0, width, height));
+  gtk_snapshot_pop (snapshot);
+}
+
+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);
+}
@@ -0,0 +1,8 @@
+#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);
@@ -354,18 +354,10 @@ do_iconscroll (GtkWidget *do_widget)
  if (!window)
    {
      GtkBuilder *builder;
-      GtkBuilderScope *scope;
      GtkWidget *label;
      guint id;

-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), iconscroll_prev_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), iconscroll_next_clicked_cb);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-
-      gtk_builder_add_from_resource (builder, "/iconscroll/iconscroll.ui", NULL);
+      builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
      gtk_window_set_display (GTK_WINDOW (window),
@@ -383,7 +375,6 @@ do_iconscroll (GtkWidget *do_widget)
                              GUINT_TO_POINTER (id), remove_timeout);

      g_object_unref (builder);
-      g_object_unref (scope);
    }

  if (!gtk_widget_get_visible (window))
@@ -17,6 +17,7 @@ demos = files([
  'css_pixbufs.c',
  'css_shadows.c',
  'cursors.c',
+  'curve.c',
  'dialog.c',
  'drawingarea.c',
  'dnd.c',
@@ -34,6 +35,7 @@ demos = files([
  'gestures.c',
  'glarea.c',
  'gltransition.c',
+  'glyphs.c',
  'headerbar.c',
  'hypertext.c',
  'iconscroll.c',
@@ -73,6 +75,7 @@ demos = files([
  'panes.c',
  'password_entry.c',
  'path_fill.c',
+  'path_maze.c',
  'path_text.c',
  'peg_solitaire.c',
  'pickers.c',
@@ -138,6 +141,9 @@ extra_demo_sources = files([
  'unicode-names.c',
  'suggestionentry.c',
  'language-names.c',
+  'nodewidget.c',
+  'graphwidget.c',
+  'curve-editor.c',
 ])

 if os_unix
@@ -152,6 +158,8 @@ if librsvg_dep.found()
  gtkdemo_deps += [ librsvg_dep ]
 endif

+gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]
+
 demos_h = custom_target('gtk4 demo header',
  output: 'demos.h',
  input: demos,
@@ -206,7 +214,6 @@ if can_use_objcopy_for_resources
    output : 'gtkdemo_resources2.o',
    command : [objcopy,
                 '--strip-all',
-                 '--set-section-alignment', '.data=8',
                 '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
                 '@INPUT@',
                 '@OUTPUT@'])
@@ -235,7 +242,7 @@ gtkdemo_deps += [ demo_conf_h ]

 executable('gtk4-demo',
  sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
-  c_args: demo_cflags,
+  c_args: gtkdemo_args + demo_cflags,
  dependencies: gtkdemo_deps,
  include_directories: confinc,
  win_subsystem: 'windows',
@@ -245,7 +252,7 @@ executable('gtk4-demo',

 executable('gtk4-demo-application',
  sources: ['application.c', gtkdemo_resources],
-  c_args: common_cflags,
+  c_args: gtkdemo_args + common_cflags,
  dependencies: gtkdemo_deps,
  include_directories: confinc,
  win_subsystem: 'windows',
@@ -0,0 +1,76 @@
+#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);
+}
@@ -0,0 +1,8 @@
+#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);
@@ -7,6 +7,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 enum {
  COLOR_SET,
  N_SIGNALS
@@ -122,16 +124,19 @@ drawing_area_unmap (GtkWidget *widget)

 static void
 drawing_area_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
+		       GtkSnapshot *snapshot)
 {
  DrawingArea *area = (DrawingArea *) widget;
-  int width, height;
+  GtkAllocation allocation;
  cairo_t *cr;

-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  cr = gtk_snapshot_append_cairo (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
+  gtk_widget_get_allocation (widget, &allocation);
+  cr = gtk_snapshot_append_cairo (snapshot,
+                                  &GRAPHENE_RECT_INIT (
+                                    0, 0,
+				    allocation.width,
+				    allocation.height
+                                  ));

  cairo_set_source_rgb (cr, 1, 1, 1);
  cairo_paint (cr);
@@ -140,7 +145,7 @@ drawing_area_snapshot (GtkWidget   *widget,
  cairo_paint (cr);

  cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
-  cairo_rectangle (cr, 0, 0, width, height);
+  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
  cairo_stroke (cr);

  cairo_destroy (cr);
@@ -1,7 +1,7 @@
-/* Path/Fill and Stroke
+/* Path/Fill
 *
- * This demo shows how to use GskPath to draw shapes that are (a bit)
- * more complex than a rounded rectangle.
+ * This demo shows how to use PangoCairo to draw text with more than
+ * just a single color.
 */

 #include <glib/gi18n.h>
@@ -9,162 +9,304 @@

 #include "paintable.h"

-#define GTK_TYPE_LOGO_PAINTABLE (gtk_logo_paintable_get_type ())
-G_DECLARE_FINAL_TYPE (GtkLogoPaintable, gtk_logo_paintable, GTK, LOGO_PAINTABLE, GObject)
+#define GTK_TYPE_PATH_PAINTABLE (gtk_path_paintable_get_type ())
+G_DECLARE_FINAL_TYPE (GtkPathPaintable, gtk_path_paintable, GTK, PATH_PAINTABLE, GObject)

-struct _GtkLogoPaintable
+struct _GtkPathPaintable
 {
  GObject parent_instance;

  int width;
  int height;
-  GskPath *path[3];
-  GdkRGBA color[3];
-
-  GskPath *stroke_path;
-  GskStroke *stroke1;
-  GskStroke *stroke2;
-  GdkRGBA stroke_color;
+  GskPath *path;
+  GdkPaintable *background;
 };

-struct _GtkLogoPaintableClass
+struct _GtkPathPaintableClass
 {
  GObjectClass parent_class;
 };

 static int
-gtk_logo_paintable_get_intrinsic_width (GdkPaintable *paintable)
+gtk_path_paintable_get_intrinsic_width (GdkPaintable *paintable)
 {
-  GtkLogoPaintable *self = GTK_LOGO_PAINTABLE (paintable);
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);

-  return self->width;
+  if (self->background)
+    return MAX (gdk_paintable_get_intrinsic_width (self->background), self->width);
+  else
+    return self->width;
 }

 static int
-gtk_logo_paintable_get_intrinsic_height (GdkPaintable *paintable)
+gtk_path_paintable_get_intrinsic_height (GdkPaintable *paintable)
 {
-  GtkLogoPaintable *self = GTK_LOGO_PAINTABLE (paintable);
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);

-  return self->height;
+  if (self->background)
+    return MAX (gdk_paintable_get_intrinsic_height (self->background), self->height);
+  else
+    return self->height;
 }

 static void
-gtk_logo_paintable_snapshot (GdkPaintable *paintable,
+gtk_path_paintable_snapshot (GdkPaintable *paintable,
                             GdkSnapshot  *snapshot,
                             double        width,
                             double        height)
 {
-  GtkLogoPaintable *self = GTK_LOGO_PAINTABLE (paintable);
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);

-  for (unsigned int i = 0; i < 3; i++)
+#if 0
+  gtk_snapshot_push_fill (snapshot, self->path, GSK_FILL_RULE_WINDING);
+#else
+  GskStroke *stroke = gsk_stroke_new (2.0);
+  gtk_snapshot_push_stroke (snapshot, self->path, stroke);
+  gsk_stroke_free (stroke);
+#endif
+
+  if (self->background)
    {
-      gtk_snapshot_push_fill (snapshot, self->path[i], GSK_FILL_RULE_WINDING);
-      gtk_snapshot_append_color (snapshot,
-                                 &self->color[i],
-                                 &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gtk_snapshot_pop (snapshot);
+      gdk_paintable_snapshot (self->background, snapshot, width, height);
    }
-  for (unsigned int i = 0; i < 3; i++)
+  else
    {
-      gtk_snapshot_push_stroke (snapshot, self->stroke_path, self->stroke1);
-      gtk_snapshot_append_color (snapshot,
-                                 &self->stroke_color,
-                                 &GRAPHENE_RECT_INIT (0, 0, width, height));
-      gtk_snapshot_pop (snapshot);
+      gtk_snapshot_append_linear_gradient (snapshot,
+                                           &GRAPHENE_RECT_INIT (0, 0, width, height),
+                                           &GRAPHENE_POINT_INIT (0, 0),
+                                           &GRAPHENE_POINT_INIT (width, height),
+                                           (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_push_stroke (snapshot, self->stroke_path, self->stroke2);
-  gtk_snapshot_append_color (snapshot,
-                             &self->stroke_color,
-                             &GRAPHENE_RECT_INIT (0, 0, width, height));
  gtk_snapshot_pop (snapshot);
+
 }

 static GdkPaintableFlags
-gtk_logo_paintable_get_flags (GdkPaintable *paintable)
+gtk_path_paintable_get_flags (GdkPaintable *paintable)
 {
-  return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+  if (self->background)
+    return gdk_paintable_get_flags (self->background);
+  else
+    return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
 }

 static void
-gtk_logo_paintable_paintable_init (GdkPaintableInterface *iface)
+gtk_path_paintable_paintable_init (GdkPaintableInterface *iface)
 {
-  iface->get_intrinsic_width = gtk_logo_paintable_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_logo_paintable_get_intrinsic_height;
-  iface->snapshot = gtk_logo_paintable_snapshot;
-  iface->get_flags = gtk_logo_paintable_get_flags;
+  iface->get_intrinsic_width = gtk_path_paintable_get_intrinsic_width;
+  iface->get_intrinsic_height = gtk_path_paintable_get_intrinsic_height;
+  iface->snapshot = gtk_path_paintable_snapshot;
+  iface->get_flags = gtk_path_paintable_get_flags;
 }

 /* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkLogoPaintable, gtk_logo_paintable, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (GtkPathPaintable, gtk_path_paintable, G_TYPE_OBJECT,
                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_logo_paintable_paintable_init))
+                                                gtk_path_paintable_paintable_init))

-static void
-gtk_logo_paintable_dispose (GObject *object)
+/* Here's the boilerplate for the GObject declaration.
+ * We need to disconnect the signals here that we set up elsewhere
+ */
+static void 
+gtk_path_paintable_dispose (GObject *object)
 {
-  GtkLogoPaintable *self = GTK_LOGO_PAINTABLE (object);
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (object);

-  for (unsigned int i = 0; i < 3; i++)
-    gsk_path_unref (self->path[i]);
+  if (self->background)
+    {
+      g_signal_handlers_disconnect_by_func (self->background, gdk_paintable_invalidate_contents, self);
+      g_signal_handlers_disconnect_by_func (self->background, gdk_paintable_invalidate_size, self);
+      g_clear_object (&self->background);
+    }

-  gsk_path_unref (self->stroke_path);
-
-  gsk_stroke_free (self->stroke1);
-  gsk_stroke_free (self->stroke2);
-
-  G_OBJECT_CLASS (gtk_logo_paintable_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gtk_path_paintable_parent_class)->dispose (object);
 }

 static void
-gtk_logo_paintable_class_init (GtkLogoPaintableClass *klass)
+gtk_path_paintable_class_init (GtkPathPaintableClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  object_class->dispose = gtk_logo_paintable_dispose;
+  object_class->dispose = gtk_path_paintable_dispose;
 }

 static void
-gtk_logo_paintable_init (GtkLogoPaintable *self)
+gtk_path_paintable_init (GtkPathPaintable *self)
 {
 }

-static GdkPaintable *
-gtk_logo_paintable_new (void)
+/* And finally, we add a simple constructor.
+ * It is declared in the header so that the other examples
+ * can use it.
+ */
+GdkPaintable *
+gtk_path_paintable_new (GskPath      *path,
+                        GdkPaintable *background,
+                        int           width,
+                        int           height)
 {
-  GtkLogoPaintable *self;
-  graphene_rect_t bounds, bounds2;
+  GtkPathPaintable *self;

-  self = g_object_new (GTK_TYPE_LOGO_PAINTABLE, NULL);
-
-  /* Paths and colors extracted from gtk-logo.svg */
-  self->path[0] = gsk_path_parse ("m3.12,66.17 -2.06,-51.46 32.93,24.7 v55.58 l-30.87,-28.82 z");
-  self->path[1] = gsk_path_parse ("m34,95 49.4,-20.58 4.12,-51.46 -53.52,16.47 v55.58 z");
-  self->path[2] = gsk_path_parse ("m1.06,14.71 32.93,24.7 53.52,-16.47 -36.75,-21.88 -49.7,13.65 z");
-
-  gdk_rgba_parse (&self->color[0], "#e40000");
-  gdk_rgba_parse (&self->color[1], "#7fe719");
-  gdk_rgba_parse (&self->color[2], "#729fcf");
-
-  self->stroke_path = gsk_path_parse ("m50.6,51.3 -47.3,14 z l33,23 z v-50");
-  self->stroke1 = gsk_stroke_new (2.12);
-  self->stroke2 = gsk_stroke_new (1.25);
-  gdk_rgba_parse (&self->stroke_color, "#ffffff");
-
-  gsk_path_get_stroke_bounds (self->path[0], self->stroke1, &bounds);
-  gsk_path_get_stroke_bounds (self->path[1], self->stroke1, &bounds2);
-  graphene_rect_union (&bounds, &bounds2, &bounds);
-  gsk_path_get_stroke_bounds (self->path[2], self->stroke1, &bounds2);
-  graphene_rect_union (&bounds, &bounds2, &bounds);
-  gsk_path_get_stroke_bounds (self->stroke_path, self->stroke2, &bounds2);
-  graphene_rect_union (&bounds, &bounds2, &bounds);
-
-  self->width = bounds.origin.x + bounds.size.width;
-  self->height = bounds.origin.y + bounds.size.height;
+  self = g_object_new (GTK_TYPE_PATH_PAINTABLE, NULL);
+  self->path = path;
+  self->background = background;
+  if (self->background)
+    {
+      g_object_ref (self->background);
+      g_signal_connect_swapped (self->background, "invalidate-contents", G_CALLBACK (gdk_paintable_invalidate_contents), self);
+      g_signal_connect_swapped (self->background, "invalidate-size", G_CALLBACK (gdk_paintable_invalidate_size), self);
+    }
+  self->width = width;
+  self->height = height;

  return GDK_PAINTABLE (self);
 }

+void
+gtk_path_paintable_set_path (GtkPathPaintable *self,
+                             GskPath          *path)
+{
+  g_clear_pointer (&self->path, gsk_path_unref);
+  self->path = gsk_path_ref (path);
+
+  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
+}
+
+static GskPath *
+create_hexagon (GtkWidget *widget)
+{
+  GskPathBuilder *builder;
+
+  builder = gsk_path_builder_new ();
+
+  gsk_path_builder_move_to (builder, 120, 0);
+  gsk_path_builder_line_to (builder, 360, 0);
+  gsk_path_builder_line_to (builder, 480, 208);
+  gsk_path_builder_line_to (builder, 360, 416);
+  gsk_path_builder_line_to (builder, 120, 416);
+  gsk_path_builder_line_to (builder, 0, 208);
+  gsk_path_builder_close (builder);
+
+  return gsk_path_builder_free_to_path (builder);
+}
+
+static GskPath *
+create_path_from_text (GtkWidget *widget)
+{
+  PangoLayout *layout;
+  PangoFontDescription *desc;
+  GskPathBuilder *builder;
+
+  layout = gtk_widget_create_pango_layout (widget, "Pango power!\nPango power!\nPango power!");
+  desc = pango_font_description_from_string ("sans bold 36");
+  pango_layout_set_font_description (layout, desc);
+  pango_font_description_free (desc);
+
+  builder = gsk_path_builder_new ();
+
+  gsk_path_builder_add_layout (builder, layout);
+
+  return gsk_path_builder_free_to_path (builder);
+}
+
+static gboolean
+build_path (GskPathOperation        op,
+            const graphene_point_t *pts,
+            gsize                   n_pts,
+            float                   weight,
+            gpointer                user_data)
+{
+  GskPathBuilder *builder = user_data;
+
+  switch (op)
+  {
+    case GSK_PATH_MOVE:
+      gsk_path_builder_move_to (builder, pts[0].x, pts[0].y);
+      break;
+
+    case GSK_PATH_CLOSE:
+      gsk_path_builder_close (builder);
+      break;
+
+    case GSK_PATH_LINE:
+      gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
+      break;
+
+    case GSK_PATH_QUAD:
+      gsk_path_builder_quad_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y);
+      break;
+
+    case GSK_PATH_CUBIC:
+      gsk_path_builder_cubic_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y);
+      break;
+
+    case GSK_PATH_CONIC:
+      gsk_path_builder_conic_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, weight);
+      break;
+
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return TRUE;
+}
+
+
+static gboolean
+update_path (GtkWidget     *widget,
+             GdkFrameClock *frame_clock,
+             gpointer       measure)
+{
+  float progress = gdk_frame_clock_get_frame_time (frame_clock) % (60 * G_USEC_PER_SEC) / (float) (30 * G_USEC_PER_SEC);
+  GskPathBuilder *builder;
+  GskPath *path;
+  GskPathPoint *point;
+  graphene_point_t pos;
+  graphene_vec2_t tangent;
+  GskStroke *stroke;
+
+  path = gsk_path_measure_get_path (measure);
+
+  stroke = gsk_stroke_new (1);
+  gsk_stroke_set_dash (stroke, (float[2]) { 10, 5 }, 2);
+  gsk_stroke_set_dash_offset (stroke, - (gdk_frame_clock_get_frame_time (frame_clock) % G_USEC_PER_SEC) * 15. / G_USEC_PER_SEC);
+  builder = gsk_path_builder_new ();
+  gsk_path_dash (path, stroke, 0.2, build_path, builder);
+
+  point = gsk_path_measure_get_point (measure,
+                                      (progress > 1 ? (progress - 1) : progress) * gsk_path_measure_get_length (measure));
+  gsk_path_point_get_position (point, &pos);
+  gsk_path_point_get_tangent (point, GSK_PATH_END, &tangent);
+  gsk_path_point_unref (point);
+
+  gsk_path_builder_move_to (builder, pos.x + 5 * graphene_vec2_get_x (&tangent), pos.y + 5 * graphene_vec2_get_y (&tangent));
+  gsk_path_builder_line_to (builder, pos.x + 3 * graphene_vec2_get_y (&tangent), pos.y + 3 * graphene_vec2_get_x (&tangent));
+  gsk_path_builder_line_to (builder, pos.x - 3 * graphene_vec2_get_y (&tangent), pos.y - 3 * graphene_vec2_get_x (&tangent));
+  gsk_path_builder_close (builder);
+
+  path = gsk_path_builder_free_to_path (builder);
+
+  gtk_path_paintable_set_path (GTK_PATH_PAINTABLE (gtk_picture_get_paintable (GTK_PICTURE (widget))),
+                               path);
+  gsk_path_unref (path);
+
+  return G_SOURCE_CONTINUE;
+}
+
 GtkWidget *
 do_path_fill (GtkWidget *do_widget)
 {
@@ -174,14 +316,35 @@ do_path_fill (GtkWidget *do_widget)
    {
      GtkWidget *picture;
      GdkPaintable *paintable;
+      GtkMediaStream *stream;
+      GskPath *path;
+      graphene_rect_t bounds;
+      GskPathMeasure *measure;

      window = gtk_window_new ();
      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
      gtk_window_set_title (GTK_WINDOW (window), "Path Fill");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      paintable = gtk_logo_paintable_new ();
+#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_hexagon (window);
+      path = create_path_from_text (window);
+      gsk_path_get_bounds (path, &bounds);
+
+      paintable = gtk_path_paintable_new (path,
+                                          GDK_PAINTABLE (stream),
+                                          bounds.origin.x + bounds.size.width,
+                                          bounds.origin.y + bounds.size.height);
      picture = gtk_picture_new_for_paintable (paintable);
+      measure = gsk_path_measure_new (path);
+      gtk_widget_add_tick_callback (picture, update_path, measure, (GDestroyNotify) gsk_path_measure_unref);
      gtk_picture_set_content_fit (GTK_PICTURE (picture), GTK_CONTENT_FIT_CONTAIN);
      gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
      g_object_unref (paintable);
@@ -0,0 +1,345 @@
+/* Path/Maze
+ *
+ * This demo shows how to use a GskPath to create a maze and use
+ * gsk_path_measure_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 <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
+pointer_motion (GtkEventControllerMotion *controller,
+                double                    x,
+                double                    y,
+                GtkMaze                  *self)
+{
+  GskPathPoint *point;
+  graphene_point_t pos;
+
+  if (!self->active)
+    return;
+
+  point = gsk_path_get_closest_point (self->path, &GRAPHENE_POINT_INIT (x, y), INFINITY);
+  gsk_path_point_get_position (point, &pos);
+  gsk_path_point_unref (point);
+
+  if (graphene_point_distance (&pos, &GRAPHENE_POINT_INIT (x, y), NULL, NULL) <= MAZE_STROKE_SIZE_ACTIVE / 2.0f)
+    return;
+
+  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;
+}
@@ -88,24 +88,22 @@ gtk_path_transform_point (GskPathMeasure         *measure,
                          graphene_point_t       *res)
 {
  graphene_vec2_t tangent;
-  GskPathPoint point;
+  GskPathPoint *point;

-  if (gsk_path_measure_get_point (measure, (pt->x + offset->x) * scale, &point))
-    {
-      GskPath *path = gsk_path_measure_get_path (measure);
+  point = gsk_path_measure_get_point (measure, (pt->x + offset->x) * scale);
+  gsk_path_point_get_position (point, res);
+  gsk_path_point_get_tangent (point, GSK_PATH_END, &tangent);
+  gsk_path_point_unref (point);

-      gsk_path_point_get_position (path, &point, res);
-      gsk_path_point_get_tangent (path, &point, GSK_PATH_END, &tangent);
-
-      res->x -= (pt->y + offset->y) * scale * graphene_vec2_get_y (&tangent);
-      res->y += (pt->y + offset->y) * scale * graphene_vec2_get_x (&tangent);
-    }
+  res->x -= (pt->y + offset->y) * scale * graphene_vec2_get_y (&tangent);
+  res->y += (pt->y + offset->y) * scale * graphene_vec2_get_x (&tangent);
 }

 static gboolean
 gtk_path_transform_op (GskPathOperation        op,
                       const graphene_point_t *pts,
                       gsize                   n_pts,
+                       float                   weight,
                       gpointer                data)
 {
  GtkPathTransform *transform = data;
@@ -147,6 +145,15 @@ gtk_path_transform_op (GskPathOperation        op,
      }
      break;

+    case GSK_PATH_CONIC:
+      {
+        graphene_point_t res[2];
+        gtk_path_transform_point (transform->measure, &pts[1], &transform->offset, transform->scale, &res[0]);
+        gtk_path_transform_point (transform->measure, &pts[2], &transform->offset, transform->scale, &res[1]);
+        gsk_path_builder_conic_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y, weight);
+      }
+      break;
+
    case GSK_PATH_CLOSE:
      gsk_path_builder_close (transform->builder);
      break;
@@ -318,22 +325,21 @@ gtk_path_widget_snapshot (GtkWidget   *widget,
  if (self->line_closest >= 0)
    {
      GskPathBuilder *builder;
-      GskPathPoint point;
+      GskPathPoint *point;
      graphene_point_t closest;

      builder = gsk_path_builder_new ();
-      if (gsk_path_measure_get_point (self->line_measure, self->line_closest, &point))
-        {
-          gsk_path_point_get_position (self->line_path, &point, &closest);
-          gsk_path_builder_add_circle (builder, &closest, POINT_SIZE);
-          path = gsk_path_builder_free_to_path (builder);
+      point = gsk_path_measure_get_point (self->line_measure, self->line_closest);
+      gsk_path_point_get_position (point, &closest);
+      gsk_path_point_unref (point);
+      gsk_path_builder_add_circle (builder, &closest, POINT_SIZE);
+      path = gsk_path_builder_free_to_path (builder);

-          gtk_snapshot_push_fill (snapshot, path, GSK_FILL_RULE_WINDING);
-          gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 1, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-          gtk_snapshot_pop (snapshot);
+      gtk_snapshot_push_fill (snapshot, path, GSK_FILL_RULE_WINDING);
+      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 1, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gtk_snapshot_pop (snapshot);

-          gsk_path_unref (path);
-        }
+      gsk_path_unref (path);
    }
 }

@@ -513,19 +519,17 @@ pointer_motion (GtkEventControllerMotion *controller,
                double                    y,
                GtkPathWidget            *self)
 {
-  GskPathPoint point;
+  GskPathPoint *point;
  graphene_point_t pos;

-  if (gsk_path_get_closest_point (gsk_path_measure_get_path (self->line_measure),
-                                  &GRAPHENE_POINT_INIT (x, y),
-                                  INFINITY,
-                                  &point))
-    {
-      gsk_path_point_get_position (self->line_path, &point, &pos);
-      self->line_closest = graphene_point_distance (&pos, &GRAPHENE_POINT_INIT (x, y), NULL, NULL);
-    
-      gtk_widget_queue_draw (GTK_WIDGET (self));
-    }
+  point = gsk_path_get_closest_point (gsk_path_measure_get_path (self->line_measure),
+                                              &GRAPHENE_POINT_INIT (x, y),
+                                              INFINITY);
+  gsk_path_point_get_position (point, &pos);
+  self->line_closest = graphene_point_distance (&pos, &GRAPHENE_POINT_INIT (x, y), NULL, NULL);
+  gsk_path_point_unref (point);
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
 }

 static void
@@ -6,6 +6,6 @@
 * Also, when adding new style properties, please add them here.
 */

-window.demo * {
+* {
  all: unset;
 }
@@ -188,20 +188,10 @@ do_spinbutton (GtkWidget *do_widget)
  if (!window)
    {
      GtkBuilder *builder;
-      GtkBuilderScope *scope;
      GtkAdjustment *adj;
      GtkWidget *label;

-      scope = gtk_builder_cscope_new ();
-      builder = gtk_builder_new ();
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_hex_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_hex_spin_output);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_time_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_time_spin_output);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_month_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_month_spin_output);
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/spinbutton/spinbutton.ui", NULL);
+      builder = gtk_builder_new_from_resource ("/spinbutton/spinbutton.ui");
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
@@ -243,7 +233,6 @@ do_spinbutton (GtkWidget *do_widget)
                                   NULL, NULL);

      g_object_unref (builder);
-      g_object_unref (scope);
    }

  if (!gtk_widget_get_visible (window))
@@ -27,6 +27,7 @@ GtkWidget *
 do_spinner (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
+  GtkWidget *content_area;
  GtkWidget *vbox;
  GtkWidget *hbox;
  GtkWidget *button;
@@ -34,19 +35,28 @@ do_spinner (GtkWidget *do_widget)

  if (!window)
  {
-    window = gtk_window_new ();
-    gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Spinner");
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    window = gtk_dialog_new_with_buttons ("Spinner",
+                                          GTK_WINDOW (do_widget),
+                                          0,
+                                          _("_Close"),
+                                          GTK_RESPONSE_NONE,
+                                          NULL);
    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+    g_signal_connect (window, "response",
+                      G_CALLBACK (gtk_window_destroy), NULL);
    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-    gtk_widget_set_margin_top (vbox, 5);
-    gtk_widget_set_margin_bottom (vbox, 5);
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
    gtk_widget_set_margin_start (vbox, 5);
    gtk_widget_set_margin_end (vbox, 5);
-
-    gtk_window_set_child (GTK_WINDOW (window), vbox);
+    gtk_widget_set_margin_top (vbox, 5);
+    gtk_widget_set_margin_bottom (vbox, 5);
+    gtk_box_append (GTK_BOX (content_area), vbox);

    /* Sensitive */
    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
@@ -801,7 +801,7 @@ suggestion_entry_key_pressed (GtkEventControllerKey *controller,
            selected = matches - 1;
        }

-      gtk_list_view_scroll_to (GTK_LIST_VIEW (self->list), selected, GTK_LIST_SCROLL_SELECT, NULL);
+      gtk_single_selection_set_selected (self->selection, selected);
      return TRUE;
    }

@@ -6,6 +6,8 @@

 #include "demo_conf.h"

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;
@@ -41,7 +43,7 @@ update_statusbar (void)
  GtkTextIter iter;
  const char *print_str;

-  gtk_label_set_label (GTK_LABEL (statusbar), "");
+  gtk_statusbar_pop (GTK_STATUSBAR (statusbar), 0);

  gtk_text_buffer_get_iter_at_mark (buffer,
                                    &iter,
@@ -59,10 +61,10 @@ update_statusbar (void)

  msg = g_strdup_printf ("%d, %d%s %s",
                         row, col,
-                         file_changed?" - Modified":"",
-                         print_str);
+			 file_changed?" - Modified":"",
+			 print_str);

-  gtk_label_set_label (GTK_LABEL (statusbar), msg);
+  gtk_statusbar_push (GTK_STATUSBAR (statusbar), 0, msg);

  g_free (msg);
 }
@@ -825,12 +827,7 @@ activate (GApplication *app)
                     contents);

  /* Create statusbar */
-  statusbar = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (statusbar), 0);
-  gtk_widget_set_margin_start (statusbar, 2);
-  gtk_widget_set_margin_end (statusbar, 2);
-  gtk_widget_set_margin_top (statusbar, 2);
-  gtk_widget_set_margin_bottom (statusbar, 2);
+  statusbar = gtk_statusbar_new ();
  gtk_box_append (GTK_BOX (box), statusbar);

  /* Show text widget info in the statusbar */
@@ -5,6 +5,16 @@ How to do a GTK release?

 Make sure you have suitable versions of Meson and Ninja.

+Also make sure you have the following packages installed with all their
+dependencies:
+
+  * gtk-doc
+  * docbook-utils
+
+Without those packages make distcheck will *not* pass.
+
+Make sure that gtk-doc is the latest released version.
+
 ## Release check list

  0. Save all your work, then move to the branch from which you want
@@ -18,8 +28,8 @@ $ git clean -dfx
  1. Build using the common sequence:

 ```sh
-$ meson setup _build
-$ meson compile -C _build
+$ meson _build .
+$ ninja -C _build
 ```

  2. Update NEWS based on the content of git log; follow the format of prior
@@ -30,10 +40,11 @@ $ meson compile -C _build
     writers, committers, etc. Anybody who is mentioned in the commit log
     gets a credit, but only real names, not email addresses or nicknames.

-  3. Update the pot file and commit the changes:
+  3. Update the pot files and commit the changes:

 ```sh
 $ ninja -C _build gtk40-pot
+$ ninja -C _build gtk40-properties-pot
 ```

  4. If this is a major, stable, release, verify that the release notes
@@ -61,7 +72,7 @@ $ ninja -C _build gtk40-pot
     Make sure that all new symbols have proper Since: tags, and that there
     is an index in the main `-docs.xml` for the next stable version.

-  8. Run `meson dist -C_build` to generate the tarball.
+  8. Run `ninja dist` to generate the tarball.

  9. Fix broken stuff found by 8), commit changes, repeat.

@@ -83,8 +94,7 @@ $ ninja -C _build gtk40-pot
 $ git tag -m "GTK 4.2.0" 4.2.0
 ```

-  13. Bump the version number in `meson.build`, and add a section for the next
-      release in NEWS and commit the change.
+  13. Bump the version number in `meson.build` and commit the change.

  14. Push the changes upstream, and push the tag as well. The git command for
    doing that is:
@@ -101,8 +111,7 @@ $ git push origin 4.2.0

 ```sh
 $ scp gtk-4.2.0.tar.xz matthiasc@master.gnome.org:
-$ ssh matthiasc@master.gnome.org
-$ ftpadmin install gtk-4.2.0.tar.xz
+$ ssh matthiasc@master.gnome.org ftpadmin install gtk-4.2.0.tar.xz
 ```

  16. Go to the gnome-announce list archives, find the last announce message,
@@ -1,7 +1,7 @@
 expand_content_md_files = [
 ]

-if get_option('documentation')
+if get_option('gtk_doc')
  gdk4_toml = configure_file(
    input: 'gdk4.toml.in',
    output: 'gdk4.toml',
@@ -1,4 +1,4 @@
-if get_option('documentation')
+if get_option('gtk_doc')
  gsk4_toml = configure_file(
    input: 'gsk4.toml.in',
    output: 'gsk4.toml',
@@ -268,7 +268,7 @@ support in the file chooser.
 This option controls whether GTK should use colord for color
 calibration support in the cups print backend.

-### `documentation`, `man-pages` and `screenshots`
+### `gtk_doc`, `man-pages` and `update_screenshots`

 The *gi-docgen* package is used to generate the reference documentation
 included with GTK. By default support for *gi-docgen* is disabled
@@ -89,11 +89,11 @@ using `gtk_application_new()`.
 When creating a [class@Gtk.Application], you need to pick an application
 identifier (a name) and pass it to [ctor@Gtk.Application.new] as parameter. For
 this example `org.gtk.example` is used. For choosing an identifier for your
-application, see [this guide](https://developer.gnome.org/documentation/tutorials/application-id.html).
+application, see [this guide](https://wiki.gnome.org/HowDoI/ChooseApplicationID).
 Lastly, [ctor@Gtk.Application.new] takes `GApplicationFlags` as input
 for your application, if your application would have special needs.

-Next the [activate signal](https://developer.gnome.org/documentation/tutorials/application.html) is
+Next the [activate signal](https://wiki.gnome.org/HowDoI/GtkApplication) is
 connected to the activate() function above the `main()` function. The `activate`
 signal will be emitted when your application is launched with `g_application_run()`
 on the line below. The `g_application_run()` call also takes as arguments the
@@ -0,0 +1,207 @@
+.. _gtk4-path-tool(1):
+
+=================
+gtk4-path-tool
+=================
+
+-----------------------
+GskPath Utility
+-----------------------
+
+SYNOPSIS
+--------
+|   **gtk4-path-tool** <COMMAND> [OPTIONS...] <PATH>
+|
+|   **gtk4-path-tool** stroke [OPTIONS...] <PATH>
+|   **gtk4-path-tool** offset [OPTIONS...] <PATH>
+|   **gtk4-path-tool** simplify [OPTIONS...] <PATH>
+|   **gtk4-path-tool** intersection [OPTIONS...] <PATH> <PATH>
+|   **gtk4-path-tool** union [OPTIONS...] <PATH> <PATH>
+|   **gtk4-path-tool** difference [OPTIONS...] <PATH> <PATH>
+|   **gtk4-path-tool** symmetric-difference [OPTIONS...] <PATH> <PATH>
+|   **gtk4-path-tool** decompose [OPTIONS...] <PATH>
+|   **gtk4-path-tool** restrict [OPTIONS...] <PATH>
+|   **gtk4-path-tool** show [OPTIONS...] <PATH>
+|   **gtk4-path-tool** render [OPTIONS...] <PATH>
+|   **gtk4-path-tool** info [OPTIONS...] <PATH>
+
+DESCRIPTION
+-----------
+
+``gtk4-path-tool`` can perform various tasks on paths. Paths are specified
+in SVG syntax, as strings like "M 100 100 C 100 200 200 200 200 100 Z".
+
+To read a path from a file, use a filename that starts with a '.' or a '/'.
+To read a path from stdin, use '-'.
+
+COMMANDS
+--------
+
+Stroking
+^^^^^^^^
+
+The ``stroke`` command performs a stroke operation along the path according to
+the parameters specified via options.
+
+``--line-width=VALUE``
+
+  The line width to use for the stroke. ``VALUE`` must be a positive number.
+  The default line width is 1.
+
+``--line-cap=VALUE``
+
+  The cap style to use at line ends. The possible values are ``butt``, ``round``
+  or ``square``. See the SVG specification for details on these styles.
+  The default cap style is ``butt``.
+
+``--line-join=VALUE``
+
+  The join style to use at line joins. The possible values are ``miter``,
+  ``miter-clip``, ``round``, ``bevel`` or ``arcs``. See the SVG specification
+  for details on these styles.
+  The default join style is ``miter``.
+
+``--miter-limit=VALUE``
+
+  The limit at which to clip miters at line joins. The default value is 4.
+
+``--dashes=VALUE``
+
+  The dash pattern to use for this stroke. A dash pattern is specified by
+  a comma-separated list of alternating non-negative numbers. Each number
+  provides the length of alternate "on" and "off" portions of the stroke.
+  If the dash pattern is empty, dashing is disabled, which is the default.
+  See the SVG specification for details on dashing.
+
+``--dash-offset=VALUE``
+
+  The offset into the dash pattern where dashing should begin.
+  The default value is 0.
+
+Offsetting
+^^^^^^^^^^
+
+The ``offset`` command applies a lateral offset to the path. Note that this
+is different from applying a translation transformation.
+
+``--distance=VALUE``
+
+  The distance by which to offset the path. Positive values offset to the right,
+  negative values to the left (wrt to the direction of the path). The default
+  value is 0.
+
+``--line-join=VALUE``
+
+  The join style to use at line joins. The possible values are ``miter``,
+  ``miter-clip``, ``round``, ``bevel`` or ``arcs``. See the SVG specification
+  for details on these styles.
+  The default join style is ``miter``.
+
+``--miter-limit=VALUE``
+
+  The limit at which to clip miters at line joins. The default value is 4.
+
+Boolean Operations
+^^^^^^^^^^^^^^^^^^
+
+The ``intersection``, ``union``, ``difference`` and ``symmetric-difference`` commands
+perform boolean operations on paths. Given two paths, they create a new path which
+encircles the area that is the intersection, union, difference or symmetric difference
+of the areas encircled by the paths.
+
+Simplification
+^^^^^^^^^^^^^^
+
+The ``simplify`` command removes areas of overlap from a path such that the resulting
+path encircles the same area, but every edge in the resulting path is a boundary between
+the inside and the outside.
+
+Decomposing
+^^^^^^^^^^^
+
+The ``decompose`` command approximates the path by one with simpler elements.
+When used without options, the curves of the path are approximated by line
+segments.
+
+``--allow-curves``
+
+  Allow cubic Bézier curves to be used in the generated path.
+
+``--allow-conics``
+
+  Allow rational quadratic Bézier curves to be used in the generated path.
+
+Restricting
+^^^^^^^^^^^
+
+The ``restrict`` command creates a path that traces a segment of the original
+path. Note that the start and the end of the segment are specified as
+path length from the beginning of the path.
+
+``--start=LENGTH``
+
+  The distance from the beginning of the path where the segment begins. The
+  default values is 0.
+
+``--end=LENGTH``
+
+  The distance from the beginning of the path where the segment ends. The
+  default value is the length of path.
+
+Showing
+^^^^^^^
+
+The ``show`` command displays the given path in a window. The interior
+of the path is filled.
+
+``--fill-rule=VALUE``
+
+  The fill rule that is used to determine what areas are inside the path.
+  The possible values are ``winding`` or ``even-odd``. The default is ``winding``.
+
+``--fg-color=COLOR``
+
+  The color that is used to fill the interior of the path.
+  If not specified, black is used.
+
+``--bg-color=COLOR``
+
+  The color that is used to render the background behind the path.
+  If not specified, white is used.
+
+Rendering
+^^^^^^^^^
+
+The ``render`` command renders the given path as a PNG image.
+The interior of the path is filled.
+
+``--fill-rule=VALUE``
+
+  The fill rule that is used to determine what areas are inside the path.
+  The possible values are ``winding`` or ``even-odd``. The default is ``winding``.
+
+``--fg-color=COLOR``
+
+  The color that is used to fill the interior of the path.
+  If not specified, black is used.
+
+``--bg-color=COLOR``
+
+  The color that is used to render the background behind the path.
+  If not specified, white is used.
+
+``--output-file=FILE``
+
+  The file to save the PNG image to.
+  If not specified, "path.png" is used.
+
+Info
+^^^^
+
+The ``info`` command shows various information about the given path,
+such as the number of contours, its bounding box and and its length.
+
+REFERENCES
+----------
+
+- SVG Path Specification, https://www.w3.org/TR/SVG2/paths.html
@@ -14,7 +14,7 @@ SYNOPSIS
 |
 |   **gtk4-rendernode-tool** info [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** show [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
+|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE>

 DESCRIPTION
 -----------
@@ -38,10 +38,14 @@ The ``show`` command displays the rendernode.
 Rendering
 ^^^^^^^^^

-The ``render`` command saves a rendering of the rendernode as a png or tiff image.
+The ``render`` command saves a rendering of the rendernode as a png image.
 The name of the file to write can be specified as a second FILE argument.

 ``--renderer=RENDERER``

-  Use the given renderer. Use ``--renderer=help`` to get a information
-  about poassible values for the ``RENDERER``.
+  Use the given renderer. This option accepts the same values as the
+  ``GSK_RENDERER`` environment variable.
+
+``--force``
+
+  Overwrite an existing file.
@@ -78,7 +78,7 @@ ui_files = [

 gtk_builder_tool = find_program('gtk4-builder-tool')

-if get_option('screenshots')
+if get_option('update_screenshots')
  foreach ui_file: ui_files
    png_file = ui_file.replace('.ui', '.png')
    gtk_images += custom_target('@0@ from @1@'.format(png_file, ui_file),
@@ -32,7 +32,7 @@ gtk_images = []

 subdir('images')

-if get_option('documentation')
+if get_option('gtk_doc')
  gtk4_toml = configure_file(
    input: 'gtk4.toml.in',
    output: 'gtk4.toml',
@@ -77,6 +77,7 @@ if get_option('man-pages') and rst2man.found()
    [ 'gtk4-query-settings', '1', ],
    [ 'gtk4-rendernode-tool', '1' ],
    [ 'gtk4-update-icon-cache', '1', ],
+    [ 'gtk4-path-tool', '1', ],
  ]

  if get_option('demos')
@@ -222,7 +222,7 @@ It is possible to set accessible attributes in UI files as well:
  <accessibility>
    <property name="label">Download</property>
    <relation name="labelled-by">label1</relation>
-  </accessibility>
+  /accessibility>
 </object>
 ```

@@ -1,7 +1,7 @@
 toml_conf = configuration_data()
 toml_conf.set('version', meson.project_version())

-gidocgen = find_program('gi-docgen', required: get_option('documentation'), native: true)
+gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'), native: true)

 gidocgen_common_args = [
  '--quiet',
@@ -14,7 +14,7 @@ endif

 docs_dir = gtk_datadir / 'doc'

-if get_option('documentation') and not build_gir
+if get_option('gtk_doc') and not build_gir
  error('API reference requires introspection.')
 endif

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs

 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)

-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
  gtk_widget_init_template (GTK_WIDGET (prefs));
  prefs->settings = g_settings_new ("org.gtk.exampleapp");

-  g_settings_bind_with_mapping (prefs->settings, "font",
-                                prefs->font, "font-desc",
-                                G_SETTINGS_BIND_DEFAULT,
-                                string_to_font_desc,
-                                font_desc_to_string,
-                                NULL, NULL);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
 }

 static void
@@ -27,10 +27,7 @@
              </object>
            </child>
            <child>
-              <object class="GtkFontDialogButton" id="font">
-                <property name="dialog">
-                  <object class="GtkFontDialog"/>
-                </property>
+              <object class="GtkFontButton" id="font">
                <layout>
                  <property name="column">1</property>
                  <property name="row">0</property>
@@ -50,16 +47,12 @@
              </object>
            </child>
            <child>
-              <object class="GtkDropDown" id="transition">
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Fade</item>
-                      <item translatable="yes">Slide</item>
-                    </items>
-                  </object>
-                </property>
+              <object class="GtkComboBoxText" id="transition">
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="crossfade">Fade</item>
+                  <item translatable="yes" id="slide-left-right">Slide</item>
+                </items>
                <layout>
                  <property name="column">1</property>
                  <property name="row">1</property>
@@ -15,78 +15,18 @@ struct _ExampleAppPrefs

 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)

-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
  gtk_widget_init_template (GTK_WIDGET (prefs));
  prefs->settings = g_settings_new ("org.gtk.exampleapp");

-  g_settings_bind_with_mapping (prefs->settings, "font",
-                                prefs->font, "font-desc",
-                                G_SETTINGS_BIND_DEFAULT,
-                                string_to_font_desc,
-                                font_desc_to_string,
-                                NULL, NULL);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
 }

 static void
@@ -27,10 +27,7 @@
              </object>
            </child>
            <child>
-              <object class="GtkFontDialogButton" id="font">
-                <property name="dialog">
-                  <object class="GtkFontDialog"/>
-                </property>
+              <object class="GtkFontButton" id="font">
                <layout>
                  <property name="column">1</property>
                  <property name="row">0</property>
@@ -50,16 +47,12 @@
              </object>
            </child>
            <child>
-              <object class="GtkDropDown" id="transition">
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Fade</item>
-                      <item translatable="yes">Slide</item>
-                    </items>
-                  </object>
-                </property>
+              <object class="GtkComboBoxText" id="transition">
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="crossfade">Fade</item>
+                  <item translatable="yes" id="slide-left-right">Slide</item>
+                </items>
                <layout>
                  <property name="column">1</property>
                  <property name="row">1</property>
@@ -15,78 +15,18 @@ struct _ExampleAppPrefs

 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)

-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
  gtk_widget_init_template (GTK_WIDGET (prefs));
  prefs->settings = g_settings_new ("org.gtk.exampleapp");

-  g_settings_bind_with_mapping (prefs->settings, "font",
-                                prefs->font, "font-desc",
-                                G_SETTINGS_BIND_DEFAULT,
-                                string_to_font_desc,
-                                font_desc_to_string,
-                                NULL, NULL);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
 }

 static void
@@ -27,10 +27,7 @@
              </object>
            </child>
            <child>
-              <object class="GtkFontDialogButton" id="font">
-                <property name="dialog">
-                  <object class="GtkFontDialog"/>
-                </property>
+              <object class="GtkFontButton" id="font">
                <layout>
                  <property name="column">1</property>
                  <property name="row">0</property>
@@ -50,16 +47,12 @@
              </object>
            </child>
            <child>
-              <object class="GtkDropDown" id="transition">
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Fade</item>
-                      <item translatable="yes">Slide</item>
-                    </items>
-                  </object>
-                </property>
+              <object class="GtkComboBoxText" id="transition">
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="crossfade">Fade</item>
+                  <item translatable="yes" id="slide-left-right">Slide</item>
+                </items>
                <layout>
                  <property name="column">1</property>
                  <property name="row">1</property>
@@ -15,78 +15,18 @@ struct _ExampleAppPrefs

 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)

-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
  gtk_widget_init_template (GTK_WIDGET (prefs));
  prefs->settings = g_settings_new ("org.gtk.exampleapp");

-  g_settings_bind_with_mapping (prefs->settings, "font",
-                                prefs->font, "font-desc",
-                                G_SETTINGS_BIND_DEFAULT,
-                                string_to_font_desc,
-                                font_desc_to_string,
-                                NULL, NULL);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
 }

 static void
@@ -27,10 +27,7 @@
              </object>
            </child>
            <child>
-              <object class="GtkFontDialogButton" id="font">
-                <property name="dialog">
-                  <object class="GtkFontDialog"/>
-                </property>
+              <object class="GtkFontButton" id="font">
                <layout>
                  <property name="column">1</property>
                  <property name="row">0</property>
@@ -50,16 +47,12 @@
              </object>
            </child>
            <child>
-              <object class="GtkDropDown" id="transition">
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Fade</item>
-                      <item translatable="yes">Slide</item>
-                    </items>
-                  </object>
-                </property>
+              <object class="GtkComboBoxText" id="transition">
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="crossfade">Fade</item>
+                  <item translatable="yes" id="slide-left-right">Slide</item>
+                </items>
                <layout>
                  <property name="column">1</property>
                  <property name="row">1</property>
@@ -1,6 +1,8 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 typedef struct
 {
  GtkApplication parent_instance;
@@ -354,8 +356,8 @@ combo_changed (GtkDropDown *combo,
               GParamSpec  *pspec,
               gpointer     user_data)
 {
+  GtkDialog *dialog = user_data;
  GtkEntry *entry = g_object_get_data (user_data, "entry");
-  GtkWidget *set_button = g_object_get_data (user_data, "set-button");
  const char *action;
  char **accels;
  char *str;
@@ -370,7 +372,7 @@ combo_changed (GtkDropDown *combo,
  g_strfreev (accels);

  gtk_editable_set_text (GTK_EDITABLE (entry), str);
-  gtk_widget_set_sensitive (set_button, FALSE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE);
 }

 static void
@@ -378,21 +380,15 @@ entry_changed (GtkEntry   *entry,
               GParamSpec *pspec,
               gpointer    user_data)
 {
-  GtkWidget *set_button = g_object_get_data (user_data, "set-button");
+  GtkDialog *dialog = user_data;

-  gtk_widget_set_sensitive (set_button, TRUE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, TRUE);
 }

 static void
-close_clicked (GtkButton *button,
-               gpointer   user_data)
-{
-  gtk_window_destroy (GTK_WINDOW (user_data));
-}
-
-static void
-set_clicked (GtkButton *button,
-             gpointer   user_data)
+response (GtkDialog *dialog,
+          guint      response_id,
+          gpointer   user_data)
 {
  GtkEntry *entry = g_object_get_data (user_data, "entry");
  GtkDropDown *combo = g_object_get_data (user_data, "combo");
@@ -400,6 +396,12 @@ set_clicked (GtkButton *button,
  const char *str;
  char **accels;

+  if (response_id == GTK_RESPONSE_CANCEL)
+    {
+      gtk_window_destroy (GTK_WINDOW (dialog));
+      return;
+    }
+
  action = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (combo)));

  if (!action)
@@ -411,7 +413,7 @@ set_clicked (GtkButton *button,
  gtk_application_set_accels_for_action (gtk_window_get_application (user_data), action, (const char **) accels);
  g_strfreev (accels);

-  gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE);
 }

 static void
@@ -422,45 +424,32 @@ edit_accels (GSimpleAction *action,
  GtkApplication *app = user_data;
  GtkWidget *combo;
  GtkWidget *entry;
-  GtkWidget *header;
-  GtkWidget *close_button;
-  GtkWidget *set_button;
-  GtkWidget *box;
  char **actions;
  GtkWidget *dialog;
  int i;
  GtkStringList *strings;

-  dialog = gtk_window_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog), "Accelerators");
+  dialog = gtk_dialog_new_with_buttons ("Accelerators",
+                                        NULL,
+                                        GTK_DIALOG_USE_HEADER_BAR,
+                                        "Close", GTK_RESPONSE_CANCEL,
+                                        "Set", GTK_RESPONSE_APPLY,
+                                        NULL);
+
  gtk_window_set_application (GTK_WINDOW (dialog), app);
  actions = gtk_application_list_action_descriptions (app);

-  header = gtk_header_bar_new ();
-  gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-  close_button = gtk_button_new_with_label ("Close");
-  g_signal_connect (close_button, "clicked", G_CALLBACK (close_clicked), dialog);
-  gtk_header_bar_pack_start (GTK_HEADER_BAR (header), close_button);
-  set_button = gtk_button_new_with_label ("Set");
-  g_signal_connect (set_button, "clicked", G_CALLBACK (set_clicked), dialog);
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (header), set_button);
-
-  gtk_window_set_titlebar (GTK_WINDOW (dialog), header);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-  g_object_set (box,
+  strings = gtk_string_list_new (NULL);
+  combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
+  g_object_set (gtk_dialog_get_content_area (GTK_DIALOG (dialog)),
                "margin-top", 10,
                "margin-bottom", 10,
                "margin-start", 10,
                "margin-end", 10,
+                "spacing", 10,
                NULL);
-  gtk_window_set_child (GTK_WINDOW (dialog), box);
-
-  strings = gtk_string_list_new (NULL);
-  combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
-
-  gtk_box_append (GTK_BOX (box), combo);

+  gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), combo);
  for (i = 0; actions[i]; i++)
    gtk_string_list_append (strings, actions[i]);
  g_signal_connect (combo, "notify::selected", G_CALLBACK (combo_changed), dialog);
@@ -469,10 +458,10 @@ edit_accels (GSimpleAction *action,
  gtk_widget_set_hexpand (entry, TRUE);
  g_signal_connect (entry, "notify::text", G_CALLBACK (entry_changed), dialog);

-  gtk_box_append (GTK_BOX (box), entry);
+  gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), entry);
+  g_signal_connect (dialog, "response", G_CALLBACK (response), dialog);
  g_object_set_data (G_OBJECT (dialog), "combo", combo);
  g_object_set_data (G_OBJECT (dialog), "entry", entry);
-  g_object_set_data (G_OBJECT (dialog), "set-button", set_button);

  gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), 0);

@@ -13,6 +13,8 @@ foreach ex : examples
  example_name = ex == 'builder' ? 'builder_example' : ex
  executable(example_name, '@0@.c'.format(ex),
             c_args: [
+               '-DGDK_DISABLE_DEPRECATED',
+               '-DGTK_DISABLE_DEPRECATED',
               '-DGTK_SRCDIR="@0@"'.format(meson.current_source_dir()),
             ] + common_cflags,
             dependencies: libgtk_dep)
@@ -151,8 +151,6 @@ gdk_memory_texture_new (int              width,
  g_return_val_if_fail (height > 0, NULL);
  g_return_val_if_fail (bytes != NULL, NULL);
  g_return_val_if_fail (stride >= width * gdk_memory_format_bytes_per_pixel (format), NULL);
-  /* needs to be this complex to support subtexture of the bottom right part */
-  g_return_val_if_fail (g_bytes_get_size (bytes) >= stride * (height - 1) + width * gdk_memory_format_bytes_per_pixel (format), NULL);

  bytes = gdk_memory_sanitize (bytes, width, height, format, stride, &stride);

@@ -85,7 +85,6 @@ typedef enum
 * @GDK_TOPLEVEL_STATE_BOTTOM_RESIZABLE: whether the bottom edge is resizable
 * @GDK_TOPLEVEL_STATE_LEFT_TILED: whether the left edge is tiled
 * @GDK_TOPLEVEL_STATE_LEFT_RESIZABLE: whether the left edge is resizable
- * @GDK_TOPLEVEL_STATE_SUSPENDED: the surface is not visible to the user
 *
 * Specifies the state of a toplevel surface.
 *
@@ -112,8 +111,7 @@ typedef enum
  GDK_TOPLEVEL_STATE_BOTTOM_TILED     = 1 << 12,
  GDK_TOPLEVEL_STATE_BOTTOM_RESIZABLE = 1 << 13,
  GDK_TOPLEVEL_STATE_LEFT_TILED       = 1 << 14,
-  GDK_TOPLEVEL_STATE_LEFT_RESIZABLE   = 1 << 15,
-  GDK_TOPLEVEL_STATE_SUSPENDED        = 1 << 16
+  GDK_TOPLEVEL_STATE_LEFT_RESIZABLE   = 1 << 15
 } GdkToplevelState;

 /**
@@ -244,7 +244,7 @@ gdk_vulkan_strerror (VkResult result)
 #endif
 #if VK_HEADER_VERSION >= 246
    case VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT:
-      return "The provided binary shader code is not compatible with this device. (VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT)";
+      return "The provided binary shader code is not compatible with this device."
 #endif
    case VK_RESULT_MAX_ENUM:
    default:
@@ -1009,7 +1009,6 @@ gdk_display_load_pipeline_cache (GdkDisplay *display)
                                           &result) != VK_SUCCESS)
    result = VK_NULL_HANDLE;

-  g_object_unref (cache_file);
  g_free (data);
  g_free (display->vk_pipeline_cache_etag);
  display->vk_pipeline_cache_etag = etag;
@@ -1645,6 +1644,7 @@ gdk_display_unref_vulkan (GdkDisplay *display)
  if (display->vulkan_refcount > 0)
    return;

+  display->vk_shader_modules = g_hash_table_new (g_str_hash, g_str_equal);
  g_hash_table_iter_init (&iter, display->vk_shader_modules);
  while (g_hash_table_iter_next (&iter, &key, &value))
    {
@@ -1653,11 +1653,9 @@ gdk_display_unref_vulkan (GdkDisplay *display)
                             value,
                             NULL);
    }
-  g_hash_table_unref (display->vk_shader_modules);

  if (display->vk_save_pipeline_cache_source)
    {
-      g_clear_handle_id (&display->vk_save_pipeline_cache_source, g_source_remove);
      gdk_vulkan_save_pipeline_cache_cb (display);
      g_assert (display->vk_save_pipeline_cache_source == 0);
    }
@@ -73,10 +73,7 @@ typedef NSString *CALayerContentsGravity;

 -(void)windowDidMiniaturize:(NSNotification *)aNotification
 {
-  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface),
-                                0,
-                                GDK_TOPLEVEL_STATE_MINIMIZED |
-                                GDK_TOPLEVEL_STATE_SUSPENDED);
+  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface), 0, GDK_TOPLEVEL_STATE_MINIMIZED);
 }

 -(void)windowDidDeminiaturize:(NSNotification *)aNotification
@@ -86,10 +83,7 @@ typedef NSString *CALayerContentsGravity;
  else if (GDK_IS_MACOS_POPUP_SURFACE (gdk_surface))
    _gdk_macos_popup_surface_attach_to_parent (GDK_MACOS_POPUP_SURFACE (gdk_surface));

-  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface),
-                                GDK_TOPLEVEL_STATE_MINIMIZED |
-                                GDK_TOPLEVEL_STATE_SUSPENDED,
-                                0);
+  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface), GDK_TOPLEVEL_STATE_MINIMIZED, 0);
 }

 -(void)windowDidBecomeKey:(NSNotification *)aNotification
@@ -27,7 +27,9 @@
 #include "gdkmacosdisplay.h"
 #include "gdkmacossurface.h"

-#import <epoxy/gl.h>
+#import <OpenGL/OpenGL.h>
+#import <OpenGL/gl3.h>
+#import <AppKit/AppKit.h>

 G_BEGIN_DECLS

@@ -21,6 +21,7 @@

 #include "gdkconfig.h"

+#include <OpenGL/gl3.h>
 #include <OpenGL/CGLIOSurface.h>
 #include <QuartzCore/QuartzCore.h>

@@ -498,7 +499,7 @@ gdk_macos_gl_context_begin_frame (GdkDrawContext *context,
  gdk_gl_context_make_current (GDK_GL_CONTEXT (self));
  gdk_macos_gl_context_allocate (self);

-  GDK_DRAW_CONTEXT_CLASS (gdk_macos_gl_context_parent_class)->begin_frame (context, depth, region);
+  GDK_DRAW_CONTEXT_CLASS (gdk_macos_gl_context_parent_class)->begin_frame (context, prefers_high_depth, region);

  gdk_gl_context_make_current (GDK_GL_CONTEXT (self));
  CHECK_GL (NULL, glBindFramebuffer (GL_FRAMEBUFFER, self->fbo));
@@ -2185,9 +2185,8 @@ set_capability_setting (GdkDisplay                *display,
                        enum gtk_shell1_capability test)
 {
  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-  int testbit = 1 << (test - 1);

-  g_value_set_boolean (value, (display_wayland->shell_capabilities & testbit) == testbit);
+  g_value_set_boolean (value, (display_wayland->shell_capabilities & test) == test);

  return TRUE;
 }
@@ -620,11 +620,6 @@ xdg_toplevel_configure (void                *data,
          pending_state |= (GDK_TOPLEVEL_STATE_TILED |
                            GDK_TOPLEVEL_STATE_LEFT_TILED);
          break;
-#ifdef HAVE_TOPLEVEL_STATE_SUSPENDED
-        case XDG_TOPLEVEL_STATE_SUSPENDED:
-          pending_state |= GDK_TOPLEVEL_STATE_SUSPENDED;
-          break;
-#endif
        default:
          /* Unknown state */
          break;
@@ -3014,11 +3014,9 @@ gdk_event_translate (MSG *msg,
 	  unset_bits = 0;

 	  if (IsIconic (msg->hwnd))
-	    set_bits |= (GDK_TOPLEVEL_STATE_MINIMIZED |
-                         GDK_TOPLEVEL_STATE_SUSPENDED);
+	    set_bits |= GDK_TOPLEVEL_STATE_MINIMIZED;
 	  else
-	    unset_bits |= (GDK_TOPLEVEL_STATE_MINIMIZED |
-                           GDK_TOPLEVEL_STATE_SUSPENDED);
+	    unset_bits |= GDK_TOPLEVEL_STATE_MINIMIZED;

 	  if (IsZoomed (msg->hwnd))
 	    set_bits |= GDK_TOPLEVEL_STATE_MAXIMIZED;
@@ -1,7 +1,6 @@
 /* GDK - The GIMP Drawing Kit
 * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
 * Copyright (C) 1998-2002 Tor Lillqvist
- * Copyright (C) 2023 the GTK team
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,13 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
 #include "config.h"

 #include <glib/gprintf.h>
@@ -39,6 +45,8 @@
 #include <wintab.h>
 #include <imm.h>

+static gboolean gdk_synchronize = FALSE;
+
 /* Whether GDK initialized COM */
 static gboolean co_initialized = FALSE;

@@ -48,6 +56,18 @@ static gboolean ole_initialized = FALSE;
 void
 _gdk_win32_surfaceing_init (void)
 {
+  GdkWin32Keymap *win32_keymap;
+
+  win32_keymap = GDK_WIN32_KEYMAP (_gdk_win32_display_get_keymap (_gdk_display));
+
+  if (gdk_synchronize)
+    GdiSetBatchLimit (1);
+
+  _gdk_input_locale = GetKeyboardLayout (0);
+  _gdk_win32_keymap_set_active_layout (win32_keymap, _gdk_input_locale);
+
+  GDK_NOTE (EVENTS, g_print ("input_locale: %p\n", _gdk_input_locale));
+
  _gdk_win32_clipdrop_init ();

  gdk_dmanipulation_initialize ();
@@ -194,6 +194,12 @@ gdk_surface_win32_finalize (GObject *object)
      surface->hicon_small = NULL;
    }

+  if (surface->cache_surface)
+    {
+      cairo_surface_destroy (surface->cache_surface);
+      surface->cache_surface = NULL;
+    }
+
  _gdk_win32_surface_unregister_dnd (GDK_SURFACE (surface));

  g_assert (surface->transient_owner == NULL);
@@ -1,6 +1,5 @@
 /* GDK - The GIMP Drawing Kit
 * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 2023 the GTK team
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -16,6 +15,13 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

+/*
+ * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
 #pragma once

 #include "gdk/win32/gdkprivate-win32.h"
@@ -283,7 +289,23 @@ struct _GdkWin32Surface
   */
  guint maximizing : 1;

-  HDC hdc;
+  /* GDK does not keep window contents around, it just draws new
+   * stuff over the window where changes occurred.
+   * cache_surface retains old window contents, because
+   * UpdateLayeredWindow() doesn't do partial redraws.
+   */
+  cairo_surface_t *cache_surface;
+
+  /* Unlike window-backed surfaces, DIB-backed surface
+   * does not provide a way to query its size,
+   * so we have to remember it ourselves.
+   */
+  int              dib_width;
+  int              dib_height;
+
+  HDC              hdc;
+  int              hdc_count;
+  HBITMAP          saved_dc_bitmap; /* Original bitmap for dc */

  GdkW32DragMoveResizeContext drag_move_resize_context;

@@ -418,18 +418,12 @@ do_net_wm_state_changes (GdkSurface *surface)
  if (old_state & GDK_TOPLEVEL_STATE_MINIMIZED)
    {
      if (!toplevel->have_hidden)
-        {
-          unset |= (GDK_TOPLEVEL_STATE_MINIMIZED |
-                    GDK_TOPLEVEL_STATE_SUSPENDED);
-        }
+        unset |= GDK_TOPLEVEL_STATE_MINIMIZED;
    }
  else
    {
      if (toplevel->have_hidden)
-        {
-          set |= (GDK_TOPLEVEL_STATE_MINIMIZED |
-                  GDK_TOPLEVEL_STATE_SUSPENDED);
-        }
+        set |= GDK_TOPLEVEL_STATE_MINIMIZED;
    }

  /* Update edge constraints and tiling */
@@ -816,12 +810,9 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
               * the minimized bit off.
               */
              if (GDK_SURFACE_IS_MAPPED (surface))
-                {
-                  gdk_synthesize_surface_state (surface,
-                                                0,
-                                                GDK_TOPLEVEL_STATE_MINIMIZED |
-                                                GDK_TOPLEVEL_STATE_SUSPENDED);
-                }
+                gdk_synthesize_surface_state (surface,
+                                              0,
+                                              GDK_TOPLEVEL_STATE_MINIMIZED);
            }

          if (surface_impl->toplevel &&
@@ -850,12 +841,9 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
 	{
 	  /* Unset minimized if it was set */
 	  if (surface->state & GDK_TOPLEVEL_STATE_MINIMIZED)
-            {
-              gdk_synthesize_surface_state (surface,
-                                            GDK_TOPLEVEL_STATE_MINIMIZED |
-                                            GDK_TOPLEVEL_STATE_SUSPENDED,
-                                            0);
-            }
+	    gdk_synthesize_surface_state (surface,
+				 	  GDK_TOPLEVEL_STATE_MINIMIZED,
+					  0);

 	  if (toplevel)
 	    gdk_surface_thaw_updates (surface);
@@ -3270,10 +3270,7 @@ gdk_x11_surface_minimize (GdkSurface *surface)
  else
    {
      /* Flip our client side flag, the real work happens on map. */
-      gdk_synthesize_surface_state (surface,
-                                    0,
-                                    GDK_TOPLEVEL_STATE_MINIMIZED |
-                                    GDK_TOPLEVEL_STATE_SUSPENDED);
+      gdk_synthesize_surface_state (surface, 0, GDK_TOPLEVEL_STATE_MINIMIZED);
      gdk_wmspec_change_state (TRUE, surface,
                               "_NET_WM_STATE_HIDDEN",
                               NULL);
@@ -3296,10 +3293,7 @@ gdk_x11_surface_unminimize (GdkSurface *surface)
  else
    {
      /* Flip our client side flag, the real work happens on map. */
-      gdk_synthesize_surface_state (surface,
-                                    GDK_TOPLEVEL_STATE_MINIMIZED |
-                                    GDK_TOPLEVEL_STATE_SUSPENDED,
-                                    0);
+      gdk_synthesize_surface_state (surface, GDK_TOPLEVEL_STATE_MINIMIZED, 0);
      gdk_wmspec_change_state (FALSE, surface,
                               "_NET_WM_STATE_HIDDEN",
                               NULL);
@@ -28,8 +28,6 @@
 #include "gskgldriverprivate.h"
 #include "gskglglyphlibraryprivate.h"

-#include "gskdebugprivate.h"
-
 #define MAX_GLYPH_SIZE 128

 G_DEFINE_TYPE (GskGLGlyphLibrary, gsk_gl_glyph_library, GSK_TYPE_GL_TEXTURE_LIBRARY)
@@ -409,8 +407,6 @@ gsk_gl_glyph_library_add (GskGLGlyphLibrary      *self,
  width = (int) ceil (ink_rect.width * key->scale / 1024.0);
  height = (int) ceil (ink_rect.height * key->scale / 1024.0);

-  GSK_DEBUG (GLYPH_CACHE, "font %p glyph %u: %u x %u pixels", key->font, key->glyph, width, height);
-
  value = gsk_gl_texture_library_pack (tl,
                                       key,
                                       sizeof *value,
@@ -1245,9 +1245,9 @@ gsk_gl_render_job_visit_as_fallback (GskGLRenderJob      *job,
 done:
  if (scale_x < 0 || scale_y < 0)
    {
-      GskTransform *transform = gsk_transform_translate (gsk_transform_scale (NULL, scale_x < 0 ? -1 : 1, scale_y < 0 ? -1 : 1),
-                                                         &GRAPHENE_POINT_INIT (scale_x < 0 ? - (node->bounds.size.width + 2 * node->bounds.origin.x) : 0,
-                                                                               scale_y < 0 ? - (node->bounds.size.height + 2 * node->bounds.origin.y) : 0));
+      GskTransform *transform = gsk_transform_translate (NULL,
+                                                         &GRAPHENE_POINT_INIT (scale_x < 0 ? - surface_width : 0,
+                                                                               scale_y < 0 ? - surface_height : 0));
      gsk_gl_render_job_push_modelview (job, transform);
      gsk_transform_unref (transform);
    }
@@ -97,19 +97,4 @@ gsk_bounding_box_intersection (const GskBoundingBox *a,
  return min.x <= max.x && min.y <= max.y;
 }

-static inline void
-gsk_bounding_box_union (const GskBoundingBox *a,
-                        const GskBoundingBox *b,
-                        GskBoundingBox       *res)
-{
-  graphene_point_t min, max;
-
-  min.x = MIN (a->min.x, b->min.x);
-  min.y = MIN (a->min.y, b->min.y);
-  max.x = MAX (a->max.x, b->max.x);
-  max.y = MAX (a->max.y, b->max.y);
-
-  gsk_bounding_box_init (res, &min, &max);
-}
-
 G_END_DECLS
@@ -20,13 +20,26 @@

 #pragma once

-#include "gskpathprivate.h"
-#include "gskpathpointprivate.h"
+#include "gskpath.h"
+
 #include "gskpathopprivate.h"
-#include "gskboundingboxprivate.h"

 G_BEGIN_DECLS

+typedef enum
+{
+  GSK_PATH_FLAT,
+  GSK_PATH_CLOSED
+} GskPathFlags;
+
+typedef struct _GskContour GskContour;
+
+GskContour *            gsk_rect_contour_new                    (const graphene_rect_t  *rect);
+GskContour *            gsk_rounded_rect_contour_new            (const GskRoundedRect   *rounded_rect);
+GskContour *            gsk_circle_contour_new                  (const graphene_point_t *center,
+                                                                 float                   radius,
+                                                                 float                   start_angle,
+                                                                 float                   end_angle);
 GskContour *            gsk_standard_contour_new                (GskPathFlags            flags,
                                                                 const graphene_point_t *points,
                                                                 gsize                   n_points,
@@ -44,10 +57,10 @@ GskPathFlags            gsk_contour_get_flags                   (const GskContou
 void                    gsk_contour_print                       (const GskContour       *self,
                                                                 GString                *string);
 gboolean                gsk_contour_get_bounds                  (const GskContour       *self,
-                                                                 GskBoundingBox         *bounds);
+                                                                 graphene_rect_t        *bounds);
 gboolean                gsk_contour_get_stroke_bounds           (const GskContour       *self,
                                                                 const GskStroke        *stroke,
-                                                                 GskBoundingBox         *bounds);
+                                                                 graphene_rect_t        *bounds);
 gboolean                gsk_contour_foreach                     (const GskContour       *self,
                                                                 float                   tolerance,
                                                                 GskPathForeachFunc      func,
@@ -61,51 +74,60 @@ int                     gsk_contour_get_winding                 (const GskContou
 gboolean                gsk_contour_get_closest_point           (const GskContour       *self,
                                                                 const graphene_point_t *point,
                                                                 float                   threshold,
-                                                                 GskRealPathPoint       *result,
+                                                                 GskPathPoint           *result,
                                                                 float                  *out_dist);

 void                    gsk_contour_get_position                (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
+                                                                 GskPathPoint           *point,
                                                                 graphene_point_t       *pos);

 void                    gsk_contour_get_tangent                 (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
+                                                                 GskPathPoint           *point,
                                                                 GskPathDirection        direction,
                                                                 graphene_vec2_t        *tangent);
 float                   gsk_contour_get_curvature               (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
+                                                                 GskPathPoint           *point,
                                                                 graphene_point_t       *center);
 gpointer                gsk_contour_init_measure                (const GskContour       *self,
                                                                 float                   tolerance,
                                                                 float                  *out_length);
 void                    gsk_contour_free_measure                (const GskContour       *self,
                                                                 gpointer                data);
-int                     gsk_contour_point_compare               (const GskContour       *self,
-                                                                 GskRealPathPoint       *p1,
-                                                                 GskRealPathPoint       *p2);
-
 void                    gsk_contour_add_segment                 (const GskContour       *self,
                                                                 GskPathBuilder         *builder,
+                                                                 gpointer                measure_data,
                                                                 gboolean                emit_move_to,
-                                                                 GskRealPathPoint       *start,
-                                                                 GskRealPathPoint       *end);
-
+                                                                 float                   start,
+                                                                 float                   end);
 void                    gsk_contour_get_point                   (const GskContour       *self,
                                                                 gpointer                measure_data,
                                                                 float                   offset,
-                                                                 GskRealPathPoint       *result);
-void                    gsk_contour_get_start_point             (const GskContour       *self,
-                                                                 GskRealPathPoint       *result);
-void                    gsk_contour_get_end_point               (const GskContour       *self,
-                                                                 GskRealPathPoint       *result);
-gboolean                gsk_contour_get_previous_point          (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
-                                                                 GskRealPathPoint       *result);
-gboolean                gsk_contour_get_next_point              (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
-                                                                 GskRealPathPoint       *result);
+                                                                 GskPathPoint           *result);
 float                   gsk_contour_get_distance                (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
+                                                                 GskPathPoint           *point,
                                                                 gpointer                measure_data);
+gboolean                gsk_contour_dash                        (const GskContour       *contour,
+                                                                 GskStroke              *stroke,
+                                                                 float                   tolerance,
+                                                                 GskPathForeachFunc      func,
+                                                                 gpointer                user_data);
+
+void                    gsk_contour_add_stroke                  (const GskContour       *contour,
+                                                                 GskPathBuilder         *builder,
+                                                                 GskStroke              *stroke);
+
+void                    gsk_contour_default_add_stroke          (const GskContour       *contour,
+                                                                 GskPathBuilder         *builder,
+                                                                 GskStroke              *stroke);
+
+void                    gsk_contour_offset                      (const GskContour       *contour,
+                                                                 GskPathBuilder         *builder,
+                                                                 float                   distance,
+                                                                 GskStroke              *stroke);
+
+void                    gsk_contour_default_offset              (const GskContour       *contour,
+                                                                 GskPathBuilder         *builder,
+                                                                 float                   distance,
+                                                                 GskStroke              *stroke);

 G_END_DECLS
@@ -0,0 +1,879 @@
+/*
+ * Copyright © 2020 Red Hat, Inc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Matthias Clasen <mclasen@redhat.com>
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include "gskcurveprivate.h"
+
+/* {{{ Utilities */
+
+static void
+get_tangent (const graphene_point_t *p0,
+             const graphene_point_t *p1,
+             graphene_vec2_t        *t)
+{
+  graphene_vec2_init (t, p1->x - p0->x, p1->y - p0->y);
+  graphene_vec2_normalize (t, t);
+}
+
+static inline gboolean
+acceptable (float t)
+{
+  return 0 - FLT_EPSILON <= t && t <= 1 + FLT_EPSILON;
+}
+
+static inline void
+_sincosf (float  angle,
+          float *out_s,
+          float *out_c)
+{
+#ifdef HAVE_SINCOSF
+      sincosf (angle, out_s, out_c);
+#else
+      *out_s = sinf (angle);
+      *out_c = cosf (angle);
+#endif
+}
+
+static void
+align_points (const graphene_point_t *p,
+              const graphene_point_t *a,
+              const graphene_point_t *b,
+              graphene_point_t       *q,
+              int                     n)
+{
+  graphene_vec2_t n1;
+  float angle;
+  float s, c;
+
+  get_tangent (a, b, &n1);
+  angle = - atan2f (graphene_vec2_get_y (&n1), graphene_vec2_get_x (&n1));
+  _sincosf (angle, &s, &c);
+
+  for (int i = 0; i < n; i++)
+    {
+      q[i].x = (p[i].x - a->x) * c - (p[i].y - a->y) * s;
+      q[i].y = (p[i].x - a->x) * s + (p[i].y - a->y) * c;
+    }
+}
+
+static void
+find_point_on_line (const graphene_point_t *p1,
+                    const graphene_point_t *p2,
+                    const graphene_point_t *q,
+                    float                  *t)
+{
+  if (p2->x != p1->x)
+    *t = (q->x - p1->x) / (p2->x - p1->x);
+  else
+    *t = (q->y - p1->y) / (p2->y - p1->y);
+}
+
+/* find solutions for at^2 + bt + c = 0 */
+static int
+solve_quadratic (float a, float b, float c, float t[2])
+{
+  float d;
+  int n = 0;
+
+  if (fabsf (a) > 0.0001)
+    {
+      if (b*b > 4*a*c)
+        {
+          d = sqrtf (b*b - 4*a*c);
+          t[n++] = (-b + d)/(2*a);
+          t[n++] = (-b - d)/(2*a);
+        }
+      else
+        {
+          t[n++] = -b / (2*a);
+        }
+    }
+  else if (fabsf (b) > 0.0001)
+    {
+      t[n++] = -c / b;
+    }
+
+  return n;
+}
+
+static int
+filter_allowable (float t[3],
+                  int   n)
+{
+  float g[3];
+  int j = 0;
+
+  for (int i = 0; i < n; i++)
+    if (0 < t[i] && t[i] < 1)
+      g[j++] = t[i];
+  for (int i = 0; i < j; i++)
+    t[i] = g[i];
+  return j;
+}
+
+/* Solve P = 0 where P is
+ * P = (1-t)^2*pa + 2*t*(1-t)*pb + t^2*pc
+ */
+static int
+get_quadratic_roots (float pa, float pb, float pc, float roots[2])
+{
+  float a, b, c, d;
+  int n_roots = 0;
+
+  a = pa - 2 * pb + pc;
+  b = 2 * (pb - pa);
+  c = pa;
+
+  d = b*b - 4*a*c;
+
+  if (d > 0.0001)
+    {
+      float q = sqrtf (d);
+      roots[n_roots] = (-b + q) / (2 * a);
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+      roots[n_roots] = (-b - q) / (2 * a);
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+    }
+  else if (fabsf (d) < 0.0001)
+    {
+      roots[n_roots] = -b / (2 * a);
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+    }
+
+  return n_roots;
+}
+
+static float
+cuberoot (float v)
+{
+  if (v < 0)
+    return -pow (-v, 1.f / 3);
+  return pow (v, 1.f / 3);
+}
+
+/* Solve P = 0 where P is
+ * P = (1-t)^3*pa + 3*t*(1-t)^2*pb + 3*t^2*(1-t)*pc + t^3*pd
+ */
+static int
+get_cubic_roots (float pa, float pb, float pc, float pd, float roots[3])
+{
+  float a, b, c, d;
+  float q, q2;
+  float p, p3;
+  float discriminant;
+  float u1, v1, sd;
+  int n_roots = 0;
+
+  d = -pa + 3*pb - 3*pc + pd;
+  a = 3*pa - 6*pb + 3*pc;
+  b = -3*pa + 3*pb;
+  c = pa;
+
+  if (fabsf (d) < 0.0001)
+    {
+      if (fabsf (a) < 0.0001)
+        {
+          if (fabsf (b) < 0.0001)
+            return 0;
+
+          if (acceptable (-c / b))
+            {
+              roots[0] = -c / b;
+
+              return 1;
+            }
+
+          return 0;
+        }
+      q = sqrtf (b*b - 4*a*c);
+      roots[n_roots] = (-b + q) / (2 * a);
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+
+      roots[n_roots] = (-b - q) / (2 * a);
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+
+      return n_roots;
+    }
+
+  a /= d;
+  b /= d;
+  c /= d;
+
+  p = (3*b - a*a)/3;
+  p3 = p/3;
+  q = (2*a*a*a - 9*a*b + 27*c)/27;
+  q2 = q/2;
+  discriminant = q2*q2 + p3*p3*p3;
+
+  if (discriminant < 0)
+    {
+      float mp3 = -p/3;
+      float mp33 = mp3*mp3*mp3;
+      float r = sqrtf (mp33);
+      float t = -q / (2*r);
+      float cosphi = CLAMP (t, -1, 1);
+      float phi = acosf (cosphi);
+      float crtr = cuberoot (r);
+      float t1 = 2*crtr;
+
+      roots[n_roots] = t1 * cosf (phi/3) - a/3;
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+      roots[n_roots] = t1 * cosf ((phi + 2*M_PI) / 3) - a/3;
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+      roots[n_roots] = t1 * cosf ((phi + 4*M_PI) / 3) - a/3;
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+
+    return n_roots;
+  }
+
+  if (discriminant == 0)
+    {
+      u1 = q2 < 0 ? cuberoot (-q2) : -cuberoot (q2);
+      roots[n_roots] = 2*u1 - a/3;
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+      roots[n_roots] = -u1 - a/3;
+      if (acceptable (roots[n_roots]))
+        n_roots++;
+
+      return n_roots;
+    }
+
+  sd = sqrtf (discriminant);
+  u1 = cuberoot (sd - q2);
+  v1 = cuberoot (sd + q2);
+  roots[n_roots] = u1 - v1 - a/3;
+  if (acceptable (roots[n_roots]))
+    n_roots++;
+
+  return n_roots;
+}
+
+/* }}} */
+/* {{{ Cusps and inflections */
+
+/* Get the points where the curvature of curve is
+ * zero, or a maximum or minimum, inside the open
+ * interval from 0 to 1.
+ */
+int
+gsk_curve_get_curvature_points (const GskCurve *curve,
+                                float           t[3])
+{
+  const graphene_point_t *pts = curve->cubic.points;
+  graphene_point_t p[4];
+  float a, b, c, d;
+  float x, y, z;
+  int n;
+
+  if (curve->op != GSK_PATH_CUBIC)
+    return 0;
+
+  align_points (pts, &pts[0], &pts[3], p, 4);
+
+  a = p[2].x * p[1].y;
+  b = p[3].x * p[1].y;
+  c = p[1].x * p[2].y;
+  d = p[3].x * p[2].y;
+
+  x = - 3*a + 2*b + 3*c - d;
+  y = 3*a - b - 3*c;
+  z = c - a;
+
+  n = solve_quadratic (x, y, z, t);
+  return filter_allowable (t, n);
+}
+
+/* Find cusps inside the open interval from 0 to 1.
+ *
+ * According to Stone & deRose, A Geometric Characterization
+ * of Parametric Cubic curves, a necessary and sufficient
+ * condition is that the first derivative vanishes.
+ */
+int
+gsk_curve_get_cusps (const GskCurve *curve,
+                     float           t[2])
+{
+  const graphene_point_t *pts = curve->cubic.points;
+  graphene_point_t p[3];
+  float ax, bx, cx;
+  float ay, by, cy;
+  float tx[3];
+  int nx;
+  int n = 0;
+
+  if (curve->op != GSK_PATH_CUBIC)
+    return 0;
+
+  p[0].x = 3 * (pts[1].x - pts[0].x);
+  p[0].y = 3 * (pts[1].y - pts[0].y);
+  p[1].x = 3 * (pts[2].x - pts[1].x);
+  p[1].y = 3 * (pts[2].y - pts[1].y);
+  p[2].x = 3 * (pts[3].x - pts[2].x);
+  p[2].y = 3 * (pts[3].y - pts[2].y);
+
+  ax = p[0].x - 2 * p[1].x + p[2].x;
+  bx = - 2 * p[0].x + 2 * p[1].x;
+  cx = p[0].x;
+
+  nx = solve_quadratic (ax, bx, cx, tx);
+  nx = filter_allowable (tx, nx);
+
+  ay = p[0].y - 2 * p[1].y + p[2].y;
+  by = - 2 * p[0].y + 2 * p[1].y;
+  cy = p[0].y;
+
+  for (int i = 0; i < nx; i++)
+    {
+      float ti = tx[i];
+
+      if (0 < ti && ti < 1 &&
+          fabs (ay * ti * ti + by * ti + cy) < 0.001)
+        t[n++] = ti;
+    }
+
+  return n;
+}
+
+/* }}} */ 
+/* {{{ Intersection */
+
+static int
+line_intersect (const GskCurve   *curve1,
+                const GskCurve   *curve2,
+                float            *t1,
+                float            *t2,
+                graphene_point_t *p,
+                int               n)
+{
+  const graphene_point_t *pts1 = curve1->line.points;
+  const graphene_point_t *pts2 = curve2->line.points;
+  float a1 = pts1[0].x - pts1[1].x;
+  float b1 = pts1[0].y - pts1[1].y;
+  float a2 = pts2[0].x - pts2[1].x;
+  float b2 = pts2[0].y - pts2[1].y;
+  float det = a1 * b2 - b1 * a2;
+
+  if (fabs(det) > 0.01)
+    {
+      float tt =   ((pts1[0].x - pts2[0].x) * b2 - (pts1[0].y - pts2[0].y) * a2) / det;
+      float ss = - ((pts1[0].y - pts2[0].y) * a1 - (pts1[0].x - pts2[0].x) * b1) / det;
+
+      if (acceptable (tt) && acceptable (ss))
+        {
+          p[0].x = pts1[0].x + tt * (pts1[1].x - pts1[0].x);
+          p[0].y = pts1[0].y + tt * (pts1[1].y - pts1[0].y);
+
+          t1[0] = tt;
+          t2[0] = ss;
+
+          return 1;
+        }
+    }
+  else /* parallel lines */
+    {
+      float r = a1 * (pts1[1].y - pts2[0].y) - (pts1[1].x - pts2[0].x) * b1;
+      float dist = (r * r) / (a1 * a1 + b1 * b1);
+      float t, s, tt, ss;
+
+      if (dist > 0.01)
+        return 0;
+
+      if (pts1[1].x != pts1[0].x)
+        {
+          t = (pts2[0].x - pts1[0].x) / (pts1[1].x - pts1[0].x);
+          s = (pts2[1].x - pts1[0].x) / (pts1[1].x - pts1[0].x);
+        }
+      else
+        {
+          t = (pts2[0].y - pts1[0].y) / (pts1[1].y - pts1[0].y);
+          s = (pts2[1].y - pts1[0].y) / (pts1[1].y - pts1[0].y);
+        }
+
+      if ((t < 0 && s < 0) || (t > 1 && s > 1))
+        return 0;
+
+      if (acceptable (t))
+        {
+          t1[0] = t;
+          t2[0] = 0;
+          p[0] = pts2[0];
+        }
+      else if (t < 0)
+        {
+          if (pts2[1].x != pts2[0].x)
+            tt = (pts1[0].x - pts2[0].x) / (pts2[1].x - pts2[0].x);
+          else
+            tt = (pts1[0].y - pts2[0].y) / (pts2[1].y - pts2[0].y);
+
+          t1[0] = 0;
+          t2[0] = tt;
+          p[0] = pts1[0];
+        }
+      else
+        {
+          if (pts2[1].x != pts2[0].x)
+            tt = (pts1[1].x - pts2[0].x) / (pts2[1].x - pts2[0].x);
+          else
+            tt = (pts1[1].y - pts2[0].y) / (pts2[1].y - pts2[0].y);
+
+          t1[0] = 1;
+          t2[0] = tt;
+          p[0] = pts1[1];
+        }
+
+      if (acceptable (s))
+        {
+          if (t2[0] == 1)
+            return 1;
+
+          t1[1] = s;
+          t2[1] = 1;
+          p[1] = pts2[1];
+        }
+      else if (s < 0)
+        {
+          if (t1[0] == 0)
+            return 1;
+
+          if (pts2[1].x != pts2[0].x)
+            ss = (pts1[0].x - pts2[0].x) / (pts2[1].x - pts2[0].x);
+          else
+            ss = (pts1[0].y - pts2[0].y) / (pts2[1].y - pts2[0].y);
+
+          t1[1] = 0;
+          t2[1] = ss;
+          p[1] = pts1[0];
+        }
+      else
+        {
+          if (t1[0] == 1)
+            return 1;
+
+          if (pts2[1].x != pts2[0].x)
+            ss = (pts1[1].x - pts2[0].x) / (pts2[1].x - pts2[0].x);
+          else
+            ss = (pts1[1].y - pts2[0].y) / (pts2[1].y - pts2[0].y);
+
+          t1[1] = 1;
+          t2[1] = ss;
+          p[1] = pts1[1];
+        }
+
+      return 2;
+    }
+
+  return 0;
+}
+
+static int
+line_quad_intersect (const GskCurve   *curve1,
+                     const GskCurve   *curve2,
+                     float            *t1,
+                     float            *t2,
+                     graphene_point_t *p,
+                     int               n)
+{
+  const graphene_point_t *a = &curve1->line.points[0];
+  const graphene_point_t *b = &curve1->line.points[1];
+  graphene_point_t pts[4];
+  float t[2];
+  int m, i, j;
+
+  /* Rotate things to place curve1 on the x axis,
+   * then solve curve2 for y == 0.
+   */
+  align_points (curve2->quad.points, a, b, pts, 3);
+
+  m = get_quadratic_roots (pts[0].y, pts[1].y, pts[2].y, t);
+
+  j = 0;
+  for (i = 0; i < m; i++)
+    {
+      t2[j] = t[i];
+      gsk_curve_get_point (curve2, t2[j], &p[j]);
+      find_point_on_line (a, b, &p[j], &t1[j]);
+      if (acceptable (t1[j]))
+        j++;
+      if (j == n)
+        break;
+    }
+
+  return j;
+}
+
+static int
+line_cubic_intersect (const GskCurve   *curve1,
+                      const GskCurve   *curve2,
+                      float            *t1,
+                      float            *t2,
+                      graphene_point_t *p,
+                      int               n)
+{
+  const graphene_point_t *a = &curve1->line.points[0];
+  const graphene_point_t *b = &curve1->line.points[1];
+  graphene_point_t pts[4];
+  float t[3];
+  int m, i, j;
+
+  /* Rotate things to place curve1 on the x axis,
+   * then solve curve2 for y == 0.
+   */
+  align_points (curve2->cubic.points, a, b, pts, 4);
+
+  m = get_cubic_roots (pts[0].y, pts[1].y, pts[2].y, pts[3].y, t);
+
+  j = 0;
+  for (i = 0; i < m; i++)
+    {
+      t2[j] = t[i];
+      gsk_curve_get_point (curve2, t2[j], &p[j]);
+      find_point_on_line (a, b, &p[j], &t1[j]);
+      if (acceptable (t1[j]))
+        j++;
+      if (j == n)
+        break;
+    }
+
+  return j;
+}
+
+#define MAX_LEVEL 25
+#define TOLERANCE 0.001
+
+static void
+cubic_intersect_recurse (const GskCurve   *curve1,
+                         const GskCurve   *curve2,
+                         float             t1l,
+                         float             t1r,
+                         float             t2l,
+                         float             t2r,
+                         float            *t1,
+                         float            *t2,
+                         graphene_point_t *p,
+                         int               n,
+                         int              *pos,
+                         int               level)
+{
+  GskCurve p11, p12, p21, p22;
+  GskBoundingBox b1, b2;
+  float d1, d2;
+
+  if (*pos == n)
+    return;
+
+  if (level == MAX_LEVEL)
+    return;
+
+  gsk_curve_get_bounds (curve1, &b1);
+  gsk_curve_get_bounds (curve2, &b2);
+  if (!gsk_bounding_box_intersection (&b1, &b2, NULL))
+    return;
+
+  gsk_curve_get_tight_bounds (curve1, &b1);
+  if (!gsk_bounding_box_intersection (&b1, &b2, NULL))
+    return;
+
+  gsk_curve_get_tight_bounds (curve2, &b2);
+  if (!gsk_bounding_box_intersection (&b1, &b2, NULL))
+    return;
+
+  d1 = (t1r - t1l) / 2;
+  d2 = (t2r - t2l) / 2;
+
+  if (b1.max.x - b1.min.x < TOLERANCE && b1.max.y - b1.min.y < TOLERANCE &&
+      b2.max.x - b2.min.x < TOLERANCE && b2.max.y - b2.min.y < TOLERANCE)
+    {
+      graphene_point_t c;
+      t1[*pos] = t1l + d1;
+      t2[*pos] = t2l + d2;
+      gsk_curve_get_point (curve1, 0.5, &c);
+
+      for (int i = 0; i < *pos; i++)
+        {
+          if (graphene_point_near (&c, &p[i], 0.1))
+            return;
+        }
+
+      p[*pos] = c;
+      (*pos)++;
+
+      return;
+    }
+
+  gsk_curve_split (curve1, 0.5, &p11, &p12);
+  gsk_curve_split (curve2, 0.5, &p21, &p22);
+
+  cubic_intersect_recurse (&p11, &p21, t1l,      t1l + d1, t2l,      t2l + d2, t1, t2, p, n, pos, level + 1);
+  cubic_intersect_recurse (&p11, &p22, t1l,      t1l + d1, t2l + d2, t2r,      t1, t2, p, n, pos, level + 1);
+  cubic_intersect_recurse (&p12, &p21, t1l + d1, t1r,      t2l,      t2l + d2, t1, t2, p, n, pos, level + 1);
+  cubic_intersect_recurse (&p12, &p22, t1l + d1, t1r,      t2l + d2, t2r,      t1, t2, p, n, pos, level + 1);
+}
+
+static int
+cubic_intersect (const GskCurve   *curve1,
+                 const GskCurve   *curve2,
+                 float            *t1,
+                 float            *t2,
+                 graphene_point_t *p,
+                 int               n)
+{
+  int pos = 0;
+
+  cubic_intersect_recurse (curve1, curve2, 0, 1, 0, 1, t1, t2, p, n, &pos, 0);
+
+  return pos;
+}
+
+static void
+get_bounds (const GskCurve  *curve,
+            float            tl,
+            float            tr,
+            GskBoundingBox  *bounds)
+{
+  GskCurve c;
+
+  gsk_curve_segment (curve, tl, tr, &c);
+  gsk_curve_get_tight_bounds (&c, bounds);
+}
+
+static void
+general_intersect_recurse (const GskCurve   *curve1,
+                           const GskCurve   *curve2,
+                           float             t1l,
+                           float             t1r,
+                           float             t2l,
+                           float             t2r,
+                           float            *t1,
+                           float            *t2,
+                           graphene_point_t *p,
+                           int               n,
+                           int              *pos,
+                           int               level)
+{
+  GskBoundingBox b1, b2;
+  float d1, d2;
+
+  if (*pos == n)
+    return;
+
+  if (level == MAX_LEVEL)
+    return;
+
+  get_bounds (curve1, t1l, t1r, &b1);
+  get_bounds (curve2, t2l, t2r, &b2);
+
+  if (!gsk_bounding_box_intersection (&b1, &b2, NULL))
+    return;
+
+  d1 = (t1r - t1l) / 2;
+  d2 = (t2r - t2l) / 2;
+
+  if (b1.max.x - b1.min.x < TOLERANCE && b1.max.y - b1.min.y < TOLERANCE &&
+      b2.max.x - b2.min.x < TOLERANCE && b2.max.y - b2.min.y < TOLERANCE)
+    {
+      graphene_point_t c;
+      t1[*pos] = t1l + d1;
+      t2[*pos] = t2l + d2;
+      gsk_curve_get_point (curve1, t1[*pos], &c);
+
+      for (int i = 0; i < *pos; i++)
+        {
+          if (graphene_point_near (&c, &p[i], 0.1))
+            return;
+        }
+
+      p[*pos] = c;
+      (*pos)++;
+
+      return;
+    }
+
+  /* Note that in the conic case, we cannot just split the curves and
+   * pass the two halves down, since splitting changes the parametrization,
+   * and we need the t's to be valid parameters wrt to the original curve.
+   *
+   * So, instead, we determine the bounding boxes above by always starting
+   * from the original curve. That is a bit less efficient, but also works
+   * for conics.
+   */
+  general_intersect_recurse (curve1, curve2, t1l,      t1l + d1, t2l,      t2l + d2, t1, t2, p, n, pos, level + 1);
+  general_intersect_recurse (curve1, curve2, t1l,      t1l + d1, t2l + d2, t2r,      t1, t2, p, n, pos, level + 1);
+  general_intersect_recurse (curve1, curve2, t1l + d1, t1r,      t2l,      t2l + d2, t1, t2, p, n, pos, level + 1);
+  general_intersect_recurse (curve1, curve2, t1l + d1, t1r,      t2l + d2, t2r,      t1, t2, p, n, pos, level + 1);
+}
+
+static int
+general_intersect (const GskCurve   *curve1,
+                   const GskCurve   *curve2,
+                   float            *t1,
+                   float            *t2,
+                   graphene_point_t *p,
+                   int               n)
+{
+  int pos = 0;
+
+  general_intersect_recurse (curve1, curve2, 0, 1, 0, 1, t1, t2, p, n, &pos, 0);
+
+  return pos;
+}
+
+static int
+curve_self_intersect (const GskCurve   *curve,
+                      float            *t1,
+                      float            *t2,
+                      graphene_point_t *p,
+                      int               n)
+{
+  float tt[3], ss[3], s;
+  graphene_point_t pp[3];
+  int m;
+  GskCurve cs, ce;
+
+  if (curve->op != GSK_PATH_CUBIC)
+    return 0;
+
+  s = 0.5;
+  m = gsk_curve_get_curvature_points (curve, tt);
+  for (int i = 0; i < m; i++)
+    {
+      if (gsk_curve_get_curvature (curve, tt[i], NULL) == 0)
+        {
+          s = tt[i];
+          break;
+        }
+    }
+
+  gsk_curve_split (curve, s, &cs, &ce);
+
+  m = cubic_intersect (&cs, &ce, tt, ss, pp, 3);
+
+  if (m > 1)
+    {
+      /* One of the (at most 2) intersections we found
+       * must be the common point where we split the curve.
+       * It will have a t value of 1 and an s value of 0.
+       */
+      if (fabs (tt[0] - 1) > 1e-3)
+        {
+          t1[0] = t2[0] = tt[0] * s;
+          p[0] = pp[0];
+        }
+      else if (fabs (tt[1] - 1) > 1e-3)
+        {
+          t1[0] = t2[0] = tt[1] * s;
+          p[0] = pp[1];
+        }
+
+      if (n == 1)
+        return 1;
+
+      if (fabs (ss[0]) > 1e-3)
+        {
+          t1[1] = t2[1] = s + ss[0] * (1 - s);
+          p[1] = pp[0];
+        }
+      else if (fabs (ss[1]) > 1e-3)
+        {
+          t1[1] = t2[1] = s + ss[1] * (1 - s);
+          p[1] = pp[1];
+        }
+
+      return 2;
+    }
+
+  return 0;
+}
+
+static inline gboolean
+curve_equal (const GskCurve *c1,
+             const GskCurve *c2)
+{
+  gsize curve_size[] = {
+    sizeof (GskLineCurve),
+    sizeof (GskLineCurve),
+    sizeof (GskLineCurve),
+    sizeof (GskQuadCurve),
+    sizeof (GskCubicCurve),
+    sizeof (GskConicCurve)
+  };
+
+  return c1->op == c2->op && memcmp (c1, c2, curve_size[c1->op]) == 0;
+}
+
+/* Place intersections between the curves in p, and their Bezier positions
+ * in t1 and t2, up to n. Return the number of intersections found.
+ *
+ * Note that two cubic Beziers can have up to 9 intersections.
+ */
+int
+gsk_curve_intersect (const GskCurve   *curve1,
+                     const GskCurve   *curve2,
+                     float            *t1,
+                     float            *t2,
+                     graphene_point_t *p,
+                     int               n)
+{
+  GskPathOperation op1 = curve1->op;
+  GskPathOperation op2 = curve2->op;
+
+  if (op1 == GSK_PATH_CLOSE)
+    op1 = GSK_PATH_LINE;
+
+  if (op2 == GSK_PATH_CLOSE)
+    op2 = GSK_PATH_LINE;
+
+  if (curve_equal (curve1, curve2))
+    return curve_self_intersect (curve1, t1, t2, p, n);
+
+  /* We special-case line-line and line-cubic intersections,
+   * since we can solve them directly.
+   * Everything else is done via bisection.
+   */
+  if (op1 == GSK_PATH_LINE && op2 == GSK_PATH_LINE)
+    return line_intersect (curve1, curve2, t1, t2, p, n);
+  else if (op1 == GSK_PATH_LINE && op2 == GSK_PATH_QUAD)
+    return line_quad_intersect (curve1, curve2, t1, t2, p, n);
+  else if (op1 == GSK_PATH_QUAD && op2 == GSK_PATH_LINE)
+    return line_quad_intersect (curve2, curve1, t2, t1, p, n);
+  else if (op1 == GSK_PATH_LINE && op2 == GSK_PATH_CUBIC)
+    return line_cubic_intersect (curve1, curve2, t1, t2, p, n);
+  else if (op1 == GSK_PATH_CUBIC && op2 == GSK_PATH_LINE)
+    return line_cubic_intersect (curve2, curve1, t2, t1, p, n);
+  else if ((op1 == GSK_PATH_QUAD || op1 == GSK_PATH_CUBIC) &&
+           (op2 == GSK_PATH_QUAD || op2 == GSK_PATH_CUBIC))
+    return cubic_intersect (curve1, curve2, t1, t2, p, n);
+  else
+    return general_intersect (curve1, curve2, t1, t2, p, n);
+}
+
+/* }}} */
+
+/* vim:set foldmethod=marker expandtab: */
@@ -33,6 +33,7 @@ typedef union _GskCurve GskCurve;
 typedef struct _GskLineCurve GskLineCurve;
 typedef struct _GskQuadCurve GskQuadCurve;
 typedef struct _GskCubicCurve GskCubicCurve;
+typedef struct _GskConicCurve GskConicCurve;

 struct _GskLineCurve
 {
@@ -65,12 +66,28 @@ struct _GskCubicCurve
  graphene_point_t coeffs[4];
 };

+struct _GskConicCurve
+{
+  GskPathOperation op;
+
+  gboolean has_coefficients;
+
+  /* points[0], points[1], points[3] are the control points,
+   * points[2].x is the weight
+   */
+  graphene_point_t points[4];
+
+  graphene_point_t num[3];
+  graphene_point_t denom[3];
+};
+
 union _GskCurve
 {
  GskPathOperation op;
  GskLineCurve line;
  GskQuadCurve quad;
  GskCubicCurve cubic;
+  GskConicCurve conic;
 };

 typedef enum {
@@ -88,6 +105,7 @@ typedef gboolean (* GskCurveAddLineFunc) (const graphene_point_t *from,
 typedef gboolean (* GskCurveAddCurveFunc) (GskPathOperation        op,
                                           const graphene_point_t *pts,
                                           gsize                   n_pts,
+                                           float                   weight,
                                           gpointer                user_data);

 void                    gsk_curve_init                          (GskCurve               *curve,
@@ -95,7 +113,8 @@ void                    gsk_curve_init                          (GskCurve
 void                    gsk_curve_init_foreach                  (GskCurve               *curve,
                                                                 GskPathOperation        op,
                                                                 const graphene_point_t *pts,
-                                                                 gsize                   n_pts);
+                                                                 gsize                   n_pts,
+                                                                 float                   weight);

 void                    gsk_curve_print                         (const GskCurve         *curve,
                                                                 GString                *string);
@@ -144,6 +163,22 @@ void                    gsk_curve_get_bounds                    (const GskCurve
                                                                 GskBoundingBox         *bounds);
 void                    gsk_curve_get_tight_bounds              (const GskCurve         *curve,
                                                                 GskBoundingBox         *bounds);
+void                    gsk_curve_offset                        (const GskCurve         *curve,
+                                                                 float                   distance,
+                                                                 GskCurve               *offset_curve);
+
+int                     gsk_curve_get_curvature_points          (const GskCurve         *curve,
+                                                                 float                   t[3]);
+
+int                     gsk_curve_get_cusps                     (const GskCurve         *curve,
+                                                                 float                   t[2]);
+
+int                     gsk_curve_intersect                     (const GskCurve         *curve1,
+                                                                 const GskCurve         *curve2,
+                                                                 float                  *t1,
+                                                                 float                  *t2,
+                                                                 graphene_point_t       *p,
+                                                                 int                     n);

 int                     gsk_curve_get_crossing                  (const GskCurve         *curve,
                                                                 const graphene_point_t *point);
@@ -198,8 +198,6 @@ typedef enum {
 * is just a description of the rule that is applied.)
 *
 * New entries may be added in future versions.
- *
- * Since: 4.14
 */
 typedef enum {
  GSK_FILL_RULE_WINDING,
@@ -219,10 +217,6 @@ typedef enum {
 * dashes when stroking.
 *
 * The default line cap style is `GSK_LINE_CAP_BUTT`.
- *
- * New entries may be added in future versions.
- *
- * Since: 4.14
 */
 typedef enum {
  GSK_LINE_CAP_BUTT,
@@ -233,23 +227,26 @@ typedef enum {
 /**
 * GskLineJoin:
 * @GSK_LINE_JOIN_MITER: Use a sharp angled corner
+ * @GSK_LINE_JOIN_MITER_CLIP: Use a sharp, angled corner, at a distance
 * @GSK_LINE_JOIN_ROUND: Use a round join, the center of the circle is
 *   the join point
 * @GSK_LINE_JOIN_BEVEL: use a cut-off join, the join is cut off at half
 *   the line width from the joint point
+ * @GSK_LINE_JOIN_ARCS: Use a sharp angled corner made from circles
 *
 * Specifies how to render the junction of two lines when stroking.
 *
+ * See [method@Gsk.Stroke.set_miter_limit] for details on the difference
+ * between `GSK_LINE_JOIN_MITER` and `GSK_LINE_JOIN_MITER_CLIP`.
+ *
 * The default line join style is `GSK_LINE_JOIN_MITER`.
- *
- * New entries may be added in future versions.
- *
- * Since: 4.14
- */
+ **/
 typedef enum {
  GSK_LINE_JOIN_MITER,
+  GSK_LINE_JOIN_MITER_CLIP,
  GSK_LINE_JOIN_ROUND,
  GSK_LINE_JOIN_BEVEL,
+  GSK_LINE_JOIN_ARCS
 } GskLineJoin;

 /**
@@ -265,19 +262,21 @@ typedef enum {
 * @GSK_PATH_CUBIC: A curve-to operation describing a cubic Bézier curve with 4
 *   points describing the start point, the two control points and the end point
 *   of the curve.
+ * @GSK_PATH_CONIC: A weighted quadratic Bézier curve with 3 points describing
+ *   the start point, control point and end point of the curve. A weight for the
+ *   curve will be passed, too.
 *
- * Path operations are used to described segments of a `GskPath`.
+ * Path operations can be used to approximate a `GskPath`.
 *
 * More values may be added in the future.
- *
- * Since: 4.14
- */
+ **/
 typedef enum {
  GSK_PATH_MOVE,
  GSK_PATH_CLOSE,
  GSK_PATH_LINE,
  GSK_PATH_QUAD,
  GSK_PATH_CUBIC,
+  GSK_PATH_CONIC,
 } GskPathOperation;

 /**
@@ -287,8 +286,6 @@ typedef enum {
 *
 * The values of the `GskPathDirection` enum are used to pick one
 * of the two sides of the path that at a given point on the path.
- *
- * Since: 4.14
 */
 typedef enum {
  GSK_PATH_START,
@@ -24,7 +24,6 @@
 #include "gskcurveprivate.h"
 #include "gskpathbuilder.h"
 #include "gskpathpointprivate.h"
-#include "gsksplineprivate.h"

 /**
 * GskPath:
@@ -38,12 +37,9 @@
 * Instead, new `GskPath` objects have to be created.
 *
 * The [struct@Gsk.PathBuilder] structure is meant to help in this endeavor.
- *
- * Conceptually, a path consists of zero or more contours (continous, connected
- * curves), each of which may or may not be closed. Contours are typically
- * constructed from Bézier segments.
 */

+
 struct _GskPath
 {
  /*< private >*/
@@ -109,8 +105,6 @@ gsk_path_new_from_contours (const GSList *contours)
 * Increases the reference count of a `GskPath` by one.
 *
 * Returns: the passed in `GskPath`.
- *
- * Since: 4.14
 */
 GskPath *
 gsk_path_ref (GskPath *self)
@@ -129,8 +123,6 @@ gsk_path_ref (GskPath *self)
 * Decreases the reference count of a `GskPath` by one.
 *
 * If the resulting reference count is zero, frees the path.
- *
- * Since: 4.14
 */
 void
 gsk_path_unref (GskPath *self)
@@ -146,17 +138,14 @@ gsk_path_unref (GskPath *self)
 }

 const GskContour *
-gsk_path_get_contour (const GskPath *self,
-                      gsize          i)
+gsk_path_get_contour (GskPath *path,
+                      gsize    i)
 {
-  if (i < self->n_contours)
-    return self->contours[i];
-  else
-    return NULL;
+  return path->contours[i];
 }

 GskPathFlags
-gsk_path_get_flags (const GskPath *self)
+gsk_path_get_flags (GskPath *self)
 {
  return self->flags;
 }
@@ -170,9 +159,10 @@ gsk_path_get_flags (const GskPath *self)
 * for printing.
 *
 * The string is compatible with
- * [SVG path syntax](https://www.w3.org/TR/SVG11/paths.html#PathData).
- *
- * Since: 4.14
+ * [SVG path syntax](https://www.w3.org/TR/SVG11/paths.html#PathData),
+ * with the exception that conic curves will generate a string of the
+ * form "O x1 y1, x2 y2, w" where x1, y1 is the control point, x2, y2
+ * is the end point, and w is the weight.
 */
 void
 gsk_path_print (GskPath *self,
@@ -204,8 +194,6 @@ gsk_path_print (GskPath *self,
 * for details.
 *
 * Returns: A new string for @self
- *
- * Since: 4.14
 */
 char *
 gsk_path_to_string (GskPath *self)
@@ -225,6 +213,7 @@ static gboolean
 gsk_path_to_cairo_add_op (GskPathOperation        op,
                          const graphene_point_t *pts,
                          gsize                   n_pts,
+                          float                   weight,
                          gpointer                cr)
 {
  switch (op)
@@ -256,6 +245,7 @@ gsk_path_to_cairo_add_op (GskPathOperation        op,
      cairo_curve_to (cr, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y);
      break;

+    case GSK_PATH_CONIC:
    default:
      g_assert_not_reached ();
      return FALSE;
@@ -277,8 +267,6 @@ gsk_path_to_cairo_add_op (GskPathOperation        op,
 *
 * This function does not clear the existing Cairo path. Call
 * cairo_new_path() if you want this.
- *
- * Since: 4.14
 */
 void
 gsk_path_to_cairo (GskPath *self,
@@ -303,9 +291,9 @@ gsk_path_to_cairo (GskPath *self,
 * Returns: the number of contours in @path
 */
 gsize
-gsk_path_get_n_contours (const GskPath *self)
+gsk_path_get_n_contours (GskPath *path)
 {
-  return self->n_contours;
+  return path->n_contours;
 }

 /**
@@ -315,8 +303,6 @@ gsk_path_get_n_contours (const GskPath *self)
 * Checks if the path is empty, i.e. contains no lines or curves.
 *
 * Returns: `TRUE` if the path is empty
- *
- * Since: 4.14
 */
 gboolean
 gsk_path_is_empty (GskPath *self)
@@ -334,8 +320,6 @@ gsk_path_is_empty (GskPath *self)
 * contour.
 *
 * Returns: `TRUE` if the path is closed
- *
- * Since: 4.14
 */
 gboolean
 gsk_path_is_closed (GskPath *self)
@@ -371,40 +355,40 @@ gsk_path_is_closed (GskPath *self)
 *
 * Returns: `TRUE` if the path has bounds, `FALSE` if the path is known
 *   to be empty and have no bounds.
- *
- * Since: 4.14
 */
 gboolean
 gsk_path_get_bounds (GskPath         *self,
                     graphene_rect_t *bounds)
 {
-  GskBoundingBox b;
+  gsize i;

  g_return_val_if_fail (self != NULL, FALSE);
  g_return_val_if_fail (bounds != NULL, FALSE);

-  if (self->n_contours == 0)
+  for (i = 0; i < self->n_contours; i++)
+    {
+      if (gsk_contour_get_bounds (self->contours[i], bounds))
+        break;
+    }
+
+  if (i >= self->n_contours)
    {
      graphene_rect_init_from_rect (bounds, graphene_rect_zero ());
      return FALSE;
    }

-  gsk_contour_get_bounds (self->contours[0], &b);
-
-  for (gsize i = 1; i < self->n_contours; i++)
+  for (i++; i < self->n_contours; i++)
    {
-      GskBoundingBox tmp;
+      graphene_rect_t tmp;

-      gsk_contour_get_bounds (self->contours[i], &tmp);
-      gsk_bounding_box_union (&b, &tmp, &b);
+      if (gsk_contour_get_bounds (self->contours[i], &tmp))
+        graphene_rect_union (bounds, &tmp, bounds);
    }

-  gsk_bounding_box_to_rect (&b, bounds);
-
  return TRUE;
 }

-/**
+/*< private >
 * gsk_path_get_stroke_bounds:
 * @self: a #GtkPath
 * @stroke: stroke parameters
@@ -419,36 +403,38 @@ gsk_path_get_bounds (GskPath         *self,
 * like miters.
 *
 * Returns: `TRUE` if the path has bounds, `FALSE` if the path is known
- *   to be empty and have no bounds.
+ *     to be empty and have no bounds.
 */
 gboolean
 gsk_path_get_stroke_bounds (GskPath         *self,
                            const GskStroke *stroke,
                            graphene_rect_t *bounds)
 {
-  GskBoundingBox b;
+  gsize i;

  g_return_val_if_fail (self != NULL, FALSE);
  g_return_val_if_fail (bounds != NULL, FALSE);

-  if (self->n_contours == 0)
+  for (i = 0; i < self->n_contours; i++)
+    {
+      if (gsk_contour_get_stroke_bounds (self->contours[i], stroke, bounds))
+        break;
+    }
+
+  if (i >= self->n_contours)
    {
      graphene_rect_init_from_rect (bounds, graphene_rect_zero ());
      return FALSE;
    }

-  gsk_contour_get_stroke_bounds (self->contours[0], stroke, &b);
-
-  for (gsize i = 1; i < self->n_contours; i++)
+  for (i++; i < self->n_contours; i++)
    {
-      GskBoundingBox tmp;
+      graphene_rect_t tmp;

      if (gsk_contour_get_stroke_bounds (self->contours[i], stroke, &tmp))
-        gsk_bounding_box_union (&b, &tmp, &b);
+        graphene_rect_union (bounds, &tmp, bounds);
    }

-  gsk_bounding_box_to_rect (&b, bounds);
-
  return TRUE;
 }

@@ -466,8 +452,6 @@ gsk_path_get_stroke_bounds (GskPath         *self,
 * implicitly closes it.
 *
 * Returns: `TRUE` if @point is inside
- *
- * Since: 4.14
 */
 gboolean
 gsk_path_in_fill (GskPath                *self,
@@ -490,128 +474,41 @@ gsk_path_in_fill (GskPath                *self,
    }
 }

-/**
- * gsk_path_get_closest_point:
- * @self: a `GskPath`
- * @point: the point
- * @threshold: maximum allowed distance
- * @result: (out caller-allocates): return location for the closest point
- *
- * Computes the closest point on the path to the given point
- * and sets the @result to it.
- *
- * If there is no point closer than the given threshold,
- * `FALSE` is returned.
- *
- * Returns: `TRUE` if @point was set to the closest point
- *   on @self, `FALSE` if no point is closer than @threshold
- *
- * Since: 4.14
- */
-gboolean
+GskPathPoint *
 gsk_path_get_closest_point (GskPath                *self,
                            const graphene_point_t *point,
-                            float                   threshold,
-                            GskPathPoint           *result)
+                            float                   threshold)
 {
-  GskRealPathPoint *res = (GskRealPathPoint *) result;
-  gboolean found;
+  GskPathPoint *p;

-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (point != NULL, FALSE);
-  g_return_val_if_fail (threshold >= 0, FALSE);
-  g_return_val_if_fail (result != NULL, FALSE);
+  g_return_val_if_fail (self != NULL, NULL);
+  g_return_val_if_fail (point != NULL, NULL);
+  g_return_val_if_fail (threshold >= 0, NULL);

-  found = FALSE;
+  p = gsk_path_point_new (self);

  for (int i = 0; i < self->n_contours; i++)
    {
      float distance;

-      if (gsk_contour_get_closest_point (self->contours[i], point, threshold, res, &distance))
+      if (gsk_contour_get_closest_point (self->contours[i], point, threshold, p, &distance))
        {
-          found = TRUE;
-          res->contour = i;
-          res->path = self;
+          p->contour = self->contours[i];
          threshold = distance;
        }
    }

-  return found;
-}
+  if (p->contour != NULL)
+    return p;

-/**
- * gsk_path_get_start_point:
- * @self: a `GskPath`
- * @result: (out caller-allocates): return location for point
- *
- * Gets the start point of the path.
- *
- * An empty path has no points, so `FALSE`
- * is returned in this case.
- *
- * Returns: `TRUE` if @result was filled
- *
- * Since: 4.14
- */
-gboolean
-gsk_path_get_start_point (GskPath      *self,
-                          GskPathPoint *result)
-{
-  GskRealPathPoint *res = (GskRealPathPoint *) result;
-
-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (result != NULL, FALSE);
-
-  if (self->n_contours == 0)
-    return FALSE;
-
-  gsk_contour_get_start_point (self->contours[0], res);
-
-  res->path = self;
-  res->contour = 0;
-
-  return TRUE;
-}
-
-/**
- * gsk_path_get_end_point:
- * @self: a `GskPath`
- * @result: (out caller-allocates): return location for point
- *
- * Gets the end point of the path.
- *
- * An empty path has no points, so `FALSE`
- * is returned in this case.
- *
- * Returns: `TRUE` if @result was filled
- *
- * Since: 4.14
- */
-gboolean
-gsk_path_get_end_point (GskPath      *self,
-                        GskPathPoint *result)
-{
-  GskRealPathPoint *res = (GskRealPathPoint *) result;
-
-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (result!= NULL, FALSE);
-
-  if (self->n_contours == 0)
-    return FALSE;
-
-  gsk_contour_get_end_point (self->contours[self->n_contours - 1], res);
-
-  res->path = self;
-  res->contour = self->n_contours - 1;
-
-  return TRUE;
+  gsk_path_point_unref (p);
+  return NULL;
 }

 /**
 * gsk_path_foreach:
 * @self: a `GskPath`
- * @flags: flags to pass to the foreach function. See [flags@Gsk.PathForeachFlags]
+ * @flags: flags to pass to the foreach function. See [enum@Gsk.PathForeachFlags]
 *   for details about flags
 * @func: (scope call) (closure user_data): the function to call for operations
 * @user_data: (nullable): user data passed to @func
@@ -624,8 +521,6 @@ gsk_path_get_end_point (GskPath      *self,
 * the ones that it contained originally.
 *
 * Returns: `FALSE` if @func returned FALSE`, `TRUE` otherwise.
- *
- * Since: 4.14
 */
 gboolean
 gsk_path_foreach (GskPath             *self,
@@ -665,6 +560,7 @@ gsk_path_foreach_trampoline_add_line (const graphene_point_t *from,
  return trampoline->func (GSK_PATH_LINE,
                           (graphene_point_t[2]) { *from, *to },
                           2,
+                           0.0f,
                           trampoline->user_data);
 }

@@ -672,17 +568,19 @@ static gboolean
 gsk_path_foreach_trampoline_add_curve (GskPathOperation        op,
                                       const graphene_point_t *pts,
                                       gsize                   n_pts,
+                                       float                   weight,
                                       gpointer                data)
 {
  GskPathForeachTrampoline *trampoline = data;

-  return trampoline->func (op, pts, n_pts, trampoline->user_data);
+  return trampoline->func (op, pts, n_pts, weight, trampoline->user_data);
 }

 static gboolean
 gsk_path_foreach_trampoline (GskPathOperation        op,
                             const graphene_point_t *pts,
                             gsize                   n_pts,
+                             float                   weight,
                             gpointer                data)
 {
  GskPathForeachTrampoline *trampoline = data;
@@ -692,28 +590,14 @@ gsk_path_foreach_trampoline (GskPathOperation        op,
    case GSK_PATH_MOVE:
    case GSK_PATH_CLOSE:
    case GSK_PATH_LINE:
-      return trampoline->func (op, pts, n_pts, trampoline->user_data);
+      return trampoline->func (op, pts, n_pts, weight, trampoline->user_data);

    case GSK_PATH_QUAD:
      {
        GskCurve curve;

        if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_QUAD)
-          return trampoline->func (op, pts, n_pts, trampoline->user_data);
-        else if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_CUBIC)
-          {
-            return trampoline->func (GSK_PATH_CUBIC,
-                                     (graphene_point_t[4]) {
-                                       pts[0],
-                                       GRAPHENE_POINT_INIT ((pts[0].x + 2 * pts[1].x) / 3,
-                                                            (pts[0].y + 2 * pts[1].y) / 3),
-                                       GRAPHENE_POINT_INIT ((pts[2].x + 2 * pts[1].x) / 3,
-                                                            (pts[2].y + 2 * pts[1].y) / 3),
-                                       pts[2],
-                                     },
-                                     4,
-                                     trampoline->user_data);
-          }
+          return trampoline->func (op, pts, n_pts, weight, trampoline->user_data);

        gsk_curve_init (&curve, gsk_pathop_encode (GSK_PATH_QUAD, pts));
        return gsk_curve_decompose (&curve,
@@ -727,10 +611,10 @@ gsk_path_foreach_trampoline (GskPathOperation        op,
        GskCurve curve;

        if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_CUBIC)
-          return trampoline->func (op, pts, n_pts, trampoline->user_data);
+          return trampoline->func (op, pts, n_pts, weight, trampoline->user_data);

        gsk_curve_init (&curve, gsk_pathop_encode (GSK_PATH_CUBIC, pts));
-        if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_QUAD)
+        if (trampoline->flags & (GSK_PATH_FOREACH_ALLOW_QUAD|GSK_PATH_FOREACH_ALLOW_CONIC))
          return gsk_curve_decompose_curve (&curve,
                                            trampoline->flags,
                                            trampoline->tolerance,
@@ -743,6 +627,28 @@ gsk_path_foreach_trampoline (GskPathOperation        op,
                                    trampoline);
      }

+    case GSK_PATH_CONIC:
+      {
+        GskCurve curve;
+
+        if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_CONIC)
+          return trampoline->func (op, pts, n_pts, weight, trampoline->user_data);
+
+        gsk_curve_init (&curve, gsk_pathop_encode (GSK_PATH_CONIC, (graphene_point_t[4]) { pts[0], pts[1], { weight, }, pts[2] } ));
+        if (trampoline->flags & (GSK_PATH_FOREACH_ALLOW_QUAD|GSK_PATH_FOREACH_ALLOW_CUBIC))
+          return gsk_curve_decompose_curve (&curve,
+                                            trampoline->flags,
+                                            trampoline->tolerance,
+                                            gsk_path_foreach_trampoline_add_curve,
+                                            trampoline);
+
+        return gsk_curve_decompose (&curve, 
+                                    trampoline->tolerance,
+                                    gsk_path_foreach_trampoline_add_line,
+                                    trampoline);
+      }
+
+
    default:
      g_assert_not_reached ();
      return FALSE;
@@ -750,7 +656,8 @@ gsk_path_foreach_trampoline (GskPathOperation        op,
 }

 #define ALLOW_ANY (GSK_PATH_FOREACH_ALLOW_QUAD| \
-                   GSK_PATH_FOREACH_ALLOW_CUBIC)
+                   GSK_PATH_FOREACH_ALLOW_CUBIC| \
+                   GSK_PATH_FOREACH_ALLOW_CONIC)

 gboolean
 gsk_path_foreach_with_tolerance (GskPath             *self,
@@ -1000,17 +907,13 @@ parse_circle (const char **p,
 * gsk_path_parse:
 * @string: a string
 *
- * This is a convenience function that constructs a `GskPath`
- * from a serialized form.
- *
- * The string is expected to be in
+ * This is a convenience function that constructs a #GskPath
+ * from a serialized form. The string is expected to be in
 * [SVG path syntax](https://www.w3.org/TR/SVG11/paths.html#PathData),
 * as e.g. produced by [method@Gsk.Path.to_string].
 *
 * Returns: (nullable): a new `GskPath`, or `NULL`
 *   if @string could not be parsed
- *
- * Since: 4.14
 */
 GskPath *
 gsk_path_parse (const char *string)
@@ -1334,6 +1237,37 @@ gsk_path_parse (const char *string)
          }
          break;

+        case 'O':
+        case 'o':
+          {
+            double x1, y1, x2, y2, weight;
+
+            if (parse_coordinate_pair (&p, &x1, &y1) &&
+                parse_coordinate_pair (&p, &x2, &y2) &&
+                parse_nonnegative_number (&p, &weight))
+              {
+                if (cmd == 'c')
+                  {
+                    x1 += x;
+                    y1 += y;
+                    x2 += x;
+                    y2 += y;
+                  }
+                if (_strchr ("zZ", prev_cmd))
+                  {
+                    gsk_path_builder_move_to (builder, x, y);
+                    path_x = x;
+                    path_y = y;
+                  }
+                gsk_path_builder_conic_to (builder, x1, y1, x2, y2, weight);
+                x = x2;
+                y = y2;
+              }
+            else
+              goto error;
+          }
+          break;
+
        case 'A':
        case 'a':
          {
@@ -1393,172 +1327,149 @@ error:
 }

 /**
- * gsk_path_builder_add_segment:
- * @self: a `GskPathBuilder`
- * @path: the `GskPath` to take the segment to
- * @start: the point on @path to start at
- * @end: the point on @path to end at
+ * gsk_path_stroke:
+ * @self: a `GskPath`
+ * @stroke: stroke parameters
 *
- * Adds to @self the segment of @path from @start to @end.
+ * Create a new path that follows the outline of the area
+ * that would be affected by stroking along @self with
+ * the given stroke parameters.
 *
- * If @start is after @end, the path will first add the segment
- * from @start to the end of the path, and then add the segment from
- * the beginning to @end. If the path is closed, these segments will
- * be connected.
- *
- * Since: 4.14
+ * Returns: a new `GskPath`
 */
-void
-gsk_path_builder_add_segment (GskPathBuilder     *self,
-                              GskPath            *path,
-                              const GskPathPoint *start,
-                              const GskPathPoint *end)
+GskPath *
+gsk_path_stroke (GskPath   *self,
+                 GskStroke *stroke)
 {
-  GskRealPathPoint *s = (GskRealPathPoint *) start;
-  GskRealPathPoint *e = (GskRealPathPoint *) end;
-  const GskContour *contour;
+  GskPathBuilder *builder;

-  g_return_if_fail (self != NULL);
-  g_return_if_fail (path != NULL);
-  g_return_if_fail (path == s->path);
-  g_return_if_fail (path == e->path);
+  builder = gsk_path_builder_new ();

-  contour = gsk_path_get_contour (path, s->contour);
+  for (int i = 0; i < self->n_contours; i++)
+    gsk_contour_add_stroke (gsk_path_get_contour (self, i), builder, stroke);

-  if (s->contour == e->contour)
-    {
-      if (gsk_contour_point_compare (contour, s, e) < 0)
-        {
-          gsk_contour_add_segment (contour, self, TRUE, s, e);
-          return;
-        }
-      else if (path->n_contours == 1)
-        {
-          gsk_contour_add_segment (contour, self, TRUE, s, NULL);
-          gsk_contour_add_segment (contour, self, FALSE, NULL, e);
-          return;
-        }
-    }
-
-  gsk_contour_add_segment (contour, self, TRUE, s, NULL);
-
-  for (gsize i = (s->contour + 1) % path->n_contours; i != e->contour; i = (i + 1) % path->n_contours)
-    gsk_path_builder_add_contour (self, gsk_contour_dup (gsk_path_get_contour (path, i)));
-
-  contour = gsk_path_get_contour (path, e->contour);
-  gsk_contour_add_segment (contour, self, FALSE, NULL, e);
+  return gsk_path_builder_free_to_path (builder);
 }

 /**
- * gsk_path_get_previous_point:
+ * gsk_path_offset:
 * @self: a `GskPath`
- * @point: a point on @self
- * @result: (out caller-allocates): Return location for the result
+ * @distance: the distance to offset the path by
+ * @stroke: stroke parameters
 *
- * Gets the previous 'significant' point on @self before @point.
+ * Create a new path that is offset from @self by @distance.
 *
- * The 'significant' points of a path are typically the
- * on-curve points that have been specified when the
- * path was created.
+ * The offset can be positive (to the right) or negative
+ * (to the left). The line-join and miter-limit of the @stroke
+ * influence how joins between the offset path segments
+ * are made.
 *
- * For example, in a path with 3 Bézier segments, the
- * significant points are the start of the first segment,
- * the start point of the second segment (which coincides
- * with the end point of the first segment), the start
- * point of the third segment, and the end point of the
- * last segment.
- *
- * If @point is the start point of the path, there is no
- * prior point, and this function returns `FALSE`.
- *
- * Returns: `TRUE` if @result has been set to a point
+ * Returns: a new `GskPath`
 */
-gboolean
-gsk_path_get_previous_point (GskPath            *self,
-                             const GskPathPoint *point,
-                             GskPathPoint       *result)
+GskPath *
+gsk_path_offset (GskPath   *self,
+                 float      distance,
+                 GskStroke *stroke)
 {
-  GskRealPathPoint *p = (GskRealPathPoint *) point;
-  GskRealPathPoint *res = (GskRealPathPoint *) result;
-  const GskContour *contour;
+  GskPathBuilder *builder;

-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (self == p->path, FALSE);
+  builder = gsk_path_builder_new ();

-  contour = gsk_path_get_contour (self, p->contour);
+  for (int i = 0; i < self->n_contours; i++)
+    gsk_contour_offset (gsk_path_get_contour (self, i), builder, distance, stroke);

-  if (gsk_contour_get_previous_point (contour, p, res))
-    {
-      res->path  = self;
-      res->contour = p->contour;
-      return TRUE;
-    }
-
-  if (p->contour > 0)
-    {
-      contour = gsk_path_get_contour (self, p->contour - 1);
-      gsk_contour_get_end_point (contour, res);
-      res->path = self;
-      res->contour = p->contour - 1;
-      return TRUE;
-    }
-
-  return FALSE;
+  return gsk_path_builder_free_to_path (builder);
 }

 /**
- * gsk_path_get_next_point:
+ * gsk_path_simplify:
 * @self: a `GskPath`
- * @point: a point on @self
- * @result: (out caller-allocates): Return location for the result
+ * @fill_rule: a `GskFillRule`
 *
- * Gets the next 'significant' point on @self after @point.
+ * Create a new path that describes the same area as @self,
+ * without overlapping contours.
 *
- * The 'significant' points of a path are typically the
- * on-curve points that have been specified when the
- * path was created.
- *
- * For example, in a path with 3 Bézier segments, the
- * significant points are the start of the first segment,
- * the start point of the second segment (which coincides
- * with the end point of the first segment), the start
- * point of the third segment, and the end point of the
- * last segment.
- *
- * If @point is the end point of the path, there is no
- * next point, and this function returns `FALSE`.
- *
- * Returns: `TRUE` if @result has been set to a point
+ * Returns: a new `GskPath`
 */
-gboolean
-gsk_path_get_next_point (GskPath            *self,
-                         const GskPathPoint *point,
-                         GskPathPoint       *result)
+GskPath *
+gsk_path_simplify (GskPath     *self,
+                   GskFillRule  fill_rule)
 {
-  GskRealPathPoint *p = (GskRealPathPoint *) point;
-  GskRealPathPoint *res = (GskRealPathPoint *) result;
-  const GskContour *contour;
-
-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (self == p->path, FALSE);
-
-  contour = gsk_path_get_contour (self, p->contour);
-
-  if (gsk_contour_get_next_point (contour, p, res))
-    {
-      res->path  = self;
-      res->contour = p->contour;
-      return TRUE;
-    }
-
-  if (p->contour < self->n_contours - 1)
-    {
-      contour = gsk_path_get_contour (self, p->contour + 1);
-      gsk_contour_get_start_point (contour, res);
-      res->path = self;
-      res->contour = p->contour + 1;
-      return TRUE;
-    }
-
-  return FALSE;
+  return gsk_path_op (GSK_PATH_OP_SIMPLIFY, fill_rule, self, NULL);
+}
+
+/**
+ * gsk_path_union:
+ * @first: a `GskPath`
+ * @second: a `GskPath`
+ * @fill_rule: a `GskFillRule`
+ *
+ * Create a new path that describes the union of the areas
+ * of the given paths.
+ *
+ * Returns: a new `GskPath`
+ */
+GskPath *
+gsk_path_union (GskPath     *first,
+                GskPath     *second,
+                GskFillRule  fill_rule)
+{
+  return gsk_path_op (GSK_PATH_OP_UNION, fill_rule, first, second);
+}
+
+/**
+ * gsk_path_intersection:
+ * @first: a `GskPath`
+ * @second: a `GskPath`
+ * @fill_rule: a `GskFillRule`
+ *
+ * Create a new path that describes the intersection of the areas
+ * of the given paths.
+ *
+ * Returns: a new `GskPath`
+ */
+GskPath *
+gsk_path_intersection (GskPath     *first,
+                       GskPath     *second,
+                       GskFillRule  fill_rule)
+{
+  return gsk_path_op (GSK_PATH_OP_INTERSECTION, fill_rule, first, second);
+}
+
+/**
+ * gsk_path_difference:
+ * @first: a `GskPath`
+ * @second: a `GskPath`
+ * @fill_rule: a `GskFillRule`
+ *
+ * Create a new path that describes the difference of the areas
+ * of the given paths.
+ *
+ * Returns: a new `GskPath`
+ */
+GskPath *
+gsk_path_difference (GskPath     *first,
+                     GskPath     *second,
+                     GskFillRule  fill_rule)
+{
+  return gsk_path_op (GSK_PATH_OP_DIFFERENCE, fill_rule, first, second);
+}
+
+/**
+ * gsk_path_symmetric_difference:
+ * @first: a `GskPath`
+ * @second: a `GskPath`
+ * @fill_rule: a `GskFillRule`
+ *
+ * Create a new path that describes the symmetric difference
+ * of the areas of the given paths.
+ *
+ * Returns: a new `GskPath`
+ */
+GskPath *
+gsk_path_symmetric_difference (GskPath     *first,
+                               GskPath     *second,
+                               GskFillRule  fill_rule)
+{
+  return gsk_path_op (GSK_PATH_OP_XOR, fill_rule, first, second);
 }
@@ -30,10 +30,9 @@ G_BEGIN_DECLS

 /**
 * GskPathForeachFlags:
- * @GSK_PATH_FOREACH_ALLOW_ONLY_LINES: The default behavior, only allow lines.
 * @GSK_PATH_FOREACH_ALLOW_QUAD: Allow emission of `GSK_PATH_QUAD` operations
 * @GSK_PATH_FOREACH_ALLOW_CUBIC: Allow emission of `GSK_PATH_CUBIC` operations.
- * @GSK_PATH_FOREACH_ALLOW_ANY: Allow emission of any kind of operation.
+ * @GSK_PATH_FOREACH_ALLOW_CONIC: Allow emission of `GSK_PATH_CONIC` operations.
 *
 * Flags that can be passed to gsk_path_foreach() to enable additional
 * features.
@@ -44,9 +43,9 @@ G_BEGIN_DECLS
 */
 typedef enum
 {
-  GSK_PATH_FOREACH_ALLOW_ONLY_LINES = 0,
-  GSK_PATH_FOREACH_ALLOW_QUAD       = (1 << 0),
-  GSK_PATH_FOREACH_ALLOW_CUBIC      = (1 << 1),
+  GSK_PATH_FOREACH_ALLOW_QUAD  = (1 << 0),
+  GSK_PATH_FOREACH_ALLOW_CUBIC = (1 << 1),
+  GSK_PATH_FOREACH_ALLOW_CONIC = (1 << 2),
 } GskPathForeachFlags;

 /**
@@ -54,91 +53,110 @@ typedef enum
 * @op: The operation to perform
 * @pts: The points of the operation
 * @n_pts: The number of points
+ * @weight: The weight for conic curves, or unused if not a conic curve.
 * @user_data: The user data provided with the function
 *
 * Prototype of the callback to iterate throught the operations of
 * a path.
 *
 * Returns: %TRUE to continue evaluating the path, %FALSE to
- *   immediately abort and not call the function again.
+ *     immediately abort and not call the function again.
 */
 typedef gboolean (* GskPathForeachFunc) (GskPathOperation        op,
                                         const graphene_point_t *pts,
                                         gsize                   n_pts,
+                                         float                   weight,
                                         gpointer                user_data);

 #define GSK_TYPE_PATH (gsk_path_get_type ())

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GType                   gsk_path_get_type                       (void) G_GNUC_CONST;

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPath *               gsk_path_ref                            (GskPath                *self);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_unref                          (GskPath                *self);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_print                          (GskPath                *self,
                                                                 GString                *string);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 char *                  gsk_path_to_string                      (GskPath                *self);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPath *               gsk_path_parse                          (const char             *string);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_to_cairo                       (GskPath                *self,
                                                                 cairo_t                *cr);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 gboolean                gsk_path_is_empty                       (GskPath                *self);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 gboolean                gsk_path_is_closed                      (GskPath                *self);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 gboolean                gsk_path_get_bounds                     (GskPath                *self,
                                                                 graphene_rect_t        *bounds);

-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_stroke_bounds              (GskPath                *self,
-                                                                 const GskStroke        *stroke,
-                                                                 graphene_rect_t        *bounds);
-
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 gboolean                gsk_path_in_fill                        (GskPath                *self,
                                                                 const graphene_point_t *point,
                                                                 GskFillRule             fill_rule);

-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_closest_point              (GskPath                *self,
+GDK_AVAILABLE_IN_ALL
+GskPathPoint *          gsk_path_get_closest_point              (GskPath                *self,
                                                                 const graphene_point_t *point,
-                                                                 float                   threshold,
-                                                                 GskPathPoint           *result);
+                                                                 float                   threshold);

-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_previous_point             (GskPath                *self,
-                                                                 const GskPathPoint     *point,
-                                                                 GskPathPoint           *result);
-
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_next_point                 (GskPath                *self,
-                                                                 const GskPathPoint     *point,
-                                                                 GskPathPoint           *result);
-
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_start_point                (GskPath                *self,
-                                                                 GskPathPoint           *result);
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_end_point                  (GskPath                *self,
-                                                                 GskPathPoint           *result);
-
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 gboolean                gsk_path_foreach                        (GskPath                *self,
                                                                 GskPathForeachFlags     flags,
                                                                 GskPathForeachFunc      func,
                                                                 gpointer                user_data);

+GDK_AVAILABLE_IN_ALL
+gboolean                gsk_path_dash                           (GskPath                *path,
+                                                                 GskStroke              *stroke,
+                                                                 float                   tolerance,
+                                                                 GskPathForeachFunc      func,
+                                                                 gpointer                user_data);
+
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_stroke                         (GskPath                *self,
+                                                                 GskStroke              *stroke);
+
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_offset                         (GskPath                *self,
+                                                                 float                   distance,
+                                                                 GskStroke              *stroke);
+
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_union                          (GskPath                *first,
+                                                                 GskPath                *second,
+                                                                 GskFillRule             fill_rule);
+
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_intersection                   (GskPath                *first,
+                                                                 GskPath                *second,
+                                                                 GskFillRule             fill_rule);
+
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_difference                     (GskPath                *first,
+                                                                 GskPath                *second,
+                                                                 GskFillRule             fill_rule);
+
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_symmetric_difference           (GskPath                *first,
+                                                                 GskPath                *second,
+                                                                 GskFillRule             fill_rule);
+
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_simplify                       (GskPath                *self,
+                                                                 GskFillRule             fill_rule);
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskPath, gsk_path_unref)

 G_END_DECLS
@@ -24,14 +24,13 @@
 #include "gskpathbuilder.h"

 #include "gskpathprivate.h"
-#include "gskcontourprivate.h"
-#include "gsksplineprivate.h"

 /**
 * GskPathBuilder:
 *
- * `GskPathBuilder` is an auxiliary object for constructing
- * `GskPath` objects.
+ * A `GskPathBuilder` struct is an opaque struct. It is meant to
+ * not be kept around and only be used to create new `GskPath`
+ * objects.
 *
 * A path is constructed like this:
 *
@@ -92,8 +91,6 @@ G_DEFINE_BOXED_TYPE (GskPathBuilder,
 * Use addition functions to add types to it.
 *
 * Returns: a new `GskPathBuilder`
- *
- * Since: 4.14
 */
 GskPathBuilder *
 gsk_path_builder_new (void)
@@ -118,13 +115,11 @@ gsk_path_builder_new (void)
 *
 * Acquires a reference on the given builder.
 *
- * This function is intended primarily for language bindings.
+ * This function is intended primarily for bindings.
 * `GskPathBuilder` objects should not be kept around.
 *
 * Returns: (transfer none): the given `GskPathBuilder` with
 *   its reference count increased
- *
- * Since: 4.14
 */
 GskPathBuilder *
 gsk_path_builder_ref (GskPathBuilder *self)
@@ -211,8 +206,6 @@ gsk_path_builder_clear (GskPathBuilder *self)
 * @self: a `GskPathBuilder`
 *
 * Releases a reference on the given builder.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_unref (GskPathBuilder *self)
@@ -240,8 +233,6 @@ gsk_path_builder_unref (GskPathBuilder *self)
 *
 * Returns: (transfer full): the newly created `GskPath`
 *   with all the contours added to the builder
- *
- * Since: 4.14
 */
 GskPath *
 gsk_path_builder_free_to_path (GskPathBuilder *self)
@@ -267,13 +258,11 @@ gsk_path_builder_free_to_path (GskPathBuilder *self)
 * you cannot call this function multiple times on the same builder
 * instance.
 *
- * This function is intended primarily for language bindings.
+ * This function is intended primarily for bindings.
 * C code should use [method@Gsk.PathBuilder.free_to_path].
 *
 * Returns: (transfer full): the newly created `GskPath`
 *   with all the contours added to the builder
- *
- * Since: 4.14
 */
 GskPath *
 gsk_path_builder_to_path (GskPathBuilder *self)
@@ -310,12 +299,8 @@ gsk_path_builder_add_contour (GskPathBuilder *self,
 * drawing commands and updated after every operation.
 *
 * When the builder is created, the default current point is set to (0, 0).
- * Note that this is different from cairo, which starts out without
- * a current point.
 *
 * Returns: (transfer none): The current point
- *
- * Since: 4.14
 */
 const graphene_point_t *
 gsk_path_builder_get_current_point (GskPathBuilder *self)
@@ -331,8 +316,6 @@ gsk_path_builder_get_current_point (GskPathBuilder *self)
 * @path: (transfer none): the path to append
 *
 * Appends all of @path to the builder.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_add_path (GskPathBuilder *self,
@@ -354,9 +337,8 @@ gsk_path_builder_add_path (GskPathBuilder *self,
 * @self: a `GskPathBuilder`
 * @path: (transfer none): the path to append
 *
- * Appends all of @path to the builder, in reverse order.
- *
- * Since: 4.14
+ * Appends all of @path to the builder, in reverse
+ * order.
 */
 void
 gsk_path_builder_add_reverse_path (GskPathBuilder *self,
@@ -381,8 +363,6 @@ gsk_path_builder_add_reverse_path (GskPathBuilder *self,
 *
 * You can use cairo_copy_path() to access the path
 * from a Cairo context.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_add_cairo_path (GskPathBuilder     *self,
@@ -435,36 +415,39 @@ gsk_path_builder_add_cairo_path (GskPathBuilder     *self,
 *
 * If the the width or height are 0, the path will be a closed
 * horizontal or vertical line. If both are 0, it'll be a closed dot.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_add_rect (GskPathBuilder        *self,
                           const graphene_rect_t *rect)
 {
+  GskContour *contour;
+
  g_return_if_fail (self != NULL);

-  gsk_path_builder_move_to (self, rect->origin.x, rect->origin.y);
+  contour = gsk_rect_contour_new (rect);
+  gsk_path_builder_add_contour (self, contour);

-  gsk_path_builder_rel_line_to (self, rect->size.width, 0);
-  gsk_path_builder_rel_line_to (self, 0, rect->size.height);
-  gsk_path_builder_rel_line_to (self, - rect->size.width, 0);
-
-  gsk_path_builder_close (self);
+  gsk_contour_get_start_end (contour, NULL, &self->current_point);
 }

-static gboolean
-circle_contour_curve (const graphene_point_t pts[4],
-                      gpointer                data)
+/**
+ * gsk_path_builder_add_rounded_rect:
+ * @self: a #GskPathBuilder
+ * @rect: the rounded rect
+ *
+ * Adds @rect as a new contour to the path built in @self.
+ */
+void
+gsk_path_builder_add_rounded_rect (GskPathBuilder       *self,
+                                   const GskRoundedRect *rect)
 {
-  GskPathBuilder *self = data;
+  GskContour *contour;

-  gsk_path_builder_cubic_to (self,
-                             pts[1].x, pts[1].y,
-                             pts[2].x, pts[2].y,
-                             pts[3].x, pts[3].y);
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (rect != NULL);

-  return TRUE;
+  contour = gsk_rounded_rect_contour_new (rect);
+  gsk_path_builder_add_contour (self, contour);
 }

 /**
@@ -474,23 +457,61 @@ circle_contour_curve (const graphene_point_t pts[4],
 * @radius: the radius of the circle
 *
 * Adds a circle with the @center and @radius.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_add_circle (GskPathBuilder         *self,
                             const graphene_point_t *center,
                             float                   radius)
 {
+  GskContour *contour;
+
  g_return_if_fail (self != NULL);
  g_return_if_fail (center != NULL);
  g_return_if_fail (radius > 0);

-  gsk_path_builder_move_to (self, center->x + radius, center->y);
-  gsk_spline_decompose_arc (center, radius,
-                            GSK_PATH_TOLERANCE_DEFAULT,
-                            0, 2 * M_PI,
-                            circle_contour_curve, self);
+  contour = gsk_circle_contour_new (center, radius, 0, 360);
+  gsk_path_builder_add_contour (self, contour);
+}
+
+/**
+ * gsk_path_builder_add_ellipse:
+ * @self: a #GskPathBuilder
+ * @center: the center point of the ellipse
+ * @radius: the radius of the ellipse in x/y direction
+ *
+ * Adds an ellipse with the given @center and the @radius in
+ * x/y direction.
+ */
+void
+gsk_path_builder_add_ellipse (GskPathBuilder         *self,
+                              const graphene_point_t *center,
+                              const graphene_size_t  *radius)
+{
+  const float weight = M_SQRT1_2;
+  graphene_point_t pts[8];
+  float w, h;
+
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (center != NULL);
+  g_return_if_fail (radius != NULL);
+
+  w = radius->width / 2;
+  h = radius->height / 2;
+
+  pts[0] = GRAPHENE_POINT_INIT (center->x + w, center->y);
+  pts[1] = GRAPHENE_POINT_INIT (center->x + w, center->y + h);
+  pts[2] = GRAPHENE_POINT_INIT (center->x,     center->y + h);
+  pts[3] = GRAPHENE_POINT_INIT (center->x - w, center->y + h);
+  pts[4] = GRAPHENE_POINT_INIT (center->x - w, center->y);
+  pts[5] = GRAPHENE_POINT_INIT (center->x - w, center->y - h);
+  pts[6] = GRAPHENE_POINT_INIT (center->x,     center->y - h);
+  pts[7] = GRAPHENE_POINT_INIT (center->x + w, center->y - h);
+
+  gsk_path_builder_move_to (self, pts[0].x, pts[0].y);
+  gsk_path_builder_conic_to (self, pts[1].x, pts[1].y, pts[2].x, pts[2].y, weight);
+  gsk_path_builder_conic_to (self, pts[3].x, pts[3].y, pts[4].x, pts[4].y, weight);
+  gsk_path_builder_conic_to (self, pts[5].x, pts[5].y, pts[6].x, pts[6].y, weight);
+  gsk_path_builder_conic_to (self, pts[7].x, pts[7].y, pts[0].x, pts[0].y, weight);
  gsk_path_builder_close (self);
 }

@@ -505,8 +526,6 @@ gsk_path_builder_add_circle (GskPathBuilder         *self,
 * If this function is called twice in succession, the first
 * call will result in a contour made up of a single point.
 * The second call will start a new contour.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_move_to (GskPathBuilder *self,
@@ -532,8 +551,6 @@ gsk_path_builder_move_to (GskPathBuilder *self,
 * point.
 *
 * This is the relative version of [method@Gsk.PathBuilder.move_to].
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_rel_move_to (GskPathBuilder *self,
@@ -555,8 +572,6 @@ gsk_path_builder_rel_move_to (GskPathBuilder *self,
 *
 * Draws a line from the current point to @x, @y and makes it
 * the new current point.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_line_to (GskPathBuilder *self,
@@ -587,8 +602,6 @@ gsk_path_builder_line_to (GskPathBuilder *self,
 * and makes it the new current point.
 *
 * This is the relative version of [method@Gsk.PathBuilder.line_to].
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_rel_line_to (GskPathBuilder *self,
@@ -614,8 +627,6 @@ gsk_path_builder_rel_line_to (GskPathBuilder *self,
 * from the current point to @x2, @y2 with @x1, @y1 as the control point.
 *
 * After this, @x2, @y2 will be the new current point.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_quad_to (GskPathBuilder *self,
@@ -649,8 +660,6 @@ gsk_path_builder_quad_to (GskPathBuilder *self,
 * All coordinates are given relative to the current point.
 *
 * This is the relative version of [method@Gsk.PathBuilder.quad_to].
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_rel_quad_to (GskPathBuilder *self,
@@ -683,8 +692,6 @@ gsk_path_builder_rel_quad_to (GskPathBuilder *self,
 * points.
 *
 * After this, @x3, @y3 will be the new current point.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_cubic_to (GskPathBuilder *self,
@@ -722,8 +729,6 @@ gsk_path_builder_cubic_to (GskPathBuilder *self,
 * points. All coordinates are given relative to the current point.
 *
 * This is the relative version of [method@Gsk.PathBuilder.cubic_to].
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_rel_cubic_to (GskPathBuilder *self,
@@ -745,6 +750,78 @@ gsk_path_builder_rel_cubic_to (GskPathBuilder *self,
                             self->current_point.y + y3);
 }

+/**
+ * gsk_path_builder_conic_to:
+ * @self: a `GskPathBuilder`
+ * @x1: x coordinate of control point
+ * @y1: y coordinate of control point
+ * @x2: x coordinate of the end of the curve
+ * @y2: y coordinate of the end of the curve
+ * @weight: weight of the curve
+ *
+ * Adds a [conic curve](https://en.wikipedia.org/wiki/Non-uniform_rational_B-spline)
+ * from the current point to @x2, @y2 with the given
+ * @weight and @x1, @y1 as the single control point.
+ *
+ * Conic curves can be used to draw ellipses and circles.
+ *
+ * After this, @x2, @y2 will be the new current point.
+ */
+void
+gsk_path_builder_conic_to (GskPathBuilder *self,
+                           float           x1,
+                           float           y1,
+                           float           x2,
+                           float           y2,
+                           float           weight)
+{
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (weight >= 0);
+
+  self->flags &= ~GSK_PATH_FLAT;
+  gsk_path_builder_append_current (self,
+                                   GSK_PATH_CONIC,
+                                   3, (graphene_point_t[3]) {
+                                     GRAPHENE_POINT_INIT (x1, y1),
+                                     GRAPHENE_POINT_INIT (weight, 0),
+                                     GRAPHENE_POINT_INIT (x2, y2)
+                                   });
+}
+
+/**
+ * gsk_path_builder_rel_conic_to:
+ * @self: a `GskPathBuilder`
+ * @x1: x offset of control point
+ * @y1: y offset of control point
+ * @x2: x offset of the end of the curve
+ * @y2: y offset of the end of the curve
+ * @weight: weight of the curve
+ *
+ * Adds a [conic curve](https://en.wikipedia.org/wiki/Non-uniform_rational_B-spline)
+ * from the current point to @x2, @y2 with the given
+ * @weight and @x1, @y1 as the single control point.
+ *
+ * This is the relative version of [method@Gsk.PathBuilder.conic_to].
+ */
+void
+gsk_path_builder_rel_conic_to (GskPathBuilder *self,
+                               float           x1,
+                               float           y1,
+                               float           x2,
+                               float           y2,
+                               float           weight)
+{
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (weight >= 0);
+
+  gsk_path_builder_conic_to (self,
+                             self->current_point.x + x1,
+                             self->current_point.y + y1,
+                             self->current_point.x + x2,
+                             self->current_point.y + y2,
+                             weight);
+}
+
 /**
 * gsk_path_builder_close:
 * @self: a `GskPathBuilder`
@@ -756,8 +833,6 @@ gsk_path_builder_rel_cubic_to (GskPathBuilder *self,
 * contour behaves different from an open one when stroking its start
 * and end point are considered connected, so they will be joined
 * via the line join, and not ended with line caps.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_close (GskPathBuilder *self)
@@ -960,8 +1035,6 @@ gsk_path_builder_svg_arc_to (GskPathBuilder *self,
 *
 * Adds the outlines for the glyphs in @layout to
 * the builder.
- *
- * Since: 4.14
 */
 void
 gsk_path_builder_add_layout (GskPathBuilder *self,
@@ -31,77 +31,85 @@ G_BEGIN_DECLS

 #define GSK_TYPE_PATH_BUILDER (gsk_path_builder_get_type ())

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GType                   gsk_path_builder_get_type               (void) G_GNUC_CONST;

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPathBuilder *        gsk_path_builder_new                    (void);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPathBuilder *        gsk_path_builder_ref                    (GskPathBuilder         *self);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_unref                  (GskPathBuilder         *self);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPath *               gsk_path_builder_free_to_path           (GskPathBuilder         *self) G_GNUC_WARN_UNUSED_RESULT;
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPath *               gsk_path_builder_to_path                (GskPathBuilder         *self) G_GNUC_WARN_UNUSED_RESULT;

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 const graphene_point_t *gsk_path_builder_get_current_point      (GskPathBuilder         *self);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_add_path               (GskPathBuilder         *self,
                                                                 GskPath                *path);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_add_reverse_path       (GskPathBuilder         *self,
                                                                 GskPath                *path);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_add_cairo_path         (GskPathBuilder         *self,
                                                                 const cairo_path_t     *path);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_add_layout             (GskPathBuilder         *self,
                                                                 PangoLayout            *layout);
-
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_add_rect               (GskPathBuilder         *self,
                                                                 const graphene_rect_t  *rect);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
+void                    gsk_path_builder_add_rounded_rect       (GskPathBuilder         *self,
+                                                                 const GskRoundedRect   *rect);
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_add_circle             (GskPathBuilder         *self,
                                                                 const graphene_point_t *center,
                                                                 float                   radius);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
+void                    gsk_path_builder_add_ellipse            (GskPathBuilder         *self,
+                                                                 const graphene_point_t *center,
+                                                                 const graphene_size_t  *radius);
+
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_add_segment            (GskPathBuilder         *self,
-                                                                 GskPath                *path,
-                                                                 const GskPathPoint     *start,
-                                                                 const GskPathPoint     *end);
-GDK_AVAILABLE_IN_4_14
+                                                                 GskPathMeasure         *measure,
+                                                                 float                   start,
+                                                                 float                   end);
+
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_move_to                (GskPathBuilder         *self,
                                                                 float                   x,
                                                                 float                   y);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_rel_move_to            (GskPathBuilder         *self,
                                                                 float                   x,
                                                                 float                   y);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_line_to                (GskPathBuilder         *self,
                                                                 float                   x,
                                                                 float                   y);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_rel_line_to            (GskPathBuilder         *self,
                                                                 float                   x,
                                                                 float                   y);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_quad_to                (GskPathBuilder         *self,
                                                                 float                   x1,
                                                                 float                   y1,
                                                                 float                   x2,
                                                                 float                   y2);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_rel_quad_to            (GskPathBuilder         *self,
                                                                 float                   x1,
                                                                 float                   y1,
                                                                 float                   x2,
                                                                 float                   y2);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_cubic_to               (GskPathBuilder         *self,
                                                                 float                   x1,
                                                                 float                   y1,
@@ -109,7 +117,7 @@ void                    gsk_path_builder_cubic_to               (GskPathBuilder
                                                                 float                   y2,
                                                                 float                   x3,
                                                                 float                   y3);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_rel_cubic_to           (GskPathBuilder         *self,
                                                                 float                   x1,
                                                                 float                   y1,
@@ -117,7 +125,21 @@ void                    gsk_path_builder_rel_cubic_to           (GskPathBuilder
                                                                 float                   y2,
                                                                 float                   x3,
                                                                 float                   y3);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
+void                    gsk_path_builder_conic_to               (GskPathBuilder         *self,
+                                                                 float                   x1,
+                                                                 float                   y1,
+                                                                 float                   x2,
+                                                                 float                   y2,
+                                                                 float                   weight);
+GDK_AVAILABLE_IN_ALL
+void                    gsk_path_builder_rel_conic_to           (GskPathBuilder         *self,
+                                                                 float                   x1,
+                                                                 float                   y1,
+                                                                 float                   x2,
+                                                                 float                   y2,
+                                                                 float                   weight);
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_builder_close                  (GskPathBuilder         *self);

 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskPathBuilder, gsk_path_builder_unref)
@@ -0,0 +1,304 @@
+/*
+ * Copyright © 2020 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte@gnome.org>
+ */
+
+#include "config.h"
+
+#include "gskcontourprivate.h"
+#include "gskcurveprivate.h"
+#include "gskpathprivate.h"
+#include "gskstrokeprivate.h"
+
+typedef struct
+{
+  float offset;                 /* how much of the current dash we've spent */
+  gsize dash_index;             /* goes from 0 to n_dash * 2, so we don't have to care about on/off
+                                   for uneven dashes */
+  gboolean on;                  /* If we're currently dashing or not */
+  gboolean may_close;           /* TRUE if we haven't turned the dash off in this contour */
+  gboolean needs_move_to;       /* If we have emitted the initial move_to() yet */
+  enum {
+    NORMAL, /* no special behavior required */
+    SKIP,   /* skip the next dash */
+    ONLY,   /* only do the first dash */
+    DONE    /* done with the first dash */
+  } first_dash_behavior;        /* How to handle the first dash in the loop. We loop closed contours
+                                   twice to make sure the first dash and the last dash can get joined */
+
+  GskCurve curve;               /* Curve we are currently processing */
+
+  float collect_start;          /* We're collecting multiple line segments when decomposing. */
+  float collect_length;         /* No need to emit a curve for every line segment when the dash is long enough. */
+
+  /* from the stroke */
+  float *dash;
+  gsize n_dash;
+  float dash_length;
+  float dash_offset;
+
+  float tolerance;
+  GskPathForeachFunc func;
+  gpointer user_data;
+} GskPathDash;
+
+static void
+gsk_path_dash_setup (GskPathDash *self)
+{
+  self->offset = fmodf (self->dash_offset, 2 * self->dash_length);
+
+  self->dash_index = 0;
+  self->on = TRUE;
+  self->may_close = TRUE;
+  while (self->offset > self->dash[self->dash_index % self->n_dash])
+    {
+      self->offset -= self->dash[self->dash_index % self->n_dash];
+      self->dash_index++;
+      self->on = !self->on;
+    }
+  if (self->first_dash_behavior != ONLY)
+    self->needs_move_to = TRUE;
+}
+
+static gboolean
+gsk_path_dash_ensure_move_to (GskPathDash            *self,
+                              const graphene_point_t *pt)
+{
+  if (!self->needs_move_to)
+    return TRUE;
+
+  if (!self->func (GSK_PATH_MOVE, pt, 1, 0, self->user_data))
+    return FALSE;
+
+  self->needs_move_to = FALSE;
+  return TRUE;
+}
+
+static gboolean
+gsk_path_dash_add_line_segment (const graphene_point_t *start,
+                                const graphene_point_t *end,
+                                float                   t_start,
+                                float                   t_end,
+                                GskCurveLineReason      reason,
+                                gpointer                user_data)
+{
+  GskPathDash *self = user_data;
+  float remaining, length, t_step;
+
+  length = graphene_point_distance (start, end, NULL, NULL);
+  if (self->collect_length)
+    {
+      t_start = self->collect_start;
+      length += self->collect_length;
+      self->collect_length = 0;
+    }
+
+  t_step = t_end - t_start;
+  remaining = length;
+
+  while (remaining)
+    {
+      float piece;
+
+      if (self->offset + remaining <= self->dash[self->dash_index % self->n_dash])
+        {
+          /* try collecting multiple line segments */
+          if (t_end < 1.0)
+            {
+              self->collect_start = t_start + t_step * (length - remaining) / length;
+              self->collect_length = remaining;
+              return TRUE;
+            }
+
+          piece = remaining;
+        }
+      else
+        piece = self->dash[self->dash_index % self->n_dash] - self->offset;
+
+      if (self->on)
+        {
+          if (self->first_dash_behavior != SKIP)
+            {
+              GskCurve segment;
+
+              if (piece)
+                {
+                  gsk_curve_segment (&self->curve,
+                                     t_start + t_step * (length - remaining) / length,
+                                     t_start + t_step * (length - (remaining - piece)) / length,
+                                     &segment);
+                  if (!gsk_path_dash_ensure_move_to (self, gsk_curve_get_start_point (&segment)))
+                    return FALSE;
+
+                  if (!gsk_pathop_foreach (gsk_curve_pathop (&segment), self->func, self->user_data))
+                    return FALSE;
+                }
+              else
+                {
+                  graphene_point_t p;
+
+                  gsk_curve_get_point (&self->curve, t_start + t_step * (length - remaining) / length, &p);
+                  if (!gsk_path_dash_ensure_move_to (self, &p))
+                    return FALSE;
+                }
+            }
+        }
+      else
+        {
+          self->may_close = FALSE;
+          if (self->first_dash_behavior == ONLY)
+            {
+              self->first_dash_behavior = DONE;
+              return FALSE;
+            }
+          self->first_dash_behavior = NORMAL;
+        }
+
+      if (self->offset + remaining <= self->dash[self->dash_index % self->n_dash])
+        {
+          self->offset += remaining;
+          remaining = 0;
+        }
+      else
+        {
+          remaining -= piece;
+          self->offset = 0;
+          self->dash_index++;
+          self->dash_index %= 2 * self->n_dash;
+          self->on = !self->on;
+          self->needs_move_to = TRUE;
+        }
+    }
+
+  return TRUE;
+}
+
+static gboolean
+gsk_path_dash_foreach (GskPathOperation        op,
+                       const graphene_point_t *pts,
+                       gsize                   n_pts,
+                       float                   weight,
+                       gpointer                user_data)
+{
+  GskPathDash *self = user_data;
+
+  switch (op)
+  {
+    case GSK_PATH_MOVE:
+      gsk_path_dash_setup (self);
+      break;
+
+    case GSK_PATH_CLOSE:
+      if (self->may_close)
+        {
+          if (graphene_point_equal (&pts[0], &pts[1]))
+            return self->func (GSK_PATH_CLOSE, pts, 2, 0, self->user_data);
+        }
+      else
+        op = GSK_PATH_LINE;
+      G_GNUC_FALLTHROUGH;
+
+    case GSK_PATH_LINE:
+    case GSK_PATH_QUAD:
+    case GSK_PATH_CUBIC:
+    case GSK_PATH_CONIC:
+      gsk_curve_init_foreach (&self->curve, op, pts, n_pts, weight);
+      if (!gsk_curve_decompose (&self->curve, self->tolerance, gsk_path_dash_add_line_segment, self))
+        return FALSE;
+      break;
+
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return TRUE;
+}
+
+gboolean
+gsk_contour_dash (const GskContour   *contour,
+                  GskStroke          *stroke,
+                  float               tolerance,
+                  GskPathForeachFunc  func,
+                  gpointer            user_data)
+{
+  GskPathDash self = {
+    .offset = 0,
+    .dash = stroke->dash,
+    .n_dash = stroke->n_dash,
+    .dash_length = stroke->dash_length,
+    .dash_offset = stroke->dash_offset,
+    .tolerance = tolerance,
+    .func = func,
+    .user_data = user_data
+  };
+  gboolean is_closed = gsk_contour_get_flags (contour) & GSK_PATH_CLOSED ? TRUE : FALSE;
+
+  self.first_dash_behavior = is_closed ? SKIP : NORMAL;
+  if (!gsk_contour_foreach (contour, tolerance, gsk_path_dash_foreach, &self))
+    return FALSE;
+
+  if (is_closed)
+    {
+      if (self.first_dash_behavior == NORMAL)
+        self.first_dash_behavior = ONLY;
+      else
+        self.first_dash_behavior = NORMAL;
+      self.needs_move_to = !self.on;
+      if (!gsk_contour_foreach (contour, tolerance, gsk_path_dash_foreach, &self) &&
+          self.first_dash_behavior != DONE)
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+/**
+ * gsk_path_dash:
+ * @path: the `GskPath` to dash
+ * @stroke: the stroke containing the dash parameters
+ * @tolerance: tolerance to use while dashing
+ * @func: (scope call) (closure user_data): the function to call for operations
+ * @user_data: (nullable): user data passed to @func
+ *
+ * Calls @func for every operation of the path that is the result
+ * of dashing @path with the dash pattern from @stroke.
+ *
+ * Returns: `FALSE` if @func returned FALSE`, `TRUE` otherwise.
+ */
+gboolean
+gsk_path_dash (GskPath            *path,
+               GskStroke          *stroke,
+               float               tolerance,
+               GskPathForeachFunc  func,
+               gpointer            user_data)
+{
+  gsize i;
+
+  /* Dashing disabled, no need to do any work */
+  if (stroke->dash_length <= 0)
+    return gsk_path_foreach (path, -1, func, user_data);
+
+  for (i = 0; i < gsk_path_get_n_contours (path); i++)
+    {
+      if (!gsk_contour_dash (gsk_path_get_contour (path, i), stroke, tolerance, func, user_data))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
@@ -20,20 +20,19 @@
 #include "config.h"

 #include "gskpathmeasure.h"
+#include "gskpathbuilder.h"

 #include "gskpathbuilder.h"
 #include "gskpathpointprivate.h"
 #include "gskpathprivate.h"

 /**
- * GskPathMeasure:
- *
 * `GskPathMeasure` is an object that allows measurements
 * on `GskPath`s such as determining the length of the path.
 *
 * Many measuring operations require approximating the path
 * with simpler shapes. Therefore, a `GskPathMeasure` has
- * a tolerance that determines what precision is required
+ * a tolerance that determines what amount is required
 * for such approximations.
 *
 * A `GskPathMeasure` struct is a reference counted struct
@@ -72,8 +71,6 @@ G_DEFINE_BOXED_TYPE (GskPathMeasure, gsk_path_measure,
 * Creates a measure object for the given @path.
 *
 * Returns: a new `GskPathMeasure` representing @path
- *
- * Since: 4.14
 */
 GskPathMeasure *
 gsk_path_measure_new (GskPath *path)
@@ -89,8 +86,6 @@ gsk_path_measure_new (GskPath *path)
 * Creates a measure object for the given @path and @tolerance.
 *
 * Returns: a new `GskPathMeasure` representing @path
- *
- * Since: 4.14
 */
 GskPathMeasure *
 gsk_path_measure_new_with_tolerance (GskPath *path,
@@ -129,8 +124,6 @@ gsk_path_measure_new_with_tolerance (GskPath *path,
 * Increases the reference count of a `GskPathMeasure` by one.
 *
 * Returns: the passed in `GskPathMeasure`.
- *
- * Since: 4.14
 */
 GskPathMeasure *
 gsk_path_measure_ref (GskPathMeasure *self)
@@ -149,8 +142,6 @@ gsk_path_measure_ref (GskPathMeasure *self)
 * Decreases the reference count of a `GskPathMeasure` by one.
 *
 * If the resulting reference count is zero, frees the object.
- *
- * Since: 4.14
 */
 void
 gsk_path_measure_unref (GskPathMeasure *self)
@@ -181,8 +172,6 @@ gsk_path_measure_unref (GskPathMeasure *self)
 * Returns the path that the measure was created for.
 *
 * Returns: (transfer none): the path of @self
- *
- * Since: 4.14
 */
 GskPath *
 gsk_path_measure_get_path (GskPathMeasure *self)
@@ -197,8 +186,6 @@ gsk_path_measure_get_path (GskPathMeasure *self)
 * Returns the tolerance that the measure was created with.
 *
 * Returns: the tolerance of @self
- *
- * Since: 4.14
 */
 float
 gsk_path_measure_get_tolerance (GskPathMeasure *self)
@@ -215,8 +202,6 @@ gsk_path_measure_get_tolerance (GskPathMeasure *self)
 * The length is cached, so this function does not do any work.
 *
 * Returns: The length of the path measured by @self
- *
- * Since: 4.14
 */
 float
 gsk_path_measure_get_length (GskPathMeasure *self)
@@ -236,36 +221,130 @@ gsk_path_measure_clamp_distance (GskPathMeasure *self,
  return CLAMP (distance, 0, self->length);
 }

+static void
+gsk_path_builder_add_segment_chunk (GskPathBuilder *self,
+                                    GskPathMeasure *measure,
+                                    gboolean        emit_move_to,
+                                    float           start,
+                                    float           end)
+{
+  g_assert (start < end);
+
+  for (gsize i = 0; i < measure->n_contours; i++)
+    {
+      if (measure->measures[i].length < start)
+        {
+          start -= measure->measures[i].length;
+          end -= measure->measures[i].length;
+        }
+      else if (start > 0 || end < measure->measures[i].length)
+        {
+          float len = MIN (end, measure->measures[i].length);
+          gsk_contour_add_segment (gsk_path_get_contour (measure->path, i),
+                                   self,
+                                   measure->measures[i].contour_data,
+                                   emit_move_to,
+                                   start,
+                                   len);
+          end -= len;
+          start = 0;
+          if (end <= 0)
+            break;
+        }
+      else
+        {
+          end -= measure->measures[i].length;
+          gsk_path_builder_add_contour (self, gsk_contour_dup (gsk_path_get_contour (measure->path, i)));
+        }
+      emit_move_to = TRUE;
+    }
+}
+
+/**
+ * gsk_path_builder_add_segment:
+ * @self: a `GskPathBuilder`
+ * @measure: the `GskPathMeasure` to take the segment to
+ * @start: start distance into the path
+ * @end: end distance into the path
+ *
+ * Adds to @self the segment of @measure from @start to @end.
+ *
+ * The distances are given relative to the length of @measure's path,
+ * from 0 for the beginning of the path to its length for the end
+ * of the path. The values will be clamped to that range. The length
+ * can be obtained with [method@Gsk.PathMeasure.get_length].
+ *
+ * If @start >= @end after clamping, the path will first add the segment
+ * from @start to the end of the path, and then add the segment from
+ * the beginning to @end. If the path is closed, these segments will
+ * be connected.
+ */
+void
+gsk_path_builder_add_segment (GskPathBuilder *self,
+                              GskPathMeasure *measure,
+                              float           start,
+                              float           end)
+{
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (measure != NULL);
+
+  start = gsk_path_measure_clamp_distance (measure, start);
+  end = gsk_path_measure_clamp_distance (measure, end);
+
+  if (start < end)
+    {
+      gsk_path_builder_add_segment_chunk (self, measure, TRUE, start, end);
+    }
+  else
+    {
+      /* If the path is closed, we can connect the 2 subpaths. */
+      gboolean closed = gsk_path_is_closed (measure->path);
+      gboolean need_move_to = !closed;
+
+      if (start < measure->length)
+        gsk_path_builder_add_segment_chunk (self, measure,
+                                            TRUE,
+                                            start, measure->length);
+      else
+        need_move_to = TRUE;
+
+      if (end > 0)
+        gsk_path_builder_add_segment_chunk (self, measure,
+                                            need_move_to,
+                                            0, end);
+      if (start == end && closed)
+        gsk_path_builder_close (self);
+    }
+}
+
 /**
 * gsk_path_measure_get_point:
 * @self: a `GskPathMeasure`
 * @distance: the distance
- * @result: (out caller-allocates): return location for the result
 *
- * Sets @result to the point at the given distance into the path.
+ * Returns a `GskPathPoint` representing the point at the given
+ * distance into the path.
 *
- * An empty path has no points, so `FALSE` is returned in that case.
+ * An empty path has no points, so `NULL` is returned in that case.
 *
- * Returns: `TRUE` if @result was set
- *
- * Since: 4.14
+ * Returns: (transfer full) (nullable): a newly allocated `GskPathPoint`
 */
-gboolean
+GskPathPoint *
 gsk_path_measure_get_point (GskPathMeasure *self,
-                            float           distance,
-                            GskPathPoint   *result)
+                            float           distance)
 {
-  GskRealPathPoint *res = (GskRealPathPoint *) result;
  gsize i;
+  float contour_offset;
  float offset;
  const GskContour *contour;
+  GskPathPoint *point;

-  g_return_val_if_fail (self != NULL, FALSE);
-  g_return_val_if_fail (result != NULL, FALSE);
+  g_return_val_if_fail (self != NULL, NULL);

  if (self->n_contours == 0)
-    return FALSE;
+    return NULL;

+  contour_offset = 0;
  offset = gsk_path_measure_clamp_distance (self, distance);

  for (i = 0; i < self->n_contours - 1; i++)
@@ -273,6 +352,7 @@ gsk_path_measure_get_point (GskPathMeasure *self,
      if (offset < self->measures[i].length)
        break;

+      contour_offset += self->measures[i].length;
      offset -= self->measures[i].length;
    }

@@ -282,46 +362,31 @@ gsk_path_measure_get_point (GskPathMeasure *self,

  contour = gsk_path_get_contour (self->path, i);

-  gsk_contour_get_point (contour, self->measures[i].contour_data, offset, res);
+  point = gsk_path_point_new (self->path);
+  gsk_contour_get_point (contour, self->measures[i].contour_data, offset, point);

-  res->path = self->path;
-  res->contour = i;
-
-  return TRUE;
+  return point;
 }

-/**
- * gsk_path_point_get_distance:
- * @measure: a `GskPathMeasure`
- * @point: a `GskPathPoint on the path of @self
- *
- * Returns the distance from the beginning of the path
- * to @point.
- *
- * Returns: the distance of @point
- *
- * Since: 4.14
- */
 float
-gsk_path_point_get_distance (GskPathMeasure     *measure,
-                             const GskPathPoint *point)
+gsk_path_measure_get_distance (GskPathMeasure *self,
+                               GskPathPoint   *point)
 {
-  GskRealPathPoint *p = (GskRealPathPoint *)point;
-  const GskContour *contour = gsk_path_get_contour (measure->path, p->contour);
+  const GskContour *contour = gsk_path_point_get_contour (point);
  float contour_offset = 0;

-  g_return_val_if_fail (measure != NULL, 0);
-  g_return_val_if_fail (measure->path == p->path, 0);
-  g_return_val_if_fail (contour != NULL, 0);
+  g_return_val_if_fail (self != NULL, 0);
+  g_return_val_if_fail (point != NULL, 0);
+  g_return_val_if_fail (self->path == point->path, 0);

-  for (gsize i = 0; i < measure->n_contours; i++)
+  for (gsize i = 0; i < self->n_contours; i++)
    {
-      if (contour == gsk_path_get_contour (measure->path, i))
+      if (contour == gsk_path_get_contour (self->path, i))
        return contour_offset + gsk_contour_get_distance (contour,
-                                                          p,
-                                                          measure->measures[i].contour_data);
+                                                          point,
+                                                          self->measures[i].contour_data);

-      contour_offset += measure->measures[i].length;
+      contour_offset += self->measures[i].length;
    }

  g_return_val_if_reached (0);
@@ -31,35 +31,34 @@ G_BEGIN_DECLS

 #define GSK_TYPE_PATH_MEASURE (gsk_path_measure_get_type ())

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GType                   gsk_path_measure_get_type               (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPathMeasure *        gsk_path_measure_new                    (GskPath                *path);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPathMeasure *        gsk_path_measure_new_with_tolerance     (GskPath                *path,
                                                                 float                   tolerance);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPathMeasure *        gsk_path_measure_ref                    (GskPathMeasure         *self);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_measure_unref                  (GskPathMeasure         *self);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPath *               gsk_path_measure_get_path               (GskPathMeasure         *self) G_GNUC_PURE;
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 float                   gsk_path_measure_get_tolerance          (GskPathMeasure         *self) G_GNUC_PURE;

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 float                   gsk_path_measure_get_length             (GskPathMeasure         *self);

-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_measure_get_point              (GskPathMeasure         *self,
-                                                                 float                   distance,
-                                                                 GskPathPoint           *result);
+GDK_AVAILABLE_IN_ALL
+GskPathPoint *          gsk_path_measure_get_point              (GskPathMeasure         *self,
+                                                                 float                   distance);

-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 float                   gsk_path_measure_get_distance           (GskPathMeasure         *self,
-                                                                 const GskPathPoint     *point);
+                                                                 GskPathPoint           *point);

 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskPathMeasure, gsk_path_measure_unref)

@@ -82,17 +82,23 @@ gsk_pathop_foreach (gskpathop          pop,
  switch (gsk_pathop_op (pop))
  {
    case GSK_PATH_MOVE:
-      return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 1, user_data);
+      return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 1, 0, user_data);

    case GSK_PATH_CLOSE:
    case GSK_PATH_LINE:
-      return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 2, user_data);
+      return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 2, 0, user_data);

    case GSK_PATH_QUAD:
-      return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 3, user_data);
+      return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 3, 0, user_data);

    case GSK_PATH_CUBIC:
-      return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 4, user_data);
+      return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 4, 0, user_data);
+
+    case GSK_PATH_CONIC:
+      {
+        const graphene_point_t *pts = gsk_pathop_points (pop);
+        return func (gsk_pathop_op (pop), (graphene_point_t[3]) { pts[0], pts[1], pts[3] }, 3, pts[2].x, user_data);
+      }

    default:
      g_assert_not_reached ();
@@ -128,6 +134,10 @@ gsk_path_builder_pathop_to (GskPathBuilder *builder,
      gsk_path_builder_cubic_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y);
      break;

+    case GSK_PATH_CONIC:
+      gsk_path_builder_conic_to (builder, pts[1].x, pts[1].y, pts[3].x, pts[3].y, pts[2].x);
+      break;
+
    default:
      g_assert_not_reached ();
      break;
@@ -162,6 +172,10 @@ gsk_path_builder_pathop_reverse_to (GskPathBuilder *builder,
      gsk_path_builder_cubic_to (builder, pts[2].x, pts[2].y, pts[1].x, pts[1].y, pts[0].x, pts[0].y);
      break;

+    case GSK_PATH_CONIC:
+      gsk_path_builder_conic_to (builder, pts[1].x, pts[1].y, pts[0].x, pts[0].y, pts[2].x);
+      break;
+
    default:
      g_assert_not_reached ();
      break;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	cf714ab265	tools: Add more commands to gtk4-path-tool Add pathops.	2023-07-25 08:23:52 +03:00
Matthias Clasen	ef122df3e3	gtk-demo: Add a demo for path ops This demo is called Glyphs, since that is what it works with.	2023-07-25 08:23:52 +03:00
Matthias Clasen	ce72ad2e1d	build: Bump the harfbuzz requirement to 4.0 The hb_font_get_glyph_shape api was introduced in 4.0.	2023-07-25 08:23:52 +03:00
Matthias Clasen	b2c0aa18be	Add API for boolean operations on paths The new APIs here are: gsk_path_union gsk_path_intersection gsk_path_difference gsk_path_symmetric_difference gsk_path_simplify	2023-07-25 08:23:52 +03:00
Matthias Clasen	beca8b4a39	Implement boolean operations on paths Implement union, intersection, difference and symmetric difference of two paths, as well as simplification of a single path.	2023-07-25 08:23:52 +03:00
Matthias Clasen	c3275e99a5	gsk: Add gsk_stroke_node_get_stroke_path We will implement stroking by filling the stroke path. Compute the stroke path ahead of time, so we don't have to do it over and over. This may change in the future, at least for simple strokes, so keep this private.	2023-07-25 08:23:52 +03:00
Matthias Clasen	09f8f34583	gtk-demo: Add a curve editor demo This demo is called Curve, for obvious reasons.	2023-07-25 08:23:52 +03:00
Matthias Clasen	776cc6a9ee	gtk-demo: Add a few path benchmarks The Tiger and Graph examples in the fishbowl test path handling.	2023-07-25 08:23:52 +03:00
Matthias Clasen	49c38ca8d9	Add a gallery of tough strokes Each of these defeated the stroker at some point.	2023-07-25 08:23:52 +03:00
Matthias Clasen	910d03c9de	Add an interactive path test This one is for interactive exploring of svg paths. You can enter an SVG path in the entry and hit Enter to see how GSK renders it. If you click the button in the headerbar, you can see what GTK thinks the closest point, tangent and distance are wrt. to the mouse position, and the bounding box of the path. There's also stroke parameters to play with.	2023-07-25 08:23:52 +03:00
Matthias Clasen	c1a86c9911	tools: Add more commands to gtk4-path-tool Add stroking and offsetting.	2023-07-25 08:23:52 +03:00
Matthias Clasen	c460a1a002	Add gsk_path_stroke Implement stroking for paths. The current implementation does not try to handle short segments in the vicinity of sharp joins in any special way, so there can be some artifacts in that situation. There are special-case implementations for rectangle and circle contours, since in many cases the outlines of these contours just consist of two of the same shapes.	2023-07-25 08:23:52 +03:00
Matthias Clasen	c1fd77ed45	Add more curve tests These tests check that gsk_curve_intersect finds the intersections we want and get_bounds returns proper bounding boxes. We also check a few simple cases of offset curves.	2023-07-25 08:23:52 +03:00
Matthias Clasen	42f67d6138	curve: Add gsk_curve_offset This method creates an offset curve from an existing curve by just moving the control points laterally. This will be used in stroking.	2023-07-25 08:23:52 +03:00
Matthias Clasen	3f6074f250	curve: Add gsk_curve_intersect Add a way to find the intersections of two curves. We can handle some curve-line intersections directly, the general case is handled via bisecting. This will be used in stroking and path ops.	2023-07-25 08:23:52 +03:00
Matthias Clasen	e350b1761a	curve: Add utilities for cusps and inflections Add functions to find cusps and inflection points of cubics. These will be used for intersections and in the stroker.	2023-07-25 08:23:52 +03:00
Matthias Clasen	37d8677041	tools: Add gtk4-path-tool This comes in handy for testing, among other things. For now, this supports decomposing, reversing, restricting, rendering and preview.	2023-07-25 08:23:52 +03:00
Benjamin Otte	1d4508a2a0	demos: Add cute maze demo	2023-07-25 08:23:52 +03:00
Benjamin Otte	5260ac6947	demos: Add a text-on-path demo	2023-07-25 08:23:52 +03:00
Benjamin Otte	ea5c4dd1df	demos: Add a simple demo filling a path	2023-07-25 08:23:52 +03:00
Benjamin Otte	50ec9b849e	WIP: css: Replace border rendering code with GskPath The weight is wrong still, I need to compute the correct one to get real 45deg circle corners and not just roughly correct ones.	2023-07-25 08:23:52 +03:00
Matthias Clasen	e619ef4b81	gsk: Add tests for gsk_path_dash	2023-07-25 08:23:52 +03:00
Matthias Clasen	4e976cdd1d	Add gsk_path_dash This is a function like gsk_path_foreach, but it provides a dashed version of the path instead of the original.	2023-07-25 08:23:52 +03:00
Benjamin Otte	a8bd3fdb28	snapshot: Add gtk_snapshot_push_stroke() This is the obvious GtkSnapshot API to go along with the new stroke nodes.	2023-07-25 08:23:52 +03:00
Benjamin Otte	9f981adf67	gsk: Add GskStrokeNode Take a rendernode as source and a GskPath and GskStroke, and fill the area that is covered when stroking the path with the given stroke parameters, like cairo_stroke() would.	2023-07-25 08:23:52 +03:00
Matthias Clasen	e337dd9448	Add gsk_path_get_stroke_bounds This is a help to compute the bounds for stroke nodes. We keep it private for now.	2023-07-25 08:23:52 +03:00
Matthias Clasen	351654bd27	Add GskStroke A GskStroke struct collects the parameters that are needed for stroking a path.	2023-07-25 08:23:52 +03:00
Matthias Clasen	dbf8566538	Add another curve decomposition test This one uses GskPathMeasure to check that our conic approximations look roughly right.	2023-07-25 08:23:52 +03:00
Matthias Clasen	98d77c04d3	Add tests for GskPathMeasure	2023-07-25 08:23:52 +03:00
Matthias Clasen	bfacbc72a0	Add GskPathMeasure GskPathMeasure is an auxiliary object for measuring path lengths.	2023-07-25 08:23:51 +03:00
Benjamin Otte	439f36be9f	gtk: Add gtk_snapshot_push_fill() This is the obvious GtkSnapshot API to go along with the new fill nodes.	2023-07-25 08:23:51 +03:00
Benjamin Otte	ff2007424c	gsk: Add GskFillNode Take a rendernode as source and a GskPath and fill the region in the path just like cairo_fill() would.	2023-07-25 08:23:51 +03:00
Matthias Clasen	fa47f63875	gsk: Add tests for GskPath	2023-07-25 08:23:51 +03:00
Matthias Clasen	3c7f4a141a	gsk: Add tests for GskCurve	2023-07-25 08:23:51 +03:00
Matthias Clasen	90e50b35ee	gsk: Add basic path infrastructure This commit adds GskPath, GskPathPoint and GskPathBuilder. GskPath is a data structure for paths that consists of contours, which in turn might contain Bézier curves. The data structure is inspired by Skia, with separate arrays for points and operations. One advantage of this arrangement is that start and end points are shared between adjacent curves. In addition to the usual contours comprised of Bézier segments, GskPath supports certain special contours directly, such as rectangles, rounded rectangles and circles.	2023-07-25 08:23:51 +03:00
Matthias Clasen	14e3ab9672	Add a bounding box type graphene_rect_t does not quite work for this purpose.	2023-07-23 17:34:51 -04:00