xxx: Plug a memory leak in GtkPopover

Fix gsk_spline_decompose_arc
For short segments (angle < tolerance), we were not emitting any curve at all when decomposing arc.
2020-12-13 10:30:22 -05:00 · 2020-12-13 10:30:22 -05:00 · 2020-12-13 10:30:22 -05:00 · 2020-12-13 10:30:22 -05:00 · 2020-12-13 10:30:22 -05:00 · 2020-12-11 01:42:17 +01:00
1342 changed files with 157529 additions and 179607 deletions
@@ -24,9 +24,9 @@ variables:
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v28"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v25"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v26"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25"

 .only-default:
  only:
@@ -43,7 +43,6 @@ style-check-diff:
    - .gitlab-ci/run-style-check-diff.sh

 .build-fedora-default:
-  extends: .only-default
  image: $FEDORA_IMAGE
  artifacts:
    when: always
@@ -122,7 +121,6 @@ installed-tests:


 .mingw-defaults:
-  extends: .only-default
  stage: build
  tags:
    - win32-ps
@@ -146,32 +144,6 @@ msys2-mingw64:
    MSYSTEM: "MINGW64"
    CHERE_INVOKING: "yes"

-macos:
-  extends: .only-default
-  only:
-    - branches@GNOME/gtk
-  stage: build
-  tags:
-    - macos
-  needs: []
-  before_script:
-    - bash .gitlab-ci/show-execution-environment.sh
-    - pip3 install --user meson==0.56
-    - pip3 install --user ninja
-    - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
-    - export MESON_FORCE_BACKTRACE=1
-  script:
-    - meson -Dx11-backend=false
-            -Dintrospection=disabled
-            -Dcpp_std=c++11
-            -Dpixman:tests=disabled
-            _build
-    - ninja -C _build
-  artifacts:
-    when: always
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-
 .flatpak-defaults:
  image: $FLATPAK_IMAGE
  stage: flatpak
@@ -290,13 +262,11 @@ reference:
    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true _build
-    - meson compile -C _build
+    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
    - mkdir -p _reference/
-    - mv _build/docs/reference/gdk/gdk4/ _reference/gdk4/
-    - mv _build/docs/reference/gdk/gdk4-x11/ _reference/gdk4-x11/
-    - mv _build/docs/reference/gdk/gdk4-wayland/ _reference/gdk4-wayland/
-    - mv _build/docs/reference/gsk/gsk4/ _reference/gsk4/
-    - mv _build/docs/reference/gtk/gtk4/ _reference/gtk4/
+    - mv _build/docs/reference/gdk/html/ _reference/gdk/
+    - mv _build/docs/reference/gsk/html/ _reference/gsk/
+    - mv _build/docs/reference/gtk/html/ _reference/gtk/
  artifacts:
    paths:
      - _reference
@@ -17,8 +17,8 @@ branch, as well as their available versions.
 ### Checklist for Updating a CI image

 - [ ] Update the `${image}.Dockerfile` file with the dependencies
- - [ ] Run `./run-docker.sh build --base ${image} --version ${number}`
- - [ ] Run `./run-docker.sh push --base ${image} --version ${number}`
+ - [ ] Run `./run-docker.sh build --base ${image} --base-version ${number}`
+ - [ ] Run `./run-docker.sh push --base ${image} --base-version ${number}`
   once the Docker image is built; you may need to log in by using
   `docker login` or `podman login`
 - [ ] Update the `image` keys in the `.gitlab-ci.yml` file with the new
@@ -30,8 +30,8 @@ branch, as well as their available versions.
 - [ ] Write a new `${image}.Dockerfile` with the instructions to set up
   a build environment
 - [ ] Add the `pip3 install meson` incantation
- - [ ] Run `./run-docker.sh build --base ${image} --version ${number}`
- - [ ] Run `./run-docker.sh push --base ${image} --version ${number}`
+ - [ ] Run `./run-docker.sh build --base ${image} --base-version ${number}`
+ - [ ] Run `./run-docker.sh push --base ${image} --base-version ${number}`
 - [ ] Add the new job to `.gitlab-ci.yml` referencing the image
 - [ ] Open a merge request with your changes and let it run

@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:31

 RUN dnf -y install \
    adwaita-icon-theme \
@@ -65,8 +65,7 @@ RUN dnf -y install \
    libxslt \
    mesa-dri-drivers \
    mesa-libEGL-devel \
-    mesa-libGLES-devel \
-    meson \
+    mesa-libwayland-egl-devel \
    ninja-build \
    pango-devel \
    pcre-devel \
@@ -87,3 +86,6 @@ RUN dnf -y install \
    which \
    xorg-x11-server-Xvfb \
 && dnf clean all
+
+RUN pip3 install meson==0.55.3
+
@@ -1,11 +1,6 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25

-RUN dnf -y install \
-        python3-jinja2 \
-        python3-markdown \
-        python3-pygments \
-        python3-toml \
-        python3-typogrify
+RUN dnf -y install pandoc

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25

 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
@@ -32,7 +32,7 @@ while (($# > 0)); do
                list) list=1;;
                help) print_help=1;;
                --base|-b) read_arg base "$@" || shift;;
-                --version|-v) read_arg base_version "$@" || shift;;
+                --base-version) read_arg base_version "$@" || shift;;
                --no-login) no_login=1;;
                *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
        esac
@@ -8,8 +8,7 @@ builddir=$1
 backend=$2

 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0
-export G_SLICE=always-malloc
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp

 case "${backend}" in
  x11)
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -eux -o pipefail
-
-xcodebuild -version || :
-xcodebuild -showsdks || :
-
-system_profiler SPSoftwareDataType || :
@@ -1,13 +1,4 @@
-<!--
-  Please, read the CONTRIBUTING.md guide on how to file a new issue.
-
-  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
-->
 ## Steps to reproduce
-<!--
-  Please, explain the sequence of actions necessary to reproduce the
-  bug
-->

 1. ...
 2. ...
@@ -41,8 +32,5 @@
 ## Additional information
 <!--
 - Screenshots or screen recordings are useful for visual errors
-  - Attaching a screenshot or a video without explaining the current
-    behavior and the actions necessary to reproduce the bug will lead
-    to the bug being closed
 - Please report any warning or message printed on the terminal
 -->
@@ -1,14 +1,4 @@
-<!--
-  Please, read the CONTRIBUTING.md guide on how to file a new issue.
-
-  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
-->
-
 ## Steps to reproduce
-<!--
-  Please, explain the sequence of actions necessary to reproduce the
-  crash
-->

 1. ...
 2. ...
@@ -56,12 +56,6 @@ If the issue includes a crash, you should also include:
 0. the eventual warnings printed on the terminal
 0. a backtrace, obtained with tools such as GDB or LLDB

-It is fine to include screenshots of screen recordings to demonstrate
-an issue that is best to understand visually, but please don't just
-dump screen recordings without further details into issues. It is
-essential that the problem is described in enough detail to reproduce
-it without watching a video.
-
 For small issues, such as:

 - spelling/grammar fixes in the documentation
@@ -17,7 +17,7 @@ license fees or royalties.

 The official download location

-  - https://download.gnome.org/sources/gtk/
+  - https://download.gnome.org/sources/gtk+

 The official web site

@@ -32,9 +32,9 @@ Discussion forum
  - https://discourse.gnome.org/c/platform/core/

 Nightly documentation can be found at
-  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk4/
-  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk4/
-  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk4/
+  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
+  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk/
+  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk/

 Building and installing
 -----------------------
@@ -49,11 +49,11 @@ In order to build GTK you will need:
 You will also need various dependencies, based on the platform you are
 building for:

