Add rounded rects to the tests

Add gsk_path_builder_add_rounded_rect
For now, this is using gsk_path_builder_svg_arc_to to approximate elliptical arcs.
2023-08-12 16:09:31 -04:00 · 2023-08-12 15:34:54 -04:00 · 2023-08-11 16:42:25 +00:00 · 2023-08-11 12:09:12 -04:00 · 2023-08-11 12:44:00 +00:00 · 2023-08-11 07:24:19 -04:00
35 changed files with 3457 additions and 1714 deletions
--- a/docs/reference/gsk/gsk4.toml.in
+++ b/docs/reference/gsk/gsk4.toml.in
@@ -34,5 +34,11 @@ base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
 [extra]
 content_images = [
  "gtk-logo.svg",
+  "images/caps-dark.png",
+  "images/caps-light.png",
+  "images/join-dark.png",
+  "images/join-light.png",
+  "images/path-dark.png",
+  "images/path-light.png",
 ]
 urlmap_file = "urlmap.js"
--- a/docs/reference/gsk/images/caps-dark.png
+++ b/docs/reference/gsk/images/caps-dark.png
--- a/docs/reference/gsk/images/caps-light.png
+++ b/docs/reference/gsk/images/caps-light.png
--- a/docs/reference/gsk/images/caps.svg
+++ b/docs/reference/gsk/images/caps.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="caps.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="2.1493149"
+     inkscape:cx="438.74445"
+     inkscape:cy="288.69664"
+     inkscape:window-width="1920"
+     inkscape:window-height="1123"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1">
+    <linearGradient
+       id="swatch1"
+       inkscape:swatch="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#000064;stroke-width:1;stroke-miterlimit:0;stroke-dasharray:none"
+       d="m 73.096455,77.084329 c 0,0 6.439436,18.711677 18.172676,26.635721"
+       id="path1"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 94.214979,99.722163 c -4.705477,-3.177832 -9.013472,-9.233699 -11.888672,-14.531169 -2.8752,-5.29748 -4.353516,-9.587833 -4.353516,-9.587833 L 68.51576,78.85704 c 0,0 1.743663,5.064163 5.021484,11.103457 3.277822,6.039297 8.05428,13.302573 15.082031,18.048773"
+       id="path1-1"
+       sodipodi:nodetypes="csccsc" />
+    <path
+       style="fill:none;stroke:#000064;stroke-width:1;stroke-miterlimit:0;stroke-dasharray:none"
+       d="m 112.14213,75.736452 c 0,0 6.43944,18.711675 18.17268,26.635728"
+       id="path1-4"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1"
+       d="m 132.83284,98.590758 c -4.70551,-3.177807 -9.01347,-9.233742 -11.88867,-14.53125 -2.8752,-5.297508 -4.35351,-9.587891 -4.35351,-9.587891 -0.89828,-2.611719 -3.74396,-4.000453 -6.35547,-3.101562 -2.61172,0.898277 -4.00046,3.743958 -3.10157,6.355468 0,0 1.74367,5.064185 5.02149,11.103516 3.27782,6.039331 8.05428,13.302641 15.08203,18.048851"
+       id="path1-4-5"
+       sodipodi:nodetypes="cscccsc" />
+    <path
+       style="fill:none;stroke:#000064;stroke-width:1;stroke-miterlimit:0;stroke-dasharray:none"
+       d="m 154.10911,73.84561 c 0,0 6.43943,18.711677 18.17267,26.63572"
+       id="path1-0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="M 175.16683,96.47344 C 170.46135,93.295592 166.1514,87.239699 163.2762,81.94219 160.401,76.644682 158.92269,72.3543 158.92269,72.3543 l -1.62696,-4.728516 -9.45508,3.253906 1.62696,4.728516 c 0,0 1.74171,5.066138 5.01953,11.105469 3.27782,6.039331 8.05428,13.300675 15.08203,18.046895"
+       id="path1-4-1"
+       sodipodi:nodetypes="csccccsc" />
+  </g>
+</svg>
--- a/docs/reference/gsk/images/join-dark.png
+++ b/docs/reference/gsk/images/join-dark.png
--- a/docs/reference/gsk/images/join-light.png
+++ b/docs/reference/gsk/images/join-light.png
--- a/docs/reference/gsk/images/join.svg
+++ b/docs/reference/gsk/images/join.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="join.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.75989759"
+     inkscape:cx="118.43701"
+     inkscape:cy="570.47161"
+     inkscape:window-width="1920"
+     inkscape:window-height="1123"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#000064;stroke-width:1;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none"
+       d="m 12.748727,122.15935 c 4.449842,-15.44496 4.175632,-15.92044 16.908788,-26.568585 0,0 8.478091,16.421195 35.150804,33.660325"
+       id="path1"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 17.59375,123.72266 c 3.810222,-13.2249 3.591775,-14.13123 11.107422,-20.53516 1.289688,1.82186 2.604788,3.71164 4.800781,6.23242 5.743296,6.59272 14.891452,15.32766 28.632813,24.20899 M 67.5625,125.23047 C 54.631174,116.87268 46.204933,108.77726 41.041016,102.84961 35.877098,96.921954 34.140625,93.474609 34.140625,93.474609 l -2.861328,-5.544922 -4.789063,4.003907 C 13.673794,102.6514 12.411529,105.58692 7.984375,120.95313"
+       id="path1-3"
+       sodipodi:nodetypes="ccsccscccc" />
+    <path
+       style="fill:none;stroke:#000064;stroke-width:1;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none"
+       d="m 147.99215,122.60257 c 4.44988,-15.44499 4.17566,-15.92048 16.90889,-26.568657 0,0 8.47814,16.421267 35.15101,33.660397"
+       id="path1-5"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 152.79687,123.98633 c 3.81053,-13.22586 3.59005,-14.12993 11.10743,-20.53516 1.28968,1.82184 2.6029,3.71173 4.79882,6.23242 5.74333,6.59274 14.89333,15.32961 28.63477,24.21094 m 5.42773,-8.40039 c -12.9314,-8.35778 -21.35753,-16.45123 -26.52148,-22.37891 -5.16395,-5.927668 -6.90039,-9.374996 -6.90039,-9.374996 l -7.65039,-1.541015 C 148.87685,102.91706 147.61469,105.85252 143.1875,121.21875"
+       id="path1-5-8"
+       sodipodi:nodetypes="ccsccsccc" />
+    <path
+       style="fill:none;stroke:#000064;stroke-width:1;stroke-linecap:square;stroke-miterlimit:10;stroke-dasharray:none"
+       d="m 79.729342,122.0734 c 4.449844,-15.44499 4.175634,-15.92048 16.908794,-26.568654 0,0 8.478114,16.421264 35.150984,33.660394"
+       id="path1-7"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="color:#000000;fill:none;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 84.533203,123.19336 c 3.810222,-13.22495 3.591776,-14.1312 11.107422,-20.53516 1.289696,1.82187 2.604775,3.71164 4.800785,6.23243 5.74333,6.59275 14.89136,15.32765 28.63281,24.20898 m 5.42969,-8.39844 c -12.93141,-8.35778 -21.35949,-16.45122 -26.52344,-22.3789 -5.16395,-5.927686 -6.90039,-9.375004 -6.90039,-9.375004 -0.69636,-1.348401 -1.967393,-2.307601 -3.45508,-2.607422 -1.487509,-0.300132 -3.03083,0.09145 -4.195313,1.064453 C 80.61325,102.12215 79.350982,105.05756 74.923828,120.42383"
+       id="path1-7-4"
+       sodipodi:nodetypes="ccsccscccc" />
+  </g>
+</svg>
--- a/docs/reference/gsk/images/path-dark.png
+++ b/docs/reference/gsk/images/path-dark.png
--- a/docs/reference/gsk/images/path-light.png
+++ b/docs/reference/gsk/images/path-light.png
--- a/docs/reference/gsk/images/path.svg
+++ b/docs/reference/gsk/images/path.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="path.svg"
+   inkscape:export-filename="path-dark.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.75989759"
+     inkscape:cx="397.42198"
+     inkscape:cy="561.25984"
+     inkscape:window-width="1920"
+     inkscape:window-height="1123"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="M 128.28233,149.47912 154.23127,90.244656 86.340809,68.820468"
+       id="path3" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1"
+       d="m 33.956804,113.31099 c -9.049189,-11.90893 5.40551,-40.570358 20.351208,-39.990271 26.687501,1.035822 4.06495,71.984581 30.695656,74.009711 19.642072,1.49368 41.962402,-34.42048 30.634382,-50.536241 C 99.663884,74.068616 50.763019,135.42833 33.956804,113.31099 Z"
+       id="path1"
+       sodipodi:nodetypes="sssss" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       id="path2"
+       cx="34.517788"
+       cy="113.66589"
+       r="1.5" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
+       id="path2-8"
+       cx="55.045853"
+       cy="73.566689"
+       r="1.5" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
+       id="path2-8-5"
+       cx="55.045834"
+       cy="73.831245"
+       r="1.5" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       id="path2-8-9"
+       cx="55.045834"
+       cy="73.831245"
+       r="1.5" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       id="path2-8-9-7"
+       cx="86.398613"
+       cy="68.897667"
+       r="1.5" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       id="path2-8-9-7-8"
+       cx="153.87553"
+       cy="90.112595"
+       r="1.5" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000064;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none"
+       id="path2-8-7"
+       cx="84.803238"
+       cy="147.51736"
+       r="1.5" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       id="path2-8-7-2"
+       cx="115.28235"
+       cy="96.705284"
+       r="1.5" />
+    <circle
+       style="fill:#ff0404;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       id="path2-8-9-7-9"
+       cx="127.92362"
+       cy="150.03427"
+       r="1.5" />
+  </g>
+</svg>
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2857,7 +2857,10 @@ gdk_event_translate (MSG *msg,
      break;

    case WM_SYSCOMMAND:
-      switch (msg->wParam)
+      /* From: https://learn.microsoft.com/en-us/windows/win32/menurc/wm-syscommand?redirectedfrom=MSDN
+       * To obtain the correct result when testing the value of wParam,
+       * an application must combine the value 0xFFF0 with the wParam value by using the bitwise AND operator. */
+      switch (msg->wParam & 0xFFF0)
 	{
 	case SC_MINIMIZE:
 	case SC_RESTORE:
@@ -2964,6 +2967,14 @@ gdk_event_translate (MSG *msg,
                  windowpos = (WINDOWPOS *) msg->lParam;
                  windowpos->cx = our_mmi.ptMaxSize.x;
                  windowpos->cy = our_mmi.ptMaxSize.y;
+
+                  if (!_gdk_win32_surface_lacks_wm_decorations (window) &&
+                      !(windowpos->flags & SWP_NOCLIENTSIZE) &&
+                      window->width == impl->next_layout.configured_width &&
+                      window->height == impl->next_layout.configured_height)
+                    {
+                      impl->inhibit_configure = TRUE;
+                    }
                }

              impl->maximizing = FALSE;
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -1230,18 +1230,11 @@ get_effective_window_decorations (GdkSurface       *window,

      *decoration |= GDK_DECOR_MINIMIZE;

-      return TRUE;
-    }
-  else if (impl->hint_flags & GDK_HINT_MAX_SIZE)
-    {
-      *decoration = GDK_DECOR_ALL | GDK_DECOR_MAXIMIZE;
-      *decoration |= GDK_DECOR_MINIMIZE;
-
      return TRUE;
    }
  else
    {
-      *decoration = (GDK_DECOR_ALL | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE);
+      *decoration = GDK_DECOR_ALL;
      return TRUE;
    }

--- a/gsk/gskcontour.c
+++ b/gsk/gskcontour.c
@@ -61,6 +61,7 @@ struct _GskContourClass
  GskContour *          (* reverse)             (const GskContour       *contour);
  int                   (* get_winding)         (const GskContour       *contour,
                                                 const graphene_point_t *point);
+  gsize                 (* get_n_points)        (const GskContour       *contour);
  gboolean              (* get_closest_point)   (const GskContour       *contour,
                                                 const graphene_point_t *point,
                                                 float                   threshold,
@@ -76,6 +77,11 @@ struct _GskContourClass
  float                 (* get_curvature)       (const GskContour       *contour,
                                                 GskRealPathPoint       *point,
                                                 graphene_point_t       *center);
+  void                  (* add_segment)         (const GskContour       *contour,
+                                                 GskPathBuilder         *builder,
+                                                 gboolean                emit_move_to,
+                                                 GskRealPathPoint       *start,
+                                                 GskRealPathPoint       *end);
 };

 /* {{{ Utilities */
@@ -399,6 +405,14 @@ gsk_standard_contour_get_winding (const GskContour       *contour,
  return winding;
 }

+static gsize
+gsk_standard_contour_get_n_points (const GskContour *contour)
+{
+  GskStandardContour *self = (GskStandardContour *) contour;
+
+  return self->n_ops;
+}
+
 static gboolean
 gsk_standard_contour_get_closest_point (const GskContour       *contour,
                                        const graphene_point_t *point,
@@ -420,8 +434,8 @@ gsk_standard_contour_get_closest_point (const GskContour       *contour,
      if (dist <= threshold)
        {
          *out_dist = dist;
-          result->data.std.idx = 0;
-          result->data.std.t = 0;
+          result->idx = 0;
+          result->t = 0;
          return TRUE;
        }

@@ -437,7 +451,8 @@ gsk_standard_contour_get_closest_point (const GskContour       *contour,
        continue;

      gsk_curve_init (&c, self->ops[i]);
-      if (gsk_curve_get_closest_point (&c, point, threshold, &distance, &t))
+      if (gsk_curve_get_closest_point (&c, point, threshold, &distance, &t) &&
+          distance < threshold)
        {
          best_idx = i;
          best_t = t;
@@ -448,8 +463,8 @@ gsk_standard_contour_get_closest_point (const GskContour       *contour,
  if (best_idx != G_MAXUINT)
    {
      *out_dist = threshold;
-      result->data.std.idx = best_idx;
-      result->data.std.t = best_t;
+      result->idx = best_idx;
+      result->t = best_t;
      return TRUE;
    }

@@ -464,14 +479,14 @@ gsk_standard_contour_get_position (const GskContour *contour,
  GskStandardContour *self = (GskStandardContour *) contour;
  GskCurve curve;

-  if (G_UNLIKELY (point->data.std.idx == 0))
+  if (G_UNLIKELY (point->idx == 0))
    {
      *position = self->points[0];
      return;
    }

-  gsk_curve_init (&curve, self->ops[point->data.std.idx]);
-  gsk_curve_get_point (&curve, point->data.std.t, position);
+  gsk_curve_init (&curve, self->ops[point->idx]);
+  gsk_curve_get_point (&curve, point->t, position);
 }

 static void
@@ -485,19 +500,19 @@ gsk_standard_contour_get_tangent (const GskContour *contour,
  gsize idx;
  float t;

-  if (G_UNLIKELY (point->data.std.idx == 0))
+  if (G_UNLIKELY (point->idx == 0))
    {
      graphene_vec2_init (tangent, 1, 0);
      return;
    }

-  idx = point->data.std.idx;
-  t = point->data.std.t;
+  idx = point->idx;
+  t = point->t;

  if (t == 0 && direction == GSK_PATH_START)
    {
      /* Look at the previous segment */
-      if (idx > 0)
+      if (idx > 1)
        {
          idx--;
          t = 1;
@@ -518,7 +533,7 @@ gsk_standard_contour_get_tangent (const GskContour *contour,
        }
      else if (self->flags & GSK_PATH_CLOSED)
        {
-          idx = 0;
+          idx = 1;
          t = 0;
        }
    }
@@ -535,11 +550,76 @@ gsk_standard_contour_get_curvature (const GskContour *contour,
  GskStandardContour *self = (GskStandardContour *) contour;
  GskCurve curve;

-  if (G_UNLIKELY (point->data.std.idx == 0))
+  if (G_UNLIKELY (point->idx == 0))
    return 0;

-  gsk_curve_init (&curve, self->ops[point->data.std.idx]);
-  return gsk_curve_get_curvature (&curve, point->data.std.t, center);
+  gsk_curve_init (&curve, self->ops[point->idx]);
+  return gsk_curve_get_curvature (&curve, point->t, center);
+}
+
+static void
+add_curve (GskCurve       *curve,
+           GskPathBuilder *builder,
+           gboolean       *emit_move_to)
+{
+  if (*emit_move_to)
+    {
+      const graphene_point_t *s;
+
+      s = gsk_curve_get_start_point (curve);
+      gsk_path_builder_move_to (builder, s->x, s->y);
+      *emit_move_to = FALSE;
+    }
+  gsk_curve_builder_to (curve, builder);
+}
+
+static void
+gsk_standard_contour_add_segment (const GskContour *contour,
+                                  GskPathBuilder   *builder,
+                                  gboolean          emit_move_to,
+                                  GskRealPathPoint *start,
+                                  GskRealPathPoint *end)
+{
+  GskStandardContour *self = (GskStandardContour *) contour;
+  GskCurve c, c1, c2;
+
+  gsk_curve_init (&c, self->ops[start->idx]);
+
+  if (start->idx == end->idx)
+    {
+      gsk_curve_segment (&c, start->t, end->t, &c1);
+      add_curve (&c1, builder, &emit_move_to);
+      return;
+    }
+  if (start->t == 0)
+    {
+      add_curve (&c, builder, &emit_move_to);
+    }
+  else if (start->t < 1)
+    {
+      gsk_curve_split (&c, start->t, &c1, &c2);
+      add_curve (&c2, builder, &emit_move_to);
+    }
+
+  for (gsize i = start->idx + 1; i < end->idx; i++)
+    {
+      gsk_curve_init (&c, self->ops[i]);
+      add_curve (&c, builder, &emit_move_to);
+    }
+
+  gsk_curve_init (&c, self->ops[end->idx]);
+  if (c.op == GSK_PATH_CLOSE)
+    c.op = GSK_PATH_LINE;
+
+  if (end->t == 1)
+    {
+      add_curve (&c, builder, &emit_move_to);
+    }
+  else if (end->t > 0)
+    {
+      gsk_curve_split (&c, end->t, &c1, &c2);
+      add_curve (&c, builder, &emit_move_to);
+    }
 }

 static const GskContourClass GSK_STANDARD_CONTOUR_CLASS =
@@ -556,10 +636,12 @@ static const GskContourClass GSK_STANDARD_CONTOUR_CLASS =
  gsk_standard_contour_foreach,
  gsk_standard_contour_reverse,
  gsk_standard_contour_get_winding,
+  gsk_standard_contour_get_n_points,
  gsk_standard_contour_get_closest_point,
  gsk_standard_contour_get_position,
  gsk_standard_contour_get_tangent,
  gsk_standard_contour_get_curvature,
+  gsk_standard_contour_add_segment,
 };

 /* You must ensure the contour has enough size allocated,
@@ -706,6 +788,12 @@ gsk_contour_get_closest_point (const GskContour       *self,
  return self->klass->get_closest_point (self, point, threshold, result, out_dist);
 }

+gsize
+gsk_contour_get_n_points (const GskContour *self)
+{
+  return self->klass->get_n_points (self);
+}
+
 void
 gsk_contour_get_position (const GskContour *self,
                          GskRealPathPoint *point,
@@ -731,6 +819,16 @@ gsk_contour_get_curvature (const GskContour *self,
  return self->klass->get_curvature (self, point, center);
 }

+void
+gsk_contour_add_segment (const GskContour *self,
+                         GskPathBuilder   *builder,
+                         gboolean          emit_move_to,
+                         GskRealPathPoint *start,
+                         GskRealPathPoint *end)
+{
+  self->klass->add_segment (self, builder, emit_move_to, start, end);
+}
+
 /* }}} */

 /* vim:set foldmethod=marker expandtab: */
--- a/gsk/gskcontourprivate.h
+++ b/gsk/gskcontourprivate.h
@@ -57,6 +57,7 @@ void                    gsk_contour_get_start_end               (const GskContou
                                                                 graphene_point_t       *end);
 int                     gsk_contour_get_winding                 (const GskContour       *self,
                                                                 const graphene_point_t *point);
+gsize                   gsk_contour_get_n_points                (const GskContour       *self);
 gboolean                gsk_contour_get_closest_point           (const GskContour       *self,
                                                                 const graphene_point_t *point,
                                                                 float                   threshold,
@@ -72,5 +73,11 @@ void                    gsk_contour_get_tangent                 (const GskContou
 float                   gsk_contour_get_curvature               (const GskContour       *self,
                                                                 GskRealPathPoint       *point,
                                                                 graphene_point_t       *center);
+void                    gsk_contour_add_segment                 (const GskContour       *self,
+                                                                 GskPathBuilder         *builder,
+                                                                 gboolean                emit_move_to,
+                                                                 GskRealPathPoint       *start,
+                                                                 GskRealPathPoint       *end);
+

 G_END_DECLS
--- a/gsk/gskenums.h
+++ b/gsk/gskenums.h
@@ -1,5 +1,5 @@
 /* GSK - The GTK Scene Kit
- * Copyright 2016  Endless 
+ * Copyright 2016  Endless
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -42,8 +42,6 @@
 * @GSK_REPEAT_NODE: A node that repeats the child's contents
 * @GSK_CLIP_NODE: A node that clips its child to a rectangular area
 * @GSK_ROUNDED_CLIP_NODE: A node that clips its child to a rounded rectangle
- * @GSK_FILL_NODE: A node that fills a path
- * @GSK_STROKE_NODE: A node that strokes a path
 * @GSK_SHADOW_NODE: A node that draws a shadow below its child
 * @GSK_BLEND_NODE: A node that blends two children together
 * @GSK_CROSS_FADE_NODE: A node that cross-fades between two children
@@ -53,7 +51,9 @@
 * @GSK_GL_SHADER_NODE: A node that uses OpenGL fragment shaders to render
 * @GSK_TEXTURE_SCALE_NODE: A node drawing a `GdkTexture` scaled and filtered (Since: 4.10)
 * @GSK_MASK_NODE: A node that masks one child with another (Since: 4.10)
- 
+ * @GSK_FILL_NODE: A node that fills a path
+ * @GSK_STROKE_NODE: A node that strokes a path
+
 * The type of a node determines what the node is rendering.
 */
 typedef enum {
@@ -76,8 +76,6 @@ typedef enum {
  GSK_REPEAT_NODE,
  GSK_CLIP_NODE,
  GSK_ROUNDED_CLIP_NODE,
-  GSK_FILL_NODE,
-  GSK_STROKE_NODE,
  GSK_SHADOW_NODE,
  GSK_BLEND_NODE,
  GSK_CROSS_FADE_NODE,
@@ -86,7 +84,9 @@ typedef enum {
  GSK_DEBUG_NODE,
  GSK_GL_SHADER_NODE,
  GSK_TEXTURE_SCALE_NODE,
-  GSK_MASK_NODE
+  GSK_MASK_NODE,
+  GSK_FILL_NODE,
+  GSK_STROKE_NODE
 } GskRenderNodeType;

 /**
@@ -220,6 +220,11 @@ typedef enum {
 *
 * The default line cap style is `GSK_LINE_CAP_BUTT`.
 *
+ * <picture>
+ *   <source srcset="caps-dark.png" media="(prefers-color-scheme: dark)">
+ *   <img alt="Line Cap Styles" src="caps-light.png">
+ * </picture>
+ *
 * New entries may be added in future versions.
 *
 * Since: 4.14
@@ -242,6 +247,11 @@ typedef enum {
 *
 * The default line join style is `GSK_LINE_JOIN_MITER`.
 *
+ * <picture>
+ *   <source srcset="join-dark.png" media="(prefers-color-scheme: dark)">
+ *   <img alt="Line Join Styles" src="join-light.png">
+ * </picture>
+ *
 * New entries may be added in future versions.
 *
 * Since: 4.14
--- a/gsk/gskpath.c
+++ b/gsk/gskpath.c
@@ -30,18 +30,26 @@
 * GskPath:
 *
 * A `GskPath` describes lines and curves that are more complex
- * than simple rectangles. Paths can used for rendering (filling or
- * stroking) and for animations (e.g. as trajectories).
+ * than simple rectangles.
+ *
+ * Paths can used for rendering (filling or stroking) and for animations
+ * (e.g. as trajectories).
 *
 * `GskPath` is an immutable, opaque, reference-counted struct.
- * After creation, you cannot change the types it represents.
- * Instead, new `GskPath` objects have to be created.
- *
- * The [struct@Gsk.PathBuilder] structure is meant to help in this endeavor.
+ * After creation, you cannot change the types it represents. 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.
+ *
+ * <picture>
+ *   <source srcset="path-dark.png" media="(prefers-color-scheme: dark)">
+ *   <img alt="A Path" src="path-light.png">
+ * </picture>
+ *
+ * Since: 4.14
 */

 struct _GskPath
@@ -420,6 +428,7 @@ gsk_path_get_bounds (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_stroke_bounds (GskPath         *self,
@@ -490,6 +499,72 @@ gsk_path_in_fill (GskPath                *self,
    }
 }

+/**
+ * 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;
+
+  res->contour = 0;
+  res->idx = 1;
+  res->t = 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;
+
+  res->contour = self->n_contours - 1;
+  res->idx = gsk_contour_get_n_points (self->contours[self->n_contours - 1]) - 1;
+  res->t = 1;
+
+  return TRUE;
+}
+
 /**
 * gsk_path_get_closest_point:
 * @self: a `GskPath`
@@ -532,7 +607,6 @@ gsk_path_get_closest_point (GskPath                *self,
        {
          found = TRUE;
          res->contour = i;
-          res->path = self;
          threshold = distance;
        }
    }
@@ -939,6 +1013,22 @@ parse_circle (const char **p,
 * [SVG path syntax](https://www.w3.org/TR/SVG11/paths.html#PathData),
 * as e.g. produced by [method@Gsk.Path.to_string].
 *
+ * A high-level summary of the syntax:
+ *
+ * - `M x y` Move to `(x, y)`
+ * - `L x y` Add a line from the current point to `(x, y)`
+ * - `Q x1 y1 x2 y2` Add a quadratic Bézier from the current point to `(x2, y2)`, with control point `(x1, y1)`
+ * - `C x1 y1 x2 y2 x3 y3` Add a cubic Bézier from the current point to `(x3, y3)`, with control points `(x1, y1)` and `(x2, y2)`
+ * - `Z` Close the contour by drawing a line back to the start point
+ * - `H x` Add a horizontal line from the current point to the given x value
+ * - `V y` Add a vertical line from the current point to the given y value
+ * - `T x2 y2` Add a quadratic Bézier, using the reflection of the previous segments' control point as control point
+ * - `S x2 y2 x3 y3` Add a cubic Bézier, using the reflection of the previous segments' second control point as first control point
+ * - `A rx ry r l s x y` Add an elliptical arc from the current point to `(x, y)` with radii rx and ry. See the SVG documentation for how the other parameters influence the arc.
+ *
+ * All the commands have lowercase variants that interpret coordinates
+ * relative to the current point.
+ *
 * Returns: (nullable): a new `GskPath`, or `NULL`
 *   if @string could not be parsed
 *
--- a/gsk/gskpath.h
+++ b/gsk/gskpath.h
@@ -41,6 +41,8 @@ G_BEGIN_DECLS
 * By default, [method@Gsk.Path.foreach] will only emit a path with all operations
 * flattened to straight lines to allow for maximum compatibility. The only
 * operations emitted will be `GSK_PATH_MOVE`, `GSK_PATH_LINE` and `GSK_PATH_CLOSE`.
+ *
+ * Since: 4.14
 */
 typedef enum
 {
@@ -110,6 +112,13 @@ gboolean                gsk_path_in_fill                        (GskPath
                                                                 const graphene_point_t *point,
                                                                 GskFillRule             fill_rule);

+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
 gboolean                gsk_path_get_closest_point              (GskPath                *self,
                                                                 const graphene_point_t *point,
--- a/gsk/gskpathbuilder.c
+++ b/gsk/gskpathbuilder.c
@@ -54,6 +54,9 @@
 * either common shapes like [method@Gsk.PathBuilder.add_circle]
 * or by adding from other paths like [method@Gsk.PathBuilder.add_path].
 *
+ * The `gsk_path_builder_add_*` methods always add complete contours,
+ * and do not use or modify the current point.
+ *
 * The other option is to define each line and curve manually with
 * the `gsk_path_builder_*_to` group of functions. You start with
 * a call to [method@Gsk.PathBuilder.move_to] to set the starting point
@@ -63,6 +66,8 @@
 * back with a line to the starting point.
 *
 * This is similar for how paths are drawn in Cairo.
+ *
+ * Since: 4.14
 */

 struct _GskPathBuilder
@@ -388,9 +393,13 @@ void
 gsk_path_builder_add_cairo_path (GskPathBuilder     *self,
                                 const cairo_path_t *path)
 {
+  graphene_point_t current;
+
  g_return_if_fail (self != NULL);
  g_return_if_fail (path != NULL);

+  current = self->current_point;
+
  for (gsize i = 0; i < path->num_data; i += path->data[i].header.length)
    {
      const cairo_path_data_t *data = &path->data[i];
@@ -421,6 +430,9 @@ gsk_path_builder_add_cairo_path (GskPathBuilder     *self,
          break;
        }
    }
+
+  gsk_path_builder_end_current (self);
+  self->current_point = current;
 }

 /**
@@ -442,8 +454,12 @@ void
 gsk_path_builder_add_rect (GskPathBuilder        *self,
                           const graphene_rect_t *rect)
 {
+  graphene_point_t current;
+
  g_return_if_fail (self != NULL);

+  current = self->current_point;
+
  gsk_path_builder_move_to (self, rect->origin.x, rect->origin.y);

  gsk_path_builder_rel_line_to (self, rect->size.width, 0);
@@ -451,6 +467,77 @@ gsk_path_builder_add_rect (GskPathBuilder        *self,
  gsk_path_builder_rel_line_to (self, - rect->size.width, 0);

  gsk_path_builder_close (self);
+  self->current_point = current;
+}
+
+/**
+ * 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)
+{
+  graphene_point_t current;
+
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (rect != NULL);
+
+  current = self->current_point;
+
+  gsk_path_builder_move_to (self,
+                            rect->bounds.origin.x + rect->corner[GSK_CORNER_TOP_LEFT].width,
+                            rect->bounds.origin.y);
+  /* top */
+  gsk_path_builder_line_to (self,
+                            rect->bounds.origin.x + rect->bounds.size.width - rect->corner[GSK_CORNER_TOP_RIGHT].width,
+                            rect->bounds.origin.y);
+  /* topright corner */
+  gsk_path_builder_svg_arc_to (self,
+                               rect->corner[GSK_CORNER_TOP_RIGHT].width,
+                               rect->corner[GSK_CORNER_TOP_RIGHT].height,
+                               0, FALSE, TRUE,
+                               rect->bounds.origin.x + rect->bounds.size.width,
+                               rect->bounds.origin.y + rect->corner[GSK_CORNER_TOP_RIGHT].height);
+  /* right */
+  gsk_path_builder_line_to (self,
+                            rect->bounds.origin.x + rect->bounds.size.width,
+                            rect->bounds.origin.y + rect->bounds.size.height - rect->corner[GSK_CORNER_BOTTOM_RIGHT].height);
+  /* bottomright corner */
+  gsk_path_builder_svg_arc_to (self,
+                               rect->corner[GSK_CORNER_BOTTOM_RIGHT].width,
+                               rect->corner[GSK_CORNER_BOTTOM_RIGHT].height,
+                               0, FALSE, TRUE,
+                               rect->bounds.origin.x + rect->bounds.size.width - rect->corner[GSK_CORNER_BOTTOM_RIGHT].width,
+                               rect->bounds.origin.y + rect->bounds.size.height);
+  /* bottom */
+  gsk_path_builder_line_to (self,
+                            rect->bounds.origin.x + rect->corner[GSK_CORNER_BOTTOM_LEFT].width,
+                            rect->bounds.origin.y + rect->bounds.size.height);
+  /* bottomleft corner */
+  gsk_path_builder_svg_arc_to (self,
+                               rect->corner[GSK_CORNER_BOTTOM_LEFT].width,
+                               rect->corner[GSK_CORNER_BOTTOM_LEFT].height,
+                               0, FALSE, TRUE,
+                               rect->bounds.origin.x,
+                               rect->bounds.origin.y + rect->bounds.size.height - rect->corner[GSK_CORNER_BOTTOM_LEFT].height);
+  /* left */
+  gsk_path_builder_line_to (self,
+                            rect->bounds.origin.x,
+                            rect->bounds.origin.y + rect->corner[GSK_CORNER_TOP_LEFT].height);
+  /* topleft corner */
+  gsk_path_builder_svg_arc_to (self,
+                               rect->corner[GSK_CORNER_TOP_LEFT].width,
+                               rect->corner[GSK_CORNER_TOP_LEFT].height,
+                               0, FALSE, TRUE,
+                               rect->bounds.origin.x + rect->corner[GSK_CORNER_TOP_LEFT].width,
+                               rect->bounds.origin.y);
+  /* done */
+  gsk_path_builder_close (self);
+  self->current_point = current;
 }

 static gboolean
@@ -482,16 +569,22 @@ gsk_path_builder_add_circle (GskPathBuilder         *self,
                             const graphene_point_t *center,
                             float                   radius)
 {
+  graphene_point_t current;
+
  g_return_if_fail (self != NULL);
  g_return_if_fail (center != NULL);
  g_return_if_fail (radius > 0);

+  current = self->current_point;
+
  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);
+
  gsk_path_builder_close (self);
+  self->current_point = current;
 }

 /**
@@ -983,3 +1076,81 @@ gsk_path_builder_add_layout (GskPathBuilder *self,
  cairo_destroy (cr);
  cairo_surface_destroy (surface);
 }
+
+/**
+ * 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
+ *
+ * Adds to @self the segment of @path from @start to @end.
+ *
+ * If @start is equal to or 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.
+ *
+ * Note that this method always adds a path with the given start point
+ * and end point. To add a closed path, use [method@Gsk.PathBuilder.add_path].
+ *
+ * Since: 4.14
+ */
+void
+gsk_path_builder_add_segment (GskPathBuilder     *self,
+                              GskPath            *path,
+                              const GskPathPoint *start,
+                              const GskPathPoint *end)
+{
+  GskRealPathPoint *s = (GskRealPathPoint *) start;
+  GskRealPathPoint *e = (GskRealPathPoint *) end;
+  const GskContour *contour;
+  gsize n_contours = gsk_path_get_n_contours (path);
+  graphene_point_t current;
+
+  g_return_if_fail (self != NULL);
+  g_return_if_fail (path != NULL);
+  g_return_if_fail (start != NULL);
+  g_return_if_fail (end != NULL);
+  g_return_if_fail (s->contour < n_contours);
+  g_return_if_fail (e->contour < n_contours);
+
+  current = self->current_point;
+
+  contour = gsk_path_get_contour (path, s->contour);
+
+  if (s->contour == e->contour)
+    {
+      if (gsk_path_point_compare (start, end) < 0)
+        {
+          gsk_contour_add_segment (contour, self, TRUE, s, e);
+          goto out;
+        }
+      else if (n_contours == 1)
+        {
+          gsk_contour_add_segment (contour, self, TRUE,
+                                   s,
+                                   &(GskRealPathPoint) { s->contour, gsk_contour_get_n_points (contour) - 1, 1 });
+          gsk_contour_add_segment (contour, self, FALSE,
+                                   &(GskRealPathPoint) { s->contour, 1, 0 },
+                                   e);
+          goto out;
+        }
+    }
+
+  gsk_contour_add_segment (contour, self, TRUE,
+                           s,
+                           &(GskRealPathPoint) { s->contour, gsk_contour_get_n_points (contour) - 1, 1 });
+
+  for (gsize i = (s->contour + 1) % n_contours; i != e->contour; i = (i + 1) % 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,
+                           &(GskRealPathPoint) { e->contour, 1, 0 },
+                           e);
+
+out:
+  gsk_path_builder_end_current (self);
+  self->current_point = current;
+}
--- a/gsk/gskpathbuilder.h
+++ b/gsk/gskpathbuilder.h
@@ -65,10 +65,17 @@ GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_add_rect               (GskPathBuilder         *self,
                                                                 const graphene_rect_t  *rect);
 GDK_AVAILABLE_IN_4_14
+void                    gsk_path_builder_add_rounded_rect       (GskPathBuilder         *self,
+                                                                 const GskRoundedRect   *rect);
+GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_add_circle             (GskPathBuilder         *self,
                                                                 const graphene_point_t *center,
                                                                 float                   radius);
-
+GDK_AVAILABLE_IN_4_14
+void                    gsk_path_builder_add_segment            (GskPathBuilder         *self,
+                                                                 GskPath                *path,
+                                                                 const GskPathPoint     *start,
+                                                                 const GskPathPoint     *end);
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_builder_move_to                (GskPathBuilder         *self,
                                                                 float                   x,
--- a/gsk/gskpathpoint.c
+++ b/gsk/gskpathpoint.c
@@ -39,6 +39,8 @@
 * don't a reference to the path object they are obtained from. It is the
 * callers responsibility to keep a reference to the path as long as the
 * `GskPathPoint` is used.
+ *
+ * Since: 4.14
 */

 G_DEFINE_BOXED_TYPE (GskPathPoint, gsk_path_point,
@@ -64,6 +66,77 @@ gsk_path_point_free (GskPathPoint *point)
  g_free (point);
 }

+/**
+ * gsk_path_point_equal:
+ * @point1: a `GskPathPoint`
+ * @point2: another `GskPathPoint`
+ *
+ * Returns whether the two path points refer to the same
+ * location on all paths.
+ *
+ * Note that the start- and endpoint of a closed contour
+ * will compare nonequal according to this definition.
+ * Use [method@Gsk.Path.is_closed] to find out if the
+ * start- and endpoint of a concrete path refer to the
+ * same location.
+ *
+ * Return: `TRUE` if @point1 and @point2 are equal
+ */
+gboolean
+gsk_path_point_equal (const GskPathPoint *point1,
+                      const GskPathPoint *point2)
+{
+  const GskRealPathPoint *p1 = (const GskRealPathPoint *) point1;
+  const GskRealPathPoint *p2 = (const GskRealPathPoint *) point2;
+
+  if (p1->contour == p2->contour)
+    {
+      if ((p1->idx     == p2->idx     && p1->t == p2->t) ||
+          (p1->idx + 1 == p2->idx     && p1->t == 1 && p2->t == 0) ||
+          (p1->idx     == p2->idx + 1 && p1->t == 0 && p2->t == 1))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * gsk_path_point_compare:
+ * @point1: a `GskPathPoint`
+ * @point2: another `GskPathPoint`
+ *
+ * Returns whether @point1 is before or after @point2.
+ *
+ * Returns: -1 if @point1 is before @point2,
+ *   1 if @point1 is after @point2,
+ *   0 if they are equal
+ */
+int
+gsk_path_point_compare (const GskPathPoint *point1,
+                        const GskPathPoint *point2)
+{
+  const GskRealPathPoint *p1 = (const GskRealPathPoint *) point1;
+  const GskRealPathPoint *p2 = (const GskRealPathPoint *) point2;
+
+  if (gsk_path_point_equal (point1, point2))
+    return 0;
+
+  if (p1->contour < p2->contour)
+    return -1;
+  else if (p1->contour > p2->contour)
+    return 1;
+  else if (p1->idx < p2->idx)
+    return -1;
+  else if (p1->idx > p2->idx)
+    return 1;
+  else if (p1->t < p2->t)
+    return -1;
+  else if (p1->t > p2->t)
+    return 1;
+
+  return 0;
+}
+
 /**
 * gsk_path_point_get_position:
 * @path: a `GskPath`
@@ -81,11 +154,14 @@ gsk_path_point_get_position (GskPath            *path,
                             graphene_point_t   *position)
 {
  GskRealPathPoint *self = (GskRealPathPoint *) point;
-  const GskContour *contour = gsk_path_get_contour (path, self->contour);
+  const GskContour *contour;

-  g_return_if_fail (path == self->path);
-  g_return_if_fail (contour != NULL);
+  g_return_if_fail (path != NULL);
+  g_return_if_fail (point != NULL);
+  g_return_if_fail (position != NULL);
+  g_return_if_fail (self->contour < gsk_path_get_n_contours (path));

+  contour = gsk_path_get_contour (path, self->contour),
  gsk_contour_get_position (contour, self, position);
 }

@@ -114,11 +190,14 @@ gsk_path_point_get_tangent (GskPath            *path,
                            graphene_vec2_t    *tangent)
 {
  GskRealPathPoint *self = (GskRealPathPoint *) point;
-  const GskContour *contour = gsk_path_get_contour (path, self->contour);
+  const GskContour *contour;

-  g_return_if_fail (path == self->path);
-  g_return_if_fail (contour != NULL);
+  g_return_if_fail (path != NULL);
+  g_return_if_fail (point != NULL);
+  g_return_if_fail (tangent != NULL);
+  g_return_if_fail (self->contour < gsk_path_get_n_contours (path));

+  contour = gsk_path_get_contour (path, self->contour),
  gsk_contour_get_tangent (contour, self, direction, tangent);
 }

@@ -126,7 +205,7 @@ gsk_path_point_get_tangent (GskPath            *path,
 * gsk_path_point_get_curvature:
 * @path: a `GskPath`
 * @point: a `GskPathPoint` on @path
- * @center: (out caller-allocates): Return location for
+ * @center: (out caller-allocates) (nullable): Return location for
 *   the center of the osculating circle
 *
 * Calculates the curvature of the path at the point.
@@ -146,10 +225,12 @@ gsk_path_point_get_curvature (GskPath            *path,
                              graphene_point_t   *center)
 {
  GskRealPathPoint *self = (GskRealPathPoint *) point;
-  const GskContour *contour = gsk_path_get_contour (path, self->contour);
+  const GskContour *contour;

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

+  contour = gsk_path_get_contour (path, self->contour);
  return gsk_contour_get_curvature (contour, self, center);
 }
--- a/gsk/gskpathpoint.h
+++ b/gsk/gskpathpoint.h
@@ -48,6 +48,14 @@ GskPathPoint *          gsk_path_point_copy            (GskPathPoint       *poin
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_point_free            (GskPathPoint       *point);

+GDK_AVAILABLE_IN_4_14
+gboolean                gsk_path_point_equal           (const GskPathPoint *point1,
+                                                        const GskPathPoint *point2);
+
+GDK_AVAILABLE_IN_4_14
+int                     gsk_path_point_compare         (const GskPathPoint *point1,
+                                                        const GskPathPoint *point2);
+
 GDK_AVAILABLE_IN_4_14
 void                    gsk_path_point_get_position    (GskPath            *path,
                                                        const GskPathPoint *point,
@@ -64,4 +72,5 @@ float                   gsk_path_point_get_curvature   (GskPath            *path
                                                        const GskPathPoint *point,
                                                        graphene_point_t   *center);

+
 G_END_DECLS
--- a/gsk/gskpathpointprivate.h
+++ b/gsk/gskpathpointprivate.h
@@ -7,15 +7,9 @@ G_BEGIN_DECLS

 struct _GskRealPathPoint
 {
-  GskPath *path;
  gsize contour;
-
-  union {
-    struct {
-      unsigned int idx;
-      float t;
-    } std;
-  } data;
+  gsize idx;
+  float t;
 };

 G_STATIC_ASSERT (sizeof (GskRealPathPoint) <= sizeof (GskPathPoint));
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -3970,7 +3970,7 @@ gsk_repeat_node_draw (GskRenderNode *node,
  scale_x *= width / self->child_bounds.size.width;
  scale_y *= height / self->child_bounds.size.height;
  cairo_surface_set_device_scale (surface, scale_x, scale_y);
-  cairo_surface_set_device_offset (surface, 
+  cairo_surface_set_device_offset (surface,
                                   - self->child_bounds.origin.x * scale_x,
                                   - self->child_bounds.origin.y * scale_y);

@@ -4141,7 +4141,7 @@ gsk_clip_node_diff (GskRenderNode  *node1,
      gsk_render_node_diff_impossible (node1, node2, region);
    }
 }
- 
+
 static void
 gsk_clip_node_class_init (gpointer g_class,
                               gpointer class_data)
@@ -4372,6 +4372,15 @@ gsk_rounded_clip_node_get_clip (const GskRenderNode *node)
 /* }}} */
 /* {{{ GSK_FILL_NODE */

+/**
+ * GskFillNode:
+ *
+ * A render node filling the area given by [struct@Gsk.Path]
+ * and [enum@Gsk.FillRule] with the child node.
+ *
+ * Since: 4.14
+ */
+
 struct _GskFillNode
 {
  GskRenderNode render_node;
@@ -4572,6 +4581,15 @@ gsk_fill_node_get_fill_rule (const GskRenderNode *node)
 /* }}} */
 /* {{{ GSK_STROKE_NODE */

+/**
+ * GskStrokeNode:
+ *
+ * A render node that will fill the area determined by stroking the the given
+ * [struct@Gsk.Path] using the [struct@Gsk.Stroke] attributes.
+ *
+ * Since: 4.14
+ */
+
 struct _GskStrokeNode
 {
  GskRenderNode render_node;
@@ -4670,8 +4688,10 @@ gsk_stroke_node_class_init (gpointer g_class,
 * @path: (transfer none): The path describing the area to stroke
 * @stroke: (transfer none): The stroke attributes to use
 *
- * Creates a #GskRenderNode that will stroke the @child along the given
- * @path using the attributes defined in @stroke.
+ * Creates a #GskRenderNode that will fill the outline generated by stroking
+ * the given @path using the attributes defined in @stroke.
+ *
+ * The area is filled with @child.
 *
 * Returns: (transfer none) (type GskStrokeNode): A new #GskRenderNode
 *
--- a/gsk/gskrendernodeprivate.h
+++ b/gsk/gskrendernodeprivate.h
@@ -14,7 +14,7 @@ typedef struct _GskRenderNodeClass GskRenderNodeClass;
 * We don't add an "n-types" value to avoid having to handle
 * it in every single switch.
 */
-#define GSK_RENDER_NODE_TYPE_N_TYPES    (GSK_MASK_NODE + 1)
+#define GSK_RENDER_NODE_TYPE_N_TYPES    (GSK_STROKE_NODE + 1)

 extern GType gsk_render_node_types[];

--- a/gsk/gskstroke.c
+++ b/gsk/gskstroke.c
@@ -26,6 +26,8 @@
 *
 * A `GskStroke` struct collects the parameters that influence
 * the operation of stroking a path.
+ *
+ * Since: 4.14
 */

 G_DEFINE_BOXED_TYPE (GskStroke, gsk_stroke, gsk_stroke_copy, gsk_stroke_free)
--- a/gtk/gtklistheader.c
+++ b/gtk/gtklistheader.c
@@ -27,9 +27,9 @@
 * `GtkListHeader` is used by list widgets to represent the headers they
 * display.
 *
- * The `GtkListHeader`s are managed just like [class@gtk.ListItem]s via
- * their factory, but provide a different set of properties suitable for
- * managing the header instead of individual items.
+ * `GtkListHeader` objects are managed just like [class@Gtk.ListItem]
+ * objects via their factory, but provide a different set of properties suitable
+ * for managing the header instead of individual items.
 *
 * Since: 4.12
 */
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -27,13 +27,14 @@
 /**
 * GtkListItem:
 *
- * `GtkListItem` is used by list widgets to represent items in a `GListModel`.
+ * `GtkListItem` is used by list widgets to represent items in a
+ * [iface@Gio.ListModel].
 *
- * The `GtkListItem`s are managed by the list widget (with its factory)
+ * `GtkListItem` objects are managed by the list widget (with its factory)
 * and cannot be created by applications, but they need to be populated
 * by application code. This is done by calling [method@Gtk.ListItem.set_child].
 *
- * `GtkListItem`s exist in 2 stages:
+ * `GtkListItem` objects exist in 2 stages:
 *
 * 1. The unbound stage where the listitem is not currently connected to
 *    an item in the list. In that case, the [property@Gtk.ListItem:item]
--- a/gtk/gtkoverlaylayout.c
+++ b/gtk/gtkoverlaylayout.c
@@ -33,12 +33,12 @@
 /**
 * GtkOverlayLayout:
 *
- * `GtkOverlayLayout` is the layout manager used by `GtkOverlay`.
+ * `GtkOverlayLayout` is the layout manager used by [class@Gtk.Overlay].
 *
 * It places widgets as overlays on top of the main child.
 *
 * This is not a reusable layout manager, since it expects its widget
- * to be a `GtkOverlay`. It only listed here so that its layout
+ * to be a `GtkOverlay`. It is only listed here so that its layout
 * properties get documented.
 */

--- a/modules/printbackends/gtkprintbackendcpdb.h
+++ b/modules/printbackends/gtkprintbackendcpdb.h
@@ -23,7 +23,7 @@

 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include "gtkprintbackendprivate.h"
+#include "gtk/print/gtkprintbackendprivate.h"

 G_BEGIN_DECLS

--- a/modules/printbackends/gtkprintercpdb.h
+++ b/modules/printbackends/gtkprintercpdb.h
@@ -21,7 +21,7 @@

 #include <glib-object.h>
 #include <cpdb/cpdb-frontend.h>
-#include <gtk/gtkprinterprivate.h>
+#include <gtk/print/gtkprinterprivate.h>

 G_BEGIN_DECLS

@@ -43,4 +43,4 @@ void                  gtk_printer_cpdb_set_printer_obj        (GtkPrinterCpdb

 G_END_DECLS

-#endif /* __GTK_PRINTER_CPDB_H__ */
+#endif /* __GTK_PRINTER_CPDB_H__ */
--- a/po/es.po
+++ b/po/es.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/testsuite/gsk/path-special-cases.c
+++ b/testsuite/gsk/path-special-cases.c
@@ -423,33 +423,269 @@ test_foreach (void)
 }

 /* Test the basics of the path point api */
+typedef struct _GskRealPathPoint GskRealPathPoint;
+struct _GskRealPathPoint
+{
+  gsize contour;
+  gsize idx;
+  float t;
+};
+
 static void
 test_path_point (void)
 {
  GskPath *path;
  GskPathPoint point;
+  GskRealPathPoint *rp = (GskRealPathPoint *)&point;
  gboolean ret;
  graphene_point_t pos, center;
  graphene_vec2_t t1, t2, mx;
  float curvature;

-  path = gsk_path_parse ("M0,0L100,0L100,100L0,100Z");
+  path = gsk_path_parse ("M 0 0 L 100 0 L 100 100 L 0 100 Z");
+
+  ret = gsk_path_get_start_point (path, &point);
+  g_assert_true (ret);
+
+  g_assert_true (rp->contour == 0);
+  g_assert_true (rp->idx == 1);
+  g_assert_true (rp->t == 0);
+
+  ret = gsk_path_get_end_point (path, &point);
+  g_assert_true (ret);
+
+  g_assert_true (rp->contour == 0);
+  g_assert_true (rp->idx == 4);
+  g_assert_true (rp->t == 1);

  ret = gsk_path_get_closest_point (path, &GRAPHENE_POINT_INIT (200, 200), INFINITY, &point);
  g_assert_true (ret);

+  g_assert_true (rp->contour == 0);
+  g_assert_true (rp->idx == 2);
+  g_assert_true (rp->t == 1);
+
  gsk_path_point_get_position (path, &point, &pos);
  gsk_path_point_get_tangent (path, &point, GSK_PATH_START, &t1);
  gsk_path_point_get_tangent (path, &point, GSK_PATH_END, &t2);
  curvature = gsk_path_point_get_curvature (path, &point, &center);

-  g_print ("%g %g\n", graphene_vec2_get_x (&t1), graphene_vec2_get_y (&t1));
  g_assert_true (graphene_point_equal (&pos, &GRAPHENE_POINT_INIT (100, 100)));
  g_assert_true (graphene_vec2_equal (&t1, graphene_vec2_y_axis ()));
  graphene_vec2_negate (graphene_vec2_x_axis (), &mx);
  g_assert_true (graphene_vec2_equal (&t2, &mx));
  g_assert_true (curvature == 0);

+  ret = gsk_path_get_closest_point (path, &GRAPHENE_POINT_INIT (100, 50), INFINITY, &point);
+  g_assert_true (ret);
+
+  g_assert_true (rp->contour == 0);
+  g_assert_true (rp->idx == 2);
+  g_assert_true (rp->t == 0.5);
+
+  gsk_path_unref (path);
+}
+
+/* Test that gsk_path_builder_add_segment yields the expected results */
+static void
+test_path_segments (void)
+{
+  struct {
+    const char *path;
+    graphene_point_t p1;
+    graphene_point_t p2;
+    const char *result;
+  } tests[] = {
+    {
+      "M 0 0 L 100 0 L 50 50 Z",
+      { 100, 0 },
+      { 50, 50 },
+      "M 100 0 L 50 50"
+    },
+    {
+      "M 0 0 L 100 0 L 50 50 Z",
+      { 50, 0 },
+      { 70, 0 },
+      "M 50 0 L 70 0"
+    },
+    {
+      "M 0 0 L 100 0 L 50 50 Z",
+      { 70, 0 },
+      { 50, 0 },
+      "M 70 0 L 100 0 L 50 50 L 0 0 L 50 0"
+    },
+    {
+      "M 0 0 L 100 0 L 50 50 Z",
+      { 50, 0 },
+      { 50, 50 },
+      "M 50 0 L 100 0 L 50 50"
+    },
+    {
+      "M 0 0 L 100 0 L 50 50 Z",
+      { 100, 0 },
+      { 100, 0 },
+      "M 100 0 L 50 50 L 0 0 L 100 0"
+    }
+  };
+
+  for (unsigned int i = 0; i < G_N_ELEMENTS (tests); i++)
+    {
+      GskPath *path;
+      GskPathPoint p1, p2;
+      GskPathBuilder *builder;
+      GskPath *result;
+      char *str;
+
+      path = gsk_path_parse (tests[i].path);
+      g_assert_true (gsk_path_get_closest_point (path, &tests[i].p1, INFINITY, &p1));
+      g_assert_true (gsk_path_get_closest_point (path, &tests[i].p2, INFINITY, &p2));
+
+      builder = gsk_path_builder_new ();
+      gsk_path_builder_add_segment (builder, path, &p1, &p2);
+      result = gsk_path_builder_free_to_path (builder);
+      str = gsk_path_to_string (result);
+
+      g_assert_cmpstr (str, ==, tests[i].result);
+
+      g_free (str);
+      gsk_path_unref (path);
+    }
+}
+
+static void
+test_bad_in_fill (void)
+{
+  GskPath *path;
+  gboolean inside;
+
+  /* A fat Cantarell W */
+  path = gsk_path_parse ("M -2 694 M 206.1748046875 704 L 390.9371337890625 704 L 551.1888427734375 99.5035400390625 L 473.0489501953125 99.5035400390625 L 649.1048583984375 704 L 828.965087890625 704 L 1028.3077392578125 10 L 857.8111572265625 10 L 710.0489501953125 621.251708984375 L 775.9720458984375 598.426513671875 L 614.5245361328125 14.0489501953125 L 430.2237548828125 14.0489501953125 L 278.6783447265625 602.230712890625 L 330.0909423828125 602.230712890625 L 195.88818359375 10 L 5.7342529296875 10 L 206.1748046875 704 Z");
+
+  /* The midpoint of the right foot of a fat Cantarell X */
+  inside = gsk_path_in_fill (path, &GRAPHENE_POINT_INIT (552.360107, 704.000000), GSK_FILL_RULE_WINDING);
+
+  g_assert_false (inside);
+
+  gsk_path_unref (path);
+}
+
+/* Test that path_in_fill implicitly closes contours. I think this is wrong,
+ * but it is what "everybody" does.
+ */
+static void
+test_unclosed_in_fill (void)
+{
+  GskPath *path;
+
+  path = gsk_path_parse ("M 0 0 L 0 100 L 100 100 L 100 0 Z");
+  g_assert_true (gsk_path_in_fill (path, &GRAPHENE_POINT_INIT (50, 50), GSK_FILL_RULE_WINDING));
+  gsk_path_unref (path);
+
+  path = gsk_path_parse ("M 0 0 L 0 100 L 100 100 L 100 0");
+  g_assert_true (gsk_path_in_fill (path, &GRAPHENE_POINT_INIT (50, 50), GSK_FILL_RULE_WINDING));
+  gsk_path_unref (path);
+}
+
+/* Test that all the gsk_path_builder_add methods close the current
+ * contour in the end and do not change the current point.
+ */
+static void
+test_path_builder_add (void)
+{
+  GskPathBuilder *builder;
+  GskPath *path, *path2;
+  char *s;
+  cairo_path_t *cpath;
+  cairo_surface_t *surface;
+  cairo_t *cr;
+  PangoLayout *layout;
+  GskPathPoint point1, point2;
+
+#define N_ADD_METHODS 8
+
+  path = gsk_path_parse ("M 10 10 L 100 100");
+
+  gsk_path_get_closest_point (path, &GRAPHENE_POINT_INIT (50, 50), INFINITY, &point1);
+  gsk_path_get_end_point (path, &point2);
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 100, 100);
+  cr = cairo_create (surface);
+  cairo_move_to (cr, 10, 10);
+  cairo_line_to (cr, 20, 30);
+  cpath = cairo_copy_path (cr);
+
+  layout = pango_cairo_create_layout (cr);
+  pango_layout_set_text (layout, "ABC", -1);
+
+  for (unsigned int i = 0; i < N_ADD_METHODS; i++)
+    {
+      builder = gsk_path_builder_new ();
+      gsk_path_builder_move_to (builder, 123, 456);
+
+      switch (i)
+        {
+        case 0:
+          gsk_path_builder_add_path (builder, path);
+          break;
+
+        case 1:
+          gsk_path_builder_add_reverse_path (builder, path);
+          break;
+
+        case 2:
+          gsk_path_builder_add_segment (builder, path, &point1, &point2);
+          break;
+
+        case 3:
+          gsk_path_builder_add_cairo_path (builder, cpath);
+          break;
+
+        case 4:
+          gsk_path_builder_add_layout (builder, layout);
+          break;
+
+        case 5:
+          gsk_path_builder_add_rect (builder, &GRAPHENE_RECT_INIT (0, 0, 10, 10));
+          break;
+
+        case 6:
+          {
+            GskRoundedRect rect;
+
+            gsk_rounded_rect_init (&rect,
+                                   &GRAPHENE_RECT_INIT (0, 0, 100, 100),
+                                   &GRAPHENE_SIZE_INIT (10, 20),
+                                   &GRAPHENE_SIZE_INIT (20, 30),
+                                   &GRAPHENE_SIZE_INIT (0, 0),
+                                   &GRAPHENE_SIZE_INIT (10, 10));
+            gsk_path_builder_add_rounded_rect (builder, &rect);
+          }
+          break;
+
+        case 7:
+          gsk_path_builder_add_circle (builder, &GRAPHENE_POINT_INIT (0, 0), 10);
+          break;
+
+        default:
+          g_assert_not_reached ();
+        }
+
+      gsk_path_builder_rel_line_to (builder, 10, 0);
+      path2 = gsk_path_builder_free_to_path (builder);
+
+      s = gsk_path_to_string (path2);
+      g_assert_true (g_str_has_prefix (s, "M 123 456"));
+      g_assert_true (g_str_has_suffix (s, "M 123 456 L 133 456"));
+      g_free (s);
+      gsk_path_unref (path2);
+    }
+
+  g_object_unref (layout);
+
+  cairo_path_destroy (cpath);
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+
  gsk_path_unref (path);
 }

@@ -463,6 +699,10 @@ main (int argc, char *argv[])
  g_test_add_func ("/path/rect", test_rect_path);
  g_test_add_func ("/path/foreach", test_foreach);
  g_test_add_func ("/path/point", test_path_point);
+  g_test_add_func ("/path/segments", test_path_segments);
+  g_test_add_func ("/path/bad-in-fill", test_bad_in_fill);
+  g_test_add_func ("/path/unclosed-in-fill", test_unclosed_in_fill);
+  g_test_add_func ("/path/builder/add", test_path_builder_add);

  return g_test_run ();
 }
--- a/testsuite/gsk/path.c
+++ b/testsuite/gsk/path.c
@@ -582,6 +582,166 @@ test_parse (void)
    }
 }

+#define N_PATHS 3
+static void
+test_in_fill_union (void)
+{
+  GskPath *path, *paths[N_PATHS];
+  GskPathBuilder *builder;
+  guint i, j, k;
+
+  for (i = 0; i < 100; i++)
+    {
+      builder = gsk_path_builder_new ();
+
+      for (k = 0; k < N_PATHS; k++)
+        {
+          paths[k] = create_random_path (G_MAXUINT);
+          gsk_path_builder_add_path (builder, paths[k]);
+        }
+
+      path = gsk_path_builder_free_to_path (builder);
+
+      for (j = 0; j < 100; j++)
+        {
+          graphene_point_t test = GRAPHENE_POINT_INIT (g_test_rand_double_range (-1000, 1000),
+                                                       g_test_rand_double_range (-1000, 1000));
+          GskFillRule fill_rule;
+
+          for (fill_rule = GSK_FILL_RULE_WINDING; fill_rule <= GSK_FILL_RULE_EVEN_ODD; fill_rule++)
+            {
+              guint n_in_fill = 0;
+              gboolean in_fill;
+
+              for (k = 0; k < N_PATHS; k++)
+                {
+                  if (gsk_path_in_fill (paths[k], &test, GSK_FILL_RULE_EVEN_ODD))
+                    n_in_fill++;
+                }
+
+              in_fill = gsk_path_in_fill (path, &test, GSK_FILL_RULE_EVEN_ODD);
+              switch (fill_rule)
+                {
+                case GSK_FILL_RULE_WINDING:
+                  if (n_in_fill == 0)
+                    g_assert_false (in_fill);
+                  else if (n_in_fill == 1)
+                    g_assert_true (in_fill);
+                  /* else we can't say anything because the winding rule doesn't give enough info */
+                  break;
+
+                case GSK_FILL_RULE_EVEN_ODD:
+                  g_assert_cmpint (in_fill, ==, n_in_fill & 1);
+                  break;
+
+                default:
+                  g_assert_not_reached ();
+                  break;
+                }
+            }
+        }
+
+      gsk_path_unref (path);
+
+      for (k = 0; k < N_PATHS; k++)
+        gsk_path_unref (paths[k]);
+    }
+}
+#undef N_PATHS
+
+/* This is somewhat sucky because using foreach breaks up the contours
+ * (like rects and circles) and replaces everything with the standard
+ * contour.
+ * But at least it extensively tests the standard contour.
+ */
+static gboolean
+rotate_path_cb (GskPathOperation        op,
+                const graphene_point_t *pts,
+                gsize                   n_pts,
+                gpointer                user_data)
+{
+  GskPathBuilder **builders = user_data;
+
+  switch (op)
+  {
+    case GSK_PATH_MOVE:
+      gsk_path_builder_move_to (builders[0], pts[0].x, pts[0].y);
+      gsk_path_builder_move_to (builders[1], pts[0].y, -pts[0].x);
+      break;
+
+    case GSK_PATH_CLOSE:
+      gsk_path_builder_close (builders[0]);
+      gsk_path_builder_close (builders[1]);
+      break;
+
+    case GSK_PATH_LINE:
+      gsk_path_builder_line_to (builders[0], pts[1].x, pts[1].y);
+      gsk_path_builder_line_to (builders[1], pts[1].y, -pts[1].x);
+      break;
+
+    case GSK_PATH_QUAD:
+      gsk_path_builder_quad_to (builders[0], pts[1].x, pts[1].y, pts[2].x, pts[2].y);
+      gsk_path_builder_quad_to (builders[1], pts[1].y, -pts[1].x, pts[2].y, -pts[2].x);
+      break;
+
+    case GSK_PATH_CUBIC:
+      gsk_path_builder_cubic_to (builders[0], pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y);
+      gsk_path_builder_cubic_to (builders[1], pts[1].y, -pts[1].x, pts[2].y, -pts[2].x, pts[3].y, -pts[3].x);
+      break;
+
+    default:
+      g_assert_not_reached ();
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void
+test_in_fill_rotated (void)
+{
+  GskPath *path;
+  GskPathBuilder *builders[2];
+  GskPath *paths[2];
+  guint i, j;
+
+#define N_FILL_RULES 2
+  /* if this triggers, you added a new enum value to GskFillRule, so the define above needs
+   * an update */
+  g_assert_null (g_enum_get_value (g_type_class_ref (GSK_TYPE_FILL_RULE), N_FILL_RULES));
+
+  for (i = 0; i < 100; i++)
+    {
+      path = create_random_path (G_MAXUINT);
+      builders[0] = gsk_path_builder_new ();
+      builders[1] = gsk_path_builder_new ();
+      /* Use -1 here because we want all the flags, even future additions */
+      gsk_path_foreach (path, -1, rotate_path_cb, builders);
+      gsk_path_unref (path);
+
+      paths[0] = gsk_path_builder_free_to_path (builders[0]);
+      paths[1] = gsk_path_builder_free_to_path (builders[1]);
+
+      for (j = 0; j < 100; j++)
+        {
+          GskFillRule fill_rule = g_random_int_range (0, N_FILL_RULES);
+          float x = g_test_rand_double_range (-1000, 1000);
+          float y = g_test_rand_double_range (-1000, 1000);
+  
+          g_assert_cmpint (gsk_path_in_fill (paths[0], &GRAPHENE_POINT_INIT (x, y), fill_rule),
+                           ==,
+                           gsk_path_in_fill (paths[1], &GRAPHENE_POINT_INIT (y, -x), fill_rule));
+          g_assert_cmpint (gsk_path_in_fill (paths[0], &GRAPHENE_POINT_INIT (y, x), fill_rule),
+                           ==,
+                           gsk_path_in_fill (paths[1], &GRAPHENE_POINT_INIT (x, -y), fill_rule));
+        }
+
+      gsk_path_unref (paths[0]);
+      gsk_path_unref (paths[1]);
+    }
+#undef N_FILL_RULES
+}
+
 int
 main (int   argc,
      char *argv[])
@@ -590,6 +750,8 @@ main (int   argc,

  g_test_add_func ("/path/create", test_create);
  g_test_add_func ("/path/parse", test_parse);
+  g_test_add_func ("/path/in-fill-union", test_in_fill_union);
+  g_test_add_func ("/path/in-fill-rotated", test_in_fill_rotated);

  return g_test_run ();
 }
--- a/testsuite/gtk/calendar.c
+++ b/testsuite/gtk/calendar.c
@@ -10,7 +10,7 @@ test_calendar_set_day (void)

  cal = gtk_calendar_new ();

-  tz = g_time_zone_new_identifier ("MET");
+  tz = g_time_zone_new_identifier ("Europe/Brussels");
  g_assert_nonnull (tz);
  dt = g_date_time_new (tz, 1970, 3, 1, 0, 0, 0);
  g_assert_nonnull (dt);
Author	SHA1	Message	Date
Matthias Clasen	44bc5a139c	Add rounded rects to the tests	2023-08-12 16:09:31 -04:00
Matthias Clasen	11f48f3c5b	Add gsk_path_builder_add_rounded_rect For now, this is using gsk_path_builder_svg_arc_to to approximate elliptical arcs.	2023-08-12 15:34:54 -04:00
Matthias Clasen	fa4ad1590d	Merge branch 'matthiasc/for-main' into 'main' path: Some documentation improvements See merge request GNOME/gtk!6273	2023-08-11 16:42:25 +00:00
Matthias Clasen	47ddc742fc	path: Some documentation improvements Among other things, add a quick summary of SVG path syntax, and add a few illustrations.	2023-08-11 12:09:12 -04:00
Matthias Clasen	31d994837b	Merge branch 'path-tests-3' into 'main' path builder: Fix add_cairo_path Closes #6011 See merge request GNOME/gtk!6270	2023-08-11 12:44:00 +00:00
Matthias Clasen	83d692e2d3	path: Add tests for gsk_path_builder_add methods Check that they all end the current contour. Fixes: #6011	2023-08-11 07:24:19 -04:00
Matthias Clasen	f2835bb48b	pathbuilder: Treat current point consistently Arrange that none of the 'add' methods change the current point.	2023-08-10 22:56:47 -04:00
Fran Dieguez	857c22db32	Update Galician translation	2023-08-11 00:35:58 +00:00
Matthias Clasen	fff1645060	path builder: Fix add_cairo_path We were forgetting to end the current contour.	2023-08-10 16:08:32 -04:00
Matthias Clasen	4f0c3c81fb	Merge branch 'matthiasc/for-main' into 'main' Matthiasc/for main See merge request GNOME/gtk!6269	2023-08-10 04:28:26 +00:00
Matthias Clasen	421365cfc3	Add more path point tests	2023-08-09 23:55:08 -04:00
Matthias Clasen	59c5b41f3d	Cosmetics	2023-08-09 23:48:50 -04:00
Matthias Clasen	267367355f	Merge branch 'path-fill-tests2' into 'main' Add more path fill tests See merge request GNOME/gtk!6268	2023-08-10 03:10:14 +00:00
Matthias Clasen	0aa3356499	Add more path fill tests These also used to live with measure tests.	2023-08-09 22:47:13 -04:00
Matthias Clasen	14a3b35333	Merge branch 'path-fill-tests' into 'main' Add path fill tests See merge request GNOME/gtk!6267	2023-08-10 02:21:34 +00:00
Matthias Clasen	77def95659	Add path fill tests These used to live with the measure tests, but path_in_fill no longer involves a measure.	2023-08-09 21:50:29 -04:00
Matthias Clasen	4e91cd1155	Merge branch 'matthiasc/for-main' into 'main' pathpoint: Use the right type See merge request GNOME/gtk!6266	2023-08-09 20:37:14 +00:00
Matthias Clasen	2d923d362f	Merge branch 'bilelmoussaoui/gi-gsk' into 'main' gsk/gi: new Path api fixes See merge request GNOME/gtk!6265	2023-08-09 19:40:53 +00:00
Matthias Clasen	b7544636d4	contour: Skip the move When jumping between segments, we always need to skip index 0, since thats the move. This fixes the tangent checks in the rectangle tests.	2023-08-09 15:12:58 -04:00
Matthias Clasen	6220baf230	get_closest_point: Prefer earlier points Only switch to a later point if it is strictly closer than the existing match. This fixes start- vs endpoint confusion in the rectangle tests.	2023-08-09 15:12:52 -04:00
Matthias Clasen	917307a6a4	pathpoint: Use the right type	2023-08-09 14:37:14 -04:00
Matthias Clasen	5f49b7b492	Merge branch 'matthiasc/for-main' into 'main' pathpoint: Clarify docs See merge request GNOME/gtk!6262	2023-08-09 18:36:05 +00:00
Bilal Elmoussaoui	b03abea402	gsk: Don't change the GskRenderNodeType order As we use their values to check that a node can be downcasted to a node type in the Rust bindings such change would break existing code	2023-08-09 20:26:46 +02:00
Bilal Elmoussaoui	d4fcc883cb	gsk/gi: Add missing since annotations & docs	2023-08-09 20:26:46 +02:00
Daniel Boles	ca2a2697d6	Merge branch 'dboles/for-main' into 'main' docs: Add/fix some links; avoid pluralisation See merge request GNOME/gtk!6261	2023-08-09 16:57:19 +00:00
Matthias Clasen	68c6f63e90	pathpoint: Clarify docs Add a paragraph explaining the situation for comparing the start- and endpoint of a closed path.	2023-08-09 11:30:26 -04:00
Daniel Boles	0e89fed8ed	docs: Add/fix some links; avoid pluralisation Appending `s` breaks the [type@NS.Object] notation, so fix that in ListHeader. Add links to ListItem and Overlay, and avoid appending `s` after `backtick`s just for consistency with the [type@NS.Object] issue.	2023-08-09 15:35:12 +01:00
Benjamin Otte	4d726543d0	Merge branch 'path-for-merge-6' into 'main' Simplify GskPathPoint See merge request GNOME/gtk!6260	2023-08-09 14:24:33 +00:00
Matthias Clasen	2bcc998e90	Add tests for gsk_path_builder_add_segment Test at least some of the special cases: - start and end point on the same contour - start and end point on the same segment - end before start	2023-08-09 07:01:01 -04:00
Matthias Clasen	f707185248	Add gsk_path_builder_add_segment With GskPathPoint, we can subset paths without a measure object.	2023-08-09 07:01:01 -04:00
Matthias Clasen	ded30049db	path: Add gsk_path_get_start/end_point These are useful to have, now that we are relying more on GskPathPoint in our api.	2023-08-08 22:05:34 -04:00
Matthias Clasen	5c55e9d11e	Add gsk_path_point_equal/compare These just make sense to have.	2023-08-08 22:05:34 -04:00
Matthias Clasen	c35bb11c18	Simplify GskPathPoint Use simple representation of just { contour index, segment index, t value }	2023-08-08 20:31:56 -04:00
Matthias Clasen	cc19781d27	Merge branch 'cpdb-fix' into 'main' print: Update printerprivate header location for cpdb backend See merge request GNOME/gtk!6259	2023-08-08 23:01:12 +00:00
Jeremy Bícha	08d08678e8	print: Update printerprivate header location for cpdb backend This fixes the print-cpdb build option	2023-08-08 17:55:54 -04:00
Matthias Clasen	11b632a691	Merge branch 'timezone' into 'main' test-calendar: Update timezone name See merge request GNOME/gtk!6258	2023-08-08 19:31:31 +00:00
Jeremy Bícha	4881ef251e	test-calendar: Update timezone name Debian no longer provides the MET timezone but instead provides geographical region and city name	2023-08-08 15:01:42 -04:00
Luca Bacci	5b39abd1a4	Merge branch 'fix-server-side-decorations' into 'main' win32: Fix minimize and maximize buttons missing on ssd Closes #5142 See merge request GNOME/gtk!6052	2023-08-08 15:17:09 +00:00
Daniel Mustieles	f0089097dd	Update Spanish translation	2023-08-08 10:41:17 +00:00
Fran Dieguez	d603925ab2	Update Galician translation	2023-08-08 00:05:18 +00:00
dgsasha	5240d8cdf5	win32: Fix minimize and maximize buttons missing on ssd Completely fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/5142	2023-06-10 23:08:21 -04:00