-  - [GLib](https://download.gnome.org/sources/glib/)
-  - [GdkPixbuf](https://download.gnome.org/sources/gdk-pixbuf/)
-  - [GObject-Introspection](https://download.gnome.org/sources/gobject-introspection/)
-  - [Cairo](https://www.cairographics.org/)
-  - [Pango](https://download.gnome.org/sources/pango/)
+  - [GLib](https://download.gnome.org/sources/glib)
+  - [GdkPixbuf](https://download.gnome.org/sources/gdk-pixbuf)
+  - [GObject-Introspection](https://download.gnome.org/sources/gobject-introspection)
+  - [Cairo](https://www.cairographics.org)
+  - [Pango](https://download.gnome.org/sources/pango)
  - [Epoxy](https://github.com/anholt/libepoxy)
  - [Graphene](https://github.com/ebassi/graphene)
  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
@@ -35,15 +35,15 @@
    "modules" : [
        {
            "name" : "wayland",
-            "buildsystem" : "meson",
+            "buildsystem" : "autotools",
            "builddir" : true,
            "config-opts" : [
-                "-Ddocumentation=false"
+                "--disable-documentation"
            ],
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
+                    "url" : "https://github.com/wayland-project/wayland.git"
                }
            ]
        },
@@ -100,8 +100,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Dbuildtype=debugoptimized"
            ],
            "sources" : [
                {
@@ -35,15 +35,15 @@
    "modules" : [
        {
            "name" : "wayland",
-            "buildsystem" : "meson",
+            "buildsystem" : "autotools",
            "builddir" : true,
            "config-opts" : [
-                "-Ddocumentation=false"
+                "--disable-documentation"
            ],
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
+                    "url" : "https://github.com/wayland-project/wayland.git"
                }
            ]
        },
@@ -100,8 +100,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Dbuildtype=debugoptimized"
            ],
            "sources" : [
                {
@@ -35,15 +35,15 @@
    "modules" : [
        {
            "name" : "wayland",
-            "buildsystem" : "meson",
+            "buildsystem" : "autotools",
            "builddir" : true,
            "config-opts" : [
-                "-Ddocumentation=false"
+                "--disable-documentation"
            ],
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
+                    "url" : "https://github.com/wayland-project/wayland.git"
                }
            ]
        },
@@ -100,8 +100,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Dbuildtype=debugoptimized"
            ],
            "sources" : [
                {
@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-from pathlib import PurePath
-import subprocess
-
-stylesheets = [ 'gtk/theme/Adwaita/Adwaita.css',
-                'gtk/theme/Adwaita/Adwaita-dark.css',
-                'gtk/theme/HighContrast/HighContrast.css',
-                'gtk/theme/HighContrast/HighContrast-dark.css' ]
-
-sourceroot = os.environ.get('MESON_SOURCE_ROOT')
-distroot = os.environ.get('MESON_DIST_ROOT')
-
-for stylesheet in stylesheets:
-  stylesheet_path = PurePath(stylesheet)
-  src = PurePath(sourceroot, stylesheet_path.with_suffix('.scss'))
-  dst = PurePath(distroot, stylesheet_path)
-  subprocess.call(['sassc', '-a', '-M', '-t', 'compact', src, dst])
@@ -1,21 +1,20 @@
 #!/usr/bin/env python3
-
-import os
-import sys
-import subprocess
-
-if 'DESTDIR' not in os.environ:
-    gtk_api_version = sys.argv[1]
-    gtk_abi_version = sys.argv[2]
+
+import os
+import sys
+import subprocess
+
+if 'DESTDIR' not in os.environ:
+    gtk_api_version = sys.argv[1]
+    gtk_abi_version = sys.argv[2]
    gtk_libdir = sys.argv[3]
    gtk_datadir = sys.argv[4]
-    gtk_bindir = sys.argv[5]
-
-    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
-    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
-    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
-
-    print('Compiling GSettings schemas...')
+
+    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
+    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
+    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
+
+    print('Compiling GSettings schemas...')
    glib_compile_schemas = subprocess.check_output(['pkg-config',
                                                   '--variable=glib_compile_schemas',
                                                   'gio-2.0']).strip()
@@ -23,14 +22,13 @@ if 'DESTDIR' not in os.environ:
        # pkg-config variables only available since GLib 2.62.0.
        glib_compile_schemas = 'glib-compile-schemas'
    subprocess.call([glib_compile_schemas,
-                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
-
-    print('Updating icon cache...')
-    update_icon_cache = os.path.join(gtk_bindir, 'gtk4-update-icon-cache')
-    subprocess.call([update_icon_cache, '-q', '-t' ,'-f',
-                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
-
-    print('Updating module cache for print backends...')
+                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
+
+    print('Updating icon cache...')
+    subprocess.call(['gtk4-update-icon-cache', '-q', '-t' ,'-f',
+                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
+
+    print('Updating module cache for print backends...')
    os.makedirs(gtk_printmodule_dir, exist_ok=True)
    gio_querymodules = subprocess.check_output(['pkg-config',
                                                '--variable=gio_querymodules',
@@ -39,7 +37,7 @@ if 'DESTDIR' not in os.environ:
        # pkg-config variables only available since GLib 2.62.0.
        gio_querymodules = 'gio-querymodules'
    subprocess.call([gio_querymodules, gtk_printmodule_dir])
-
-    print('Updating module cache for input methods...')
+
+    print('Updating module cache for input methods...')
    os.makedirs(gtk_immodule_dir, exist_ok=True)
    subprocess.call([gio_querymodules, gtk_immodule_dir])
@@ -8,16 +8,14 @@ constraint_editor_sources = [
 ]

 constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
-  'constraint-editor.gresource.xml',
-  source_dir: '.',
-)
+                                                      'constraint-editor.gresource.xml',
+                                                      source_dir: '.')

 executable('gtk4-constraint-editor',
-  sources: [ constraint_editor_sources, constraint_editor_resources, ],
-  c_args: common_cflags,
-  dependencies: libgtk_dep,
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: false,
-)
+           constraint_editor_sources, constraint_editor_resources,
+           c_args: common_cflags,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: false)
@@ -465,7 +465,7 @@ demo_application_window_size_allocate (GtkWidget *widget,
                                                                          baseline);

  if (!window->maximized && !window->fullscreen)
-    gtk_window_get_default_size (GTK_WINDOW (window), &window->width, &window->height);
+    gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);
 }

 static void
@@ -98,9 +98,6 @@ create_page1 (GtkWidget *assistant)
  gtk_box_append (GTK_BOX (box), label);

  entry = gtk_entry_new ();
-  gtk_accessible_update_relation (GTK_ACCESSIBLE (entry),
-                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                  -1);
  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
  gtk_box_append (GTK_BOX (box), entry);
@@ -20,7 +20,7 @@ mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
  float b = 1.0/distance (pos, p2);
  float sum = r + g + b;

-  float alpha = 1.0 - pow (1.0/(sum), 40.0)*pow (10.0, 40.0*0.7);
+  float alpha = 1.0 - pow (1.0/(sum), 40)*pow (10.0, 40*0.7);

  fragColor = vec4 (r*0.5, g*0.5, b*0.5, 1.0) * alpha;
 }
@@ -177,7 +177,7 @@ float ccell2(vec2 p, float r) {
 float df(vec2 p, float scale, inout vec2 nn) {
  p /= scale;
  nn = hextile(p);
-  nn = floor(nn + 0.5);
+  nn = round(nn);
  float r = hash(nn);

  float d;;
@@ -179,7 +179,7 @@ float ccell2(vec2 p, float r) {
 float df(vec2 p, float scale, inout vec2 nn) {
  p /= scale;
  nn = hextile(p);
-  nn = floor(nn + 0.5);
+  nn = round(nn);
  float r = hash(nn);

  float d;;
@@ -319,6 +319,9 @@
    <file>paintable_svg.c</file>
    <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>
    <file>printing.c</file>
@@ -403,6 +406,9 @@
  <gresource prefix="/fontrendering">
    <file>fontrendering.ui</file>
  </gresource>
+  <gresource prefix="/path_text">
+    <file>path_text.ui</file>
+  </gresource>
  <gresource prefix="/org/gtk/Demo4">
    <file>icons/16x16/actions/application-exit.png</file>
    <file>icons/16x16/actions/document-new.png</file>
@@ -97,9 +97,9 @@ demo3_widget_size_allocate (GtkWidget *widget,

  /* Since we are not using a layout manager (who would do this
   * for us), we need to allocate a size for our menu by calling
-   * gtk_popover_present().
+   * gtk_native_check_resize().
   */
-  gtk_popover_present (GTK_POPOVER (self->menu));
+  gtk_native_check_resize (GTK_NATIVE (self->menu));
 }

 static void
@@ -119,12 +119,13 @@ create_label (void)
 static GtkWidget *
 create_video (void)
 {
-  GtkWidget *w = gtk_video_new ();
+  GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
+  GtkWidget *w = gtk_picture_new_for_paintable (GDK_PAINTABLE (stream));

  gtk_widget_set_size_request (w, 64, 64);
-  gtk_video_set_loop (GTK_VIDEO (w), TRUE);
-  gtk_video_set_autoplay (GTK_VIDEO (w), TRUE);
-  gtk_video_set_resource (GTK_VIDEO (w), "/images/gtk-logo.webm");
+  gtk_media_stream_set_loop (stream, TRUE);
+  gtk_media_stream_play (stream);
+  g_object_unref (stream);

  return w;
 }
@@ -787,8 +787,6 @@ gtk_gears_realize (GtkWidget *widget)
  glLinkProgram(program);
  glGetProgramInfoLog(program, sizeof msg, NULL, msg);
  g_debug ("program info: %s\n", msg);
-  glDetachShader (program, v);
-  glDetachShader (program, f);
  glDeleteShader (v);
  glDeleteShader (f);

@@ -13,7 +13,7 @@ static GtkWidget *window = NULL;
 static GtkWidget *scrolledwindow;
 static int selected;

-#define N_WIDGET_TYPES 8
+#define N_WIDGET_TYPES 7


 static int hincrement = 5;
@@ -110,41 +110,6 @@ populate_text (gboolean highlight)
  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), textview);
 }

-static void
-populate_emoji_text (void)
-{
-  GtkWidget *textview;
-  GtkTextBuffer *buffer;
-  GString *s;
-
-  s = g_string_sized_new (1000 * 30 * 4);
-
-  for (int i = 0; i < 1000; i++)
-    {
-      if (i % 2)
-        g_string_append (s, "x");
-      for (int j = 0; j < 30; j++)
-        g_string_append (s, "💓x");
-      g_string_append (s, "\n");
-    }
-
-  buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_set_text (buffer, s->str, s->len);
-
-  g_string_free (s, TRUE);
-
-  textview = gtk_text_view_new ();
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
-
-  hincrement = 0;
-  vincrement = 5;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), textview);
-}
-
 static void
 populate_image (void)
 {
@@ -259,26 +224,21 @@ set_widget_type (int type)
      break;

    case 3:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling text with Emoji");
-      populate_emoji_text ();
-      break;
-
-    case 4:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a big image");
      populate_image ();
      break;

-    case 5:
+    case 4:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a list");
      populate_list ();
      break;

-    case 6:
+    case 5:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a columned list");
      populate_list2 ();
      break;

-    case 7:
+    case 6:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a grid");
      populate_grid ();
      break;
@@ -39,7 +39,7 @@ create_application_list (void)
 }

 /* This is the function we use for setting up new listitems to display.
- * We add just an #GtkImage and a #GtkLabel here to display the application's
+ * We add just an #GtkImage and a #GtkKabel here to display the application's
 * icon and name, as this is just a simple demo.
 */
 static void
@@ -142,11 +142,11 @@ load_file (GtkStringList *list,
 }

 static void
-open_response_cb (GtkNativeDialog *dialog,
-                  int              response,
-                  GtkStringList   *stringlist)
+open_response_cb (GtkWidget     *dialog,
+                  int            response,
+                  GtkStringList *stringlist)
 {
-  gtk_native_dialog_hide (dialog);
+  gtk_widget_hide (dialog);

  if (response == GTK_RESPONSE_ACCEPT)
    {
@@ -157,24 +157,27 @@ open_response_cb (GtkNativeDialog *dialog,
      g_object_unref (file);
    }

-  gtk_native_dialog_destroy (dialog);
+  gtk_window_destroy (GTK_WINDOW (dialog));
 }

 static void
 file_open_cb (GtkWidget     *button,
              GtkStringList *stringlist)
 {
-  GtkFileChooserNative *dialog;
+  GtkWidget *dialog;

-  dialog = gtk_file_chooser_native_new ("Open file",
+  dialog = gtk_file_chooser_dialog_new ("Open file",
                                        GTK_WINDOW (gtk_widget_get_root (button)),
                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Load",
-                                        "_Cancel");
-  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
+                                        "_Cancel", GTK_RESPONSE_CANCEL,
+                                        "_Load", GTK_RESPONSE_ACCEPT,
+                                        NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);

  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), stringlist);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
+  gtk_widget_show (dialog);
 }

 GtkWidget *
@@ -25,8 +25,6 @@
 #include "demos.h"
 #include "fontify.h"

-#include "demo_conf.h"
-
 static GtkWidget *info_view;
 static GtkWidget *source_view;

@@ -198,20 +196,16 @@ activate_about (GSimpleAction *action,
                          gtk_get_micro_version ());
  g_string_append_printf (s, "\nA link can appear here: <http://www.gtk.org>");

-  version = g_strdup_printf ("%s%s%s\nRunning against GTK %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                             PACKAGE_VERSION,
-                             g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-                             g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "",
                             gtk_get_major_version (),
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());

  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", g_strcmp0 (PROFILE, "devel") == 0
-                                         ? "GTK Demo (Development)"
-                                         : "GTK Demo",
+                         "program-name", "GTK Demo",
                         "version", version,
-                         "copyright", "© 1997—2021 The GTK Team",
+                         "copyright", "© 1997—2020 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK widgets",
@@ -907,9 +901,6 @@ activate (GApplication *app)
  window = (GtkWidget *)gtk_builder_get_object (builder, "window");
  gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (window));

-  if (g_strcmp0 (PROFILE, "devel") == 0)
-    gtk_widget_add_css_class (window, "devel");
-
  action = g_simple_action_new ("run", NULL);
  g_signal_connect (action, "activate", G_CALLBACK (activate_run), window);
  g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (action));
@@ -1052,10 +1043,10 @@ out:
 static void
 print_version (void)
 {
-  g_print ("gtk4-demo %s%s%s\n",
-           PACKAGE_VERSION,
-           g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-           g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "");
+  g_print ("gtk4-demo %d.%d.%d\n",
+           gtk_get_major_version (),
+           gtk_get_minor_version (),
+           gtk_get_micro_version ());
 }

 static int
@@ -53,30 +53,31 @@
    <child>
      <object class="GtkBox">
        <child>
-          <object class="GtkBox">
-            <property name="width-request">220</property>
-            <property name="orientation">vertical</property>
+          <object class="GtkScrolledWindow">
+            <style>
+              <class name="sidebar"/>
+            </style>
+            <property name="width-request">120</property>
+            <property name="hscrollbar-policy">never</property>
+            <property name="min-content-width">150</property>
            <child>
-              <object class="GtkSearchBar" id="searchbar">
-                <property name="key-capture-widget">window</property>
+              <object class="GtkBox">
+                <property name="width-request">220</property>
+                <property name="orientation">vertical</property>
+
                <child>
-                  <object class="GtkSearchEntry" id="search-entry">
-                    <accessibility>
-                      <relation name="controls">listview</relation>
-                    </accessibility>
+                  <object class="GtkSearchBar" id="searchbar">
+                    <property name="key-capture-widget">window</property>
+                    <child>
+                      <object class="GtkSearchEntry" id="search-entry">
+                        <accessibility>
+                          <relation name="controls">listview</relation>
+                        </accessibility>
+                      </object>
+                    </child>
                  </object>
                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <style>
-                  <class name="sidebar"/>
-                </style>
-                <property name="width-request">120</property>
-                <property name="hscrollbar-policy">never</property>
-                <property name="min-content-width">150</property>
-                <property name="vexpand">1</property>
+
                <child>
                  <object class="GtkListView" id="listview">
                    <style>
@@ -93,6 +94,7 @@
                    </accessibility>
                  </object>
                </child>
+
              </object>
            </child>
          </object>
@@ -68,6 +68,9 @@ demos = files([
  'paintable_mediastream.c',
  'panes.c',
  'password_entry.c',
+  'path_fill.c',
+  'path_maze.c',
+  'path_text.c',
  'peg_solitaire.c',
  'pickers.c',
  'printing.c',
@@ -100,33 +103,31 @@ demos = files([

 gtkdemo_deps = [ libgtk_dep, ]

-extra_demo_sources = files([
-  'main.c',
-  'fontify.c',
-  'gtkfishbowl.c',
-  'fontplane.c',
-  'gtkgears.c',
-  'gtkshaderbin.c',
-  'gtkshadertoy.c',
-  'gtkshaderstack.c',
-  'gskshaderpaintable.c',
-  'puzzlepiece.c',
-  'bluroverlay.c',
-  'demoimage.c',
-  'demotaggedentry.c',
-  'demochild.c',
-  'demolayout.c',
-  'demowidget.c',
-  'demo2layout.c',
-  'singular_value_decomposition.c',
-  'four_point_transform.c',
-  'demo2widget.c',
-  'demo3widget.c',
-  'pixbufpaintable.c',
-  'script-names.c',
-  'unicode-names.c',
-  'suggestionentry.c',
-])
+extra_demo_sources = files(['main.c',
+                            'fontify.c',
+                            'gtkfishbowl.c',
+                            'fontplane.c',
+                            'gtkgears.c',
+                            'gtkshaderbin.c',
+                            'gtkshadertoy.c',
+                            'gtkshaderstack.c',
+                            'gskshaderpaintable.c',
+                            'puzzlepiece.c',
+                            'bluroverlay.c',
+                            'demoimage.c',
+                            'demotaggedentry.c',
+                            'demochild.c',
+                            'demolayout.c',
+                            'demowidget.c',
+                            'demo2layout.c',
+                            'singular_value_decomposition.c',
+                            'four_point_transform.c',
+                            'demo2widget.c',
+                            'demo3widget.c',
+                            'pixbufpaintable.c',
+                            'script-names.c',
+                            'unicode-names.c',
+                            'suggestionentry.c'])

 if harfbuzz_dep.found() and pangoft_dep.found()
  demos += files(['font_features.c'])
@@ -149,17 +150,14 @@ endif
 gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]

 demos_h = custom_target('gtk4 demo header',
-  output: 'demos.h',
-  input: demos,
-  command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ],
-)
+                        output: 'demos.h',
+                        input: demos,
+                        command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ])

 gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
-  'demo.gresource.xml',
-  source_dir: '.',
-)
+                                            'demo.gresource.xml',
+                                            source_dir: '.')

-# Use a subset of compiler flags
 demo_cflags = []
 foreach flag: common_cflags
  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
@@ -167,33 +165,31 @@ foreach flag: common_cflags
  endif
 endforeach

-gtkdemo_deps += [ demo_conf_h ]
-
 executable('gtk4-demo',
-  sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
-  c_args: gtkdemo_args + demo_cflags,
-  dependencies: gtkdemo_deps,
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: true,
-)
+           demos, demos_h, extra_demo_sources, gtkdemo_resources,
+           c_args: gtkdemo_args + demo_cflags,
+           dependencies: gtkdemo_deps,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: true)

 executable('gtk4-demo-application',
-  sources: ['application.c', gtkdemo_resources],
-  c_args: gtkdemo_args + common_cflags,
-  dependencies: gtkdemo_deps,
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: true,
-)
+           'application.c', gtkdemo_resources,
+           c_args: gtkdemo_args + common_cflags,
+           dependencies: gtkdemo_deps,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: true)

 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

 foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size, install_dir: icontheme_dir)
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
 endforeach

 # desktop file
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=Development;GTK;
+NoDisplay=true
@@ -13,11 +13,11 @@


 static void
-open_response_cb (GtkNativeDialog *dialog,
-                  int              response,
-                  GtkPicture      *picture)
+open_response_cb (GtkWidget  *dialog,
+                  int         response,
+                  GtkPicture *picture)
 {
-  gtk_native_dialog_hide (dialog);
+  gtk_widget_hide (dialog);

  if (response == GTK_RESPONSE_ACCEPT)
    {
@@ -31,7 +31,7 @@ open_response_cb (GtkNativeDialog *dialog,
      g_object_unref (file);
    }

-  gtk_native_dialog_destroy (dialog);
+  gtk_window_destroy (GTK_WINDOW (dialog));
 }

 static void
@@ -39,20 +39,24 @@ show_file_open (GtkWidget  *button,
                GtkPicture *picture)
 {
  GtkFileFilter *filter;
-  GtkFileChooserNative *dialog;
+  GtkWidget *dialog;

-  dialog = gtk_file_chooser_native_new ("Open node file",
+  dialog = gtk_file_chooser_dialog_new ("Open node file",
                                        GTK_WINDOW (gtk_widget_get_root (button)),
                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Load",
-                                        "_Cancel");
+                                        "_Cancel", GTK_RESPONSE_CANCEL,
+                                        "_Load", GTK_RESPONSE_ACCEPT,
+                                        NULL);

  filter = gtk_file_filter_new ();
  gtk_file_filter_add_mime_type (filter, "image/svg+xml");
  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
-  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), picture);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
+  gtk_widget_show (dialog);
 }

 static GtkWidget *window;
@@ -0,0 +1,359 @@
+/* Path/Fill
+ *
+ * This demo shows how to use PangoCairo to draw text with more than
+ * just a single color.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include "paintable.h"
+#include "gsk/gskpathdashprivate.h"
+
+#define GTK_TYPE_PATH_PAINTABLE (gtk_path_paintable_get_type ())
+G_DECLARE_FINAL_TYPE (GtkPathPaintable, gtk_path_paintable, GTK, PATH_PAINTABLE, GObject)
+
+struct _GtkPathPaintable
+{
+  GObject parent_instance;
+
+  int width;
+  int height;
+  GskPath *path;
+  GdkPaintable *background;
+};
+
+struct _GtkPathPaintableClass
+{
+  GObjectClass parent_class;
+};
+
+static int
+gtk_path_paintable_get_intrinsic_width (GdkPaintable *paintable)
+{
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+  if (self->background)
+    return MAX (gdk_paintable_get_intrinsic_width (self->background), self->width);
+  else
+    return self->width;
+}
+
+static int
+gtk_path_paintable_get_intrinsic_height (GdkPaintable *paintable)
+{
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+  if (self->background)
+    return MAX (gdk_paintable_get_intrinsic_height (self->background), self->height);
+  else
+    return self->height;
+}
+
+static void
+gtk_path_paintable_snapshot (GdkPaintable *paintable,
+                             GdkSnapshot  *snapshot,
+                             double        width,
+                             double        height)
+{
+  GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+#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)
+    {
+      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 GdkPaintableFlags
+gtk_path_paintable_get_flags (GdkPaintable *paintable)
+{
+  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_path_paintable_paintable_init (GdkPaintableInterface *iface)
+{
+  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 (GtkPathPaintable, gtk_path_paintable, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
+                                                gtk_path_paintable_paintable_init))
+
+/* Here's the boilerplate for the GObject declaration.
+ * We don't need to do anything special here, because we keep no
+ * data of our own.
+ */
+static void
+gtk_path_paintable_class_init (GtkPathPaintableClass *klass)
+{
+}
+
+static void
+gtk_path_paintable_init (GtkPathPaintable *self)
+{
+}
+
+/* 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)
+{
+  GtkPathPaintable *self;
+
+  self = g_object_new (GTK_TYPE_PATH_PAINTABLE, NULL);
+  self->path = path;
+  self->background = background;
+  if (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)
+{
+  cairo_surface_t *surface;
+  cairo_t *cr;
+  cairo_path_t *path;
+  PangoLayout *layout;
+  PangoFontDescription *desc;
+  GskPath *result;
+
+  surface = cairo_recording_surface_create (CAIRO_CONTENT_COLOR_ALPHA, NULL);
+  cr = cairo_create (surface);
+
+  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);
+
+  pango_cairo_layout_path (cr, layout);
+  path = cairo_copy_path_flat (cr);
+  result = gsk_path_new_from_cairo (path);
+
+  cairo_path_destroy (path);
+  g_object_unref (layout);
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+
+  return result;
+}
+
+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_CURVE:
+      gsk_path_builder_curve_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;
+  graphene_point_t pos;
+  graphene_vec2_t tangent;
+  GskStroke *stroke;
+
+  builder = gsk_path_builder_new ();
+  gsk_path_builder_add_segment (builder,
+                                measure,
+#if 1
+                                0.0, gsk_path_measure_get_length (measure));
+#else
+                                progress > 1 ? (progress - 1) * gsk_path_measure_get_length (measure) : 0.0,
+                                (progress < 1 ? progress : 1.0) * gsk_path_measure_get_length (measure));
+#endif
+
+  path = gsk_path_builder_free_to_path (builder);
+
+  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);
+  gsk_path_unref (path);
+
+  gsk_path_measure_get_point (measure,
+                              (progress > 1 ? (progress - 1) : progress) * gsk_path_measure_get_length (measure),
+                              &pos,
+                              &tangent);
+  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)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      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);
+
+#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_keep_aspect_ratio (GTK_PICTURE (picture), FALSE);
+      gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
+      g_object_unref (paintable);
+
+      gtk_window_set_child (GTK_WINDOW (window), picture);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}
@@ -0,0 +1,338 @@
+/* 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)
+{
+  if (!self->active)
+    return;
+
+  if (gsk_path_measure_get_closest_point (self->measure, &GRAPHENE_POINT_INIT (x, y), 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] = { };
+  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_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}
@@ -0,0 +1,590 @@
+/* Path/Text
+ *
+ * This demo shows how to use GskPath to animate a path along another path.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#define GTK_TYPE_PATH_WIDGET (gtk_path_widget_get_type ())
+G_DECLARE_FINAL_TYPE (GtkPathWidget, gtk_path_widget, GTK, PATH_WIDGET, GtkWidget)
+
+#define POINT_SIZE 8
+
+enum {
+  PROP_0,
+  PROP_TEXT,
+  PROP_EDITABLE,
+  N_PROPS
+};
+
+struct _GtkPathWidget
+{
+  GtkWidget parent_instance;
+
+  char *text;
+  gboolean editable;
+
+  graphene_point_t points[4];
+
+  guint active_point;
+  float line_closest;
+
+  GskPath *line_path;
+  GskPathMeasure *line_measure;
+  GskPath *text_path;
+
+  GdkPaintable *background;
+};
+
+struct _GtkPathWidgetClass
+{
+  GtkWidgetClass parent_class;
+};
+
+static GParamSpec *properties[N_PROPS] = { NULL, };
+
+G_DEFINE_TYPE (GtkPathWidget, gtk_path_widget, GTK_TYPE_WIDGET)
+
+static GskPath *
+create_path_from_text (GtkWidget  *widget,
+                       const char *text)
+{
+  cairo_surface_t *surface;
+  cairo_t *cr;
+  cairo_path_t *path;
+  PangoLayout *layout;
+  PangoFontDescription *desc;
+  GskPath *result;
+
+  surface = cairo_recording_surface_create (CAIRO_CONTENT_COLOR_ALPHA, NULL);
+  cr = cairo_create (surface);
+
+  layout = gtk_widget_create_pango_layout (widget, text);
+  desc = pango_font_description_from_string ("sans bold 36");
+  pango_layout_set_font_description (layout, desc);
+  pango_font_description_free (desc);
+
+  cairo_move_to (cr, 0, - pango_layout_get_baseline (layout) / (double) PANGO_SCALE);
+  pango_cairo_layout_path (cr, layout);
+  path = cairo_copy_path_flat (cr);
+  result = gsk_path_new_from_cairo (path);
+
+  cairo_path_destroy (path);
+  g_object_unref (layout);
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+
+  return result;
+}
+
+typedef struct
+{
+  GskPathMeasure *measure;
+  GskPathBuilder *builder;
+  double scale;
+} GtkPathTransform;
+
+static void
+gtk_path_transform_point (GskPathMeasure         *measure,
+                          const graphene_point_t *pt,
+                          float                   scale,
+                          graphene_point_t       *res)
+{
+  graphene_vec2_t tangent;
+
+  gsk_path_measure_get_point (measure, pt->x * scale, res, &tangent);
+
+  res->x -= pt->y * scale * graphene_vec2_get_y (&tangent);
+  res->y += pt->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;
+
+  switch (op)
+  {
+    case GSK_PATH_MOVE:
+      {
+        graphene_point_t res;
+        gtk_path_transform_point (transform->measure, &pts[0], transform->scale, &res);
+        gsk_path_builder_move_to (transform->builder, res.x, res.y);
+      }
+      break;
+
+    case GSK_PATH_LINE:
+      {
+        graphene_point_t res;
+        gtk_path_transform_point (transform->measure, &pts[1], transform->scale, &res);
+        gsk_path_builder_line_to (transform->builder, res.x, res.y);
+      }
+      break;
+
+    case GSK_PATH_CURVE:
+      {
+        graphene_point_t res[3];
+        gtk_path_transform_point (transform->measure, &pts[1], transform->scale, &res[0]);
+        gtk_path_transform_point (transform->measure, &pts[2], transform->scale, &res[1]);
+        gtk_path_transform_point (transform->measure, &pts[3], transform->scale, &res[2]);
+        gsk_path_builder_curve_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y, res[2].x, res[2].y);
+      }
+      break;
+
+    case GSK_PATH_CONIC:
+      {
+        graphene_point_t res[2];
+        gtk_path_transform_point (transform->measure, &pts[1], transform->scale, &res[0]);
+        gtk_path_transform_point (transform->measure, &pts[2], 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;
+
+    default:
+      g_assert_not_reached();
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static GskPath *
+gtk_path_transform (GskPathMeasure *measure,
+                    GskPath        *path)
+{
+  GtkPathTransform transform = { measure, gsk_path_builder_new () };
+  graphene_rect_t bounds;
+
+  gsk_path_get_bounds (path, &bounds);
+  if (bounds.origin.x + bounds.size.width > 0)
+    transform.scale = gsk_path_measure_get_length (measure) / (bounds.origin.x + bounds.size.width);
+  else
+    transform.scale = 1.0f;
+
+  gsk_path_foreach (path, GSK_PATH_FOREACH_ALLOW_CURVE, gtk_path_transform_op, &transform);
+
+  return gsk_path_builder_free_to_path (transform.builder);
+}
+
+static void
+gtk_path_widget_clear_text_path (GtkPathWidget *self)
+{
+  g_clear_pointer (&self->text_path, gsk_path_unref);
+}
+
+static void
+gtk_path_widget_clear_paths (GtkPathWidget *self)
+{
+  gtk_path_widget_clear_text_path (self);
+
+  g_clear_pointer (&self->line_path, gsk_path_unref);
+  g_clear_pointer (&self->line_measure, gsk_path_measure_unref);
+}
+
+static void
+gtk_path_widget_create_text_path (GtkPathWidget *self)
+{
+  GskPath *path;
+
+  gtk_path_widget_clear_text_path (self);
+
+  if (self->line_measure == NULL)
+    return;
+
+  path = create_path_from_text (GTK_WIDGET (self), self->text);
+  self->text_path = gtk_path_transform (self->line_measure, path);
+
+  gsk_path_unref (path);
+}
+
+static void
+gtk_path_widget_create_paths (GtkPathWidget *self)
+{
+  double width = gtk_widget_get_width (GTK_WIDGET (self));
+  double height = gtk_widget_get_height (GTK_WIDGET (self));
+  GskPathBuilder *builder;
+
+  gtk_path_widget_clear_paths (self);
+
+  if (width <= 0 || height <= 0)
+    return;
+
+  builder = gsk_path_builder_new ();
+  gsk_path_builder_move_to (builder,
+                            self->points[0].x * width, self->points[0].y * height);
+  gsk_path_builder_curve_to (builder,
+                             self->points[1].x * width, self->points[1].y * height,
+                             self->points[2].x * width, self->points[2].y * height,
+                             self->points[3].x * width, self->points[3].y * height);
+  self->line_path = gsk_path_builder_free_to_path (builder);
+
+  self->line_measure = gsk_path_measure_new (self->line_path);
+
+  gtk_path_widget_create_text_path (self);
+}
+
+static void
+gtk_path_widget_allocate (GtkWidget *widget,
+                          int        width,
+                          int        height,
+                          int        baseline)
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (widget);
+
+  GTK_WIDGET_CLASS (gtk_path_widget_parent_class)->size_allocate (widget, width, height, baseline);
+
+  gtk_path_widget_create_paths (self);
+}
+
+static void
+gtk_path_widget_snapshot (GtkWidget   *widget,
+                          GtkSnapshot *snapshot)
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (widget);
+  double width = gtk_widget_get_width (widget);
+  double height = gtk_widget_get_height (widget);
+  GskPath *path;
+  GskStroke *stroke;
+  gsize i;
+
+  /* frosted glass the background */
+  gtk_snapshot_push_blur (snapshot, 100);
+  gdk_paintable_snapshot (self->background, snapshot, width, height);
+  gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 1, 1, 1, 0.6 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+  gtk_snapshot_pop (snapshot);
+
+  /* draw the text */
+  if (self->text_path)
+    {
+      gtk_snapshot_push_fill (snapshot, self->text_path, GSK_FILL_RULE_WINDING);
+      gdk_paintable_snapshot (self->background, snapshot, width, height);
+
+      /* ... with an emboss effect */
+      stroke = gsk_stroke_new (2.0);
+      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT(1, 1));
+      gtk_snapshot_push_stroke (snapshot, self->text_path, stroke);
+      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 0.2 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gsk_stroke_free (stroke);
+      gtk_snapshot_pop (snapshot);
+
+      gtk_snapshot_pop (snapshot);
+    }
+
+  if (self->editable && self->line_path)
+    {
+      GskPathBuilder *builder;
+
+      /* draw the control line */
+      stroke = gsk_stroke_new (1.0);
+      gtk_snapshot_push_stroke (snapshot, self->line_path, stroke);
+      gsk_stroke_free (stroke);
+      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gtk_snapshot_pop (snapshot);
+
+      /* draw the points */
+      builder = gsk_path_builder_new ();
+      for (i = 0; i < 4; i++)
+        {
+          gsk_path_builder_add_circle (builder, &GRAPHENE_POINT_INIT (self->points[i].x * width, self->points[i].y * height), 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) { 1, 1, 1, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gtk_snapshot_pop (snapshot);
+
+      stroke = gsk_stroke_new (1.0);
+      gtk_snapshot_push_stroke (snapshot, path, stroke);
+      gsk_stroke_free (stroke);
+      gtk_snapshot_append_color (snapshot, &(GdkRGBA) { 0, 0, 0, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
+      gtk_snapshot_pop (snapshot);
+
+      gsk_path_unref (path);
+    }
+
+  if (self->line_closest >= 0)
+    {
+      GskPathBuilder *builder;
+      graphene_point_t closest;
+
+      builder = gsk_path_builder_new ();
+      gsk_path_measure_get_point (self->line_measure, self->line_closest, &closest, NULL);
+      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);
+
+      gsk_path_unref (path);
+    }
+}
+
+static void
+gtk_path_widget_set_text (GtkPathWidget *self,
+                          const char    *text)
+{
+  if (g_strcmp0 (self->text, text) == 0)
+    return;
+
+  g_free (self->text);
+  self->text = g_strdup (text);
+
+  gtk_path_widget_create_paths (self);
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TEXT]);
+}
+
+static void
+gtk_path_widget_set_editable (GtkPathWidget *self,
+                              gboolean       editable)
+{
+  if (self->editable == editable)
+    return;
+
+  self->editable = editable;
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_EDITABLE]);
+}
+
+static void
+gtk_path_widget_set_property (GObject      *object,
+                              guint         prop_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (object);
+
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      gtk_path_widget_set_text (self, g_value_get_string (value));
+      break;
+
+    case PROP_EDITABLE:
+      gtk_path_widget_set_editable (self, g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_path_widget_get_property (GObject    *object,
+                              guint       prop_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (object);
+
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      g_value_set_string (value, self->text);
+      break;
+
+    case PROP_EDITABLE:
+      g_value_set_boolean (value, self->editable);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_path_widget_dispose (GObject *object)
+{
+  GtkPathWidget *self = GTK_PATH_WIDGET (object);
+
+  gtk_path_widget_clear_paths (self);
+
+  G_OBJECT_CLASS (gtk_path_widget_parent_class)->dispose (object);
+}
+
+static void
+gtk_path_widget_class_init (GtkPathWidgetClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gtk_path_widget_dispose;
+  object_class->set_property = gtk_path_widget_set_property;
+  object_class->get_property = gtk_path_widget_get_property;
+
+  widget_class->size_allocate = gtk_path_widget_allocate;
+  widget_class->snapshot = gtk_path_widget_snapshot;
+
+  properties[PROP_TEXT] =
+    g_param_spec_string ("text",
+                         "text",
+                         "Text transformed along a path",
+                         NULL,
+                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
+
+  properties[PROP_EDITABLE] =
+    g_param_spec_boolean ("editable",
+                          "editable",
+                          "If the path can be edited by the user",
+                          FALSE,
+                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (object_class, N_PROPS, properties);
+}
+
+static void
+drag_begin (GtkGestureDrag *gesture,
+            double          x,
+            double          y,
+            GtkPathWidget  *self)
+{
+  graphene_point_t mouse = GRAPHENE_POINT_INIT (x, y);
+  double width = gtk_widget_get_width (GTK_WIDGET (self));
+  double height = gtk_widget_get_height (GTK_WIDGET (self));
+  gsize i;
+
+  for (i = 0; i < 4; i++)
+    {
+      if (graphene_point_distance (&GRAPHENE_POINT_INIT (self->points[i].x * width, self->points[i].y * height), &mouse, NULL, NULL) <= POINT_SIZE)
+        {
+          self->active_point = i;
+          break;
+        }
+    }
+  if (i == 4)
+    {
+      gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
+      return;
+    }
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+drag_update (GtkGestureDrag *drag,
+             double          offset_x,
+             double          offset_y,
+             GtkPathWidget  *self)
+{
+  double width = gtk_widget_get_width (GTK_WIDGET (self));
+  double height = gtk_widget_get_height (GTK_WIDGET (self));
+  double start_x, start_y;
+
+  gtk_gesture_drag_get_start_point (drag, &start_x, &start_y);
+
+  self->points[self->active_point] = GRAPHENE_POINT_INIT ((start_x + offset_x) / width,
+                                                          (start_y + offset_y) / height);
+  self->points[self->active_point].x = CLAMP (self->points[self->active_point].x, 0, 1);
+  self->points[self->active_point].y = CLAMP (self->points[self->active_point].y, 0, 1);
+
+  gtk_path_widget_create_paths (self);
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+pointer_motion (GtkEventControllerMotion *controller,
+                double                    x,
+                double                    y,
+                GtkPathWidget            *self)
+{
+  gsk_path_measure_get_closest_point_full (self->line_measure,
+                                           &GRAPHENE_POINT_INIT (x, y),
+                                           INFINITY,
+                                           &self->line_closest,
+                                           NULL, NULL, NULL);
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+pointer_leave (GtkEventControllerMotion *controller,
+               GtkPathWidget            *self)
+{
+  self->line_closest = -1;
+
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+gtk_path_widget_init (GtkPathWidget *self)
+{
+  GtkEventController *controller;
+
+  controller = GTK_EVENT_CONTROLLER (gtk_gesture_drag_new ());
+  g_signal_connect (controller, "drag-begin", G_CALLBACK (drag_begin), self);
+  g_signal_connect (controller, "drag-update", G_CALLBACK (drag_update), self);
+  g_signal_connect (controller, "drag-end", G_CALLBACK (drag_update), self);
+  gtk_widget_add_controller (GTK_WIDGET (self), controller);
+
+  controller = GTK_EVENT_CONTROLLER (gtk_event_controller_motion_new ());
+  g_signal_connect (controller, "enter", G_CALLBACK (pointer_motion), self);
+  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->line_closest = -1;
+
+  self->points[0] = GRAPHENE_POINT_INIT (0.1, 0.9);
+  self->points[1] = GRAPHENE_POINT_INIT (0.3, 0.1);
+  self->points[2] = GRAPHENE_POINT_INIT (0.7, 0.1);
+  self->points[3] = GRAPHENE_POINT_INIT (0.9, 0.9);
+
+  self->background = GDK_PAINTABLE (gdk_texture_new_from_resource ("/sliding_puzzle/portland-rose.jpg"));
+
+  gtk_path_widget_set_text (self, "It's almost working");
+}
+
+GtkWidget *
+gtk_path_widget_new (void)
+{
+  GtkPathWidget *self;
+
+  self = g_object_new (GTK_TYPE_PATH_WIDGET, NULL);
+
+  return GTK_WIDGET (self);
+}
+
+GtkWidget *
+do_path_text (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkBuilder *builder;
+
+      g_type_ensure (GTK_TYPE_PATH_WIDGET);
+
+      builder = gtk_builder_new_from_resource ("/path_text/path_text.ui");
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
+      g_object_unref (builder);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow" id="window">
+    <property name="title" translatable="yes">Text along a Path</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <child type="end">
+          <object class="GtkToggleButton" id="edit-toggle">
+            <property name="icon-name">document-edit-symbolic</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkRevealer">
+            <property name="reveal-child" bind-source="edit-toggle" bind-property="active" bind-flags="sync-create"></property>
+            <child>
+              <object class="GtkEntry" id="text">
+                <property name="text">Through the looking glass</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkPathWidget" id="view">
+            <property name="editable" bind-source="edit-toggle" bind-property="active" bind-flags="sync-create"></property>
+            <property name="text" bind-source="text" bind-property="text" bind-flags="sync-create"></property>
+            <property name="hexpand">true</property>
+            <property name="vexpand">true</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
@@ -1,8 +1,9 @@
 /* Pickers
- * #Keywords: GtkColorChooser, GtkFontChooser, GtkApplicationChooser
+ * #Keywords: GtkColorChooser, GtkFontChooser, GtkFileChooser,
+ * #Keywords: GtkApplicationChooser
 *
 * These widgets are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts, directories and applications.
+ * They allow to select colors, fonts, files, directories and applications.
 *
 * This demo shows both the default appearance for these dialogs,
 * as well as some of the customizations that are possible.
@@ -119,14 +120,20 @@ do_pickers (GtkWidget *do_widget)

    gtk_grid_attach (GTK_GRID (table), picker, 2, 1, 1, 1);

+    label = gtk_label_new ("File:");
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+    gtk_widget_set_hexpand (label, TRUE);
+    gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
+
    label = gtk_label_new ("Mail:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
    gtk_widget_set_hexpand (label, TRUE);
    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
+    gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1);
+    gtk_grid_attach (GTK_GRID (table), picker, 1, 4, 1, 1);
  }

  if (!gtk_widget_get_visible (window))
@@ -31,7 +31,7 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec
  float propagation_length = time * wave_speed;

  float t = (propagation_length - distance_from_center) / wave_length;
-  float offset_magnitude = 0.0;
+  float offset_magnitude = 0;
  if (t > 0.0)
    offset_magnitude = decay(wave_height * sin(t * 2.0 * PI), t);

@@ -474,7 +474,7 @@ suggestion_entry_size_allocate (GtkWidget *widget,
  gtk_widget_set_size_request (self->popup, gtk_widget_get_allocated_width (GTK_WIDGET (self)), -1);
  gtk_widget_queue_resize (self->popup);

-  gtk_popover_present (GTK_POPOVER (self->popup));
+  gtk_native_check_resize (GTK_NATIVE (self->popup));
 }

 static gboolean
@@ -1,6 +1,6 @@
 /* Benchmark/Themes
 *
- * This demo continuously switches themes, like some of you.
+ * This demo switches themes like a maniac, like some of you.
 *
 * Warning: This demo involves rapidly flashing changes and may
 * be hazardous to photosensitive viewers.
@@ -10,11 +10,11 @@
 static GtkWidget *window = NULL;

 static void
-open_dialog_response_cb (GtkNativeDialog *dialog,
-                         int              response,
-                         GtkWidget       *video)
+open_dialog_response_cb (GtkWidget *dialog,
+                         int        response,
+                         GtkWidget *video)
 {
-  gtk_native_dialog_hide (dialog);
+  gtk_widget_hide (dialog);

  if (response == GTK_RESPONSE_ACCEPT)
    {
@@ -25,30 +25,32 @@ open_dialog_response_cb (GtkNativeDialog *dialog,
      g_object_unref (file);
    }

-  gtk_native_dialog_destroy (dialog);
+  gtk_window_destroy (GTK_WINDOW (dialog));
 }

 static void
 open_clicked_cb (GtkWidget *button,
                 GtkWidget *video)
 {
-  GtkFileChooserNative *dialog;
+  GtkWidget *dialog;
  GtkFileFilter *filter;

-  dialog = gtk_file_chooser_native_new ("Select a video",
+  dialog = gtk_file_chooser_dialog_new ("Select a video",
                                        GTK_WINDOW (gtk_widget_get_root (button)),
                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Open",
-                                        "_Cancel");
+                                        "_Cancel", GTK_RESPONSE_CANCEL,
+                                        "_Open", GTK_RESPONSE_ACCEPT,
+                                        NULL);

  filter = gtk_file_filter_new ();
  gtk_file_filter_add_mime_type (filter, "video/*");
  gtk_file_filter_set_name (filter, "Video");
  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
  g_object_unref (filter);
-  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
  g_signal_connect (dialog, "response", G_CALLBACK (open_dialog_response_cb), video);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
+  gtk_widget_show (dialog);
 }

 static void
@@ -4,8 +4,6 @@
 #include "iconbrowserapp.h"
 #include "iconbrowserwin.h"

-#include "demo_conf.h"
-
 struct _IconBrowserApp
 {
  GtkApplication parent;
@@ -77,25 +75,21 @@ about_activated (GSimpleAction *action,
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
  g_string_append_printf (s, "\nIcon theme\n\t%s", icon_theme);
-  version = g_strdup_printf ("%s%s%s\nRunning against GTK %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                             PACKAGE_VERSION,
-                             g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-                             g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "",
                             gtk_get_major_version (),
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());

  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", g_strcmp0 (PROFILE, "devel") == 0
-                                         ? "GTK Icon Browser (Development)"
-                                         : "GTK Icon Browser",
+                         "program-name", "GTK Icon Browser",
                         "version", version,
-                         "copyright", "© 1997—2021 The GTK Team",
+                         "copyright", "© 1997—2020 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to browse themed icons",
                         "authors", authors,
-                         "logo-icon-name", "org.gtk.IconBrowser4",
+                         "logo-icon-name", "org.gtk.Demo4",
                         "title", "About GTK Icon Browser",
                         "system-information", s->str,
                         NULL);
@@ -135,10 +129,6 @@ icon_browser_app_activate (GApplication *app)
  IconBrowserWindow *win;

  win = icon_browser_window_new (ICON_BROWSER_APP (app));
-
-  if (g_strcmp0 (PROFILE, "devel") == 0)
-    gtk_widget_add_css_class (GTK_WIDGET (win), "devel");
-
  gtk_window_present (GTK_WINDOW (win));
 }

@@ -14,10 +14,8 @@ struct _IconBrowserWindow
  GtkWidget *searchbar;
  GListModel *icon_filter_model;
  GListStore *icon_store;
-  GListModel *context_model;
  GListStore *context_store;
  GtkFilter *name_filter;
-  GtkFilter *search_mode_filter;
  GtkWidget *details;
  GtkWidget *image1;
  GtkWidget *image2;
@@ -281,31 +279,11 @@ drag_prepare_texture (GtkDragSource *source,
                      GtkWidget     *widget)
 {
  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (widget));
-  GtkSnapshot *snapshot;
-  double width, height;
-  GskRenderNode *node;
-  GskRenderer *renderer;
-  GdkTexture *texture;
-  GdkContentProvider *ret;

  if (!GDK_IS_PAINTABLE (paintable))
    return NULL;

-  snapshot = gtk_snapshot_new ();
-  width = gdk_paintable_get_intrinsic_width (paintable);
-  height = gdk_paintable_get_intrinsic_height (paintable);
-  gdk_paintable_snapshot (paintable, snapshot, width, height);
-  node = gtk_snapshot_free_to_node (snapshot);
-
-  renderer = gtk_native_get_renderer (gtk_widget_get_native (widget));
-  texture = gsk_renderer_render_texture (renderer, node, &GRAPHENE_RECT_INIT (0, 0, width, height));
-
-  ret = gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, texture);
-
-  g_object_unref (texture);
-  gsk_render_node_unref (node);
-
-  return ret;
+  return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
 }

 static GdkContentProvider *
@@ -356,28 +334,6 @@ setup_scalable_image_dnd (GtkWidget *image)
  gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
 }

-static void
-search_mode_toggled (GtkSearchBar      *searchbar,
-                     GParamSpec        *pspec,
-                     IconBrowserWindow *win)
-{
-  if (gtk_search_bar_get_search_mode (searchbar))
-    gtk_single_selection_set_selected (GTK_SINGLE_SELECTION (win->context_model), GTK_INVALID_LIST_POSITION);
-  else if (gtk_single_selection_get_selected (GTK_SINGLE_SELECTION (win->context_model)) == GTK_INVALID_LIST_POSITION)
-    gtk_single_selection_set_selected (GTK_SINGLE_SELECTION (win->context_model), 0);
-
-  gtk_filter_changed (win->search_mode_filter, GTK_FILTER_CHANGE_DIFFERENT);
-}
-
-static void
-selected_name_changed (GtkSingleSelection *selection,
-                       GParamSpec         *pspec,
-                       IconBrowserWindow  *win)
-{
-  if (gtk_single_selection_get_selected (selection) != GTK_INVALID_LIST_POSITION)
-    gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
-}
-
 static void
 icon_browser_window_init (IconBrowserWindow *win)
 {
@@ -404,9 +360,6 @@ icon_browser_window_init (IconBrowserWindow *win)
  win->name_filter = GTK_FILTER (gtk_custom_filter_new (filter_by_icon_name, NULL, NULL));

  gtk_multi_filter_append (GTK_MULTI_FILTER (filter), g_object_ref (win->name_filter));
-
-  g_signal_connect (win->searchbar, "notify::search-mode-enabled",  G_CALLBACK (search_mode_toggled), win);
-  g_signal_connect (win->context_model, "notify::selected",  G_CALLBACK (selected_name_changed), win);
 }

 static void
@@ -436,7 +389,6 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, searchbar);
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, icon_store);
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, icon_filter_model);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, context_model);
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, context_store);

  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, details);
@@ -450,7 +402,6 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image8);
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, label8);
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, description);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, search_mode_filter);

  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), item_activated);
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), copy_to_clipboard);
@@ -7,25 +7,25 @@ iconbrowser_sources = [
 ]

 iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
-  'iconbrowser.gresource.xml',
-  source_dir: '.',
-)
+                                                'iconbrowser.gresource.xml',
+                                                source_dir: '.')

 executable('gtk4-icon-browser',
-  sources: [iconbrowser_sources, iconbrowser_resources],
-  c_args: common_cflags,
-  dependencies: [ libgtk_dep, demo_conf_h ],
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: true,
-)
+           iconbrowser_sources, iconbrowser_resources,
+           c_args: common_cflags,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: true)

 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

 foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size, install_dir: icontheme_dir)
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
 endforeach

 # desktop file
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=Development;GTK;
+NoDisplay=true
@@ -151,32 +151,19 @@
                                  </object>
                                </child>
                                <child>
-                                  <object class="GtkAnyFilter">
-                                    <child>
-                                      <object class="GtkBoolFilter" id="search_mode_filter">
-                                        <property name="expression">
-                                          <lookup name="search-mode-enabled">
-                                             searchbar
-                                          </lookup>
-                                        </property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkStringFilter">
-                                        <property name="ignore-case">0</property>
-                                        <property name="match-mode">exact</property>
-                                        <property name="expression">
-                                          <lookup name="context" type="IbIcon"/>
-                                        </property>
-                                        <binding name="search">
-                                          <lookup name="id" type="IbContext">
-                                            <lookup name="selected-item" type="GtkSingleSelection">
-                                              context_model
-                                            </lookup>
-                                          </lookup>
-                                        </binding>
-                                      </object>
-                                    </child>
+                                  <object class="GtkStringFilter">
+                                    <property name="ignore-case">0</property>
+                                    <property name="match-mode">exact</property>
+                                    <property name="expression">
+                                      <lookup name="context" type="IbIcon"/>
+                                    </property>
+                                    <binding name="search">
+                                      <lookup name="id" type="IbContext">
+                                        <lookup name="selected-item" type="GtkSingleSelection">
+                                          context_model
+                                        </lookup>
+                                      </lookup>
+                                    </binding>
                                  </object>
                                </child>
                              </object>
@@ -1,19 +1,3 @@
-demo_conf = configuration_data()
-demo_conf.set_quoted('PROFILE', get_option('profile'))
-demo_conf.set_quoted('VCS_TAG', '@VCS_TAG@')
-
-demo_conf_h = declare_dependency(
-  sources: vcs_tag(
-             command: [ 'git', 'rev-parse', '--short', 'HEAD' ],
-             fallback: get_option('profile') != 'default' ? 'devel' : '',
-             input: configure_file(
-                      output: 'demo_conf.h.in',
-                      configuration: demo_conf
-                    ),
-             output: 'demo_conf.h'
-           )
-)
-
 subdir('constraint-editor')
 subdir('gtk-demo')
 subdir('icon-browser')
@@ -13,7 +13,6 @@
            <property name="right-margin">20</property>
            <property name="top-margin">20</property>
            <property name="bottom-margin">20</property>
-            <property name="monospace">1</property>
            <property name="buffer">
              <object class="GtkTextBuffer" id="buffer"/>
            </property>
@@ -6,25 +6,25 @@ node_editor_sources = [
 ]

 node_editor_resources = gnome.compile_resources('node_editor_resources',
-  'node-editor.gresource.xml',
-  source_dir: '.',
-)
+                                                'node-editor.gresource.xml',
+                                                source_dir: '.')

 executable('gtk4-node-editor',
-  sources: [node_editor_sources, node_editor_resources],
-  dependencies: [ libgtk_dep, demo_conf_h ],
-  include_directories: confinc,
-  c_args: [
-    '-DNODE_EDITOR_SOURCE_DIR="@0@/../../testsuite/gsk/compare/"'.format(meson.current_source_dir())
-  ] + common_cflags,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: false,
-)
+           node_editor_sources, node_editor_resources,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           c_args: [
+             '-DNODE_EDITOR_SOURCE_DIR="@0@/../../testsuite/gsk/compare/"'.format(meson.current_source_dir())
+           ] + common_cflags,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: false)

 # icons, don't install them until we decide to install gtk4-node-editor
 #icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

 #foreach size: ['scalable', 'symbolic']
-#  install_subdir('data/' + size, install_dir: icontheme_dir)
+#  install_subdir('data/' + size,
+#    install_dir: icontheme_dir
+#  )
 #endforeach
@@ -23,8 +23,6 @@

 #include "node-editor-window.h"

-#include "demo_conf.h"
-
 static const char *css =
 "textview.editor {"
 "  color: rgb(192, 197, 206);"
@@ -96,26 +94,22 @@ activate_about (GSimpleAction *action,

  g_string_append_printf (s, "\nRenderer\n\t%s", renderer);

-  version = g_strdup_printf ("%s%s%s\nRunning against GTK %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                             PACKAGE_VERSION,
-                             g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-                             g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "",
                             gtk_get_major_version (),
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());

  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
                         "transient-for", gtk_application_get_active_window (app),
-                         "program-name", g_strcmp0 (PROFILE, "devel") == 0
-                                         ? "GTK Node Editor (Development)"
-                                         : "GTK Node Editor",
+                         "program-name", "GTK Node Editor",
                         "version", version,
-                         "copyright", "© 2019—2021 The GTK Team",
+                         "copyright", "© 2019—2020 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to test GTK rendering",
                         "authors", (const char *[]){ "Benjamin Otte", "Timm Bäder", NULL},
-                         "logo-icon-name", "org.gtk.gtk4.NodeEditor",
+                         "logo-icon-name", "org.gtk.gtk4.NodeEditor.Devel",
                         "title", "About GTK Node Editor",
                         "system-information", s->str,
                         NULL);
@@ -213,10 +207,6 @@ node_editor_application_activate (GApplication *app)
  NodeEditorWindow *win;

  win = node_editor_window_new (NODE_EDITOR_APPLICATION (app));
-
-  if (g_strcmp0 (PROFILE, "devel") == 0)
-    gtk_widget_add_css_class (GTK_WIDGET (win), "devel");
-
  gtk_window_present (GTK_WINDOW (win));
 }

@@ -25,7 +25,6 @@

 #include "gsk/gskrendernodeparserprivate.h"
 #include "gsk/gl/gskglrenderer.h"
-#include "gsk/ngl/gsknglrenderer.h"
 #ifdef GDK_WINDOWING_BROADWAY
 #include "gsk/broadway/gskbroadwayrenderer.h"
 #endif
@@ -701,16 +700,6 @@ out:
  g_free (source_dir);
 }

-static void
-dark_mode_cb (GtkToggleButton *button,
-              GParamSpec      *pspec,
-              NodeEditorWindow *self)
-{
-  g_object_set (gtk_widget_get_settings (GTK_WIDGET (self)),
-                "gtk-application-prefer-dark-theme", gtk_toggle_button_get_active (button),
-                NULL);
-}
-
 static void
 node_editor_window_finalize (GObject *object)
 {
@@ -763,9 +752,6 @@ node_editor_window_realize (GtkWidget *widget)
  node_editor_window_add_renderer (self,
                                   gsk_gl_renderer_new (),
                                   "OpenGL");
-  node_editor_window_add_renderer (self,
-                                   gsk_ngl_renderer_new (),
-                                   "NGL");
 #ifdef GDK_RENDERING_VULKAN
  node_editor_window_add_renderer (self,
                                   gsk_vulkan_renderer_new (),
@@ -828,7 +814,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  gtk_widget_class_bind_template_callback (widget_class, export_image_cb);
  gtk_widget_class_bind_template_callback (widget_class, testcase_save_clicked_cb);
  gtk_widget_class_bind_template_callback (widget_class, testcase_name_entry_changed_cb);
-  gtk_widget_class_bind_template_callback (widget_class, dark_mode_cb);
 }

 static GtkWidget *
@@ -925,26 +910,6 @@ node_editor_window_init (NodeEditorWindow *self)
  self->text_buffer = gtk_text_buffer_new (self->tag_table);
  g_signal_connect (self->text_buffer, "changed", G_CALLBACK (text_changed), self);
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (self->text_view), self->text_buffer);
-
-  /* Default */
-  gtk_text_buffer_set_text (self->text_buffer,
-         "shadow {\n"
-         "  child: texture {\n"
-         "    bounds: 0 0 128 128;\n"
-         "    texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n"
-         "  }\n"
-         "  shadows: rgba(0,0,0,0.5) 0 1 12;\n"
-         "}\n"
-         "\n"
-         "transform {\n"
-         "  child: text {\n"
-         "    color: rgb(46,52,54);\n"
-         "    font: \"Cantarell Bold 11\";\n"
-         "    glyphs: \"GTK Node Editor\";\n"
-         "    offset: 8 14.418;\n"
-         "  }\n"
-         "  transform: translate(0, 140);\n"
-         "}", -1);
 }

 NodeEditorWindow *
@@ -139,15 +139,6 @@
            <property name="icon-name">open-menu-symbolic</property>
          </object>
        </child>
-        <child type="end">
-          <object class="GtkToggleButton" id="dark_bg_button">
-            <property name="valign">center</property>
-            <property name="has-frame">0</property>
-            <property name="icon-name">display-brightness-symbolic</property>
-            <property name="tooltip-text" translatable="yes">Use a dark background</property>
-            <signal name="notify::active" handler="dark_mode_cb" swapped="0"/>
-          </object>
-        </child>
      </object>
    </child>
    <child>
@@ -4,6 +4,6 @@
    <file preprocess="xml-stripblanks">node-editor-window.ui</file>
    <file preprocess="xml-stripblanks">help-window.ui</file>
    <file>node-format.md</file>
-    <file alias='icons/apps/org.gtk.gtk4.NodeEditor.svg'>data/scalable/apps/org.gtk.gtk4.NodeEditor.svg</file>
+    <file alias='icons/apps/org.gtk.gtk4.NodeEditor.Devel.svg'>data/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg</file>
  </gresource>
 </gresources>
@@ -23,7 +23,7 @@ The **container** node is a special node that allows specifying a list of child

 | property | syntax           | default                | printed     |
 | -------- | ---------------- | ---------------------- | ----------- |
-| bottom   | `<node>`         | color { }              | always      |
+| bottom   | `<node>`         | color { color: #AF0; } | always      |
 | mode     | `<blend-mode>`   | normal                 | non-default |
 | top      | `<node>`         | color { }              | always      |

@@ -42,28 +42,13 @@ Creates a node like `gsk_blur_node_new()` with the given properties.

 | property | syntax           | default                | printed     |
 | -------- | ---------------- | ---------------------- | ----------- |
-| colors   | `<color>{1,4}`   | black                  | non-default |
+| color    | `<color>{1,4}`   | black                  | non-default |
 | outline  | `<rounded-rect>` | 50                     | always      |
-| widths   | `<number>{1,4}`  | 1                      | non-default |
+| width    | `<number>{1,4}`  | 1                      | non-default |

 Creates a node like `gsk_border_node_new()` with the given properties.

-For the color and width properties, the values follow the typical CSS order
-of top, right, bottom, left. If the last/left value isn't given, the 2nd/right
-value is used. If the 3rd/bottom value isn't given, the 1st/top value is used.
-And if the 2nd/right value also isn't given, the 1st/top value is used for
-every 4 values.
-
-### cairo
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | none                   | always      |
-| pixels   | `<url>`          | none                   | non-default |
-| script   | `<url>`          | none                   | non-default |
-
-The pixels are a base64-encoded data url of png data. The script is
-a base64-encoded data url of a cairo script.
+For the color and width properties, the values follow the typical CSS order of top, right, bottom, left. If the last/left value isn't given, the 2nd/right value is used. If the 3rd/bottom value isn't given, the 1st/top value is used. And if the 2nd/right value also isn't given, the 1st/top value is used for every 4 values.

 ### clip

@@ -74,9 +59,7 @@ a base64-encoded data url of a cairo script.

 Creates a node like `gsk_clip_node_new()` with the given properties.

-As an extension, this node allows specifying a rounded rectangle for the
-clip property. If that rectangle is indeed rounded, a node like
-`gsk_rounded_clip_node_new()` will be created instead.
+As an extension, this node allows specifying a rounded rectangle for the clip property. If that rectangle is indeed rounded, a node like `gsk_rounded_clip_node_new()` will be created instead.

 ### color

@@ -87,8 +70,7 @@ clip property. If that rectangle is indeed rounded, a node like

 Creates a node like `gsk_color_node_new()` with the given properties.

-The color is chosen as an error pink so it is visible while also reminding
-people to change it.
+The color is chosen as an error pink so it is visible while also reminding people to change it.

 ### color-matrix

@@ -100,29 +82,15 @@ people to change it.

 Creates a node like `gsk_color_matrix_node_new()` with the given properties.

-The matrix property accepts a <transform> for compatibility purposes, but you
-should be aware that the allowed values are meant to be used on 3D transformations,
-so their naming might appear awkward. However, it is always possible to use the
-matrix3d() production to specify all 16 values individually.
-
-### conic-gradient
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| center   | `<point>`        | 25, 25                 | always      |
-| rotation | `<number>`       | 0                      | always      |
-| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |
-
-Creates a node like `gsk_conic_gradient_node_new()` with the given properties.
+The matrix property accepts a <transform> for compatibility purposes, but you should be aware that the allowed values are meant to be used on 3D transformations, so their naming might appear awkward. However, it is always possible to use the matrix3d() production to specify all 16 values individually.

 ### cross-fade

 | property | syntax           | default                | printed     |
 | -------- | ---------------- | ---------------------- | ----------- |
 | end      | `<node>`         | color { }              | always      |
-| progress | `<number>`       | 0.5                    | non-default |
-| start    | `<node>`         | color { }              | always      |
+| mode     | `<number>`       | 0.5                    | non-default |
+| start    | `<node>`         | color { color: #AF0; } | always      |

 Creates a node like `gsk_cross_fade_node_new()` with the given properties.

@@ -153,8 +121,8 @@ Creates a node like `gsk_inset_shadow_node_new()` with the given properties.
 | property | syntax           | default                | printed     |
 | -------- | ---------------- | ---------------------- | ----------- |
 | bounds   | `<rect>`         | 50                     | always      |
-| start    | `<point>`        | 0 0                    | always      |
 | end      | `<point>`        | 0 50                   | always      |
+| start    | `<point>`        | 0 0                    | always      |
 | stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |

 Creates a node like `gsk_linear_gradient_node_new()` with the given properties.
@@ -181,57 +149,16 @@ Creates a node like `gsk_transform_node_new()` with the given properties.

 Creates a node like `gsk_outset_shadow_node_new()` with the given properties.

-### radial-gradient
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| center   | `<point>`        | 25 25                  | always      |
-| hradius  | `<number>`       | 25                     | always      |
-| vradius  | `<number>`       | 25                     | always      |
-| start    | `<number>`       | 0                      | always      |
-| end      | `<number>`       | 1                      | always      |
-| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |
-
-Creates a node like `gsk_radial_gradient_node_new()` with the given properties.
-
 ### repeat

-| property    | syntax           | default                | printed     |
-| ----------- | ---------------- | ---------------------- | ----------- |
-| bounds      | `<rect>`         | *bounds of child node* | non-default |
-| child       | `<node>`         | color { }              | always      |
-| child-bounds| `<rect>`         | *bounds of child node* | non-default |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| bounds   | `<rect>`         | *bounds of child node* | non-default |
+| child    | `<node>`         | color { }              | always      |
+| child-bounds| `<rect>`      | *bounds of child node* | non-default |

 Creates a node like `gsk_repeat_node_new()` with the given properties.

-### repeating-linear-gradient
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| start    | `<point>`        | 0 0                    | always      |
-| end      | `<point>`        | 0 50                   | always      |
-| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |
-
-Creates a node like `gsk_repeating_linear_gradient_node_new()` with the given
-properties.
-
-### repeating radial-gradient
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| center   | `<point>`        | 25 25                  | always      |
-| hradius  | `<number>`       | 25                     | always      |
-| vradius  | `<number>`       | 25                     | always      |
-| start    | `<number>`       | 0                      | always      |
-| end      | `<number>`       | 1                      | always      |
-| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |
-
-Creates a node like `gsk_repeating_radial_gradient_node_new()` with the given
-properties.
-
 ### rounded-clip

 | property | syntax           | default                | printed     |
@@ -246,7 +173,7 @@ Creates a node like `gsk_rounded_clip_node_new()` with the given properties.
 | property | syntax           | default                | printed     |
 | -------- | ---------------- | ---------------------- | ----------- |
 | child    | `<node>`         | color { }              | always      |
-| shadows  | `<shadow>`       | black 1 1              | always      |
+| shadow   | `<shadow>`       | black 1 1              | always      |

 Creates a node like `gsk_shadow_node_new()` with the given properties.

@@ -261,8 +188,7 @@ Creates a node like `gsk_shadow_node_new()` with the given properties.

 Creates a node like `gsk_text_node_new()` with the given properties.

-If the given font does not exist or the given glyphs are invalid for the given
-font, an error node will be returned.
+If the given font does not exist or the given glyphs are invalid for the given font, an error node will be returned.

 ### texture

@@ -273,9 +199,7 @@ font, an error node will be returned.

 Creates a node like `gsk_texture_node_new()` with the given properties.

-The default texture is a 10x10 checkerboard with the top left and bottom right
-5x5 being in the color #FF00CC and the other part being transparent. A possible
-representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")
+The default texture is a 10x10 checkerboard with the top left and bottom right 5x5 being in the color #FF00CC and the other part being transparent. A possible representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")
 `.

 ### transform
@@ -287,19 +211,3 @@ representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANS

 Creates a node like `gsk_transform_node_new()` with the given properties.

-### glshader
-
-| property   | syntax             | default                | printed     |
-| ---------- | ------------------ | ---------------------- | ----------- |
-| bounds     | `<rect>`           | 50                     | always      |
-| sourcecode | `<string>`         | ""                     | always      |
-| args       | `<uniform values>` | none                   | non-default |
-| child1     | `<node>`           | none                   | non-default |
-| child2     | `<node>`           | none                   | non-default |
-| child3     | `<node>`           | none                   | non-default |
-| child4     | `<node>`           | none                   | non-default |
-
-Creates a GLShader node. The `sourcecode` must be a GLSL fragment shader.
-The `args` must match the uniforms of simple types declared in that shader,
-in order and comma-separated. The `child` properties must match the sampler
-uniforms in the shader.
@@ -1,12 +1,11 @@
 executable('gtk4-print-editor',
-  sources: ['print-editor.c'],
-  c_args: common_cflags,
-  dependencies: [ libgtk_dep, demo_conf_h ],
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: true,
-)
+           ['print-editor.c'],
+           c_args: common_cflags,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: true)

 # desktop file
 install_data('org.gtk.PrintEditor4.desktop', install_dir: gtk_applicationsdir)
@@ -18,5 +17,7 @@ install_data('org.gtk.PrintEditor4.appdata.xml', install_dir: gtk_appdatadir)
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

 foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size, install_dir: icontheme_dir)
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
 endforeach
@@ -2,8 +2,9 @@
 Name=Print Editor
 Comment=A simple editor demonstrating GTK printing
 Exec=gtk4-print-editor %f
-Icon=org.gtk.PrintEditor4
+Icon=org.gtk.PrintEditor4.Devel
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=Development;GTK;
+NoDisplay=true
@@ -4,8 +4,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-#include "demo_conf.h"
-
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;
@@ -643,26 +641,22 @@ activate_about (GSimpleAction *action,
  g_strfreev (backends);
  g_free (setting);

-  version = g_strdup_printf ("%s%s%s\nRunning against GTK %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                             PACKAGE_VERSION,
-                             g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-                             g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "",
                             gtk_get_major_version (),
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());

  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
                         "transient-for", main_window,
-                         "program-name", g_strcmp0 (PROFILE, "devel") == 0
-                                         ? "GTK Print Editor (Development)"
-                                         : "GTK Print Editor",
+                         "program-name", "GTK Print Editor",
                         "version", version,
-                         "copyright", "© 2006-2021 Red Hat, Inc",
+                         "copyright", "© 2006-2020 Red Hat, Inc",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK printing",
                         "authors", authors,
-                         "logo-icon-name", "org.gtk.PrintEditor4",
+                         "logo-icon-name", "org.gtk.PrintEditor4.Devel",
                         "title", "About GTK Print Editor",
                         "system-information", sysinfo->str,
                         NULL);
@@ -813,10 +807,6 @@ activate (GApplication *app)
  GtkWidget *contents;

  main_window = gtk_application_window_new (GTK_APPLICATION (app));
-
-  if (g_strcmp0 (PROFILE, "devel") == 0)
-    gtk_widget_add_css_class (GTK_WIDGET (main_window), "devel");
-
  gtk_window_set_icon_name (GTK_WINDOW (main_window), "text-editor");
  gtk_window_set_default_size (GTK_WINDOW (main_window), 400, 600);
  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (main_window), TRUE);
@@ -1,19 +1,17 @@
 # demos/widget-factory

 widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
-  'widget-factory.gresource.xml',
-  source_dir: '.',
-)
+                                                  'widget-factory.gresource.xml',
+                                                  source_dir: '.')

 executable('gtk4-widget-factory',
-  sources: ['widget-factory.c', widgetfactory_resources],
-  c_args: common_cflags,
-  dependencies: [ libgtk_dep, demo_conf_h ],
-  include_directories: confinc,
-  gui_app: true,
-  link_args: extra_demo_ldflags,
-  install: true,
-)
+           'widget-factory.c', widgetfactory_resources,
+           c_args: common_cflags,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           gui_app: true,
+           link_args: extra_demo_ldflags,
+           install: true)

 # desktop file
 install_data('org.gtk.WidgetFactory4.desktop', install_dir: gtk_applicationsdir)
@@ -22,7 +20,9 @@ install_data('org.gtk.WidgetFactory4.desktop', install_dir: gtk_applicationsdir)
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

 foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size, install_dir: icontheme_dir)
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
 endforeach

 # appdata
@@ -7,3 +7,4 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=Development;GTK;
+NoDisplay=true
@@ -25,8 +25,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-#include "demo_conf.h"
-
 static void
 change_dark_state (GSimpleAction *action,
                    GVariant      *state,
@@ -302,10 +300,8 @@ activate_about (GSimpleAction *action,
                          gtk_get_micro_version ());
  g_string_append_printf (s, "\nA link can appear here: <http://www.gtk.org>");

-  version = g_strdup_printf ("%s%s%s\nRunning against GTK %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                             PACKAGE_VERSION,
-                             g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-                             g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "",
                             gtk_get_major_version (),
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());
@@ -313,11 +309,9 @@ activate_about (GSimpleAction *action,
  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
                         "transient-for", gtk_application_get_active_window (app),
                         "modal", TRUE,
-                         "program-name", g_strcmp0 (PROFILE, "devel") == 0
-                                         ? "GTK Widget Factory (Development)"
-                                         : "GTK Widget Factory",
+                         "program-name", "GTK Widget Factory",
                         "version", version,
-                         "copyright", "© 1997—2021 The GTK Team",
+                         "copyright", "© 1997—2020 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK themes and widgets",
@@ -2071,10 +2065,6 @@ activate (GApplication *app)
    }

  window = (GtkWindow *)gtk_builder_get_object (builder, "window");
-
-  if (g_strcmp0 (PROFILE, "devel") == 0)
-    gtk_widget_add_css_class (GTK_WIDGET (window), "devel");
-
  gtk_application_add_window (GTK_APPLICATION (app), window);
  g_action_map_add_action_entries (G_ACTION_MAP (window),
                                   win_entries, G_N_ELEMENTS (win_entries),
@@ -2329,10 +2319,10 @@ activate (GApplication *app)
 static void
 print_version (void)
 {
-  g_print ("gtk4-widget-factory %s%s%s\n",
-           PACKAGE_VERSION,
-           g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-           g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "");
+  g_print ("gtk4-widget-factory %d.%d.%d\n",
+           gtk_get_major_version (),
+           gtk_get_minor_version (),
+           gtk_get_micro_version ());
 }

 static int
@@ -1072,7 +1072,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="margin-end">6</property>
                                    <property name="margin-top">6</property>
                                    <property name="margin-bottom">6</property>
-                                    <property name="autoplay">1</property>
+                                    <property name="autoplay">0</property>
                                    <property name="loop">1</property>
                                    <property name="file">resource:///org/gtk/WidgetFactory4/gtk-logo.webm</property>
                                  </object>
@@ -3298,6 +3298,7 @@ bad things might happen.</property>
      </object>
    </child>
  </object>
+  <object class="GtkSizeGroup" id="basement-indicators"/>
  <menu id="new_style_menu_model">
    <section>
      <attribute name="display-hint">circular-buttons</attribute>
@@ -70,8 +70,3 @@ gtk/inspector           @otte @matthiasc
 # Layout managers
 gtk/gtklayout*          @ebassi
 gtk/gtkconstraint*      @ebassi
-
-# Accessibility
-gtk/gtkaccessible*.[ch] @ebassi
-gtk/gtkatcontext*.[ch]  @ebassi
-gtk/a11y                @ebassi
@@ -696,29 +696,27 @@ Public macros should not be used unless they evaluate to a constant.
 ### Symbol visibility

 Any symbol that is not explicitly annotated using a `GDK_AVAILABLE_IN_*`
-or `GDK_DEPRECATED_IN_*` macro is considered internal, and not exported
-in the shared library.
+macro is considered internal, and not exported in the shared library.

 Never export variables as public API, since this is cumbersome on some
 platforms. It is always preferable to add getters and setters instead.

 Non-exported functions that are needed in more than one source file
-should be declared in a private header file with a name that ends in
-`private.h`.
+should be declared in a private header file.

 Non-exported functions that are only needed in one source file
 should be declared static.

 ### Documentation

-All public APIs must have doc comments. For functions, these should
+All public APIs must have gtk-doc comments. For functions, these should
 be placed in the source file, directly above the function.

 ```c
  /* valid */
  /**
   * gtk_get_flow:
-   * @widget: a `GtkWidget`
+   * @widget: a #GtkWidget
   *
   * Gets the flow of a widget.
   *
@@ -738,34 +736,29 @@ be placed in the source file, directly above the function.
 Doc comments for macros, function types, class structs, etc should be
 placed next to the definitions, typically in headers.

-The main content of the doc comments uses markdown, which can include
-inline formatting, sections, tables, images, links. For links to
-symbols/classes/etc, we use a markdown extension syntax like this:
-
-[class@Gtk.Widget], [method@Gtk.ListView.get_factory],...
-
-Every doc comment should start with a single-sentence paragraph that
-can serve as a summary of sorts (it will often be placed next to a
-link pointing to the full documentation for the symbol/class/etc).
-The summary should not include links.
-
-Long-form documentation for classes should be included in the doc
-comment for the struct, typically at the top of the source file,
-after the license header and includes:
+Section introductions should be placed in the source file they describe,
+after the license header:

 ```c
+  /* valid */
  /**
-   * GtkSizeRequest:
-   *
-   * The GtkSizeRequest interface is GTK's height-for-width geometry
-   * geometry management system.
-   *
-   * # Geometry management
+   * SECTION:gtksizerequest
+   * @Short_Description: Height-for-width geometry management
+   * @Title: GtkSizeRequest
   *
+   * The GtkSizeRequest interface is GTK's height-for-width (and
+   * width-for-height) geometry management system.
   * ...
   */
 ```

+To properly document a new function, macro, function type or struct,
+it needs to be listed in the `sections.txt` file.
+
+To properly document a new class, it needs to be given its own section
+in the sections.txt, needs to be included in the `docs.xml` file, and the
+`get_type` function needs to listed in the `.types` file.
+
 For more information on the documentation style and contribution guidelines,
 please [follow the corresponding contribution guide](./reference/README.md).

@@ -6,41 +6,40 @@ The GTK documentation is divided in two major components:
   source code
 - static pages that provide an overview of specific sections of the API

-In both cases, the contents are parsed as markdown and cross-linked in order
-to match types, functions, signals, and properties. Ultimatively, we generate
-HTML, which can be used to read the documentation both offline and online.
+In both cases, the contents are parsed, converted into DocBook format, and
+cross-linked in order to match types, functions, signals, and properties.
+From the DocBook output, we generate HTML, which can be used to read the
+documentation both offline and online.

-Contributing to the GTK documentation requires modifying files tracked in the
-source control repository, and follows the same steps as any other code
-contribution as outlined in the GTK [contribution guide][contributing].
-Please, refer to that document for any further question on the mechanics
-of contributing to GTK.
+In both cases, contributing to the GTK documentation requires modifying
+files tracked in the source control repository, and follows the same steps
+as any other code contribution as outlined in the GTK [contribution
+guide][contributing]. Please, refer to that document for any further
+question on the mechanics of contributing to GTK.

-GTK uses [gi-docgen][gidocgen] to generate its documentation. Please, visit
-the gi-docgen website to read the project's documentation.
+GTK uses [gtk-doc][gtkdoc] to generate its documentation. Please, visit the
+gtk-doc website to read the project's documentation.

 [contributing]: ../../CONTRIBUTING.md
-[gi-docgen]: https://gitlab.gnome.org/ebassi/gi-docgen
+[gtkdoc]: https://wiki.gnome.org/DocumentationProject/GtkDoc

 ## Contributing to the API reference

 Whenever you need to add or modify the documentation of a type or a
-function, you will need to edit a comment stanza, typically right
+function, you will need to edit a `gtk-doc` comment stanza, typically right
 above the type or function declaration. For instance:

 ```c
 /**
 * gtk_foo_set_bar:
- * @self: a foo widget
- * @bar: (nullable): the bar to set
+ * @self: a #GtkFoo
+ * @bar: a #GtkBar
 *
- * Sets the given `GtkBar` instance on a foo widget.
- *
- * Returns: `TRUE` if the bar was set
+ * Sets the given #GtkBar instance on a #GtkFoo widget.
 */
-gboolean
+void
 gtk_foo_set_bar (GtkFoo *self,
-                 GtkBar *bar)
+		 GtkBar *bar)
 {
  ...
 ```
@@ -52,14 +51,31 @@ Or, for types:
 * GtkFoo:
 *
 * A foo widget instance.
+ *
+ * The contents of this structure are private and should never
+ * be accessed directly.
 */
 struct _GtkFoo
 {
-  /*< private >*/
  GtkWidget parent_instance;
 };
 ```

+Each public function and type in the GTK API reference must be listed in the
+`sections.txt` file for the specific namespace to which it belongs: GDK,
+GSK, or GTK. For instance, if you add a function named `gtk_foo_set_bar()`,
+you will need to:
+
+ 1. open `docs/reference/gtk/gtk4-sections.txt`
+ 1. find the section that lists the symbols of the `GtkFoo` type
+ 1. add `gtk_foo_set_bar` to the list
+
+New classes require:
+
+ 1. a new section in the `sections.txt` file
+ 1. the `get_type` function added to the `.types` file
+ 1. an `xinclude` element in the `docs.xml` file
+
 The GTK documentation also contains a number of 'freestanding' chapters
 for which the source is in .md files in docs/reference/gtk.

@@ -74,61 +90,49 @@ unrelated reasons.

 ### Syntax

-The input syntax for GTK documentation is Markdown, in a flavor that is
-similar to what you see on GitLab or GitHub. The markdown support for
-fragments that are extracted from sources is identical to the one for
+The input syntax for GTK documentation is markdown, in a flavor that is
+similar to what you see on gitlab or github. The markdown support for
+fragments that are extracted from sources is more limited than for
 freestanding chapters. As an exception, man pages for tools are currently
 maintained in docbook, since the conversion from markdown to docbook is
 losing too much of the expected formatting.

 In addition to typical markdown formatting such as \*emphasis\* or \_italics\_,
-the GTK documentation supports additional link formats, like:
+gtk-doc supports a few abbreviations for cross-references and formatting:

-`[class@Namespace.ClassName]`
+`#ClassName`
 : Creates a link to the docs for a class

-`[method@Namespace.Method.name]`
- : Creates a link to the docs for a method in a class
+`function()`
+ : Creates a link to the docs for a function

-`[func@Namespace.function]`
- : Creates a link to the docs for a global function
+`%constant`
+ : Generates suitable markup for enum values or constants

-For more information on the available link formats, see the gi-docgen
-documentation.
+### Sections

-Every doc comment should start with a single-sentence paragraph that
-can serve as a summary of sorts (it will often be placed next to a
-link pointing to the full documentation for the symbol/class/etc).
-The summary should not include links.
+ - The "section" of each type must contain a name, to be referenced in the
+   `sections.txt` file; a title; and a short description. For instance:

-### Introspection annotations
+```c
+/**
+ * SECTION:gtkshortcut
+ * @Title: GtkShortcut
+ * @Short_desc: A key shortcut
+ *
+ * ...
+```

-The purpose of the annotations for function arguments, properties, signals,
-etc., is to describe the API in a machine readable way. The annotations
-are consumed by language bindings and by the documentation tools.
-
-For more information about the annotations used by GTK, you should refer to
-the [GObject Introspection documentation][gi-annotations].
-
-[gi-annotations]: https://gi.readthedocs.io/en/latest/annotations/giannotations.html
-
-### Type description
-
-Each type should be annotated with a description of what the type does.
-
-For classes, the description should contain an overview of the type;
-what it does; typical use cases; and idiomatic examples of its use.
-
-For widget classes, the description should also contain:
-
-  - special XML elements and attributes parsed by the class, in case of a
-    custom GtkBuildable implementation
-  - the CSS element name to be used by selectors
-  - the CSS selector hierarchy for children, in case of a composite widget
-  - the accessible role of the class
-
-Each section in a type description can have a heading; it's preferred to use
-second and third level headings only.
+   For classes, the title should be the name of the class. While it's
+   possible to add section titles directly to the `sections.txt` file, this
+   is considered deprecated, and should not be done for newly written code.
+ - For classes, the long description should contain an overview of the type;
+   what it does; typical use cases; and idiomatic examples of its use.
+ - For widget classes, the long description of a section should also contain:
+   - special XML elements and attributes parsed by the class, in case of a
+     custom GtkBuildable implementation
+   - the CSS element name to be used by selectors
+   - the CSS selector hierarchy for children, in case of a composite widget

 ### Functions

@@ -151,26 +155,17 @@ Checks whether the widget is set to be visible or not.
 - Methods are special functions whose first argument is always the instance
   of a certain class. The instance argument for newly written code should be
   called `self`.
- - If a method is a setter or a getter for an object property, you should
-   add an `(attributes org.gtk.Method.set_property=property-name)` or a
-   an `(attributes org.gtk.Method.get_property=property-name)` annotation
-   to the method's identifier
+ - If a method is a setter or a getter for an object property, link the
+   property in the methods's description.
 - If a method changes one or more properties as side effect, link those
   properties in the method's description
- - If a method is a signal emitter, you should use the
-   `(attributes org.gtk.Method.signal=signal-name)` annotation in
-   the method's identifier
-
-### Arguments and return values
-
- - Arguments should be descriptive, but short
- - There is no need to mention the type of the argument
- - Always annotate nullability, direction, and ownership transfer
+ - If a method is a signal emitter, link the signal in the method's
+   description.

 ### Signals

 - While GObject can introspect argument and return types for signals,
-   you should *always* document them with an explicit documentation stanza.
+   you should *always* document them with an explicit gtk-doc stanza.
 - The syntax for signal stanzas is similar to functions:

 ```c
@@ -186,15 +181,12 @@ Checks whether the widget is set to be visible or not.

 - While GObject properties contain text that can be extracted
   programmatically in order to build their documentation, you should
-   *always* document them with an explicit documentation stanza. The text
+   *always* document them with an explicit gtk-doc stanza. The text
   associated to the property is short and meant to be used when
   programmatically building user interfaces, and not for documentation
   purposes.
 - Always note if setting a property has side effects, like causing another
   property to change state.
- - If the property has public accessors you should annotate it with
-   the `(attributes org.gtk.Property.set=setter_function)` and
-   `(attributes org.gtk.Property.get=getter_function)` attributes
 - The syntax for property documentation is:

 ```c
@@ -206,9 +198,8 @@ Checks whether the widget is set to be visible or not.

 ### Actions

- - Actions are new in GTK 4, and describe an action associated to
-   a widget class
- - The syntax for action documentation is:
+ - Actions are new in GTK 4, and gtk-doc had to learn a new syntax
+   to document them:

 ```
 /**c
@@ -1,18 +0,0 @@
----
-Title: Cairo interaction
----
-
-## Functions to support using cairo
-
-[Cairo](http://cairographics.org) is a graphics library that supports vector
-graphics and image compositing that can be used with GTK.
-
-GDK does not wrap the Cairo API; instead it allows to create Cairo
-drawing contexts which can be used to draw on [class@Gdk.Surface]s.
-
-Additional functions allow use [struct@Gdk.Rectangle]s with Cairo
-and to use [struct@Gdk.RGBA], `GdkPixbuf`, and [class@Gdk.Surface]
-instances as sources for drawing operations.
-
-For more information on Cairo, please see the
-[Cairo API reference](https://www.cairographics.org/manual/).
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+<!ENTITY version SYSTEM "version.xml">
+]>
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>GDK 4 Reference Manual</title>
+    <releaseinfo>
+      This document is for the GDK 4 library, version &version;.
+      The latest versions can be found online at
+      <ulink role="online-location" url="https://developer.gnome.org/gdk4/">https://developer.gnome.org/gdk4/</ulink>.
+      If you are looking for the older GDK 3 series of libraries,
+      see <ulink role="online-location" url="https://developer.gnome.org/gdk3/">https://developer.gnome.org/gdk3/</ulink>.
+    </releaseinfo>
+  </bookinfo>
+
+  <chapter>
+    <title>API Reference</title>
+    <xi:include href="xml/general.xml" />
+    <xi:include href="xml/gdkdisplaymanager.xml" />
+    <xi:include href="xml/gdkdisplay.xml" />
+    <xi:include href="xml/gdkseat.xml" />
+    <xi:include href="xml/gdkdevice.xml" />
+    <section>
+      <xi:include href="xml/gdkdevicepad.xml" />
+    </section>
+    <xi:include href="xml/gdkmonitor.xml" />
+    <xi:include href="xml/regions.xml" />
+    <xi:include href="xml/textures.xml" />
+    <xi:include href="xml/gdkpaintable.xml" />
+    <xi:include href="xml/rgba_colors.xml" />
+    <xi:include href="xml/cursors.xml" />
+    <xi:include href="xml/gdksurface.xml" />
+    <xi:include href="xml/gdktoplevel.xml" />
+    <section>
+      <xi:include href="xml/gdktoplevellayout.xml" />
+      <xi:include href="xml/gdktoplevelsize.xml" />
+    </section>
+    <xi:include href="xml/gdkpopup.xml" />
+    <section>
+      <xi:include href="xml/gdkpopuplayout.xml" />
+    </section>
+    <xi:include href="xml/gdkframeclock.xml" />
+    <section>
+      <xi:include href="xml/gdkframetimings.xml" />
+    </section>
+    <xi:include href="xml/gdkdrawcontext.xml" />
+    <section>
+      <xi:include href="xml/gdkglcontext.xml" />
+      <xi:include href="xml/gdkvulkancontext.xml" />
+      <xi:include href="xml/gdkcairocontext.xml" />
+    </section>
+    <xi:include href="xml/events.xml" />
+    <xi:include href="xml/keys.xml" />
+    <xi:include href="xml/gdkclipboard.xml" />
+    <xi:include href="xml/dnd.xml" />
+    <xi:include href="xml/gdkcontentformats.xml" />
+    <xi:include href="xml/gdkcontentprovider.xml" />
+    <xi:include href="xml/gdkcontentserializer.xml" />
+    <xi:include href="xml/gdkcontentdeserializer.xml" />
+    <xi:include href="xml/pixbufs.xml" />
+    <xi:include href="xml/pango_interaction.xml" />
+    <xi:include href="xml/cairo_interaction.xml" />
+  </chapter>
+  <chapter>
+    <title>GDK Platform Support</title>
+    <xi:include href="xml/gdkapplaunchcontext.xml" />
+    <xi:include href="xml/x_interaction.xml" />
+    <xi:include href="xml/wayland_interaction.xml" />
+  </chapter>
+
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-deprecated" role="deprecated">
+    <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
+</book>
@@ -0,0 +1,25 @@
+
+<MACRO>
+<NAME>GDK_WINDOWING_X11</NAME>
+#define GDK_WINDOWING_X11
+</MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_WIN32</NAME>
+#define GDK_WINDOWING_WIN32
+</MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_MACOS</NAME>
+#define GDK_WINDOWING_MACOS
+</MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_WAYLAND</NAME>
+#define GDK_WINDOWING_WAYLAND
+</MACRO>
+
+<MACRO>
+<NAME>GDK_DISABLE_DEPRECATION_WARNINGS</NAME>
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+</MACRO>
@@ -1,23 +0,0 @@
-[library]
-version = "@version@"
-browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
-repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
-website_url = "https://www.gtk.org"
-authors = "GTK Development Team"
-logo_url = "gtk-logo.svg"
-license = "GPL-2.1-or-later"
-description = "The GTK toolkit"
-dependencies = [ "GObject-2.0" ]
-devhelp = true
-
-  [dependencies."GObject-2.0"]
-  name = "GObject"
-  description = "The base type system library"
-  docs_url = "https://developer.gnome.org/gobject/stable"
-
-[theme]
-name = "basic"
-show_index_summary = true
-
-[source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
@@ -1,23 +0,0 @@
-[library]
-version = "@version@"
-browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
-repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
-website_url = "https://www.gtk.org"
-authors = "GTK Development Team"
-logo_url = "gtk-logo.svg"
-license = "GPL-2.1-or-later"
-description = "The GTK toolkit"
-dependencies = [ "GObject-2.0" ]
-devhelp = true
-
-  [dependencies."GObject-2.0"]
-  name = "GObject"
-  description = "The base type system library"
-  docs_url = "https://developer.gnome.org/gobject/stable"
-
-[theme]
-name = "basic"
-show_index_summary = true
-
-[source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
@@ -1,97 +0,0 @@
-[library]
-version = "@version@"
-browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
-repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
-website_url = "https://www.gtk.org"
-authors = "GTK Development Team"
-logo_url = "gtk-logo.svg"
-license = "GPL-2.1-or-later"
-description = "The GTK toolkit"
-dependencies = [ "GObject-2.0", "cairo-1.0", "Pango-1.0", "GdkWayland-4.0",  "GdkX11-4.0" ]
-devhelp = true
-search_index = true
-
-  [dependencies."GObject-2.0"]
-  name = "GObject"
-  description = "The base type system library"
-  docs_url = "https://developer.gnome.org/gobject/stable"
-
-  [dependencies."cairo-1.0"]
-  name = "Cairo"
-  description = "A 2D graphics library with support for multiple output devices"
-  docs_url = "https://www.cairographics.org/manual/"
-
-  [dependencies."Pango-1.0"]
-  name = "Pango"
-  description = "Text shaping and rendering"
-  docs_url = "https://developer.gnome.org/pango/stable"
-
-  [dependencies."GdkWayland-4.0"]
-  name = "GdkWayland"
-  description = "GDK Wayland Backend"
-  docs_url = "https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/"
-
-  [dependencies."GdkX11-4.0"]
-  name = "GdkX11"
-  description = "GDK X11 Backend"
-  docs_url = "https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/"
-
-[theme]
-name = "basic"
-show_index_summary = true
-show_class_hierarchy = true
-
-[source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
-
-[extra]
-content_files = [
-  "keys.md",
-  "cairo.md",
-  "pango.md",
-  "wayland.md",
-  "x11.md",
-  "macos.md",
-]
-content_images = [
-  "images/gtk-logo.svg",
-  "images/rotated-text.png",
-  "images/default_cursor.png",
-  "images/help_cursor.png",
-  "images/pointer_cursor.png",
-  "images/context_menu_cursor.png",
-  "images/progress_cursor.png",
-  "images/wait_cursor.png",
-  "images/cell_cursor.png",
-  "images/crosshair_cursor.png",
-  "images/text_cursor.png",
-  "images/vertical_text_cursor.png",
-  "images/alias_cursor.png",
-  "images/copy_cursor.png",
-  "images/no_drop_cursor.png",
-  "images/move_cursor.png",
-  "images/not_allowed_cursor.png",
-  "images/grab_cursor.png",
-  "images/grabbing_cursor.png",
-  "images/all_scroll_cursor.png",
-  "images/col_resize_cursor.png",
-  "images/row_resize_cursor.png",
-  "images/n_resize_cursor.png",
-  "images/e_resize_cursor.png",
-  "images/s_resize_cursor.png",
-  "images/w_resize_cursor.png",
-  "images/ne_resize_cursor.png",
-  "images/nw_resize_cursor.png",
-  "images/sw_resize_cursor.png",
-  "images/se_resize_cursor.png",
-  "images/ew_resize_cursor.png",
-  "images/ns_resize_cursor.png",
-  "images/nesw_resize_cursor.png",
-  "images/nwse_resize_cursor.png",
-  "images/zoom_in_cursor.png",
-  "images/zoom_out_cursor.png",
-  "images/popup-anchors.png",
-  "images/popup-flip.png",
-  "images/popup-slide.png",
-]
-urlmap_file = "urlmap.js"
@@ -0,0 +1,32 @@
+gdk_app_launch_context_get_type
+gdk_clipboard_get_type
+gdk_content_deserializer_get_type
+gdk_content_formats_get_type
+gdk_content_provider_get_type
+gdk_content_serializer_get_type
+gdk_cursor_get_type
+gdk_device_get_type
+gdk_device_pad_get_type
+gdk_device_tool_get_type
+gdk_display_get_type
+gdk_display_manager_get_type
+gdk_drag_get_type
+gdk_drag_surface_get_type
+gdk_drop_get_type
+gdk_event_get_type
+gdk_frame_clock_get_type
+gdk_gl_context_get_type
+gdk_gl_texture_get_type
+gdk_memory_texture_get_type
+gdk_monitor_get_type
+gdk_paintable_get_type
+gdk_popup_get_type
+gdk_popup_layout_get_type
+gdk_rgba_get_type
+gdk_seat_get_type
+gdk_snapshot_get_type
+gdk_surface_get_type
+gdk_texture_get_type
+gdk_toplevel_get_type
+gdk_toplevel_layout_get_type
+gdk_vulkan_context_get_type
@@ -1,16 +0,0 @@
-Title: Library initialization and versioning
-
-The GDK and GTK headers annotate deprecated APIs in a way that produces
-compiler warnings if these deprecated APIs are used. The warnings
-can be turned off by defining the macro `GDK_DISABLE_DEPRECATION_WARNINGS`
-before including the `gdk.h` header.
-
-GDK and GTK also provide support for building applications against defined
-subsets of deprecated or new APIs. You can define the macro
-`GDK_VERSION_MIN_REQUIRED` to specify up to what version you want to receive
-warnings about deprecated APIs; and the macro `GDK_VERSION_MAX_ALLOWED` to
-specify the newest version whose API you want to use. If you attempt to use
-a function deprecated before the version of GTK specified in
-`GDK_VERSION_MIN_REQUIRED`, or a function introduced after the version of
-GTK specified in `GDK_VERSION_MAX_ALLOWED`, the compiler will warn you when
-building your code.
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg6843"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   version="1.0"
-   sodipodi:docname="gtk-logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/ebassi/Pictures/gtk-logo-256.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <defs
-     id="defs6845">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-50 : 600 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="700 : 600 : 1"
-       inkscape:persp3d-origin="300 : 400 : 1"
-       id="perspective13" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="69.874353"
-     inkscape:cy="64.313526"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     width="128px"
-     height="128px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7947" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata6848">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <dc:date />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:source />
-        <dc:relation />
-        <dc:language />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path6976"
-       d="M 20.88413,30.82696 L 53.816977,55.527708 L 107.33282,39.060543 L 70.587303,17.177763 L 20.88413,30.82696 z"
-       style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6978"
-       d="M 22.94243,82.287118 L 20.88413,30.82696 L 53.816977,55.527708 L 53.816977,111.10486 L 22.94243,82.287118 z"
-       style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6980"
-       d="M 53.816977,111.10486 L 103.21619,90.5207 L 107.33282,39.060543 L 53.816977,55.527708 L 53.816977,111.10486 z"
-       style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path6982"
-       d="M 23.216626,81.319479 L 70.48573,67.361442 L 103.38422,90.444516"
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path6984"
-       d="M 70.434539,17.875593 L 70.434539,66.984877"
-       style="opacity:1;fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
@@ -1,113 +0,0 @@
-Title: Key Values
-
-## Functions for manipulating keyboard codes
-
-Key values are the codes which are sent whenever a key is pressed or released.
-They are included in the data contained in a key press or release #GdkEvent.
-The complete list of key values can be found in the `gdk/gdkkeysyms.h` header
-file.
-
-Key values are regularly updated from the upstream X.org X11 implementation,
-so new values are added regularly. They will be prefixed with GDK_KEY_ rather
-than XF86XK_ or XK_ (for older symbols).
-
-Key values can be converted into a string representation using
-gdk_keyval_name(). The reverse function, converting a string to a key value,
-is provided by gdk_keyval_from_name().
-
-The case of key values can be determined using gdk_keyval_is_upper() and
-gdk_keyval_is_lower(). Key values can be converted to upper or lower case
-using gdk_keyval_to_upper() and gdk_keyval_to_lower().
-
-When it makes sense, key values can be converted to and from
-Unicode characters with gdk_keyval_to_unicode() and gdk_unicode_to_keyval().
-
-## Key groups
-
-At the lowest level, physical keys on the keyboard are represented by
-numeric keycodes, and GDK knows how to translate these keycodes into
-key values according to the configured keyboard layout and the current
-state of the keyboard. In the GDK api, the mapping from keycodes to key
-values is available via [`method@Gdk.Display.map_keycode`], and the reverse
-mapping is available via [`method@Gdk.Display.map_keyval`]. The results of
-these functions are returned in [struct@Gdk.KeymapKey] structures.
-
-You can think of a [struct@Gdk.KeymapKey] as a representation of a symbol
-printed on a physical keyboard key. That is, it contains three pieces of
-information:
-
-  1. first, it contains the hardware keycode; this is an identifying number
-    for a physical key
-  1. second, it contains the “level” of the key. The level indicates which
-    symbol on the key will be used, in a vertical direction. So on a standard
-    US keyboard, the key with the number “1“ on it also has the exclamation
-    point (”!”) character on it. The level indicates whether to use the “1”
-    or the “!” symbol. The letter keys are considered to have a lowercase
-    letter at level 0, and an uppercase letter at level 1, though normally
-    only the uppercase letter is printed on the key
-  1. third, the #GdkKeymapKey contains a group; groups are not used on
-     standard US keyboards, but are used in many other countries. On a
-     keyboard with groups, there can be 3 or 4 symbols printed on a single
-     key. The group indicates movement in a horizontal direction. Usually
-     groups are used for two different languages. In group 0, a key might
-     have two English characters, and in group 1 it might have two Hebrew
-     characters. The Hebrew characters will be printed on the key next to
-     the English characters.
-
-When GDK creates a key event in order to deliver a key press or release,
-it first converts the current keyboard state into an effective group and
-level. This is done via a set of rules that varies widely according to
-type of keyboard and user configuration. The input to this translation
-consists of the hardware keycode pressed, the active modifiers, and the
-active group. It then applies the appropriate rules, and returns the
-group/level to be used to index the keymap, along with the modifiers
-which did not affect the group and level. i.e. it returns “unconsumed
-modifiers.” The keyboard group may differ from the effective group used
-for lookups because some keys don't have multiple groups - e.g. the
-<kbd>Enter</kbd> key is always in group 0 regardless of keyboard state.
-
-The results of the translation, including the keyval, are all included
-in the key event and can be obtained via [class@Gdk.KeyEvent] getters.
-
-### Consumed modifiers
-
-The `consumed_modifiers` in a key event are modifiers that should be masked
-out from @state when comparing this key press to a hot key. For instance,
-on a US keyboard, the `plus` symbol is shifted, so when comparing a key
-press to a `<Control>plus` accelerator `<Shift>` should be masked out.
-
-```c
-// We want to ignore irrelevant modifiers like ScrollLock
-#define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_ALT_MASK)
-state = gdk_event_get_modifier_state (event);
-gdk_keymap_translate_keyboard_state (keymap,
-                                     gdk_key_event_get_keycode (event),
-                                     state,
-                                     gdk_key_event_get_group (event),
-                                     &keyval, NULL, NULL, &consumed);
-if (keyval == GDK_PLUS &&
-    (state & ~consumed & ALL_ACCELS_MASK) == GDK_CONTROL_MASK)
-  // Control was pressed
-```
-
-An older interpretation of `consumed_modifiers` was that it contained
-all modifiers that might affect the translation of the key;
-this allowed accelerators to be stored with irrelevant consumed
-modifiers, by doing:
-
-```c
-// XXX Don’t do this XXX
-if (keyval == accel_keyval &&
-    (state & ~consumed & ALL_ACCELS_MASK) == (accel_mods & ~consumed))
-  // Accelerator was pressed
-```
-
-However, this did not work if multi-modifier combinations were
-used in the keymap, since, for instance, `<Control>` would be
-masked out even if only `<Control><Alt>` was used in
-the keymap. To support this usage as well as well as possible, all single
-modifier combinations that could affect the key for any combination
-of modifiers will be returned in `consumed_modifiers`; multi-modifier
-combinations are returned only when actually found in `state`. When
-you store accelerators, you should always store them with consumed
-modifiers removed. Store `<Control>plus`, not `<Control><Shift>plus`.
@@ -1,58 +0,0 @@
-Title: macOS Interaction
-
-## macOS backend-specific functions
-
-The functions in this section are specific to the GDK macOS backend.
-To use them, you need to include the `<gdk/macos/gdkmacos.h>` header and
-use the macOS-specific pkg-config `gtk4-macos` file to build your
-application.
-
-## Checking for the macOS backend
-
-GDK can be built with support for multiple backends, which means you will
-need to perform both compile time *and* run time checks if you wish to call
-backend-specific API; for instance, the code sample below will guard the
-calls to different backends, and error out on unsupported windowing systems:
-
-```c
-#ifdef GDK_WINDOWING_MACOS
-#include <gdk/macos/gdkmacos.h>
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
-#include <gdk/wayland/gdkwayland.h>
-#endif
-#ifdef GDK_WINDOWING_X11
-#include <gdk/x11/gdkx.h>
-#endif
-
-#ifdef GDK_WINDOWING_MACOS
-  if (GDK_IS_MACOS_DISPLAY (display))
-    {
-      // make macOS-specific calls here
-    }
-  else
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
-  if (GTK_IS_WAYLAND_DISPLAY (display))
-    {
-      // make Wayland-specific calls here
-    }
-  else
-#endif
-#ifdef GDK_WINDOWING_X11
-  if (GDK_IS_X11_DISPLAY (display))
-    {
-      // make X11-specific calls here
-    }
-  else
-#endif
-  g_error ("Unsupported GDK backend");
-```
-
-The compile time check is performed by using the `GDK_WINDOWING_*`
-pre-processor symbols; there is one defined for each windowing system
-backend built into GDK. For Wayland, the symbol is `GDK_WINDOWING_MACOS`.
-
-The run time check is performed by looking at the type of the
-[class@Gdk.Display] object. For Wayland, the display objects will be of type
-`GdkMacosDisplay`.
@@ -1,74 +1,183 @@
-expand_content_md_files = [
+private_headers = [
+  'gdk-autocleanup.h',
+  'gdk-private.h',
+  'gdkapplaunchcontextprivate.h',
+  'gdkcairocontextprivate.h',
+  'gdkcairoprivate.h',
+  'gdkclipboardprivate.h',
+  'gdkcontentformatsprivate.h',
+  'gdkcontentproviderprivate.h',
+  'gdkcursorprivate.h',
+  'gdkdebug.h',
+  'gdkdevicepadprivate.h',
+  'gdkdeviceprivate.h',
+  'gdkdevicetoolprivate.h',
+  'gdkdisplaymanagerprivate.h',
+  'gdkdisplayprivate.h',
+  'gdkdndprivate.h',
+  'gdkdragprivate.h',
+  'gdkdragsurfaceprivate.h',
+  'gdkdrawcontextprivate.h',
+  'gdkdropprivate.h',
+  'gdkeventsprivate.h',
+  'gdkframeclockidleprivate.h',
+  'gdkframeclockprivate.h',
+  'gdkglcontextprivate.h',
+  'gdkgltextureprivate.h',
+  'gdkinternals.h',
+  'gdkintl.h',
+  'gdkkeysprivate.h',
+  'gdkkeysyms.h',
+  'gdkmarshalers.h',
+  'gdkmemorytextureprivate.h',
+  'gdkmonitorprivate.h',
+  'gdkpipeiostreamprivate.h',
+  'gdkpopupprivate.h',
+  'gdkprofilerprivate.h',
+  'gdkrgbaprivate.h',
+  'gdkscreenprivate.h',
+  'gdkseatdefaultprivate.h',
+  'gdkseatprivate.h',
+  'gdksnapshotprivate.h',
+  'gdksurfaceimpl.h',
+  'gdksurfaceprivate.h',
+  'gdktextureprivate.h',
+  'gdktoplevelprivate.h',
+  'gdktoplevelsizeprivate.h',
+  'gdkvulkancontextprivate.h',
+  'filetransferportalprivate.h',
+  'keyname-table.h',
+
+  # gdk/x11
+  'gdkcairocontext-x11.h',
+  'gdkclipboard-x11.h',
+  'gdkdevice-xi2-private.h',
+  'gdkdevicemanagerprivate-core.h',
+  'gdkdisplay-x11.h',
+  'gdkeventsource.h',
+  'gdkeventtranslator.h',
+  'gdkglcontext-x11.h',
+  'gdkkeys-x11.h',
+  'gdkmonitor-x11.h',
+  'gdkprivate-x11.h',
+  'gdkscreen-x11.h',
+  'gdkselectioninputstream-x11.h',
+  'gdkselectionoutputstream-x11.h',
+  'gdksurface-x11.h',
+  'gdktextlistconverter-x11.h',
+  'gdkvisual-x11.h',
+  'gdkvulkancontext-x11.h',
+  'gdkx-autocleanups.h',
+  'MwmUtil.h',
+  'xsettings-client.h',
+
+  # gdk/wayland
+  'gdkcairocontext-wayland.h',
+  'gdkclipboard-wayland.h',
+  'gdkdevice-wayland-private.h',
+  'gdkdisplay-wayland.h',
+  'gdkglcontext-wayland.h',
+  'gdkmonitor-wayland.h',
+  'gdkprimary-wayland.h',
+  'gdkprivate-wayland.h',
+  'gdkseat-wayland.h',
+  'gdksurface-wayland.h',
+  'gdkvulkancontext-wayland.h',
+  'wm-button-layout-translation.h',
+  'gtk-primary-selection-client-protocol.h',
+  'gtk-shell-client-protocol.h',
+  'idle-inhibit-unstable-v1-client-protocol.h',
+  'keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h',
+  'pointer-gestures-unstable-v1-client-protocol.h',
+  'primary-selection-unstable-v1-client-protocol.h',
+  'server-decoration-client-protocol.h',
+  'tablet-unstable-v2-client-protocol.h',
+  'xdg-foreign-unstable-v1-client-protocol.h',
+  'xdg-shell-unstable-v6-client-protocol.h',
+  'xdg-output-unstable-v1-client-protocol.h',
+  'xdg-shell-client-protocol.h',
+  'xdg-shell-unstable-v6-client-protocol.h',
+  'wayland-cursor.h',
+  'os-compatibility.h',
+  'xcursor.h',
+
+  'broadway',
+  'wayland/cursor',
+  'macos',
+  'win32',
 ]

-gdk4_toml = configure_file(input: 'gdk4.toml.in', output: 'gdk4.toml', configuration: toml_conf)
-gdk4x11_toml = configure_file(input: 'gdk4-x11.toml.in', output: 'gdk4-x11.toml', configuration: toml_conf)
-gdk4wayland_toml = configure_file(input: 'gdk4-wayland.toml.in', output: 'gdk4-wayland.toml', configuration: toml_conf)
+images = [
+  'images/rotated-text.png',
+  'images/default_cursor.png',
+  'images/help_cursor.png',
+  'images/pointer_cursor.png',
+  'images/context_menu_cursor.png',
+  'images/progress_cursor.png',
+  'images/wait_cursor.png',
+  'images/cell_cursor.png',
+  'images/crosshair_cursor.png',
+  'images/text_cursor.png',
+  'images/vertical_text_cursor.png',
+  'images/alias_cursor.png',
+  'images/copy_cursor.png',
+  'images/no_drop_cursor.png',
+  'images/move_cursor.png',
+  'images/not_allowed_cursor.png',
+  'images/grab_cursor.png',
+  'images/grabbing_cursor.png',
+  'images/all_scroll_cursor.png',
+  'images/col_resize_cursor.png',
+  'images/row_resize_cursor.png',
+  'images/n_resize_cursor.png',
+  'images/e_resize_cursor.png',
+  'images/s_resize_cursor.png',
+  'images/w_resize_cursor.png',
+  'images/ne_resize_cursor.png',
+  'images/nw_resize_cursor.png',
+  'images/sw_resize_cursor.png',
+  'images/se_resize_cursor.png',
+  'images/ew_resize_cursor.png',
+  'images/ns_resize_cursor.png',
+  'images/nesw_resize_cursor.png',
+  'images/nwse_resize_cursor.png',
+  'images/zoom_in_cursor.png',
+  'images/zoom_out_cursor.png',
+]
+
+src_dir = [ gdkinc ]
+
+if x11_enabled
+  src_dir += [ gdkx11_inc ]
+endif
+
+if wayland_enabled
+  src_dir += [ gdkwayland_inc ]
+endif

 if get_option('gtk_doc')
-  custom_target('gdk4-doc',
-    input: [ gdk4_toml, gdk_gir[0] ],
-    output: 'gdk4',
-    command: [
-      gidocgen,
-      'generate',
-      '--quiet',
-      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-      '--config=@INPUT0@',
-      '--output-dir=@OUTPUT@',
-      '--no-namespace-dir',
-      '--content-dir=@0@'.format(meson.current_source_dir()),
-      '@INPUT1@',
-    ],
-    depend_files: [ expand_content_md_files ],
-    build_by_default: true,
-    install: true,
-    install_dir: docs_dir,
-  )
+  configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)

-  if x11_enabled
-    custom_target('gdk4-x11-doc',
-      input: [ gdk4x11_toml, gdk_x11_gir[0] ],
-      output: 'gdk4-x11',
-      command: [
-        gidocgen,
-        'generate',
-        '--quiet',
-        '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-        '--config=@INPUT0@',
-        '--output-dir=@OUTPUT@',
-        '--no-namespace-dir',
-        '--content-dir=@0@'.format(meson.current_source_dir()),
-        '@INPUT1@',
-      ],
-      depends: [ gdk_gir[0] ],
-      depend_files: [ ],
-      build_by_default: true,
-      install: true,
-      install_dir: docs_dir,
-    )
-  endif
-
-  if wayland_enabled
-    custom_target('gdk4-wayland-doc',
-      input: [ gdk4wayland_toml, gdk_wayland_gir[0] ],
-      output: 'gdk4-wayland',
-      command: [
-        gidocgen,
-        'generate',
-        '--quiet',
-        '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-        '--config=@INPUT0@',
-        '--output-dir=@OUTPUT@',
-        '--no-namespace-dir',
-        '--content-dir=@0@'.format(meson.current_source_dir()),
-        '@INPUT1@',
-      ],
-      depends: [ gdk_gir[0] ],
-      depend_files: [ ],
-      build_by_default: true,
-      install: true,
-      install_dir: docs_dir,
-    )
-  endif
+  gnome.gtkdoc('gdk4',
+               mode: 'none',
+               main_xml: 'gdk4-docs.xml',
+               src_dir: src_dir,
+               dependencies: libgtk_dep,
+               gobject_typesfile: join_paths(meson.current_source_dir(), 'gdk4.types'),
+               scan_args: [
+                 '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
+                 '--ignore-headers=' + ' '.join(private_headers),
+               ],
+               mkdb_args: [
+                 '--ignore-files=' + ' '.join(private_headers),
+               ],
+               fixxref_args: [
+                 '--html-dir=@0@'.format(docpath),
+                 '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+                 '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+                 '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+                 '--extra-dir=@0@'.format(cairo_docpath),
+               ],
+               html_assets: images,
+               install: true)
 endif
@@ -1,94 +0,0 @@
- Title: Pango Interaction
-
-Pango is the text layout system used by GDK and GTK. The functions
-and types in this section are used to obtain clip regions for
-`PangoLayout`s, and to get `PangoContext`s that can be used with
-GDK.
-
-## Using Pango in GDK
-
-Creating a `PangoLayout` object is the first step in rendering text,
-and requires getting a handle to a `PangoContext`. For GTK programs,
-you’ll usually want to use [method@Gtk.Widget.get_pango_context], or
-[method@Gtk.Widget.create_pango_layout]. Once you have a `PangoLayout`,
-you can set the text and attributes of it with Pango functions like
-[method@Pango.Layout.set_text] and get its size with
-[method@Pango.Layout.get_size].
-
-*Note*: Pango uses a fixed point system internally, so converting
-between Pango units and pixels using `PANGO_SCALE` or the `PANGO_PIXELS()`
-macro.
-
-Rendering a Pango layout is done most simply with [func@PangoCairo.show_layout];
-you can also draw pieces of the layout with [func@PangoCairo.show_layout_line].
-
-### Draw transformed text with Pango and cairo
-
-```c
-#define RADIUS 100
-#define N_WORDS 10
-#define FONT "Sans Bold 18"
-
-PangoContext *context;
-PangoLayout *layout;
-PangoFontDescription *desc;
-
-double radius;
-int width, height;
-int i;
-
-// Set up a transformation matrix so that the user space coordinates for
-// where we are drawing are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
-// We first center, then change the scale
-
-width = gdk_surface_get_width (surface);
-height = gdk_surface_get_height (surface);
-radius = MIN (width, height) / 2.;
-
-cairo_translate (cr,
-                 radius + (width - 2 * radius) / 2,
-                 radius + (height - 2 * radius) / 2);
-                 cairo_scale (cr, radius / RADIUS, radius / RADIUS);
-
-// Create a PangoLayout, set the font and text
-context = gdk_pango_context_get_for_display (display);
-layout = pango_layout_new (context);
-pango_layout_set_text (layout, "Text", -1);
-desc = pango_font_description_from_string (FONT);
-pango_layout_set_font_description (layout, desc);
-pango_font_description_free (desc);
-
-// Draw the layout N_WORDS times in a circle
-for (i = 0; i < N_WORDS; i++)
-  {
-    double red, green, blue;
-    double angle = 2 * G_PI * i / n_words;
-
-    cairo_save (cr);
-
-    // Gradient from red at angle == 60 to blue at angle == 300
-    red = (1 + cos (angle - 60)) / 2;
-    green = 0;
-    blue = 1 - red;
-
-    cairo_set_source_rgb (cr, red, green, blue);
-    cairo_rotate (cr, angle);
-
-    // Inform Pango to re-layout the text with the new transformation matrix
-    pango_cairo_update_layout (cr, layout);
-
-    pango_layout_get_size (layout, &width, &height);
-
-    cairo_move_to (cr, - width / 2 / PANGO_SCALE, - DEFAULT_TEXT_RADIUS);
-    pango_cairo_show_layout (cr, layout);
-
-    cairo_restore (cr);
-  }
-
-g_object_unref (layout);
-g_object_unref (context);
-```
-
-The example code above will yield the following result:
-
-![](rotated-text.png)
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2021 GNOME Foundation
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-// A map between namespaces and base URLs for their online documentation
-baseURLs = [
-    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
-    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
-    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
-    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
-    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
-    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
-]
@@ -0,0 +1 @@
+@GTK_VERSION@
@@ -1,48 +0,0 @@
-Title: Wayland Interaction
-
-## Wayland backend-specific functions
-
-The functions in this section are specific to the GDK Wayland backend.
-To use them, you need to include the `<gdk/wayland/gdkwayland.h>` header and
-use the Wayland-specific pkg-config `gtk4-wayland` file to build your
-application.
-
-## Checking for the Wayland backend
-
-GDK can be built with support for multiple backends, which means you will
-need to perform both compile time *and* run time checks if you wish to call
-backend-specific API; for instance, the code sample below will guard the
-calls to different backends, and error out on unsupported windowing systems:
-
-```c
-#ifdef GDK_WINDOWING_WAYLAND
-#include <gdk/wayland/gdkwayland.h>
-#endif
-#ifdef GDK_WINDOWING_X11
-#include <gdk/x11/gdkx.h>
-#endif
-
-#ifdef GDK_WINDOWING_WAYLAND
-  if (GTK_IS_WAYLAND_DISPLAY (display))
-    {
-      // make Wayland-specific calls here
-    }
-  else
-#endif
-#ifdef GDK_WINDOWING_X11
-  if (GDK_IS_X11_DISPLAY (display))
-    {
-      // make X11-specific calls here
-    }
-  else
-#endif
-  g_error ("Unsupported GDK backend");
-```
-
-The compile time check is performed by using the `GDK_WINDOWING_*`
-pre-processor symbols; there is one defined for each windowing system
-backend built into GDK. For Wayland, the symbol is `GDK_WINDOWING_WAYLAND`.
-
-The run time check is performed by looking at the type of the
-[class@Gdk.Display] object. For Wayland, the display objects will be of type
-`GdkWaylandDisplay`.
@@ -1,47 +0,0 @@
-Title: X Window System Interaction
-
-## X backend-specific functions
-
-The functions in this section are specific to the GDK X11 backend.
-To use them, you need to include the `<gdk/x11/gdkx.h>` header and use
-the X11-specific pkg-config file `gtk4-x11` to build your application.
-
-## Checking for the X11 backend
-
-GDK can be built with support for multiple backends, which means you will
-need to perform both compile time *and* run time checks if you wish to call
-backend-specific API; for instance, the code sample below will guard the
-calls to different backends, and error out on unsupported windowing systems:
-
-```c
-#ifdef GDK_WINDOWING_X11
-#include <gdk/x11/gdkx.h>
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
-#include <gdk/wayland/gdkwayland.h>
-#endif
-
-#ifdef GDK_WINDOWING_X11
-  if (GDK_IS_X11_DISPLAY (display))
-    {
-      // make X11-specific calls here
-    }
-  else
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
-  if (GTK_IS_WAYLAND_DISPLAY (display))
-    {
-      // make Wayland-specific calls here
-    }
-  else
-#endif
-  g_error ("Unsupported GDK backend");
-```
-
-The compile time check is performed by using the `GDK_WINDOWING_*`
-pre-processor symbols; there is one defined for each windowing system
-backend built into GDK. For X11, the symbol is `GDK_WINDOWING_X11`.
-
-The run time check is performed by looking at the type of the
-[class@Gdk.Display] object. For X11, the display objects will be of type
-`GdkX11Display`.
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+<!ENTITY version SYSTEM "version.xml">
+]>
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>GSK 4 Reference Manual</title>
+    <releaseinfo>
+      This document is for the GSK 4 library, version &version;
+      The latest versions can be found online at
+      <ulink role="online-location" url="https://developer.gnome.org/gsk4/">https://developer.gnome.org/gsk4/</ulink>.
+    </releaseinfo>
+  </bookinfo>
+
+  <reference id="reference">
+    <title>API Reference</title>
+    <xi:include href="xml/GskRenderer.xml" />
+    <xi:include href="xml/GskRenderNode.xml" />
+    <xi:include href="xml/GskRoundedRect.xml" />
+    <xi:include href="xml/GskTransform.xml" />
+    <xi:include href="xml/GskGLShader.xml" />
+  </reference>
+
+  <part id="paths">
+    <title>Paths</title>
+    <xi:include href="xml/GskPath.xml" />
+    <xi:include href="xml/GskPathBuilder.xml" />
+    <xi:include href="xml/GskStroke.xml" />
+  </part>
+
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
+</book>
@@ -0,0 +1,431 @@
+<SECTION>
+<FILE>GskRenderer</FILE>
+GskRenderer
+gsk_renderer_get_surface
+gsk_renderer_realize
+gsk_renderer_unrealize
+gsk_renderer_is_realized
+gsk_renderer_render
+gsk_renderer_render_texture
+<SUBSECTION>
+gsk_renderer_new_for_surface
+gsk_gl_renderer_new
+gsk_cairo_renderer_new
+gsk_vulkan_renderer_new
+gsk_broadway_renderer_new
+<SUBSECTION Standard>
+GSK_IS_RENDERER
+GSK_RENDERER
+GSK_TYPE_RENDERER
+GskRendererClass
+gsk_renderer_get_type
+GSK_TYPE_SCALING_FILTER
+</SECTION>
+
+<SECTION>
+<FILE>GskRenderNode</FILE>
+GskRenderNode
+GskBlendNode
+GskBlurNode
+GskBorderNode
+GskCairoNode
+GskClipNode
+GskColorMatrixNode
+GskColorNode
+GskContainerNode
+GskCrossFadeNode
+GskDebugNode
+GskInsetShadowNode
+GskLinearGradientNode
+GskRadialGradientNode
+GskOpacityNode
+GskOutsetShadowNode
+GskRepeatingLinearGradientNode
+GskRepeatingRadialGradientNode
+GskRepeatNode
+GskRoundedClipNode
+GskShadowNode
+GskTextNode
+GskTextureNode
+GskTransformNode
+GskGLShaderNode
+gsk_render_node_ref
+gsk_render_node_unref
+GskRenderNodeType
+gsk_render_node_get_node_type
+gsk_render_node_draw
+GskSerializationError
+GskParseErrorFunc
+gsk_render_node_serialize
+gsk_render_node_deserialize
+gsk_render_node_write_to_file
+GskScalingFilter
+gsk_render_node_get_bounds
+
+<SUBSECTION>
+gsk_color_node_new
+gsk_color_node_get_color
+gsk_texture_node_new
+gsk_texture_node_get_texture
+<SUBSECTION>
+GskColorStop
+gsk_linear_gradient_node_new
+gsk_repeating_linear_gradient_node_new
+gsk_linear_gradient_node_get_start
+gsk_linear_gradient_node_get_end
+gsk_linear_gradient_node_get_n_color_stops
+gsk_linear_gradient_node_get_color_stops
+<SUBSECTION>
+gsk_radial_gradient_node_new
+gsk_repeating_radial_gradient_node_new
+gsk_radial_gradient_node_get_n_color_stops
+gsk_radial_gradient_node_get_color_stops
+gsk_radial_gradient_node_get_start
+gsk_radial_gradient_node_get_end
+gsk_radial_gradient_node_get_hradius
+gsk_radial_gradient_node_get_vradius
+gsk_radial_gradient_node_get_center
+<SUBSECTION>
+gsk_conic_gradient_node_new
+gsk_conic_gradient_node_get_n_color_stops
+gsk_conic_gradient_node_get_color_stops
+gsk_conic_gradient_node_get_center
+gsk_conic_gradient_node_get_rotation
+<SUBSECTION>
+gsk_border_node_new
+gsk_border_node_get_outline
+gsk_border_node_get_widths
+gsk_border_node_get_colors
+<SUBSECTION>
+gsk_inset_shadow_node_new
+gsk_inset_shadow_node_get_outline
+gsk_inset_shadow_node_get_color
+gsk_inset_shadow_node_get_dx
+gsk_inset_shadow_node_get_dy
+gsk_inset_shadow_node_get_spread
+gsk_inset_shadow_node_get_blur_radius
+<SUBSECTION>
+gsk_outset_shadow_node_new
+gsk_outset_shadow_node_get_outline
+gsk_outset_shadow_node_get_color
+gsk_outset_shadow_node_get_dx
+gsk_outset_shadow_node_get_dy
+gsk_outset_shadow_node_get_spread
+gsk_outset_shadow_node_get_blur_radius
+<SUBSECTION>
+gsk_cairo_node_new
+gsk_cairo_node_get_draw_context
+gsk_cairo_node_get_surface
+<SUBSECTION>
+gsk_container_node_new
+gsk_container_node_get_n_children
+gsk_container_node_get_child
+<SUBSECTION>
+gsk_transform_node_new
+gsk_transform_node_get_child
+gsk_transform_node_get_transform
+<SUBSECTION>
+gsk_opacity_node_new
+gsk_opacity_node_get_child
+gsk_opacity_node_get_opacity
+<SUBSECTION>
+gsk_color_matrix_node_new
+gsk_color_matrix_node_get_child
+gsk_color_matrix_node_get_color_matrix
+gsk_color_matrix_node_get_color_offset
+<SUBSECTION>
+gsk_repeat_node_new
+gsk_repeat_node_get_child
+gsk_repeat_node_get_child_bounds
+<SUBSECTION>
+gsk_clip_node_new
+gsk_clip_node_get_child
+gsk_clip_node_get_clip
+<SUBSECTION>
+gsk_rounded_clip_node_new
+gsk_rounded_clip_node_get_child
+gsk_rounded_clip_node_get_clip
+<SUBSECTION>
+GskFillRule
+gsk_fill_node_new
+gsk_fill_node_get_child
+gsk_fill_node_get_path
+gsk_fill_node_get_fill_rule
+<SUBSECTION>
+GskShadow
+gsk_shadow_node_new
+gsk_shadow_node_get_shadow
+gsk_shadow_node_get_n_shadows
+gsk_shadow_node_get_child
+<SUBSECTION>
+GskBlendMode
+gsk_blend_node_new
+gsk_blend_node_get_bottom_child
+gsk_blend_node_get_top_child
+gsk_blend_node_get_blend_mode
+<SUBSECTION>
+gsk_cross_fade_node_new
+gsk_cross_fade_node_get_start_child
+gsk_cross_fade_node_get_end_child
+gsk_cross_fade_node_get_progress
+<SUBSECTION>
+gsk_text_node_new
+gsk_text_node_get_font
+gsk_text_node_get_glyphs
+gsk_text_node_get_color
+gsk_text_node_has_color_glyphs
+gsk_text_node_get_num_glyphs
+gsk_text_node_get_offset
+<SUBSECTION>
+gsk_blur_node_new
+gsk_blur_node_get_child
+gsk_blur_node_get_radius
+<SUBSECTION>
+gsk_debug_node_new
+gsk_debug_node_get_child
+gsk_debug_node_get_message
+<SUBSECTION>
+gsk_gl_shader_node_new
+gsk_gl_shader_node_get_n_children
+gsk_gl_shader_node_get_child
+gsk_gl_shader_node_get_args
+gsk_gl_shader_node_get_shader
+<SUBSECTION Standard>
+GSK_IS_RENDER_NODE
+GSK_RENDER_NODE
+GSK_TYPE_RENDER_NODE
+GSK_TYPE_BLEND_NODE
+GSK_TYPE_BLUR_NODE
+GSK_TYPE_BORDER_NODE
+GSK_TYPE_CAIRO_NODE
+GSK_TYPE_CLIP_NODE
+GSK_TYPE_COLOR_MATRIX_NODE
+GSK_TYPE_COLOR_NODE
+GSK_TYPE_CONTAINER_NODE
+GSK_TYPE_CROSS_FADE_NODE
+GSK_TYPE_DEBUG_NODE
+GSK_TYPE_FILL_NODE
+GSK_TYPE_INSET_SHADOW_NODE
+GSK_TYPE_LINEAR_GRADIENT_NODE
+GSK_TYPE_OPACITY_NODE
+GSK_TYPE_OUTSET_SHADOW_NODE
+GSK_TYPE_REPEATING_LINEAR_GRADIENT_NODE
+GSK_TYPE_REPEAT_NODE
+GSK_TYPE_ROUNDED_CLIP_NODE
+GSK_TYPE_SHADOW_NODE
+GSK_TYPE_TEXT_NODE
+GSK_TYPE_TEXTURE_NODE
+GSK_TYPE_TRANSFORM_NODE
+GSK_TYPE_GLSHADER_NODE
+GskRenderNodeClass
+gsk_blend_node_get_type
+gsk_blur_node_get_type
+gsk_border_node_get_type
+gsk_broadway_renderer_get_type
+gsk_cairo_node_get_type
+gsk_cairo_renderer_get_type
+gsk_clip_node_get_type
+gsk_color_matrix_node_get_type
+gsk_color_node_get_type
+gsk_container_node_get_type
+gsk_cross_fade_node_get_type
+gsk_debug_node_get_type
+gsk_fill_node_get_type
+gsk_inset_shadow_node_get_type
+gsk_linear_gradient_node_get_type
+gsk_opacity_node_get_type
+gsk_outset_shadow_node_get_type
+gsk_render_node_get_type
+gsk_repeating_linear_gradient_node_get_type
+gsk_repeat_node_get_type
+gsk_rounded_clip_node_get_type
+gsk_shadow_node_get_type
+gsk_text_node_get_type
+gsk_texture_node_get_type
+gsk_transform_node_get_type
+gsk_gl_shader_node_get_type
+GSK_TYPE_BLEND_MODE
+<SUBSECTION Standard>
+gsk_serialization_error_quark
+GSK_SERIALIZATION_ERROR
+GSK_TYPE_SERIALIZATION_ERROR
+</SECTION>
+
+<SECTION>
+<FILE>GskRoundedRect</FILE>
+GskCorner
+GskRoundedRect
+GSK_ROUNDED_RECT_INIT
+gsk_rounded_rect_init
+gsk_rounded_rect_init_copy
+gsk_rounded_rect_init_from_rect
+gsk_rounded_rect_normalize
+gsk_rounded_rect_offset
+gsk_rounded_rect_shrink
+gsk_rounded_rect_is_rectilinear
+gsk_rounded_rect_contains_point
+gsk_rounded_rect_contains_rect
+gsk_rounded_rect_intersects_rect
+</SECTION>
+
+<SECTION>
+<FILE>GskPath</FILE>
+<SUBSECTION>
+GskPath
+gsk_path_ref
+gsk_path_unref
+gsk_path_new_rect
+gsk_path_new_from_cairo
+gsk_path_parse
+<SUBSECTION>
+gsk_path_print
+gsk_path_to_string
+gsk_path_to_cairo
+<SUBSECTION>
+gsk_path_is_empty
+gsk_path_get_bounds
+<SUBSECTION>
+GskPathForeachFlags
+gsk_path_foreach
+<SUBSECTION Private>
+GSK_TYPE_PATH
+gsk_path_get_type
+</SECTION>
+
+<SECTION>
+<FILE>GskPathBuilder</FILE>
+GskPathBuilder
+gsk_path_builder_new
+gsk_path_builder_ref
+gsk_path_builder_unref
+gsk_path_builder_to_path
+gsk_path_builder_free_to_path
+<SUBSECTION>
+gsk_path_builder_get_current_point
+<SUBSECTION>
+gsk_path_builder_add_rect
+gsk_path_builder_add_rounded_rect
+gsk_path_builder_add_circle
+<SUBSECTION>
+gsk_path_builder_move_to
+gsk_path_builder_rel_move_to
+gsk_path_builder_line_to
+gsk_path_builder_rel_line_to
+gsk_path_builder_curve_to
+gsk_path_builder_rel_curve_to
+gsk_path_builder_conic_to
+gsk_path_builder_rel_conic_to
+gsk_path_builder_close
+<SUBSECTION Private>
+GSK_TYPE_PATH_BUILDER
+gsk_path_builder_get_type
+</SECTION>
+
+<SECTION>
+<FILE>GskStroke</FILE>
+GskLineCap
+GskLineJoin
+gsk_stroke_new
+gsk_stroke_copy
+gsk_stroke_free
+gsk_stroke_equal
+gsk_stroke_set_line_width
+gsk_stroke_get_line_width
+gsk_stroke_set_line_join
+gsk_stroke_get_line_join
+gsk_stroke_set_line_cap
+gsk_stroke_get_line_cap
+gsk_stroke_set_miter_limit
+gsk_stroke_get_miter_limit
+gsk_stroke_set_dash
+gsk_stroke_get_dash
+gsk_stroke_set_dash_offset
+gsk_stroke_get_dash_offset
+<SUBSECTION Private>
+GSK_TYPE_STROKE
+gsk_stroke_get_type
+</SECTION>
+
+<SECTION>
+<FILE>GskTransform</FILE>
+GskTransform
+gsk_transform_ref
+gsk_transform_unref
+<SUBSECTION>
+GskTransformCategory
+gsk_transform_get_category
+<SUBSECTION>
+gsk_transform_print
+gsk_transform_to_string
+gsk_transform_parse
+<SUBSECTION>
+gsk_transform_to_matrix
+gsk_transform_to_2d
+gsk_transform_to_affine
+gsk_transform_to_translate
+<SUBSECTION>
+gsk_transform_transform
+gsk_transform_invert
+gsk_transform_matrix
+gsk_transform_translate
+gsk_transform_translate_3d
+gsk_transform_rotate
+gsk_transform_rotate_3d
+gsk_transform_scale
+gsk_transform_scale_3d
+gsk_transform_perspective
+<SUBSECTION>
+gsk_transform_equal
+<SUBSECTION>
+gsk_transform_transform_bounds
+gsk_transform_transform_point
+<SUBSECTION Private>
+GSK_TYPE_TRANSFORM
+GSK_TYPE_TRANSFORM_CATEGORY
+gsk_transform_get_type
+gsk_transform_new
+</SECTION>
+
+<SECTION>
+<FILE>GskGLShader</FILE>
+GskGLShader
+gsk_gl_shader_new_from_bytes
+gsk_gl_shader_new_from_resource
+gsk_gl_shader_compile
+gsk_gl_shader_get_source
+gsk_gl_shader_get_n_textures
+gsk_gl_shader_get_n_uniforms
+gsk_gl_shader_get_uniform_name
+gsk_gl_shader_find_uniform_by_name
+gsk_gl_shader_get_uniform_type
+gsk_gl_shader_get_uniform_offset
+gsk_gl_shader_get_args_size
+
+<SUBSECTION Uniform Data>
+gsk_gl_shader_get_arg_float
+gsk_gl_shader_get_arg_int
+gsk_gl_shader_get_arg_uint
+gsk_gl_shader_get_arg_bool
+gsk_gl_shader_get_arg_vec2
+gsk_gl_shader_get_arg_vec3
+gsk_gl_shader_get_arg_vec4
+gsk_gl_shader_format_args_va
+gsk_gl_shader_format_args
+
+<SUBSECTION Shader Args Builder>
+GskShaderArgsBuilder
+
+gsk_shader_args_builder_new
+gsk_shader_args_builder_to_args
+gsk_shader_args_builder_free_to_args
+gsk_shader_args_builder_unref
+gsk_shader_args_builder_ref
+
+gsk_shader_args_builder_set_float
+gsk_shader_args_builder_set_int
+gsk_shader_args_builder_set_uint
+gsk_shader_args_builder_set_bool
+gsk_shader_args_builder_set_vec2
+gsk_shader_args_builder_set_vec3
+gsk_shader_args_builder_set_vec4
+</SECTION>
@@ -1,46 +0,0 @@
-[library]
-version = "@version@"
-browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
-repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
-website_url = "https://www.gtk.org"
-authors = "GTK Development Team"
-logo_url = "gtk-logo.svg"
-license = "GPL-2.1-or-later"
-description = "The GTK toolkit"
-dependencies = [ "GObject-2.0", "Graphene-1.0", "Pango-1.0", "Gdk-4.0" ]
-devhelp = true
-search_index = true
-
-  [dependencies."GObject-2.0"]
-  name = "GObject"
-  description = "The base type system library"
-  docs_url = "https://developer.gnome.org/gobject/stable"
-
-  [dependencies."Graphene-1.0"]
-  name = "Graphene"
-  description = "A thin layer of mathematical types for 3D libraries"
-  docs_url = "https://ebassi.github.io/graphene/docs"
-
-  [dependencies."Pango-1.0"]
-  name = "Pango"
-  description = "Text shaping and rendering"
-  docs_url = "https://developer.gnome.org/pango/stable"
-
-  [dependencies."Gdk-4.0"]
-  name = "GDK"
-  description = "The GTK windowing system abstraction"
-  docs_url = "https://gnome.pages.gitlab.gnome.org/gtk/gdk4/"
-
-[theme]
-name = "basic"
-show_index_summary = true
-show_class_hierarchy = true
-
-[source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
-
-[extra]
-content_images = [
-  "gtk-logo.svg",
-]
-urlmap_file = "urlmap.js"
@@ -0,0 +1,3 @@
+gsk_render_node_get_type
+gsk_renderer_get_type
+gsk_gl_shader_get_type
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg6843"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   version="1.0"
-   sodipodi:docname="gtk-logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/ebassi/Pictures/gtk-logo-256.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <defs
-     id="defs6845">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-50 : 600 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="700 : 600 : 1"
-       inkscape:persp3d-origin="300 : 400 : 1"
-       id="perspective13" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="69.874353"
-     inkscape:cy="64.313526"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     width="128px"
-     height="128px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7947" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata6848">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <dc:date />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier />
-        <dc:source />
-        <dc:relation />
-        <dc:language />
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:coverage />
-        <dc:description />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path6976"
-       d="M 20.88413,30.82696 L 53.816977,55.527708 L 107.33282,39.060543 L 70.587303,17.177763 L 20.88413,30.82696 z"
-       style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6978"
-       d="M 22.94243,82.287118 L 20.88413,30.82696 L 53.816977,55.527708 L 53.816977,111.10486 L 22.94243,82.287118 z"
-       style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       id="path6980"
-       d="M 53.816977,111.10486 L 103.21619,90.5207 L 107.33282,39.060543 L 53.816977,55.527708 L 53.816977,111.10486 z"
-       style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path6982"
-       d="M 23.216626,81.319479 L 70.48573,67.361442 L 103.38422,90.444516"
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path6984"
-       d="M 70.434539,17.875593 L 70.434539,66.984877"
-       style="opacity:1;fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
@@ -1,24 +1,64 @@
-gsk4_toml = configure_file(input: 'gsk4.toml.in', output: 'gsk4.toml', configuration: toml_conf)
+private_headers = [
+  'gskcairoblurprivate.h',
+  'gskcairorendererprivate.h',
+  'gskdebugprivate.h',
+  'gskgldriverprivate.h',
+  'gskglprofilerprivate.h',
+  'gskglrendererprivate.h',
+  'gskprivate.h',
+  'gskprofilerprivate.h',
+  'gskrendererprivate.h',
+  'gskrendernodeprivate.h',
+  'gskrendernodeparserprivate.h',
+  'gskroundedrectprivate.h',
+  'gskshaderbuilderprivate.h',
+  'gsktextureprivate.h',
+  'gsktransformprivate.h',
+  'gskvulkanblendpipelineprivate.h',
+  'gskvulkanborderpipelineprivate.h',
+  'gskvulkanboxshadowpipelineprivate.h',
+  'gskvulkanbufferprivate.h',
+  'gskvulkanclipprivate.h',
+  'gskvulkancolorpipelineprivate.h',
+  'gskvulkancommandpoolprivate.h',
+  'gskvulkaneffectpipelineprivate.h',
+  'gskvulkanimageprivate.h',
+  'gskvulkanlineargradientpipelineprivate.h',
+  'gskvulkanmemoryprivate.h',
+  'gskvulkanpipelineprivate.h',
+  'gskvulkanpushconstantsprivate.h',
+  'gskvulkanrendererprivate.h',
+  'gskvulkanrenderpassprivate.h',
+  'gskvulkanrenderprivate.h',
+  'gskvulkanshaderprivate.h',
+]
+
+images = [
+]

 if get_option('gtk_doc')
-  custom_target('gsk4-doc',
-    input: [ gsk4_toml, gsk_gir[0] ],
-    output: 'gsk4',
-    command: [
-      gidocgen,
-      'generate',
-      '--quiet',
-      '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
-      '--config=@INPUT0@',
-      '--output-dir=@OUTPUT@',
-      '--no-namespace-dir',
-      '--content-dir=@0@'.format(meson.current_source_dir()),
-      '@INPUT1@',
-    ],
-    depends: [ gdk_gir[0] ],
-    depend_files: [ expand_content_md_files ],
-    build_by_default: true,
-    install: true,
-    install_dir: docs_dir,
-  )
+  configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+
+  gnome.gtkdoc('gsk4',
+               mode: 'none',
+               main_xml: 'gsk4-docs.xml',
+               src_dir: [
+                 gskinc,
+               ],
+               dependencies: libgtk_dep,
+               gobject_typesfile: join_paths(meson.current_source_dir(), 'gsk4.types'),
+               scan_args: [
+                 '--ignore-decorators=_GDK_EXTERN',
+                 '--ignore-headers=' + ' '.join(private_headers),
+               ],
+               fixxref_args: [
+                 '--html-dir=@0@'.format(docpath),
+                 '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+                 '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+                 '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+                 '--extra-dir=@0@'.format(cairo_docpath),
+                 '--extra-dir=../gdk',
+               ],
+               html_assets: images,
+               install: true)
 endif
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2021 GNOME Foundation
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-// A map between namespaces and base URLs for their online documentation
-baseURLs = [
-    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
-    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
-    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
-    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
-    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
-    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
-]
@@ -0,0 +1 @@
+@GTK_VERSION@
@@ -1,14 +1,13 @@
-Title: Overview of actions in GTK
-Slug: actions
+# Overview of actions in GTK {#actions-overview}

 This chapter describes in detail how GTK uses actions to connect
 activatable UI elements to callbacks. GTK inherits the underlying
-architecture of `GAction` and `GMenu` for describing abstract actions
+architecture of GAction and GMe:u for describing abstract actions
 and menus from the GIO library.

 ## Basics about actions

-A `GAction` is essentially a way to tell the toolkit about a piece of
+A GAction is essentially a way to tell the toolkit about a piece of
 functionality in your program, and to give it a name.

 Actions are purely functional. They do not contain any presentational
@@ -77,7 +76,7 @@ state type, and activating them with a particular parameter value is
 equivalent to changing their state to that value.

 This approach to handling radio buttons is different than many other
-action systems such as `GtkAction`. With `GAction`, there is only one action
+action systems such as GtkAction. With GAction, there is only one action
 for "text-justify" and "left", "center" and "right" are possible states on
 that action. There are not three separate "justify-left", "justify-center"
 and "justify-right" actions.
@@ -97,7 +96,7 @@ Even though toggle actions have a state, they do not have a parameter.
 Therefore, a target value is not needed when referring to them — they
 will always be toggled on activation.

-Most APIs that allow using a `GAction` (such as `GMenuModel` and `GtkActionable`)
+Most APIs that allow using a GAction (such as GMenuModel and GtkActionable)
 allow use of detailed action names. This is a convenient way of specifying
 an action name and an action target with a single string.

@@ -141,7 +140,7 @@ separate state for each instance of the action as well as being able to
 control the enabled state of the action on a per-window basis.

 Actions are added to their relevant scope (application, window or widget)
-either using the `GActionMap` interface, or by using
+either using the GActionMap interface, or by using
 gtk_widget_insert_action_group(). Actions that will be the same for all
 instances of a widget class can be added globally using
 gtk_widget_class_install_action().
@@ -150,7 +149,7 @@ gtk_widget_class_install_action().

 Actions rarely occurs in isolation. It is common to have groups
 of related actions, which are represented by instances of the
-`GActionGroup` interface.
+GActionGroup interface.

 Action maps are a variant of action groups that allow to change
 the name of the action as it is looked up. In GTK, the convention
@@ -161,46 +160,46 @@ or "win." for those with window scope.
 When referring to actions on a GActionMap only the name of the
 action itself is used (ie: "quit", not "app.quit"). The
 "app.quit" form is only used when referring to actions from
-places like a `GMenu` or `GtkActionable` widget where the scope
+places like a GMenu or GtkActionable widget where the scope
 of the action is not already known.

-`GtkApplication` and `GtkApplicationWindow` implement the `GActionMap`
+GtkApplication and GtkApplicationWindow implement the GActionMap
 interface, so you can just add actions directly to them. For
 other widgets, use gtk_widget_insert_action_group() to add
 actions to it.

 If you want to insert several actions at the same time, it is
-typically faster and easier to use `GActionEntry`.
+typically faster and easier to use GActionEntry.

 ## Connecting actions to widgets

-Any widget that implements the `GtkActionable` interface can
+Any widget that implements the GtkActionable interface can
 be connected to an action just by setting the ::action-name
 property. If the action has a parameter, you will also need
-to set the ::action-target property. Widgets that implement
-`GtkActionable` include `GtkSwitch`, `GtkButton`, and their
-respective subclasses.
+to set the ::action-target property.
+Widgets that implement GtkActionable include GtkSwitch, GtkButton,
+and their respective subclasses.

 Another way of obtaining widgets that are connected to actions
-is to create a menu using a `GMenu` menu model. `GMenu` provides an
+is to create a menu using a GMenu menu model. GMenu provides an
 abstract way to describe typical menus: nested groups of items
 where each item can have a label, and icon, and an action.

-A typical use of `GMenu` inside GTK is to set up an application
+A typical use of GMenu inside GTK is to set up an application
 menubar with gtk_application_set_menubar(). Another, maybe more
 common use is to create a popover for a menubutton, using
 gtk_menu_button_set_menu_model().

 Unlike traditional menus, those created from menu models don't
 have keyboard accelerators associated with menu items. Instead,
-`GtkApplication` offers the gtk_application_set_accels_for_action()
+GtkApplication offers the gtk_application_set_accels_for_action()
 API to associate keyboard shortcuts with actions.

 ## Activation

 When a widget with a connected action is activated, GTK finds
 the action to activate by walking up the widget hierarchy,
-looking for a matching action, ending up at the `GtkApplication`.
+looking for a matching action, ending up at the GtkApplication.

 ## Built-in Actions

@@ -210,16 +209,13 @@ you should avoid naming conflicts with them when creating your
 own actions.

 default.activate
-: Activates the default widget in a context (typically a `GtkWindow`,
-  `GtkDialog` or `GtkPopover`)
-
+ :  Activates the default widget in a context (typically a GtkWindow,
+    GtkDialog or GtkPopover)
 clipboard.cut, clipboard.copy, clipboard.paste
-: Clipboard operations on entries, text view and labels, typically
-  used in the context menu
-
+ :  Clipboard operations on entries, text view and labels, typically
+    used in the context menu
 selection.delete, selection.select-all
-: Selection operations on entries, text view and labels
-
+ : Selection operations on entries, text view and labels
 color.select, color.customize:
-: Operate on colors in a `GtkColorChooserWidget`. These actions are
-  unusual in that they have the non-trivial parameter type (dddd):
+ : Operate on colors in a #GtkColorChooserWidget. These actions are
+   unusual in that they have the non-trivial parameter type (dddd):
@@ -1,7 +1,4 @@
-Title: The Broadway windowing system
-Slug: broadway
-
-## Using GTK with Broadway
+# Using GTK with Broadway {#gtk-broadway}

 The GDK Broadway backend provides support for displaying GTK
 applications in a web browser, using HTML5 and web sockets. To run
@@ -29,9 +26,9 @@ Start your applications like this:
 GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
 ```

-## Broadway-specific environment variables
+## Broadway-specific environment variables {#broadway-envar}

-### BROADWAY\_DISPLAY
+### BROADWAY_DISPLAY

 Specifies the Broadway display number. The default display is 0.
 The display number determines the port to use when connecting
@@ -1,5 +1,4 @@
-Title: Compiling the GTK Libraries
-Slug: gtk-building
+# Compiling the GTK Libraries {#gtk-building}

 ## Building GTK

@@ -76,7 +75,7 @@ PATH="/opt/gtk/bin:$PATH"
 export LD_LIBRARY_PATH PATH
 ```

-## Build types
+## Build types {#build-types}

 Meson has different build types, exposed by the `buildtype`
 configuration option. GTK enables and disables functionality
@@ -112,7 +111,7 @@ linker flags. Note that with the plain build type, you are also
 responsible for controlling the debugging features of GTK with
 `-DG_ENABLE_DEBUG` and `-DG_DISABLE_CAST_CHECKS`.

-## Dependencies
+## Dependencies {#dependencies}

 Before you can compile the GTK widget toolkit, you need to have
 various other tools and libraries installed on your
@@ -180,7 +179,7 @@ Other libraries are maintained separately.
  `XDG_DATA_DIRS` set accordingly at configure time. Otherwise,
  gdk-pixbuf falls back to its built-in mime type detection.

-## Building and testing GTK
+## Building and testing GTK {#building}

 First make sure that you have the necessary external
 dependencies installed: `pkg-config`, Meson, Ninja,
@@ -208,7 +207,7 @@ log that can help you understand the issue you're encountering. If
 all else fails, you can ask for help on the
 [GTK forums](#gtk-resources).

-## Extra Configuration Options
+## Extra Configuration Options {#extra-configuration-options}

 In addition to the normal options provided by Meson, GTK defines various
 arguments that modify what should be built. All of these options are passed
@@ -1,5 +1,4 @@
-Title: Compiling GTK Applications on UNIX
-Slug: gtk-compiling
+# Compiling GTK Applications on UNIX {#gtk-compiling}

 To compile a GTK application, you need to tell the compiler where to
 find the GTK header files and libraries. This is done with the
@@ -1,5 +1,4 @@
-Title: CSS in GTK
-Slug: css
+# CSS in GTK {#css}

 This chapter describes how GTK uses CSS for styling and layout. 
 It is not meant to be an explanation of CSS from first principles,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	5efa3400d9	xxx: Plug a memory leak in GtkPopover	2020-12-13 10:30:22 -05:00
Matthias Clasen	41c6bfec67	Fix gsk_spline_decompose_arc For short segments (angle < tolerance), we were not emitting any curve at all when decomposing arc.	2020-12-13 10:30:22 -05:00
Matthias Clasen	5a4d19644f	pathbuilder: Misc docs improvements	2020-12-13 10:30:22 -05:00
Matthias Clasen	c9e9f6184d	path: Misc doc improvements	2020-12-13 10:30:22 -05:00
Matthias Clasen	3a3c16c475	Add gsk_path_measure_get_{path,tolerance} These are just nice apis to have and avoid having to carry these around as extra arguments in many places. This was showing up as inconvenience in writing tests for the measure apis.	2020-12-13 10:30:22 -05:00
Benjamin Otte	dfb25771a7	xxx path)_fill	2020-12-11 01:42:17 +01:00
Benjamin Otte	b286b04b7d	testsuite: Add tests for the dasher	2020-12-11 01:42:17 +01:00
Benjamin Otte	22aa12ade5	path: Add a foreach function that dashes a path	2020-12-11 01:42:17 +01:00
Benjamin Otte	79ba157664	path: Deal with non-uniformness of progress parameter The progress is non-uniform, so simple translation of progress doesn't work. So check if larger and smaller values inch closer towards minimal distance.	2020-12-10 20:18:05 +01:00
Benjamin Otte	c21c63c357	path: Always decompose conics into at least 2 segments Conics are evil in that their parameter skews towards the center, and if it's a very flat conic (weight almost equal to 0), then we'd approximate it with a single segment and not subdivide, which would cause the parameter to be wildly off around 0.25 or 0.75. And that would cause offset calculations to fail.	2020-12-10 20:18:05 +01:00
Matthias Clasen	78f04ae486	testsuite Add curve tangent tests	2020-12-10 20:18:05 +01:00
Benjamin Otte	bd4dcc54fb	testsuite: Add a test for the conic that got us segment()	2020-12-10 20:18:05 +01:00
Benjamin Otte	580d3057ce	path: Add gsk_curve_segment() Using split() twice with scaled t values does not work with conics.	2020-12-10 20:18:05 +01:00
Benjamin Otte	0060734103	testsuite: Add a test for gsk_curve_decompose()	2020-12-10 20:18:05 +01:00
Benjamin Otte	95ce8aafb4	testuite: Add tests for gsk_curve_get_tangent()	2020-12-10 20:18:05 +01:00
Matthias Clasen	0603bc2f45	testuite: Add tests for gsk_curve_get_point() Add a few tests for gsk_curve_get_point(). Since GskCurve is not public api, we add gskcurve.c as source to the test binary.	2020-12-10 20:18:05 +01:00
Benjamin Otte	07864c3070	curve: Split eval() into get_point() and get_tangent() That's more in line with the get_start/end_point/tangent() functions. Plus, those calls are independent and we usually want one or the other.	2020-12-10 20:18:05 +01:00
Matthias Clasen	95d5b9a057	Add gsk_curve_get_{start,end}_tangent Add a way to get the tangents at the start and end of the curve. This will be used in stroking.	2020-12-10 20:18:05 +01:00
Benjamin Otte	d5fe88a787	testsuite: Add conics to the random paths	2020-12-10 20:18:05 +01:00
Benjamin Otte	343324c205	path: Add GskCurve GskCurve is an abstraction for path operations. It's essentially a collection of vfuncs per GskPathOperation. GskStandardContour has been ported to use it where appropriate.	2020-12-10 20:18:05 +01:00
Benjamin Otte	12dde7b4a1	path: Introduce gskpathop A gskpathop is a pointer to a graphene_point_t* with the low bits used to encode the GskPathOperation. It's an easy way to introduce API for operations. So far it's just used to replace GskStandardOperation.	2020-12-10 20:18:05 +01:00
Benjamin Otte	c07afdf1d7	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.	2020-12-10 20:18:05 +01:00
Benjamin Otte	7959ed96e2	WIP: pathbuilder: Add gsk_path_builder_add_rounded_rect() It works, but does not use a custom contour yet.	2020-12-10 20:02:13 +01:00
Benjamin Otte	43360a1cfa	path: Add conic curves So far this just adds the API, if you use it, you'll get lots of g_warnings(). This will be fixed in future commits.	2020-12-08 21:33:46 +01:00
Benjamin Otte	22753c685e	path: Rename to gtk_path_builder_add_segment() It's about bulding paths, not about measuring them.	2020-12-06 18:54:01 +01:00
Benjamin Otte	40ae74e03d	path: Split contours into their own file I'm not sure I want to keep all contours in one file, but for now that's how it is.	2020-12-06 18:54:01 +01:00
Benjamin Otte	95b71d47c9	path: Make all private contour APIs take a GskContour ... instead of a path, index tuple.	2020-12-06 18:54:01 +01:00
Benjamin Otte	cfd8855676	stroke: Add support for dashes ... and hook it up in the node parser and for Cairo rendering.	2020-12-06 18:54:01 +01:00
Matthias Clasen	7c7bb31d93	gsk: Implement parsing fill and stroke nodes Make serialization and deserialization work for stroke and fill nodes.	2020-12-06 18:54:01 +01:00
Benjamin Otte	a0c9e33865	path: Add flags to gsk_path_foreach() This way we can default to the siplest possible foreach() output - like cairo_copy_path_flat() decomposing everything into lines - and add flags to get more and more fancy. This will be useful to have conics automatically decomposed for Cairo drawing or if we want to add more line types in the future.	2020-12-06 18:54:01 +01:00
Benjamin Otte	dccec4ced2	testsuite: Add an in_fill() test	2020-12-06 18:54:01 +01:00
Matthias Clasen	8f3f16d251	Implement gsk_path_measure_in_fill Implement this in the obvious way, using the decomposed form of standard contours. Since the decomposed form is part of the measure object, this api moves from gsk_path_in_fill to gsk_path_measure_in_fill.	2020-12-06 18:54:01 +01:00
Benjamin Otte	d0ce83e853	testsuite: Add a parsing test This test includes an implementation of a gsk_path_equal() func with a tolerance that is necessary because parsing does not always work 100% exactly due to floating point rounding, so we can't just compare the to_string() output.	2020-12-06 18:54:01 +01:00
Matthias Clasen	91dd2e449e	path: Special-case rects and circles Write out the commands for rects and circles in a special way, and add code in the parser to recognize this, so we can successfully round-trip these through the SVG path format. The special way - for people who want to use it for debugging - for now is that we use uppercase "Z" to close standard paths, but lowercase "z" to close our special paths. A test is included, but the random path serializations should take care of it, too.	2020-12-06 18:54:01 +01:00
Matthias Clasen	6ff7c67c67	path: Fix serialization for circles The svg A can not do a full circle, since it is a two point parametrization - if the start and end point are the same, it draws nothing. So, use two arcs.	2020-12-06 18:54:01 +01:00
Benjamin Otte	de1213cbb2	testsuite: Add librsvg path tests	2020-12-06 18:54:01 +01:00
Matthias Clasen	217921ff22	path: Implement gsk_path_parse Implement the SVG path syntax to read back the strings that we generate when serializing paths. The tests for this code are taken from librsvg. This includes an elliptical arc implementation according to the SVG spec. The code is mostly taken from librsvg, but pretty directly follows the SVG spec implementation notes. We don't export this, since the parametrization is inconvenient. We do want an arc_to API, but these are not the arcs we are looking for.	2020-12-06 18:54:01 +01:00
Matthias Clasen	13153e4b30	path: Implement SVG arcs This is elliptical arc implementation according to the SVG spec. The code is mostly taken from librsvg, but pretty directly follows the SVG spec implementation notes. We don't export this, since the parametrization is inconvenient. We do want an arc_to API, but these are not the arcs we are looking for. It will be used in parsing SVG path syntax.	2020-12-06 18:54:01 +01:00
Matthias Clasen	1eca63e442	stroke: Add miter limit Add a miter limit to GskStroke. This will be needed to fully implement line joins. Also introduce the GSK_LINE_JOIN_MITER_CLIP value, following SVG 2.0. cairo does not have it, so translate it to plain miter when using cairo.	2020-12-06 18:54:01 +01:00
Matthias Clasen	2ed55da45c	Documentation typo fixes	2020-12-06 18:54:01 +01:00
Benjamin Otte	ab77041437	testsuite: Add relative path functions They're making the paths slightly weirder, but they test public API, so woohoo!	2020-12-06 18:54:01 +01:00
Benjamin Otte	1ef2a39c4d	pathbuilder: Add relative path commands And gsk_path_builder_get_current_point(). They will be needed by the string parser.	2020-12-06 18:54:01 +01:00
Benjamin Otte	bccada91b6	path: Add GSK_CIRCLE_POINT_INIT() to initialize points on the circle This is just splitting out a commonly done operation into a macro.	2020-12-06 18:54:01 +01:00
Benjamin Otte	bed254cc7a	pathbuilder: Redo semantics for starting curves We now always have a "current point" which is either the last point an operation was made to, or (0, 0) if no drawing operation has been made yet. Adding a contour of any kind to the builder will always update the current point to that contour's end point.	2020-12-06 18:54:00 +01:00
Benjamin Otte	bb224682c1	xxx: demo	2020-12-06 18:53:24 +01:00
Benjamin Otte	8e2f90c887	path: Split GskPathBuilder into its own file ... and add missing API docs.	2020-12-06 18:53:17 +01:00
Benjamin Otte	705617a6d5	testsuite: Add a test using get_point() and get_closest_point()	2020-12-06 18:51:55 +01:00
Benjamin Otte	bc019bd1fc	testsuite: Add a test for get_point()	2020-12-06 18:51:55 +01:00
Benjamin Otte	c9edcb1009	testsuite: Update create_random_path() 1. Allow specifying the max number of contours 2. Be smarter about creating the paths: With 10% chance, create a "weird" path like the empty one or only points or things like that. Otherwise create a bunch of contours, with 2/3 a standard contour, with 1/3 a predetermined one.	2020-12-06 18:51:55 +01:00
Benjamin Otte	967968fb0b	gtk-demo: Add cute maze demo	2020-12-06 18:51:55 +01:00
Benjamin Otte	9e7d3b4473	testsuite: Add tests for gsk_path_measure_get_closest_point()	2020-12-06 18:51:54 +01:00
Benjamin Otte	5819bfeca7	path: Add gsk_path_measure_get_closest_point() ... and gsk_path_measure_get_closest_point_full(). Those 2 functions allow finding the closest point on a path to a given point.	2020-12-06 18:51:54 +01:00
Benjamin Otte	e611becb9f	spline: Use Skia's tolerance checks This avoids measuring being too far off (it's still off, but it's less than a percent now.	2020-12-06 18:51:54 +01:00
Benjamin Otte	541f7aa2bb	testsuite: Add tests for gsk_path_measure_add_segment()	2020-12-06 18:51:54 +01:00
Benjamin Otte	7163015b1a	gtk-demo: Add a text-on-path demo	2020-12-06 18:51:54 +01:00
Benjamin Otte	8422d7965f	xxx: path_fill demo	2020-12-06 18:51:54 +01:00
Benjamin Otte	0092f55bd1	path: Add gsk_path_measure_get_point() Allows querying the coordinates and direction of any specific point on a path.	2020-12-06 18:51:54 +01:00
Matthias Clasen	3e8fcf4831	path: Add gsk_path_add_circle() Adds a circle contour, too.	2020-12-06 18:51:54 +01:00
Benjamin Otte	a0c680011c	pathmeasure: Implement support for beziers Instead of treating bezier curves as lines, we properly decompose them into line segments now so that we can treat those as lines.	2020-12-06 18:51:54 +01:00
Benjamin Otte	b8ddef040d	path: Implement gsk_path_to_cairo() using foreach()	2020-12-06 18:51:54 +01:00
Benjamin Otte	a1f759336c	path: Add gsk_path_foreach()	2020-12-06 18:51:54 +01:00
Benjamin Otte	acfcb9da6c	path: Collect flags We don't need them yet, but maybe later.	2020-12-06 18:51:50 +01:00
Benjamin Otte	b2fdb10aaa	testsuite: Add path tests	2020-12-04 02:58:34 +01:00
Benjamin Otte	f92dbb8caa	pathmeasure: Add gsk_path_measure_add_segment() This allows chunking paths, weeee.	2020-12-04 02:58:34 +01:00
Benjamin Otte	484b7dd5f2	path: Add gsk_path_builder_add_path()	2020-12-04 02:58:34 +01:00
Benjamin Otte	307eccc451	gsk: Add GskPathMeasure An object to do measuring operations on paths - determining their length, cutting off subpaths, things like that.	2020-12-04 02:58:34 +01:00
Benjamin Otte	57227e8f64	path: Change data structure for standard path Instead of the Cairo method and imitating cairo_path_data_t, use the Skia method and keep points and operations separate. That way we get a points array that includes the starting point - because it's always the end point of the previous operation.	2020-12-04 02:58:34 +01:00
Benjamin Otte	a5b1842acf	popover: Use fill and stroke nodes instead of Cairo ... to render the arrow. The arrow should really be turned into a real thing - maybe an icon?	2020-12-04 02:58:34 +01:00
Benjamin Otte	e482dd739f	snapshot: Add gtk_snapshot_push_stroke()	2020-12-04 02:58:34 +01:00
Benjamin Otte	c1b8eb50ed	gsk: Add GskStrokeNode	2020-12-04 02:58:34 +01:00
Benjamin Otte	12c5bb6f8c	gsk: Add GskStroke It's unused in this commit. This just prepares the new object.	2020-12-04 02:58:34 +01:00
Benjamin Otte	16d504a78c	demos: Add a simple demo filling a path	2020-12-04 02:58:34 +01:00
Benjamin Otte	e22a12bb42	snapshot: Add gtk_snapshot_push_fill()	2020-12-04 02:58:34 +01:00
Benjamin Otte	4fc6ef1a5f	gsk: Add GskFillNode Take a rendernode as source and a GskPath and fill the region in the path just like cairo_fill() would.	2020-12-04 02:58:31 +01:00
Benjamin Otte	5bda1e0d4b	gsk: Add GskPath	2020-12-04 02:56:18 +01:00
Benjamin Otte	aca2f15f05	listview: Use the correct scroll policy Use the horizontal policy for horizontal decisions, not the vertical one. This broke in `0011ce949c`.	2020-12-04 02:56:18 +01:00
Benjamin Otte	b69e956d60	docs: Put render nodes in their own sections	2020-12-04 02:56:17 +01:00
Benjamin Otte	feaff8825c	roundedbox: Remove unused API	2020-12-04 02:55:57 +01:00