Add a demo for path ops

Implement boolean operations on paths.

.gitlab-ci.yml

@@ -25,7 +25,7 @@ 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:v37"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v35"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
 
 .only-default:
@@ -88,7 +88,7 @@ fedora-x86_64:
     - meson compile -C _build
     - meson install -C _build
     - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
-    - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
+    - meson compile -C _build_hello
     - .gitlab-ci/run-tests.sh _build x11
     - .gitlab-ci/run-tests.sh _build wayland
     - .gitlab-ci/run-tests.sh _build waylandgles
@@ -156,11 +156,6 @@ msys2-mingw64:
   variables:
     MSYSTEM: "MINGW64"
     CHERE_INVOKING: "yes"
-  artifacts:
-    when: always
-    expose_as: 'Windows_DLL_MSYS2_64_bit_toolchain'
-    paths:
-      - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
 macos:
   extends: .only-default
@@ -172,7 +167,7 @@ macos:
   needs: []
   before_script:
     - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson==0.59
+    - 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

.gitlab-ci/fedora.Dockerfile

@@ -42,7 +42,6 @@ RUN dnf -y install \
     iso-codes \
     itstool \
     json-glib-devel \
-    lcms2-devel \
     lcov \
     libasan \
     libattr-devel \
@@ -72,7 +71,6 @@ RUN dnf -y install \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
     meson \
-    mutter \
     ninja-build \
     pango-devel \
     pcre-devel \
@@ -97,8 +95,6 @@ RUN dnf -y install \
     weston-libs \
     which \
     xorg-x11-server-Xvfb \
- && dnf install -y 'dnf-command(builddep)' \
- && dnf builddep -y wayland \
  && dnf clean all
 
 # Enable sudo for wheel users

.gitlab-ci/test-msvc.bat

@@ -5,8 +5,8 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 @echo on
 
 :: FIXME: make warnings fatal
-pip3 install --upgrade --user meson==0.59 || goto :error
-meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
+pip3 install --upgrade --user meson==0.56.2  || goto :error
+meson -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 
 goto :EOF

.gitlab-ci/test-msys2.sh

@@ -15,9 +15,9 @@ pacman --noconfirm -Suy
 pacman --noconfirm -S --needed \
     base-devel \
     git \
-    mingw-w64-$MSYS2_ARCH-cc \
+    mingw-w64-$MSYS2_ARCH-toolchain \
     mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-pkgconf \
+    mingw-w64-$MSYS2_ARCH-pkg-config \
     mingw-w64-$MSYS2_ARCH-gobject-introspection \
     mingw-w64-$MSYS2_ARCH-meson \
     mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
@@ -30,13 +30,8 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-libepoxy \
     mingw-w64-$MSYS2_ARCH-pango \
     mingw-w64-$MSYS2_ARCH-fribidi \
-    mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-python-gobject
-    mingw-w64-$MSYS2_ARCH-libpng \
-    mingw-w64-$MSYS2_ARCH-libjpeg-turbo \
-    mingw-w64-$MSYS2_ARCH-libtiff \
-    mingw-w64-$MSYS2_ARCH-lcms2
+    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
+    mingw-w64-$MSYS2_ARCH-shared-mime-info
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -77,5 +72,3 @@ unset CCACHE_DISABLE
 
 ninja -C _build
 ccache --show-stats
-
-tar zcf _build/gtkdll.tar.gz _build/gtk/libgtk*.dll

NEWS

@@ -1,344 +1,8 @@
-Overview of Changes in 4.7.0, 07-05-2022
-========================================
-
-* GtkTextView:
- - Reduce overdraws
-
-* GtkViewport:
- - Default scroll-to-focus to TRUE
-
-* GtkText:
- - Stop blinking when we lose focus
-
-* GtkSearchEntry:
- - Make search delay configurable
-
-* GtkPopoverMenu:
- - Fix RTL positioning of buttons
-
-* GtkLabel:
- - Fix focus keynav with links
-
-* GtkFileChooser:
- - Prevent undesirable completion popups
- - Fix a corner case in save mode
- - Keep the portal filechooser alive long enough
-
-* GtkCheckButton:
- - Allow setting a custom child
-
-* GtkEditableLabel:
- - Make the :editing property writable
-
-* GtkColumnView:
- - Various optimizations to improve scrolling performance
-
-* GtkTreeStore:
- - Allow populating tree stores from ui files
-
-* GtkBoxLayout:
- - Avoid infinite loops
-
-* CSS:
- - Optimize reordering within the same parent
-
-* Emoji:
- - Update to CLDR v40 / Unicode 14
- - Add more locales
-
-* Input:
- - Add scroll unit handling
- - Handle display changes in GtkIMMultiContext
- - Always populate GDK_AXIS_X/Y in event history
- - Don't crash for large compose tables
-
-* Accessibility:
- - Fix a crash at start when orca is running
-
-* Theme:
- - Refresh icons
- - Fix selection in vertical spin buttons
- - Fix selection in editable labels
-
-* gdk:
- - Optimize pixel format conversions
- - Use EGL_KHR_swap_buffers_with_damage for NVidia
-
-* gsk:
- - Handle large viewports
- - Prepare texture libraries for glyphy rendering
- - Don't leak big glyphs in the glyph cache
- - Align offscreen rendering with th pixel grid
- - Check for half-float support before using it
-
-* Wayland:
- - Use xdg-activation protocol
- - Fix text caret coordinates
- - Fix on-screen keyboard activation
-
-* MacOS:
- - Fix sluggish and reversed scrolling
- - Improve monitor detection
- - Event handling fixes
- - Fix keyboard input on popovers
- - Support OpenGL-based video playback
- - Suport fullscreen
- - Improve native filechoooser size allocation
- - Use CALayer and IOSurface for rendering
- - Use a per-monitor CVDisplayLink
- - Fix kinetic scrolling
- - Improve window placement
- - Improve multi-monitor handling
- - Start applications in the foreground
- - Fix cursor blink time
-
-* Windows:
- - Fix preedit window placement on HiDPI
-
-* Tools:
- - gtk4-builder-tool: Don't require a display for all commands
- - gtk4-builder-tool: Add a screenshot command
- - gtk4-node-editor: Install this utility
-
-* Debugging:
- - inspector: Show more application data
- - inspector: Allow viewing PangoAttrList properties
-
-* Documentation:
- - Use the gtk-builder-tool to generate screenshots
-
-* Build:
- - Fix cross-compilation
- - Fix build on aarch64
- - Fix build with gcc 12
-
-* Translation updates
- Basque
- Brazilian Portuguese
- British English
- Catalan
- Chinese (China)
- Chinese (Taiwan)
- Croatian
- Czech
- Danish
- Finnish
- Galician
- Georgian
- German
- Hebrew
- Hungarian
- Indonesian
- Italian
- Kazakh
- Korean
- Latvian
- Lithuanian
- Norwegian Bokmål
- Persian
- Polish
- Portuguese
- Russian
- Serbian
- Slovak
- Slovenian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.6.1, 11-02-2022
-========================================
-
-* GtkFontChooser:
- - Stop using PangoFc api
- - Fix a crash
- - Use new HarfBuzz api
-
-* GtkMenuButton:
- - Update accessible description
-
-* GtkTextView:
- - Fix intra-widget dnd
-
-* Printing:
- - Fix an fd leak
-
-* Input:
- - Make sure input methods get focus-in events
- - Always flush events to avoid scroll event pileup
- - Support hold events
- - Update keysyms from libxkbcommon
-
-* Theme:
- - Improve text selection legibility
-
-* Introspection:
- - Add missing nullable annotations everywhere
-
-* Build:
- - Make stack noexec again
- - Avoid symbol leaks
- - Drop unneeded script data
-
-* Windows:
- - Stop using WM_SYNCPAINT
- - Relax check for GL 3.x legacy contexts
- - Use native apis for language names
- - Rewrite the keymap code
- - Use the GL renderer by default
-
-* Wayland:
- - Fix support for the new high-contrast setting
- - Avoid redundant scale changes
- - Fix DND hotspot handling
- - Don't always restore the saved size when floating
-
-* MacOS:
- - Various performance improvements
-
-* Translation updates:
- Brazilian Portuguese
- Catalan
- Chinese (China)
- Galician
- Hebrew
- Japanese
- Lithuanian
- Persian
- Polish
- Portuguese
- Russian
- Slovenian
- Spanish
- Ukrainian
-
-
-Overview of Changes in 4.6.0, 30-12-2021
-========================================
-
-* GtkProgressBar:
- - Fix handling of "inverted"
-
-* GtkLabel:
- - Add a "natural wrap mode" property to influence how
-   natural width is determined
-
-* GtkTextView
- - Scroll insertion on-screen after undo / redo
-
-* gsk:
- - Abort region diffing when changes are too complex
-
-* gdk:
- - Avoid compressing discrete scroll events
- - Fix problems with hiding windows
- - Improve GL and GLES version checks
-
-* Wayland:
- - Support new high-contrast setting
-
-* Inspector:
- - Add DND inspection support
-
-* build:
- - Avoid deprecated meson apis
-
-* Translation updates
- Galician
- Portuguese
- Ukrainian
-
-
-Overview of Changes in 4.5.1, 16-12-2021
-========================================
-
-* GtkWidget sizing has been rewritten to implement
-  width-for-height more properly. This had some fallout,
-  and some widgets may still not react kindly to the
-  new way of doing things.
-
-  See https://blog.gtk.org/2021/12/03/sizable-news/
-  for details, and please file issues if you notice fallout.
+Overview of Changes
+===================
 
 * Rename git `master` branch to `main`
 
-* Css:
- - Fully support font-variant-caps
- - Fix a crash with gradients
-
-* Make various widgets activatable:
- - GtkComboBox
- - GtkDropDown
-
-* GtkPopover:
- - Make focus indicators not disappear
-
-* GtkTextView:
- - Don't leave embedded children stranded when scrolling
- - Don't insert Emoji into non-editable textviews
- - Fix Emoji chooser positioning
- - Fix problems with pasting text
- - Improve scroll-to-mark behavior
- - Support right-aligned, centered and decimal tabs
- - Make child anchor replacement character settable
- - Provide more context to input methods
-
-* GtkDragIcon:
- - Provide default icons for paintables and files
-
-* GtkBuilder:
- - Speed up template precompilation
-
-* Actions:
- - Reduce allocations during signal emissions
- - Avoid duplication and unnecessary recursion
-
-* Inspector:
- - Show the selected im-module in the General tab
- - Add a clipboard viewer
- - Make the recorder record events too
- - Add a graph visualizing gtk_widget_measure()
-
-* Gsk:
- - Fix hexbox rendering
- - Fix transformed linear gradient rendering
-
-* Printing:
- - Fix dialog-less printing
-
-* Windows:
- - Use the common EGL setup code
- - Respect GDK_DEBUG=gl-egl
- - Fix AeroSnap indicator and positioning
-
-* X11:
- - Improve behavior of windows drags on headerbar controls
- - Trap errors for RANDR changes
- - Fix problems with drag icons
-
-* Wayland:
- - Ensure we prefer the Wayland im-module over others
-
-* Translation updates
- Basque
- Catalan
- Croatian
- Friulian
- Galician
- Hebrew
- Icelandic
- Italian
- Latvian
- Lithuanian
- Occitan
- Persian
- Portuguese
- Spanish
- Swedish
- Ukrainian
-
 Overview of Changes in 4.5.0
 ============================
 

build-aux/flatpak/org.gtk.Demo4.json

@@ -43,8 +43,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                 }
             ]
         },

build-aux/flatpak/org.gtk.IconBrowser4.json

@@ -43,8 +43,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                 }
             ]
         },

build-aux/flatpak/org.gtk.WidgetFactory4.json

@@ -43,8 +43,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                 }
             ]
         },

build-aux/meson/post-install.py

@@ -13,7 +13,7 @@ if 'DESTDIR' not in os.environ:
 
     gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
     gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
-    gtk_mediamodule_dir = os.path.join(gtk_moduledir, 'media')
+    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
 
     print('Compiling GSettings schemas...')
     glib_compile_schemas = subprocess.check_output(['pkg-config',
@@ -40,6 +40,6 @@ if 'DESTDIR' not in os.environ:
         gio_querymodules = 'gio-querymodules'
     subprocess.call([gio_querymodules, gtk_printmodule_dir])
 
-    print('Updating module cache for media backends...')
-    os.makedirs(gtk_mediamodule_dir, exist_ok=True)
-    subprocess.call([gio_querymodules, gtk_mediamodule_dir])
+    print('Updating module cache for input methods...')
+    os.makedirs(gtk_immodule_dir, exist_ok=True)
+    subprocess.call([gio_querymodules, gtk_immodule_dir])

demos/constraint-editor/meson.build

@@ -17,7 +17,7 @@ executable('gtk4-constraint-editor',
   c_args: common_cflags,
   dependencies: libgtk_dep,
   include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
   link_args: extra_demo_ldflags,
   install: false,
 )

demos/gtk-demo/clipboard.c

@@ -1,10 +1,12 @@
 /* Clipboard
  *
  * GdkClipboard is used for clipboard handling. This demo shows how to
- * copy and paste text, images, colors or files to and from the clipboard.
+ * copy and paste text to and from the clipboard.
  *
- * You can also use Drag-And-Drop to copy the data from the source to the
- * target.
+ * It also shows how to transfer images via the clipboard or via
+ * drag-and-drop, and how to make clipboard contents persist after
+ * the application exits. Clipboard persistence requires a clipboard
+ * manager to run.
  */
 
 #include <glib/gi18n.h>
@@ -12,103 +14,22 @@
 #include <string.h>
 #include "demoimage.h"
 
+static GtkWidget *window = NULL;
+
 static void
-copy_button_clicked (GtkStack *source_stack,
-                     gpointer  user_data)
+copy_button_clicked (GtkWidget *button,
+                     gpointer   user_data)
 {
+  GtkWidget *entry;
   GdkClipboard *clipboard;
-  const char *visible_child_name;
-  GtkWidget *visible_child;
 
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (source_stack));
+  entry = GTK_WIDGET (user_data);
 
-  visible_child = gtk_stack_get_visible_child (source_stack);
-  visible_child_name = gtk_stack_get_visible_child_name (source_stack);
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry);
 
-  if (strcmp (visible_child_name, "Text") == 0)
-    {
-      gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (visible_child)));
-    }
-  else if (strcmp (visible_child_name, "Image") == 0)
-    {
-      GtkWidget *child;
-
-      for (child = gtk_widget_get_first_child (visible_child); child; child = gtk_widget_get_next_sibling (child))
-        {
-          if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (child)))
-            {
-              GtkWidget *image = gtk_widget_get_first_child (child);
-              GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
-
-              if (GDK_IS_TEXTURE (paintable))
-                gdk_clipboard_set (clipboard, GDK_TYPE_TEXTURE, paintable);
-              else
-                gdk_clipboard_set (clipboard, GDK_TYPE_PAINTABLE, paintable);
-              break;
-            }
-        }
-    }
-  else if (strcmp (visible_child_name, "Color") == 0)
-    {
-      GdkRGBA color;
-
-      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (visible_child), &color);
-      gdk_clipboard_set (clipboard, GDK_TYPE_RGBA, &color);
-    }
-  else if (strcmp (visible_child_name, "File") == 0)
-    {
-      gdk_clipboard_set (clipboard, G_TYPE_FILE, g_object_get_data (G_OBJECT (visible_child), "file"), NULL);
-    }
-  else
-    {
-      g_print ("TODO");
-    }
-}
-
-static void
-present_value (GtkStack     *dest_stack,
-               const GValue *value)
-{
-  GtkWidget *child;
-
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      GFile *file;
-
-      gtk_stack_set_visible_child_name (dest_stack, "File");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      file = g_value_get_object (value);
-      g_object_set (child, "label", g_file_peek_path (file), NULL);
-    }
-  else if (G_VALUE_HOLDS (value, GDK_TYPE_RGBA))
-    {
-      GdkRGBA *color;
-
-      gtk_stack_set_visible_child_name (dest_stack, "Color");
-      child = gtk_widget_get_first_child (gtk_stack_get_visible_child (dest_stack));
-
-      color = g_value_get_boxed (value);
-      g_object_set (child, "rgba", color, NULL);
-    }
-  else if (G_VALUE_HOLDS (value, GDK_TYPE_TEXTURE) ||
-           G_VALUE_HOLDS (value, GDK_TYPE_PAINTABLE))
-    {
-      GdkPaintable *paintable;
-
-      gtk_stack_set_visible_child_name (dest_stack, "Image");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      paintable = g_value_get_object (value);
-      g_object_set (child, "paintable", paintable, NULL);
-    }
-  else if (G_VALUE_HOLDS (value, G_TYPE_STRING))
-    {
-      gtk_stack_set_visible_child_name (dest_stack, "Text");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      gtk_label_set_label (GTK_LABEL (child), g_value_get_string (value));
-    }
+  /* Set clipboard text */
+  gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (entry)));
 }
 
 static void
@@ -116,259 +37,149 @@ paste_received (GObject      *source_object,
                 GAsyncResult *result,
                 gpointer      user_data)
 {
-  GtkStack *dest_stack = user_data;
   GdkClipboard *clipboard;
-  const GValue *value;
+  GtkWidget *entry;
+  char *text;
   GError *error = NULL;
 
   clipboard = GDK_CLIPBOARD (source_object);
+  entry = GTK_WIDGET (user_data);
 
-  value = gdk_clipboard_read_value_finish (clipboard, result, &error);
-  if (value)
+  /* Get the resulting text of the read operation */
+  text = gdk_clipboard_read_text_finish (clipboard, result, &error);
+
+  if (text)
     {
-      present_value (dest_stack, value);
+      /* Set the entry text */
+      gtk_editable_set_text (GTK_EDITABLE (entry), text);
+      g_free (text);
     }
   else
     {
-      g_print ("%s\n", error->message);
+      GtkWidget *dialog;
+
+      /* Show an error about why pasting failed.
+       * Usually you probably want to ignore such failures,
+       * but for demonstration purposes, we show the error.
+       */
+      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+                                       GTK_MESSAGE_ERROR,
+                                       GTK_BUTTONS_CLOSE,
+                                       "Could not paste text: %s",
+                                       error->message);
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_window_destroy), NULL);
+      gtk_widget_show (dialog);
+
       g_error_free (error);
     }
 }
 
 static void
-paste_button_clicked (GtkStack *dest_stack,
-                      gpointer  user_data)
+paste_button_clicked (GtkWidget *button,
+                      gpointer   user_data)
 {
+  GtkWidget *entry;
   GdkClipboard *clipboard;
-  GdkContentFormats *formats;
 
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (dest_stack));
-  formats = gdk_clipboard_get_formats (clipboard);
+  entry = GTK_WIDGET (user_data);
 
-  if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_TEXTURE))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_TEXTURE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_PAINTABLE))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_PAINTABLE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_RGBA))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_RGBA, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, G_TYPE_FILE))
-    gdk_clipboard_read_value_async (clipboard, G_TYPE_FILE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, G_TYPE_STRING))
-    gdk_clipboard_read_value_async (clipboard, G_TYPE_STRING, 0, NULL, paste_received, dest_stack);
-}
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry);
 
-static void
-update_copy_button_sensitivity (GtkWidget *source_stack)
-{
-  GtkButton *copy_button;
-  const char *visible_child_name;
-  GtkWidget *visible_child;
-  gboolean sensitive;
-
-  copy_button = GTK_BUTTON (g_object_get_data (G_OBJECT (source_stack), "copy-button"));
-
-  visible_child = gtk_stack_get_visible_child (GTK_STACK (source_stack));
-  visible_child_name = gtk_stack_get_visible_child_name (GTK_STACK (source_stack));
-  if (strcmp (visible_child_name, "Text") == 0)
-    {
-      sensitive = strlen (gtk_editable_get_text (GTK_EDITABLE (visible_child))) > 0;
-    }
-  else if (strcmp (visible_child_name, "Color") == 0 ||
-           strcmp (visible_child_name, "Image") == 0)
-    {
-      sensitive = TRUE;
-    }
-  else if (strcmp (visible_child_name, "File") == 0)
-    {
-      sensitive = g_object_get_data (G_OBJECT (visible_child), "file") != NULL;
-    }
-  else
-    {
-      sensitive = FALSE;
-    }
-
-  gtk_widget_set_sensitive (GTK_WIDGET (copy_button), sensitive);
-}
-
-static void
-source_changed_cb (GtkButton  *copy_button,
-                   GParamSpec *pspec,
-                   GtkWidget  *source_stack)
-{
-  update_copy_button_sensitivity (source_stack);
-}
-
-static void
-text_changed_cb (GtkButton  *copy_button,
-                 GParamSpec *pspec,
-                 GtkWidget  *entry)
-{
-  update_copy_button_sensitivity (gtk_widget_get_ancestor (entry, GTK_TYPE_STACK));
-}
-
-static void
-file_button_set_file (GtkButton *button,
-                      GFile     *file)
-{
-  gtk_label_set_label (GTK_LABEL (gtk_button_get_child (button)), g_file_peek_path (file));
-  g_object_set_data_full (G_OBJECT (button), "file", g_object_ref (file), g_object_unref);
-}
-
-static void
-file_chooser_response (GtkNativeDialog *dialog,
-                       int              response,
-                       GtkButton       *button)
-{
-  gtk_native_dialog_hide (dialog);
-
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      GFile *file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-      file_button_set_file (button, file);
-      g_object_unref (file);
-
-      update_copy_button_sensitivity (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_STACK));
-    }
-
-  gtk_native_dialog_destroy (dialog);
-}
-
-static void
-open_file_cb (GtkWidget *button)
-{
-  GtkFileChooserNative *chooser;
-
-  chooser = gtk_file_chooser_native_new ("Choose a file",
-                                         GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
-                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                         "_Open",
-                                         "_Cancel");
-
-  g_signal_connect (chooser, "response", G_CALLBACK (file_chooser_response), button);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (chooser));
-}
-
-static void
-update_paste_button_sensitivity (GdkClipboard *clipboard,
-                                 GtkWidget    *paste_button)
-{
-  GdkContentFormats *formats;
-  gboolean sensitive = FALSE;
-
-  formats = gdk_clipboard_get_formats (clipboard);
-
-  if (gdk_content_formats_contain_gtype (formats, G_TYPE_FILE) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_RGBA) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_TEXTURE) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_PAINTABLE) ||
-      gdk_content_formats_contain_gtype (formats, G_TYPE_STRING))
-    sensitive = TRUE;
-
-  gtk_widget_set_sensitive (paste_button, sensitive);
-}
-
-static void
-unset_clipboard_handler (gpointer data)
-{
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-
-  g_signal_handlers_disconnect_by_func (clipboard, update_paste_button_sensitivity, data);
-}
-
-static gboolean
-on_drop (GtkStack      *dest_stack,
-         const GValue  *value,
-         double         x,
-         double         y,
-         gpointer       data)
-{
-  present_value (dest_stack, value);
-  return TRUE;
-}
-
-static GdkContentProvider *
-drag_prepare (GtkDragSource *drag_source,
-              double         x,
-              double         y,
-              gpointer       data)
-{
-  GtkWidget *button;
-  GValue value = G_VALUE_INIT;
-
-  button = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (drag_source));
-
-  if (GTK_IS_TOGGLE_BUTTON (button))
-    {
-      GtkWidget *image = gtk_widget_get_first_child (button);
-      GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
-
-      if (GDK_IS_TEXTURE (paintable))
-        {
-          g_value_init (&value, GDK_TYPE_TEXTURE);
-          g_value_set_object (&value, paintable);
-        }
-      else
-        {
-          g_value_init (&value, GDK_TYPE_PAINTABLE);
-          g_value_set_object (&value, paintable);
-        }
-    }
-  else
-    {
-      GFile *file = g_object_get_data (G_OBJECT (button), "file");
-
-      if (file)
-        {
-          g_value_init (&value, G_TYPE_FILE);
-          g_value_set_object (&value, file);
-        }
-      else
-        return NULL;
-    }
-
-  return gdk_content_provider_new_for_value (&value);
+  /* Request the contents of the clipboard, contents_received will be
+     called when we do get the contents.
+   */
+  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
 }
 
 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
-  static GtkWidget *window = NULL;
-
   if (!window)
     {
-      GtkBuilderScope *scope;
-      GtkBuilder *builder;
-      GtkWidget *button;
+      GtkWidget *vbox, *hbox;
+      GtkWidget *label;
+      GtkWidget *entry, *button;
+      GtkWidget *image;
 
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-                                               "copy_button_clicked", G_CALLBACK (copy_button_clicked),
-                                               "paste_button_clicked", G_CALLBACK (paste_button_clicked),
-                                               "source_changed_cb", G_CALLBACK (source_changed_cb),
-                                               "text_changed_cb", G_CALLBACK (text_changed_cb),
-                                               "open_file_cb", G_CALLBACK (open_file_cb),
-                                               "on_drop", G_CALLBACK (on_drop),
-                                               "drag_prepare", G_CALLBACK (drag_prepare),
-                                               NULL);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/clipboard/clipboard.ui", NULL);
-
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      window = gtk_window_new ();
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
 
-      button = GTK_WIDGET (gtk_builder_get_object (builder, "copy_button"));
-      g_object_set_data (gtk_builder_get_object (builder, "source_stack"), "copy-button", button);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_widget_set_margin_start (vbox, 8);
+      gtk_widget_set_margin_end (vbox, 8);
+      gtk_widget_set_margin_top (vbox, 8);
+      gtk_widget_set_margin_bottom (vbox, 8);
 
-      button = GTK_WIDGET (gtk_builder_get_object (builder, "paste_button"));
-      g_signal_connect (gtk_widget_get_clipboard (button), "changed",
-                        G_CALLBACK (update_paste_button_sensitivity), button);
-      g_object_set_data_full (G_OBJECT (button), "clipboard-handler", button, unset_clipboard_handler);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
-      g_object_unref (builder);
-      g_object_unref (scope);
+      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
+
+      gtk_box_append (GTK_BOX (vbox), label);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
+
+      /* Create the first entry */
+      entry = gtk_entry_new ();
+      gtk_box_append (GTK_BOX (hbox), entry);
+
+      /* Create the button */
+      button = gtk_button_new_with_mnemonic (_("_Copy"));
+      gtk_box_append (GTK_BOX (hbox), button);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (copy_button_clicked), entry);
+
+      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
+      gtk_box_append (GTK_BOX (vbox), label);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
+
+      /* Create the second entry */
+      entry = gtk_entry_new ();
+      gtk_box_append (GTK_BOX (hbox), entry);
+
+      /* Create the button */
+      button = gtk_button_new_with_mnemonic (_("_Paste"));
+      gtk_box_append (GTK_BOX (hbox), button);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (paste_button_clicked), entry);
+
+      label = gtk_label_new ("Images can be transferred via the clipboard, too");
+      gtk_box_append (GTK_BOX (vbox), label);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
+
+      /* Create the first image */
+      image = demo_image_new ("dialog-warning");
+      gtk_box_append (GTK_BOX (hbox), image);
+
+      /* Create the second image */
+      image = demo_image_new ("process-stop");
+      gtk_box_append (GTK_BOX (hbox), image);
+
+      /* Create the third image */
+      image = demo_image_new ("weather-clear");
+      gtk_box_append (GTK_BOX (hbox), image);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/clipboard.ui

@@ -1,288 +0,0 @@
-
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="resizable">1</property>
-    <property name="title">Clipboard</property>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">“Copy” will copy the selected data the clipboard, “Paste” will show the current clipboard contents. You can also drag the data to the bottom.</property>
-            <property name="wrap">1</property>
-            <property name="max-width-chars">40</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkDropDown" id="source_chooser">
-                <property name="valign">center</property>
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item>Text</item>
-                      <item>Color</item>
-                      <item>Image</item>
-                      <item>File</item>
-                    </items>
-                  </object>
-                </property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStack" id="source_stack">
-                <signal name="notify::visible-child" handler="source_changed_cb" object="copy_button"/>
-                <property name="vexpand">1</property>
-                <binding name="visible-child-name">
-                  <lookup name="string" type="GtkStringObject">
-                    <lookup name="selected-item">
-                      source_chooser
-                    </lookup>
-                  </lookup>
-                </binding>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Text</property>
-                    <property name="child">
-                      <object class="GtkEntry" id="source_text">
-                        <property name="valign">center</property>
-                        <signal name="notify::text" handler="text_changed_cb" object="copy_button"/>
-                        <property name="text">Copy this!</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Color</property>
-                    <property name="child">
-                      <object class="GtkColorButton" id="source_color">
-                        <property name="valign">center</property>
-                        <property name="rgba">purple</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Image</property>
-                    <property name="child">
-                      <object class="GtkBox">
-                        <property name="valign">center</property>
-                        <style>
-                          <class name="linked"/>
-                        </style>
-                        <child>
-                          <object class="GtkToggleButton" id="image_rose">
-                            <property name="active">1</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <signal name="prepare" handler="drag_prepare"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <style>
-                                  <class name="large-icons"/>
-                                </style>
-                                <property name="paintable">resource:///transparent/portland-rose.jpg</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="image_floppy">
-                            <property name="group">image_rose</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <signal name="prepare" handler="drag_prepare"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <style>
-                                  <class name="large-icons"/>
-                                </style>
-                                <property name="paintable">resource:///images/floppybuddy.gif</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="image_logo">
-                            <property name="group">image_floppy</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <signal name="prepare" handler="drag_prepare"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <style>
-                                  <class name="large-icons"/>
-                                </style>
-                                <property name="paintable">resource:///images/org.gtk.Demo4.svg</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">File</property>
-                    <property name="child">
-                      <object class="GtkButton" id="source_file">
-                        <child>
-                          <object class="GtkDragSource">
-                            <property name="propagation-phase">capture</property>
-                            <signal name="prepare" handler="drag_prepare"/>
-                          </object>
-                        </child>
-                        <property name="valign">center</property>
-                        <property name="child">
-                          <object class="GtkLabel">
-                            <property name="label">—</property>
-                            <property name="xalign">0</property>
-                            <property name="ellipsize">start</property>
-                          </object>
-                        </property>
-                        <signal name="clicked" handler="open_file_cb"/>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="copy_button">
-                <property name="valign">center</property>
-                <property name="label" translatable="yes">_Copy</property>
-                <signal name="clicked" handler="copy_button_clicked" object="source_stack"/>
-                <property name="use-underline">1</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkDropTarget">
-                <property name="actions">copy</property>
-                <property name="formats">GdkTexture GdkPaintable GFile GdkRGBA gchararray</property>
-                <signal name="drop" handler="on_drop" object="dest_stack"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="paste_button">
-                <property name="label" translatable="yes">_Paste</property>
-                <signal name="clicked" handler="paste_button_clicked" object="dest_stack"/>
-                <property name="use-underline">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="xalign">0</property>
-                <binding name="label">
-                  <lookup name="visible-child-name" type="GtkStack">
-                    dest_stack
-                  </lookup>
-                </binding>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStack" id="dest_stack">
-                <property name="halign">end</property>
-                <property name="valign">center</property>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name"></property>
-                    <property name="child">
-                      <object class="GtkLabel">
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Text</property>
-                    <property name="child">
-                      <object class="GtkLabel">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <property name="xalign">0</property>
-                        <property name="ellipsize">end</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Image</property>
-                    <property name="child">
-                      <object class="GtkImage">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <style>
-                          <class name="large-icons"/>
-                        </style>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Color</property>
-                    <property name="child">
-                      <object class="GtkBox">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <child>
-                          <object class="GtkColorSwatch">
-                            <property name="accessible-role">img</property>
-                            <property name="can-focus">0</property>
-                            <property name="selectable">0</property>
-                            <property name="has-menu">0</property>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">File</property>
-                    <property name="child">
-                      <object class="GtkLabel">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <property name="xalign">0</property>
-                        <property name="hexpand">1</property>
-                        <property name="ellipsize">start</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/colorprofiles.c

@@ -1,86 +0,0 @@
-/* Color Profiles
- *
- * Demonstrates support for color profiles.
- *
- * The test images used here are taken from http://displaycal.net/icc-color-management-test/
- * and are licensed under the Creative Commons BY-SA 4.0 International License
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *jpeg;
-static GtkWidget *png;
-static GtkWidget *tiff;
-static GtkWidget *noprofile;
-static GtkWidget *test1;
-static GtkWidget *test2;
-
-static void
-on_changed (GtkCheckButton *button,
-            gpointer        user_data)
-{
-  GdkTexture *texture;
-  const char *extension = NULL;
-  char *path;
-
-  if (!gtk_check_button_get_active (GTK_CHECK_BUTTON (button)))
-    return;
-
-  if (gtk_check_button_get_active (GTK_CHECK_BUTTON (jpeg)))
-    extension = ".jpg";
-  else if (gtk_check_button_get_active (GTK_CHECK_BUTTON (png)))
-    extension = ".png";
-  else if (gtk_check_button_get_active (GTK_CHECK_BUTTON (tiff)))
-    extension = ".tif";
-  else if (gtk_check_button_get_active (GTK_CHECK_BUTTON (noprofile)))
-    extension = "-expected-result-no-cm.png";
-
-  path = g_strconcat ("/colorprofiles/sRGB_Gray", extension, NULL);
-  texture = gdk_texture_new_from_resource (path);
-  gtk_picture_set_paintable (GTK_PICTURE (test1), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-
-  path = g_strconcat ("/colorprofiles/ICC-Rendering-Intent-Test", extension, NULL);
-  texture = gdk_texture_new_from_resource (path);
-  gtk_picture_set_paintable (GTK_PICTURE (test2), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-}
-
-GtkWidget*
-do_colorprofiles (GtkWidget *do_widget)
-{
-  static GtkWidget *window;
-
-  if (!window)
-    {
-      GtkBuilder *builder;
-      GtkBuilderScope *scope;
-
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope),
-                                              "on_changed", G_CALLBACK (on_changed));
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/colorprofiles/colorprofiles.ui", NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      jpeg = GTK_WIDGET (gtk_builder_get_object (builder, "jpeg"));
-      png = GTK_WIDGET (gtk_builder_get_object (builder, "png"));
-      tiff = GTK_WIDGET (gtk_builder_get_object (builder, "tiff"));
-      noprofile = GTK_WIDGET (gtk_builder_get_object (builder, "noprofile"));
-      test1 = GTK_WIDGET (gtk_builder_get_object (builder, "test1"));
-      test2 = GTK_WIDGET (gtk_builder_get_object (builder, "test2"));
-      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);
-      g_object_unref (scope);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/colorprofiles.ui

@@ -1,94 +0,0 @@
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="default-width">660</property>
-    <property name="default-height">660</property>
-    <property name="resizable">false</property>
-    <property name="title">Color Profiles</property>
-    <child>
-      <object class="GtkScrolledWindow">
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">10</property>
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-            <property name="margin-start">10</property>
-            <property name="margin-end">10</property>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">File format:</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="jpeg">
-                    <property name="label">JPEG</property>
-                    <property name="active">1</property>
-                    <signal name="notify::active" handler="on_changed"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="png">
-                    <property name="label">PNG</property>
-                    <property name="group">jpeg</property>
-                    <signal name="notify::active" handler="on_changed"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="tiff">
-                    <property name="label">TIFF</property>
-                    <property name="group">png</property>
-                    <signal name="notify::active" handler="on_changed"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="noprofile">
-                    <property name="label">No profile</property>
-                    <property name="group">tiff</property>
-                    <signal name="notify::active" handler="on_changed"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Test 1: Matrix-based profile</property>
-                <style>
-                  <class name="title-3"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkPicture" id="test1">
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="can-shrink">1</property>
-                <property name="keep-aspect-ratio">1</property>
-                <property name="file">resource:///colorprofiles/sRGB_Gray.jpg</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Test 2: Lookup table-based profile</property>
-                <style>
-                  <class name="title-3"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkPicture" id="test2">
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="can-shrink">1</property>
-                <property name="keep-aspect-ratio">1</property>
-                <property name="file">resource:///colorprofiles/ICC-Rendering-Intent-Test.jpg</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/curve-editor.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define CURVE_TYPE_EDITOR (curve_editor_get_type ())
+G_DECLARE_FINAL_TYPE (CurveEditor, curve_editor, CURVE, EDITOR, GtkWidget)
+
+GtkWidget *       curve_editor_new              (void);
+
+void              curve_editor_set_edit         (CurveEditor *self,
+                                                 gboolean     edit);
+
+void              curve_editor_set_path         (CurveEditor *self,
+                                                 GskPath     *path);
+
+GskPath *         curve_editor_get_path         (CurveEditor *self);
+
+void              curve_editor_set_stroke       (CurveEditor *self,
+                                                 GskStroke   *stroke);
+
+const GskStroke * curve_editor_get_stroke       (CurveEditor *self);
+
+
+void              curve_editor_set_color        (CurveEditor *self,
+                                                 GdkRGBA     *color);
+
+const GdkRGBA *   curve_editor_get_color        (CurveEditor *self);
+
+gboolean          curve_editor_get_show_outline (CurveEditor *self);
+
+void              curve_editor_set_show_outline (CurveEditor *self,
+                                                 gboolean     show_outline);
+
+G_END_DECLS

demos/gtk-demo/curve.c

@@ -0,0 +1,272 @@
+/* Path/Curve Editor
+ *
+ * This demo shows an elaborate curve editor that you would expect to find
+ * in a vector graphics editor. It is built on top of GTK's path APIs.
+ */
+
+#include <gtk/gtk.h>
+#include "curve-editor.h"
+
+
+static GskPath *
+make_circle_path (void)
+{
+  float w = 310;
+  float h = 310;
+  float cx = w / 2;
+  float cy = h / 2;
+  float pad = 20;
+  float r = (w - 2 * pad) / 2;
+  float k = 0.55228;
+  float kr = k  * r;
+  GskPathBuilder *builder;
+
+  builder = gsk_path_builder_new ();
+
+  gsk_path_builder_move_to (builder,  cx, pad);
+  gsk_path_builder_curve_to (builder, cx + kr, pad,
+                                      w - pad, cy - kr,
+                                      w - pad, cy);
+  gsk_path_builder_curve_to (builder, w - pad, cy + kr,
+                                      cx + kr, h - pad,
+                                      cx, h - pad);
+  gsk_path_builder_curve_to (builder, cx - kr, h - pad,
+                                      pad, cy + kr,
+                                      pad, cy);
+  gsk_path_builder_curve_to (builder, pad, cy - kr,
+                                      cx - kr, pad,
+                                      cx, pad);
+  gsk_path_builder_close (builder);
+
+  return gsk_path_builder_free_to_path (builder);
+}
+
+static void
+edit_changed (GtkToggleButton *button,
+              GParamSpec      *pspec,
+              CurveEditor     *editor)
+{
+  curve_editor_set_edit (editor, gtk_toggle_button_get_active (button));
+}
+
+static void
+reset (GtkButton   *button,
+       CurveEditor *editor)
+{
+  GskPath *path;
+
+  path = make_circle_path ();
+  curve_editor_set_path (editor, path);
+  gsk_path_unref (path);
+}
+
+static void
+line_width_changed (GtkSpinButton *spin,
+                    CurveEditor   *editor)
+{
+  GskStroke *stroke;
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_line_width (stroke, gtk_spin_button_get_value (spin));
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+}
+
+static void
+cap_changed (GtkDropDown *combo,
+             GParamSpec  *pspec,
+             CurveEditor *editor)
+{
+  GskStroke *stroke;
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_line_cap (stroke, (GskLineCap)gtk_drop_down_get_selected (combo));
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+}
+
+static void
+join_changed (GtkDropDown *combo,
+              GParamSpec  *pspec,
+              CurveEditor *editor)
+{
+  GskStroke *stroke;
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_line_join (stroke, (GskLineJoin)gtk_drop_down_get_selected (combo));
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+}
+
+static void
+color_changed (GtkColorChooser *chooser,
+               GParamSpec      *pspec,
+               CurveEditor     *editor)
+{
+  GdkRGBA color;
+
+  gtk_color_chooser_get_rgba (chooser, &color);
+  curve_editor_set_color (editor, &color);
+}
+
+static void
+stroke_toggled (GtkCheckButton *button,
+                CurveEditor    *editor)
+{
+  curve_editor_set_show_outline (editor, gtk_check_button_get_active (button));
+  gtk_widget_queue_draw (GTK_WIDGET (editor));
+}
+
+static void
+limit_changed (GtkSpinButton *spin,
+               CurveEditor   *editor)
+{
+  GskStroke *stroke;
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_miter_limit (stroke, gtk_spin_button_get_value (spin));
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+}
+
+static void
+dashes_changed (GtkEntry    *entry,
+                GParamSpec  *spec,
+                CurveEditor *editor)
+{
+  const char *text;
+  char **split;
+  GArray *dash;
+  GskStroke *stroke;
+
+  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  split = g_strsplit (text, " ", 0);
+
+  dash = g_array_new (FALSE, FALSE, sizeof (float));
+  for (int i = 0; split[i] != NULL; i++)
+    {
+      double d;
+      char *endp = 0;
+
+      d = g_strtod (split[i], &endp);
+      if (*endp == '\0')
+        g_array_append_vals (dash, (float[1]) { d }, 1);
+    }
+
+  g_strfreev (split);
+
+  stroke = gsk_stroke_copy (curve_editor_get_stroke (editor));
+  gsk_stroke_set_dash (stroke, (const float *)dash->data, dash->len);
+  curve_editor_set_stroke (editor, stroke);
+  gsk_stroke_free (stroke);
+
+  g_array_free (dash, TRUE);
+}
+
+GtkWidget *
+do_curve (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *demo;
+  GtkWidget *edit_toggle;
+  GtkWidget *reset_button;
+  GtkWidget *titlebar;
+  GtkWidget *stroke_toggle;
+  GtkWidget *line_width_spin;
+  GtkWidget *stroke_button;
+  GtkWidget *popover;
+  GtkWidget *grid;
+  GtkWidget *cap_combo;
+  GtkWidget *join_combo;
+  GtkWidget *color_button;
+  GtkWidget *limit_spin;
+  GtkWidget *dash_entry;
+
+  if (!window)
+    {
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Curve Editor");
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      gtk_window_set_default_size (GTK_WINDOW (window), 310, 350);
+
+      edit_toggle = gtk_toggle_button_new ();
+      gtk_button_set_icon_name (GTK_BUTTON (edit_toggle), "document-edit-symbolic");
+
+      reset_button = gtk_button_new_from_icon_name ("edit-undo-symbolic");
+
+      stroke_button = gtk_menu_button_new ();
+      gtk_menu_button_set_icon_name (GTK_MENU_BUTTON (stroke_button), "open-menu-symbolic");
+      popover = gtk_popover_new ();
+      gtk_menu_button_set_popover (GTK_MENU_BUTTON (stroke_button), popover);
+
+      grid = gtk_grid_new ();
+      gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+      gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+      gtk_popover_set_child (GTK_POPOVER (popover), grid);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Color:"), 0, 0, 1, 1);
+      color_button = gtk_color_button_new_with_rgba (&(GdkRGBA){ 0., 0., 0., 1.});
+      gtk_grid_attach (GTK_GRID (grid), color_button, 1, 0, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line width:"), 0, 1, 1, 1);
+      line_width_spin = gtk_spin_button_new_with_range (1, 20, 1);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (line_width_spin), 1);
+      gtk_grid_attach (GTK_GRID (grid), line_width_spin, 1, 1, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line cap:"), 0, 2, 1, 1);
+      cap_combo = gtk_drop_down_new_from_strings ((const char *[]){"Butt", "Round", "Square", NULL});
+      gtk_grid_attach (GTK_GRID (grid), cap_combo, 1, 2, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Line join:"), 0, 3, 1, 1);
+      join_combo = gtk_drop_down_new_from_strings ((const char *[]){"Miter", "Miter-clip", "Round", "Bevel", "Arcs", NULL});
+      gtk_grid_attach (GTK_GRID (grid), join_combo, 1, 3, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Miter limit:"), 0, 4, 1, 1);
+      limit_spin = gtk_spin_button_new_with_range (0, 10, 1);
+      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (limit_spin), 1);
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (limit_spin), 4);
+      gtk_grid_attach (GTK_GRID (grid), limit_spin, 1, 4, 1, 1);
+
+      gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Dashes:"), 0, 5, 1, 1);
+      dash_entry = gtk_entry_new ();
+      gtk_grid_attach (GTK_GRID (grid), dash_entry, 1, 5, 1, 1);
+
+      stroke_toggle = gtk_check_button_new_with_label ("Show outline");
+      gtk_grid_attach (GTK_GRID (grid), stroke_toggle, 1, 6, 1, 1);
+
+      titlebar = gtk_header_bar_new ();
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), edit_toggle);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), reset_button);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), stroke_button);
+
+      gtk_window_set_titlebar (GTK_WINDOW (window), titlebar);
+
+      demo = curve_editor_new ();
+
+      g_signal_connect (stroke_toggle, "toggled", G_CALLBACK (stroke_toggled), demo);
+      g_signal_connect (edit_toggle, "notify::active", G_CALLBACK (edit_changed), demo);
+      g_signal_connect (reset_button, "clicked", G_CALLBACK (reset), demo);
+      g_signal_connect (cap_combo, "notify::selected", G_CALLBACK (cap_changed), demo);
+      g_signal_connect (join_combo, "notify::selected", G_CALLBACK (join_changed), demo);
+      g_signal_connect (color_button, "notify::rgba", G_CALLBACK (color_changed), demo);
+      g_signal_connect (line_width_spin, "value-changed", G_CALLBACK (line_width_changed), demo);
+      g_signal_connect (limit_spin, "value-changed", G_CALLBACK (limit_changed), demo);
+      g_signal_connect (dash_entry, "notify::text", G_CALLBACK (dashes_changed), demo);
+
+      reset (NULL, CURVE_EDITOR (demo));
+
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (line_width_spin), 6);
+      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (color_button), &(GdkRGBA) { 1, 0, 0, 1 });
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (cap_combo), GSK_LINE_CAP_ROUND);
+      gtk_editable_set_text (GTK_EDITABLE (dash_entry), "0 8");
+
+      gtk_window_set_child (GTK_WINDOW (window), demo);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/demo.gresource.xml

@@ -15,21 +15,9 @@
     <file>demo.ui</file>
   </gresource>
   <gresource prefix="/clipboard">
-    <file>clipboard.ui</file>
     <file>demoimage.c</file>
     <file>demoimage.h</file>
   </gresource>
-  <gresource prefix="/colorprofiles">
-    <file>colorprofiles.ui</file>
-    <file>sRGB_Gray.jpg</file>
-    <file>sRGB_Gray.png</file>
-    <file>sRGB_Gray.tif</file>
-    <file>sRGB_Gray-expected-result-no-cm.png</file>
-    <file>ICC-Rendering-Intent-Test.png</file>
-    <file>ICC-Rendering-Intent-Test.jpg</file>
-    <file>ICC-Rendering-Intent-Test.tif</file>
-    <file>ICC-Rendering-Intent-Test-expected-result-no-cm.png</file>
-  </gresource>
   <gresource prefix="/constraints_builder">
     <file>constraints_builder.ui</file>
   </gresource>
@@ -261,12 +249,15 @@
   <gresource prefix="/video-player">
     <file>bbb.png</file>
   </gresource>
+  <gresource prefix="/curve">
+    <file>curve-editor.c</file>
+    <file>curve-editor.h</file>
+  </gresource>
   <gresource prefix="/sources">
     <file>application_demo.c</file>
     <file>assistant.c</file>
     <file>builder.c</file>
     <file>clipboard.c</file>
-    <file>colorprofiles.c</file>
     <file>combobox.c</file>
     <file>constraints.c</file>
     <file>constraints_interactive.c</file>
@@ -279,6 +270,7 @@
     <file>css_pixbufs.c</file>
     <file>css_shadows.c</file>
     <file>cursors.c</file>
+    <file>curve.c</file>
     <file>dialog.c</file>
     <file>drawingarea.c</file>
     <file>dropdown.c</file>
@@ -299,6 +291,7 @@
     <file>gears.c</file>
     <file>gestures.c</file>
     <file>glarea.c</file>
+    <file>glyphs.c</file>
     <file>gltransition.c</file>
     <file>headerbar.c</file>
     <file>hypertext.c</file>
@@ -337,6 +330,9 @@
     <file>paintable_symbolic.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>
@@ -421,6 +417,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>

demos/gtk-demo/font_features.c

@@ -12,6 +12,7 @@
  */
 
 #include <gtk/gtk.h>
+#include <pango/pangofc-font.h>
 #include <hb.h>
 #include <hb-ot.h>
 #include <glib/gi18n.h>

demos/gtk-demo/hypertext.c

@@ -100,7 +100,7 @@ show_page (GtkTextView *text_view,
 
       theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (text_view)));
       icon = gtk_icon_theme_lookup_icon (theme,
-                                         "view-conceal-symbolic",
+                                         "eye-not-looking-symbolic",
                                          NULL,
                                          16,
                                          1,

demos/gtk-demo/language-names.c

@@ -18,81 +18,15 @@
 
 #include "language-names.h"
 
-#ifdef G_OS_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#else
-
 #ifndef ISO_CODES_PREFIX
 #define ISO_CODES_PREFIX "/usr"
 #endif
 
 #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
 #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
-#endif
 
 static GHashTable *language_map;
 
-#ifdef G_OS_WIN32
-/* if we are using native Windows use native Windows API for language names */
-static BOOL CALLBACK
-get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
-{
-  wchar_t *langname_w = NULL;
-  wchar_t locale_abbrev_w[9];
-  gchar *langname, *locale_abbrev, *locale, *p;
-  gint i;
-  const LCTYPE iso639_lctypes[] = { LOCALE_SISO639LANGNAME, LOCALE_SISO639LANGNAME2 };
-  GHashTable *ht_scripts_langs = (GHashTable *) param;
-  PangoLanguage *lang;
-
-  gint langname_size, locale_abbrev_size;
-  langname_size = GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, 0);
-  if (langname_size == 0)
-    return FALSE;
-
-  langname_w = g_new0 (wchar_t, langname_size);
-
-  if (langname_size == 0)
-    return FALSE;
-
-  GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, langname_size);
-  langname = g_utf16_to_utf8 (langname_w, -1, NULL, NULL, NULL);
-  locale = g_utf16_to_utf8 (locale_w, -1, NULL, NULL, NULL);
-  p = strchr (locale, '-');
-  lang = pango_language_from_string (locale);
-  if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
-    g_hash_table_insert (ht_scripts_langs, lang, langname);
-
-  /*
-   * Track 3+-letter ISO639-2/3 language codes as well (these have a max length of 9 including terminating NUL)
-   * ISO639-2: iso639_lctypes[0] = LOCALE_SISO639LANGNAME
-   * ISO639-3: iso639_lctypes[1] = LOCALE_SISO639LANGNAME2
-   */
-  for (i = 0; i < 2; i++)
-    {
-      locale_abbrev_size = GetLocaleInfoEx (locale_w, iso639_lctypes[i], locale_abbrev_w, 0);
-      if (locale_abbrev_size > 0)
-        {
-          GetLocaleInfoEx (locale_w, iso639_lctypes[i], locale_abbrev_w, locale_abbrev_size);
-
-          locale_abbrev = g_utf16_to_utf8 (locale_abbrev_w, -1, NULL, NULL, NULL);
-          lang = pango_language_from_string (locale_abbrev);
-          if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
-            g_hash_table_insert (ht_scripts_langs, lang, langname);
-
-          g_free (locale_abbrev);
-        }
-    }
-
-  g_free (locale);
-  g_free (langname_w);
-
-  return TRUE;
-}
-
-#else /* non-Windows */
-
 static char *
 get_first_item_in_semicolon_list (const char *list)
 {
@@ -276,7 +210,6 @@ languages_variant_init (const char *variant)
   g_free (filename);
   g_free (buf);
 }
-#endif
 
 static void
 languages_init (void)
@@ -285,13 +218,8 @@ languages_init (void)
     return;
 
   language_map = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-
-#ifdef G_OS_WIN32
-  g_return_if_fail (EnumSystemLocalesEx (&get_win32_all_locales_scripts, LOCALE_ALL, (LPARAM) language_map, NULL));
-#else
   languages_variant_init ("iso_639");
   languages_variant_init ("iso_639_3");
-#endif
 }
 
 const char *

demos/gtk-demo/main.c

@@ -512,7 +512,7 @@ load_file (const char *demoname,
 
   info_buffer = gtk_text_buffer_new (NULL);
   gtk_text_buffer_create_tag (info_buffer, "title",
-                              "size", 18 * 1024,
+                              "font", "Sans 18",
                               "pixels-below-lines", 10,
                               NULL);
 
@@ -1040,7 +1040,7 @@ out:
       g_signal_connect_swapped (G_OBJECT (demo), "destroy", G_CALLBACK (g_application_quit), app);
     }
   else
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_show (GTK_WIDGET (window));
 
   if (autoquit)
     g_timeout_add_seconds (1, auto_quit, app);

demos/gtk-demo/menus.ui

@@ -21,7 +21,7 @@
         <item>
           <attribute name="label" translatable="yes">Save _As...</attribute>
           <attribute name="action">app.save-as</attribute>
-          <attribute name="accel">&lt;Control&gt;&lt;Shift&gt;s</attribute>
+          <attribute name="accel">&lt;Control&gt;s</attribute>
         </item>
       </section>
       <section>

demos/gtk-demo/meson.build

@@ -5,7 +5,6 @@ demos = files([
   'assistant.c',
   'builder.c',
   'clipboard.c',
-  'colorprofiles.c',
   'combobox.c',
   'constraints.c',
   'constraints_interactive.c',
@@ -18,6 +17,7 @@ demos = files([
   'css_pixbufs.c',
   'css_shadows.c',
   'cursors.c',
+  'curve.c',
   'dialog.c',
   'drawingarea.c',
   'dnd.c',
@@ -35,6 +35,7 @@ demos = files([
   'gestures.c',
   'glarea.c',
   'gltransition.c',
+  'glyphs.c',
   'headerbar.c',
   'hypertext.c',
   'iconscroll.c',
@@ -71,6 +72,9 @@ demos = files([
   'paintable_symbolic.c',
   'panes.c',
   'password_entry.c',
+  'path_fill.c',
+  'path_maze.c',
+  'path_text.c',
   'peg_solitaire.c',
   'pickers.c',
   'printing.c',
@@ -99,7 +103,6 @@ demos = files([
   'transparent.c',
   'tree_store.c',
   'video_player.c',
-  'font_features.c',
 ])
 
 gtkdemo_deps = [ libgtk_dep, ]
@@ -130,9 +133,15 @@ extra_demo_sources = files([
   'script-names.c',
   'unicode-names.c',
   'suggestionentry.c',
-  'language-names.c',
+  'curve-editor.c',
 ])
 
+if harfbuzz_dep.found() and pangoft_dep.found()
+  demos += files(['font_features.c'])
+  extra_demo_sources += files(['language-names.c'])
+  gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
+endif
+
 if os_unix
   demos += files('pagesetup.c')
 endif
@@ -161,7 +170,7 @@ endif
 
 ld = find_program('ld', required : false)
 
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
   glib_compile_resources = find_program('glib-compile-resources')
 
   # Create the resource blob
@@ -171,7 +180,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
       depfile : 'gtkdemo.gresource.d',
       command : [glib_compile_resources,
                  '--generate',
-                 '--internal',
                  '--target=@OUTPUT@',
                  '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
@@ -185,7 +193,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
       depfile : 'gtkdemo_resources.c.d',
       command : [glib_compile_resources,
                  '--generate-source',
-                 '--internal',
                  '--target=@OUTPUT@',
                  '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
@@ -199,7 +206,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
       input : gtkdemo_gresource,
       output : 'gtkdemo_resources.o',
       command : [ld,
-                 '-z', 'noexecstack',
                  '-r',
                  '-b','binary',
                  '@INPUT@',
@@ -210,7 +216,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
     input : gtkdemo_resources_binary,
     output : 'gtkdemo_resources2.o',
     command : [objcopy,
-                 '--strip-all',
                  '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
                  '@INPUT@',
                  '@OUTPUT@'])
@@ -243,7 +248,7 @@ executable('gtk4-demo',
   c_args: gtkdemo_args + demo_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
   link_args: extra_demo_ldflags,
   install: true,
 )
@@ -253,7 +258,7 @@ executable('gtk4-demo-application',
   c_args: gtkdemo_args + common_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
   link_args: extra_demo_ldflags,
   install: true,
 )

demos/gtk-demo/path_fill.c

@@ -0,0 +1,348 @@
+/* Path/Text 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)
+{
+  PangoLayout *layout;
+  PangoFontDescription *desc;
+  GskPathBuilder *builder;
+
+  layout = gtk_widget_create_pango_layout (widget, "Pango power!\nPango power!\nPango power!");
+  desc = pango_font_description_from_string ("sans bold 36");
+  pango_layout_set_font_description (layout, desc);
+  pango_font_description_free (desc);
+
+  builder = gsk_path_builder_new ();
+
+  gsk_path_builder_add_layout (builder, layout);
+
+  return gsk_path_builder_free_to_path (builder);
+}
+
+static gboolean
+build_path (GskPathOperation        op,
+            const graphene_point_t *pts,
+            gsize                   n_pts,
+            float                   weight,
+            gpointer                user_data)
+{
+  GskPathBuilder *builder = user_data;
+
+  switch (op)
+  {
+    case GSK_PATH_MOVE:
+      gsk_path_builder_move_to (builder, pts[0].x, pts[0].y);
+      break;
+
+    case GSK_PATH_CLOSE:
+      gsk_path_builder_close (builder);
+      break;
+
+    case GSK_PATH_LINE:
+      gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
+      break;
+
+    case GSK_PATH_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;
+}

demos/gtk-demo/path_maze.c

@@ -0,0 +1,339 @@
+/* Path/Maze
+ * #Keywords: game, mouse
+ *
+ * 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;
+}

demos/gtk-demo/path_text.c

@@ -0,0 +1,594 @@
+/* Path/Curved 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.5 }, &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)
+    {
+      /* 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);
+    }
+
+  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);
+    }
+
+  if (self->editable && self->line_path)
+    {
+      GskPathBuilder *builder;
+
+      /* 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);
+    }
+}
+
+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,
+                                           NULL, NULL,
+                                           &self->line_closest,
+                                           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;
+}

demos/gtk-demo/path_text.ui

@@ -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>

demos/icon-browser/meson.build

@@ -16,7 +16,7 @@ executable('gtk4-icon-browser',
   c_args: common_cflags,
   dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
   link_args: extra_demo_ldflags,
   install: true,
 )

demos/meson.build

@@ -3,7 +3,7 @@ demo_profile = get_option('profile')
 
 demo_conf_h = declare_dependency(
   sources: custom_target('demo-header',
-    command: [gen_demo_header, meson.project_source_root(), demo_profile],
+    command: [gen_demo_header, meson.source_root(), demo_profile],
     capture: true,
     output: 'demo_conf.h',
     build_by_default: true,

demos/node-editor/meson.build

@@ -17,26 +17,14 @@ executable('gtk4-node-editor',
   c_args: [
     '-DNODE_EDITOR_SOURCE_DIR="@0@/../../testsuite/gsk/compare/"'.format(meson.current_source_dir())
   ] + common_cflags,
-  win_subsystem: 'windows',
+  gui_app: true,
   link_args: extra_demo_ldflags,
-  install: true,
+  install: false,
 )
 
-# icons
-icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-
-foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size, install_dir: icontheme_dir)
-endforeach
-
-# desktop file
-install_data('org.gtk.gtk4.NodeEditor.desktop', install_dir: gtk_applicationsdir)
-
-# appdata
-configure_file(
-  input: 'org.gtk.gtk4.NodeEditor.appdata.xml.in',
-  output: 'org.gtk.gtk4.NodeEditor.appdata.xml',
-  configuration: appdata_config,
-  install_dir: gtk_appdatadir
-)
+# 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)
+#endforeach

demos/node-editor/org.gtk.gtk4.NodeEditor.appdata.xml.in

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>org.gtk.gtk4.NodeEditor</id>
-  <launchable type="desktop-id">org.gtk.gtk4.NodeEditor.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
-  <name>GTK Node Editor</name>
-  <summary>Program to edit render node files</summary>
-  <description>
-    <p>
-      GTK Node Editor is a simple application to show and edit
-      render node files.
-    </p>
-    <p>
-      Render node files can e.g. be created by the GTK inspector.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-node-editor/gtk4-node-editor.png</image>
-      <caption>Node Editor</caption>
-    </screenshot>
-  </screenshots>
-  <kudos>
-    <kudo>HiDpiIcon</kudo>
-    <kudo>ModernToolkit</kudo>
-  </kudos>
-  <url type="homepage">https://www.gtk.org</url>
-  <translation type="gettext">gtk-4.0</translation>
-  <update_contact>matthias.clasen_at_gmail.com</update_contact>
-  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
-  <releases>
-    <release version="@BUILD_VERSION@">
-      <description>
-        <p>A new build of GTK.</p>
-      </description>
-    </release>
-  </releases>
-</component>

demos/node-editor/org.gtk.gtk4.NodeEditor.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Node Editor
-Comment=An application that edits render nodes
-Exec=gtk4-node-editor
-Icon=org.gtk.gtk4.NodeEditor
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;

demos/print-editor/meson.build

@@ -3,7 +3,7 @@ executable('gtk4-print-editor',
   c_args: common_cflags,
   dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
   link_args: extra_demo_ldflags,
   install: true,
 )

demos/print-editor/print-editor.c

@@ -871,7 +871,7 @@ activate (GApplication *app)
 
   update_ui ();
 
-  gtk_window_present (GTK_WINDOW (main_window));
+  gtk_widget_show (main_window);
 }
 
 static void

demos/widget-factory/heif-loader.c

@@ -1,257 +0,0 @@
-#include "heif-loader.h"
-#include <gtk/gtk.h>
-#include <libheif/heif.h>
-
-static void
-describe_nclx_color_profile (const struct heif_color_profile_nclx *nclx,
-                             GString                              *s)
-{
-  if (nclx->color_primaries == heif_color_primaries_unspecified)
-    return;
-
-  if (nclx->color_primaries == heif_color_primaries_ITU_R_BT_709_5)
-    {
-      if (nclx->transfer_characteristics == heif_transfer_characteristic_IEC_61966_2_1 &&
-          (nclx->matrix_coefficients == heif_matrix_coefficients_ITU_R_BT_470_6_System_B_G ||
-           nclx->matrix_coefficients == heif_matrix_coefficients_ITU_R_BT_601_6))
-        {
-          g_string_append (s, "sRGB");
-          return;
-        }
-
-      if (nclx->transfer_characteristics == heif_transfer_characteristic_linear &&
-          (nclx->matrix_coefficients == heif_matrix_coefficients_ITU_R_BT_470_6_System_B_G ||
-           nclx->matrix_coefficients == heif_matrix_coefficients_ITU_R_BT_601_6))
-        {
-          g_string_append (s, "sRGB linear");
-          return;
-        }
-    }
-
- if (nclx->color_primaries == heif_color_primaries_ITU_R_BT_2020_2_and_2100_0)
-    {
-      if (nclx->transfer_characteristics == heif_transfer_characteristic_ITU_R_BT_2100_0_PQ &&
-          nclx->matrix_coefficients == heif_matrix_coefficients_ITU_R_BT_2020_2_non_constant_luminance)
-        {
-          g_string_append (s, "BT.2020 PQ");
-          return;
-        }
-
-      if (nclx->transfer_characteristics == heif_transfer_characteristic_ITU_R_BT_2100_0_HLG &&
-          nclx->matrix_coefficients == heif_matrix_coefficients_ITU_R_BT_2020_2_non_constant_luminance)
-        {
-          g_string_append (s, "BT.2020 HLG");
-          return;
-        }
-    }
-
-  if (nclx->color_primaries == heif_color_primaries_SMPTE_EG_432_1)
-    {
-      if (nclx->transfer_characteristics == heif_transfer_characteristic_ITU_R_BT_2100_0_PQ)
-        {
-          g_string_append (s, "P3 PQ");
-          return;
-        }
-    }
-
-  g_string_append_printf (s, "%d/%d/%d",
-                          nclx->color_primaries,
-                          nclx->matrix_coefficients,
-                          nclx->transfer_characteristics);
-}
-
-GdkTexture *
-load_heif_image (const char  *resource_path,
-                 GString     *details,
-                 GError     **error)
-{
-  struct heif_context *ctx;
-  struct heif_error err;
-  struct heif_image_handle *handle = NULL;
-  struct heif_image *image = NULL;
-  enum heif_chroma chroma;
-  GdkMemoryFormat format;
-  const char *format_name;
-  uint8_t *data = NULL;
-  gsize size;
-  int width, height, bpp, stride, bits;
-  GBytes *bytes;
-  GdkTexture *texture = NULL;
-  GdkColorProfile *profile = NULL;
-  char *profile_type = NULL;
-
-  ctx = heif_context_alloc ();
-
-  bytes = g_resources_lookup_data (resource_path, 0, NULL);
-  data = (uint8_t *) g_bytes_get_data (bytes, &size);
-
-  err = heif_context_read_from_memory (ctx, data, size, NULL);
-
-  g_bytes_unref (bytes);
-
-  if (err.code != heif_error_Ok)
-    {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, err.message);
-      goto out;
-    }
-
-  err = heif_context_get_primary_image_handle (ctx, &handle);
-  if (err.code != heif_error_Ok)
-    {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, err.message);
-      goto out;
-    }
-
-  switch (heif_image_handle_get_color_profile_type (handle))
-    {
-    case heif_color_profile_type_not_present:
-      break;
-    case heif_color_profile_type_rICC:
-    case heif_color_profile_type_prof:
-      {
-        guchar *icc_data;
-        gsize icc_size;
-
-        profile_type = g_strdup ("icc");
-        icc_size = heif_image_handle_get_raw_color_profile_size (handle);
-        icc_data = g_new0 (guchar, icc_size);
-        err = heif_image_handle_get_raw_color_profile (handle, icc_data);
-        if (err.code == heif_error_Ok)
-          {
-            bytes = g_bytes_new (icc_data, icc_size);
-            profile = gdk_color_profile_new_from_icc_bytes (bytes, NULL);
-            g_bytes_unref (bytes);
-          }
-        g_free (icc_data);
-      }
-      break;
-    case heif_color_profile_type_nclx:
-      {
-        struct heif_color_profile_nclx *nclx = NULL;
-
-        err = heif_image_handle_get_nclx_color_profile (handle, &nclx);
-        if (err.code == heif_error_Ok)
-          {
-            GString *s;
-
-            s = g_string_new ("");
-            describe_nclx_color_profile (nclx, s);
-            profile_type = g_string_free (s, FALSE);
-            profile = gdk_color_profile_new_from_cicp (nclx->color_primaries,
-                                                       nclx->transfer_characteristics,
-                                                       0,
-                                                       TRUE,
-                                                       NULL);
-            heif_nclx_color_profile_free (nclx);
-          }
-      }
-      break;
-    default:
-      g_assert_not_reached ();
-    }
-
-  g_string_append_printf (details, "%d × %d pixels\n%d bits of luma, %d bits of chroma%s\n",
-                          heif_image_handle_get_width (handle),
-                          heif_image_handle_get_height (handle),
-                          heif_image_handle_get_luma_bits_per_pixel (handle),
-                          heif_image_handle_get_chroma_bits_per_pixel (handle),
-                          heif_image_handle_has_alpha_channel (handle) ? ", with alpha" : "");
-
-  if (profile_type)
-    {
-      g_string_append_printf (details, "color profile: %s\n", profile_type);
-      g_free (profile_type);
-    }
-
-  if (profile == NULL)
-    profile = g_object_ref (gdk_color_profile_get_srgb ());
-
-  if (heif_image_handle_has_alpha_channel (handle))
-    {
-      if (heif_image_handle_get_luma_bits_per_pixel (handle) > 8 ||
-          heif_image_handle_get_chroma_bits_per_pixel (handle) > 8)
-        {
-          chroma = heif_chroma_interleaved_RRGGBBAA_BE;
-          format = GDK_MEMORY_R16G16B16A16;
-          format_name = "R<sub>16</sub>G<sub>16</sub>B<sub>16</sub>A<sub>16</sub>";
-        }
-      else
-        {
-          chroma = heif_chroma_interleaved_RGBA;
-          format = GDK_MEMORY_R8G8B8A8;
-          format_name = "R<sub>8</sub>G<sub>8</sub>B<sub>8</sub>A<sub>8</sub>";
-        }
-    }
-  else
-    {
-      if (heif_image_handle_get_luma_bits_per_pixel (handle) > 8 ||
-          heif_image_handle_get_chroma_bits_per_pixel (handle) > 8)
-        {
-          chroma = heif_chroma_interleaved_RRGGBB_BE;
-          format = GDK_MEMORY_R16G16B16;
-          format_name = "R<sub>16</sub>G<sub>16</sub>B<sub>16</sub>";
-        }
-      else
-        {
-          chroma = heif_chroma_interleaved_RGB;
-          format = GDK_MEMORY_R8G8B8;
-          format_name = "R<sub>8</sub>G<sub>8</sub>B<sub>8</sub>";
-        }
-    }
-
-  err = heif_decode_image (handle, &image, heif_colorspace_RGB, chroma, NULL);
-  if (err.code != heif_error_Ok)
-    {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, err.message);
-      goto out;
-    }
-
-  width = heif_image_get_width (image, heif_channel_interleaved);
-  height = heif_image_get_height (image, heif_channel_interleaved);
-  bpp = heif_image_get_bits_per_pixel (image, heif_channel_interleaved);
-  data = (uint8_t*)heif_image_get_plane_readonly (image, heif_channel_interleaved, &stride);
-  bits = heif_image_get_bits_per_pixel_range (image, heif_channel_interleaved);
-
-  g_string_append_printf (details, "texture format %s", format_name);
-
-  if (format == GDK_MEMORY_R16G16B16A16 || format == GDK_MEMORY_R16G16B16)
-    {
-      /* Shift image data to full 16bit range */
-      int shift = 16 - bits;
-      if (shift > 0)
-        {
-          for (int y = 0; y < height; ++y)
-            {
-              uint8_t *row = data + y * stride;
-
-              for (int x = 0; x < stride; x += 2)
-                {
-                  uint8_t* p = &row[x];
-                  int v = (p[0] << 8) | p[1];
-                  v = (v << shift) | (v >> (16 - shift));
-                  p[1] = (uint8_t) (v >> 8);
-                  p[0] = (uint8_t) (v & 0xFF);
-                }
-            }
-        }
-    }
-
-  bytes = g_bytes_new_with_free_func (data, height * stride * bpp, (GDestroyNotify)heif_image_release, image);
-
-  image = NULL;
-
-  texture = gdk_memory_texture_new_with_color_profile (width, height,
-                                                       format, profile,
-                                                       bytes, stride);
-  g_bytes_unref (bytes);
-  g_object_unref (profile);
-
-out:
-  heif_context_free (ctx);
-  if (handle)
-    heif_image_handle_release (handle);
-  if (image)
-    heif_image_release (image);
-
-  return texture;
-}

demos/widget-factory/heif-loader.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-GdkTexture *load_heif_image (const char  *resource_path,
-                             GString     *details,
-                             GError     **error);

demos/widget-factory/meson.build

@@ -8,7 +8,7 @@ endif
 
 ld = find_program('ld', required : false)
 
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
   glib_compile_resources = find_program('glib-compile-resources')
 
   # Create the resource blob
@@ -18,7 +18,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
       depfile: 'widgetfactory.gresource.d',
       command : [glib_compile_resources,
                  '--generate',
-                 '--internal',
                  '--target=@OUTPUT@',
                  '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
@@ -32,7 +31,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
       depfile: 'widgetfactory_resources.c.d',
       command : [glib_compile_resources,
                  '--generate-source',
-                 '--internal',
                  '--target=@OUTPUT@',
                  '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
@@ -46,7 +44,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
       input : widgetfactory_gresource,
       output : 'widgetfactory_resources.o',
       command : [ld,
-                 '-z', 'noexecstack',
                  '-r',
                  '-b','binary',
                  '@INPUT@',
@@ -57,7 +54,6 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
     input : widgetfactory_resources_binary,
     output : 'widgetfactory_resources2.o',
     command : [objcopy,
-                 '--strip-all',
                  '--add-symbol','_g_binary_widgetfactory_resource_data=.data:0',
                  '@INPUT@',
                  '@OUTPUT@'])
@@ -73,14 +69,12 @@ else
   )
 endif
 
-libheif_dep = dependency('libheif')
-
 executable('gtk4-widget-factory',
-  sources: ['widget-factory.c', 'heif-loader.c', widgetfactory_resources],
+  sources: ['widget-factory.c', widgetfactory_resources],
   c_args: common_cflags,
-  dependencies: [ libgtk_dep, libheif_dep, demo_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
   link_args: extra_demo_ldflags,
   install: true,
 )

demos/widget-factory/widget-factory.c

@@ -27,8 +27,6 @@
 
 #include "demo_conf.h"
 
-#include "heif-loader.h"
-
 static void
 change_dark_state (GSimpleAction *action,
                     GVariant      *state,
@@ -2055,7 +2053,6 @@ activate (GApplication *app)
     { "win.open", { "<Control>o", NULL } },
     { "win.record", { "<Control>r", NULL } },
     { "win.lock", { "<Control>l", NULL } },
-    { "win.fullscreen", { "F11", NULL } },
   };
   struct {
     const char *action_and_target;
@@ -2362,16 +2359,7 @@ activate (GApplication *app)
   model = (GMenuModel *)gtk_builder_get_object (builder, "new_style_context_menu_model");
   set_up_context_popover (widget, model);
 
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "hdr_picture");
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "hdr_label");
-  GString *details = g_string_new ("");
-  GdkTexture *texture = load_heif_image ("/org/gtk/WidgetFactory4/hdr-example.heif", details, NULL);
-  gtk_picture_set_paintable (GTK_PICTURE (widget), GDK_PAINTABLE (texture));
-  gtk_label_set_label (GTK_LABEL (widget2), details->str);
-  g_string_free (details, TRUE);
-  g_object_unref (texture);
-
-  gtk_window_present (window);
+  gtk_widget_show (GTK_WIDGET (window));
 
   g_object_unref (builder);
 }

demos/widget-factory/widget-factory.css

@@ -6,10 +6,3 @@
 .toolbar {
   -gtk-icon-style: symbolic;
 }
-
-.gtk-gradient-color {
-  background: linear-gradient(to right, lime, red);
-}
-.gtk-gradient-monochrome {
-  background: linear-gradient(to right, black, white);
-}

demos/widget-factory/widget-factory.gresource.xml

@@ -110,7 +110,6 @@
     <file>icons/scalable/status/weather-severe-alert-symbolic.svg</file>
     <file>icons/scalable/status/weather-showers-symbolic.svg</file>
     <file>icons/scalable/status/weather-snow-symbolic.svg</file>
-    <file>hdr-example.heif</file>
 
   </gresource>
   <gresource prefix="/org/gtk/WidgetFactory4">
@@ -119,12 +118,5 @@
     <file>portland-rose.jpg</file>
     <file>nyc.jpg</file>
     <file>beach.jpg</file>
-    <file>linear-gradient-color.png</file>
-    <file>linear-gradient-monochrome.png</file>
-    <file>srgb-gradient-color.png</file>
-    <file>srgb-gradient-monochrome.png</file>
-    <file>color-profile-check.png</file>
-    <file>color-profile-check.jpeg</file>
-    <file>color-profile-check.tiff</file>
   </gresource>
 </gresources>

demos/widget-factory/widget-factory.ui

@@ -1346,173 +1346,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkGrid">
-                                    <property name="hexpand">0</property>
-                                    <property name="row-spacing">6</property>
-                                    <property name="column-spacing">6</property>
-                                    <property name="margin-start">6</property>
-                                    <property name="margin-end">6</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <property name="row-homogeneous">1</property>
-                                    <property name="valign">start</property>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label" translatable="yes">color</property>
-                                        <style>
-                                          <class name="caption-heading"/>
-                                        </style>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">0</property>
-                                          <property name="column-span">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">sRGB</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPicture">
-                                        <property name="file">resource:///org/gtk/WidgetFactory4/srgb-gradient-color.png</property>
-                                        <property name="can-shrink">0</property>
-                                        <property name="keep-aspect-ratio">0</property>
-                                        <property name="hexpand">1</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">GTK</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPicture">
-                                        <property name="width-request">128</property>
-                                        <property name="keep-aspect-ratio">0</property>
-                                        <style>
-                                          <class name="gtk-gradient-color"/>
-                                        </style>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">linear</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPicture">
-                                        <property name="file">resource:///org/gtk/WidgetFactory4/linear-gradient-color.png</property>
-                                        <property name="can-shrink">0</property>
-                                        <property name="keep-aspect-ratio">0</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label" translatable="yes">monochrome</property>
-                                        <style>
-                                          <class name="caption-heading"/>
-                                        </style>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">4</property>
-                                          <property name="column-span">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">sRGB</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">5</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPicture">
-                                        <property name="file">resource:///org/gtk/WidgetFactory4/srgb-gradient-monochrome.png</property>
-                                        <property name="can-shrink">0</property>
-                                        <property name="keep-aspect-ratio">0</property>
-                                        <property name="hexpand">1</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">5</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">GTK</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">6</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPicture">
-                                        <property name="width-request">128</property>
-                                        <property name="keep-aspect-ratio">0</property>
-                                        <style>
-                                          <class name="gtk-gradient-monochrome"/>
-                                        </style>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">6</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">linear</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">7</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkPicture">
-                                        <property name="file">resource:///org/gtk/WidgetFactory4/linear-gradient-monochrome.png</property>
-                                        <property name="can-shrink">0</property>
-                                        <property name="keep-aspect-ratio">0</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">7</property>
-                                        </layout>
-                                      </object>
-                                    </child>
+                                  <object class="GtkBox" id="box8">
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label8">
-                                    <property name="label" translatable="1">Gradients</property>
+                                    <property name="label" translatable="1">page 1</property>
                                   </object>
                                 </property>
                               </object>
@@ -1521,92 +1361,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <object class="GtkNotebookPage">
                                 <property name="position">1</property>
                                 <property name="child">
-                                  <object class="GtkGrid">
-                                    <property name="hexpand">0</property>
-                                    <property name="row-spacing">6</property>
-                                    <property name="column-spacing">6</property>
-                                    <property name="margin-start">6</property>
-                                    <property name="margin-end">6</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <property name="row-homogeneous">1</property>
-                                    <property name="valign">start</property>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label" translatable="yes">image loading</property>
-                                        <style>
-                                          <class name="caption-heading"/>
-                                        </style>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">0</property>
-                                          <property name="column-span">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage">
-                                        <property name="paintable">resource:///org/gtk/WidgetFactory4/color-profile-check.png</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">PNG</property>
-                                        <property name="hexpand">1</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">1</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage">
-                                        <property name="paintable">resource:///org/gtk/WidgetFactory4/color-profile-check.jpeg</property>
-                                        <layout>
-                                          <property name="column">0</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">JPEG</property>
-                                        <property name="hexpand">1</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">2</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage">
-                                        <property name="paintable">resource:///org/gtk/WidgetFactory4/color-profile-check.tiff</property>
-                                        <layout>
-
-                                          <property name="column">0</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="label">TIFF</property>
-                                        <property name="hexpand">1</property>
-                                        <layout>
-                                          <property name="column">1</property>
-                                          <property name="row">3</property>
-                                        </layout>
-                                      </object>
-                                    </child>
+                                  <object class="GtkBox" id="box10">
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label9">
-                                    <property name="label" translatable="1">Images</property>
+                                    <property name="label" translatable="1">page 2</property>
                                   </object>
                                 </property>
                               </object>
@@ -1616,26 +1377,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="position">2</property>
                                 <property name="child">
                                   <object class="GtkBox" id="box11">
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkPicture" id="hdr_picture">
-                                        <property name="can-shrink">1</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="hdr_label">
-                                        <property name="margin-start">10</property>
-                                        <property name="margin-end">10</property>
-                                        <property name="margin-top">10</property>
-                                        <property name="margin-bottom">10</property>
-                                        <property name="use-markup">1</property>
-                                      </object>
-                                    </child>
+                                    <property name="orientation">1</property>
                                   </object>
                                 </property>
                                 <property name="tab">
                                   <object class="GtkLabel" id="label10">
-                                    <property name="label" translatable="1">HDR</property>
+                                    <property name="label" translatable="1">page 3</property>
                                   </object>
                                 </property>
                               </object>
@@ -2180,12 +1927,6 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="tooltip-text" translatable="1">Insert something</property>
                                           </object>
                                         </child>
-                                        <child>
-                                          <object class="GtkColorButton">
-                                            <property name="rgba">#9141AC</property>
-                                            <property name="tooltip-text" translatable="1">Select a color</property>
-                                          </object>
-                                        </child>
                                       </object>
                                     </child>
                                     <child>

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

@@ -7,21 +7,20 @@ 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 = ["Gdk-4.0"]
-
-  [dependencies."Gdk-4.0"]
-  name = "GDK"
-  description = "The GTK drawing kit"
-  docs_url = "https://docs.gtk.org/gdk/"
+  [dependencies."GObject-2.0"]
+  name = "GObject"
+  description = "The base type system library"
+  docs_url = "https://docs.gtk.org/gobject/"
 
 [theme]
 name = "basic"
 show_index_summary = true
 
 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
 
 [extra]
 content_images = [

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

@@ -7,20 +7,20 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "GPL-2.1-or-later"
 description = "The GTK toolkit"
-dependencies = ["Gdk-4.0"]
+dependencies = [ "GObject-2.0" ]
 devhelp = true
 
-  [dependencies."Gdk-4.0"]
-  name = "GDK"
-  description = "The GTK drawing kit"
-  docs_url = "https://docs.gtk.org/gdk4/"
+  [dependencies."GObject-2.0"]
+  name = "GObject"
+  description = "The base type system library"
+  docs_url = "https://docs.gtk.org/gobject/"
 
 [theme]
 name = "basic"
 show_index_summary = true
 
 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
 
 [extra]
 content_images = [

docs/reference/gdk/gdk4.toml.in

@@ -8,7 +8,7 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"
 description = "The GTK toolkit"
-dependencies = ["GObject-2.0", "Gio-2.0", "cairo-1.0", "Pango-1.0", "GdkPixbuf-2.0"]
+dependencies = [ "GObject-2.0", "cairo-1.0", "Pango-1.0", "GdkWayland-4.0",  "GdkX11-4.0" ]
 devhelp = true
 search_index = true
 
@@ -17,11 +17,6 @@ search_index = true
   description = "The base type system library"
   docs_url = "https://docs.gtk.org/gobject/"
 
-  [dependencies."Gio-2.0"]
-  name = "GIO"
-  description = "GObject Interfaces and Objects, Networking, IPC, and I/O"
-  docs_url = "https://docs.gtk.org/gio/"
-
   [dependencies."cairo-1.0"]
   name = "Cairo"
   description = "A 2D graphics library with support for multiple output devices"
@@ -32,19 +27,12 @@ search_index = true
   description = "Text shaping and rendering"
   docs_url = "https://docs.gtk.org/Pango/"
 
-  [dependencies."GdkPixbuf-2.0"]
-  name = "GdkPixbuf"
-  description = "Image data loading"
-  docs_url = "https://docs.gtk.org/gdk-pixbuf/"
-
-related = ["GdkWayland-4.0", "GdkX11-4.0"]
-
-  [related."GdkWayland-4.0"]
+  [dependencies."GdkWayland-4.0"]
   name = "GdkWayland"
   description = "GDK Wayland Backend"
   docs_url = "https://docs.gtk.org/gdk4-wayland/"
 
-  [related."GdkX11-4.0"]
+  [dependencies."GdkX11-4.0"]
   name = "GdkX11"
   description = "GDK X11 Backend"
   docs_url = "https://docs.gtk.org/gdk4-x11/"
@@ -55,7 +43,7 @@ show_index_summary = true
 show_class_hierarchy = true
 
 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
 
 [extra]
 content_files = [

docs/reference/gsk/gsk4.toml.in

@@ -8,16 +8,25 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-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 = ["Graphene-1.0", "Gdk-4.0"]
+  [dependencies."GObject-2.0"]
+  name = "GObject"
+  description = "The base type system library"
+  docs_url = "https://docs.gtk.org/gobject/"
 
   [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://docs.gtk.org/Pango/"
+
   [dependencies."Gdk-4.0"]
   name = "GDK"
   description = "The GTK windowing system abstraction"
@@ -29,7 +38,7 @@ show_index_summary = true
 show_class_hierarchy = true
 
 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
 
 [extra]
 content_images = [

docs/reference/gtk/getting_started.md

@@ -170,7 +170,7 @@ activate (GtkApplication *app,
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_set_halign (box, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (box, GTK_ALIGN_CENTER);
-
+  
   gtk_window_set_child (GTK_WINDOW (window), box);
 
   button = gtk_button_new_with_label ("Hello World");
@@ -752,7 +752,7 @@ templates, resources, application menus, settings, [class@Gtk.HeaderBar], [class
 
 The full, buildable sources for these examples can be found in the
 `examples` directory of the GTK source distribution, or
-[online](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples) in the GTK
+[online](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples) in the GTK
 source code repository. You can build each example separately by using make
 with the `Makefile.example` file. For more information, see the `README`
 included in the examples directory.
@@ -972,7 +972,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
  ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application2/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application2/exampleappwin.c))
 
 You may have noticed that we used the `_from_resource()` variant of the function
 that sets a template. Now we need to use
@@ -1043,7 +1043,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application3/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application3/exampleappwin.c))
 
 Now we revisit the `example_app_window_open()` function that is called for each
 commandline argument, and construct a GtkTextView that we then add as a page
@@ -1087,7 +1087,7 @@ example_app_window_open (ExampleAppWindow *win,
 ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application3/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application3/exampleappwin.c))
 
 Lastly, we add a [class@Gtk.StackSwitcher] to the titlebar area in the UI file, and we
 tell it to display information about our stack.
@@ -1188,7 +1188,7 @@ example_app_class_init (ExampleAppClass *class)
 ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application4/exampleapp.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application4/exampleapp.c))
 
 Our preferences menu item does not do anything yet, but the Quit menu item
 is fully functional. Note that it can also be activated by the usual Ctrl-Q
@@ -1258,7 +1258,7 @@ example_app_window_init (ExampleAppWindow *win)
 ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application5/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application5/exampleappwin.c))
 
 The code to connect the font setting is a little more involved, since there
 is no simple object property that it corresponds to, so we are not going to
@@ -1429,7 +1429,7 @@ preferences_activated (GSimpleAction *action,
 ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application6/exampleapp.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application6/exampleapp.c))
 
 After all this work, our application can now show a preference dialog
 like this:
@@ -1549,7 +1549,7 @@ example_app_window_init (ExampleAppWindow *win)
 ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application7/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application7/exampleappwin.c))
 
 With the search bar, our application now looks like this:
 
@@ -1682,7 +1682,7 @@ example_app_window_init (ExampleAppWindow *win)
 ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application8/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application8/exampleappwin.c))
 
 What our application looks like now:
 
@@ -1760,10 +1760,10 @@ example_app_window_init (ExampleAppWindow *win)
 ...
 ```
 
-([full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application9/exampleappwin.c))
+([full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application9/exampleappwin.c))
 
 We also need a function that counts the lines of the currently active tab,
-and updates the `lines` label. See the [full source](https://gitlab.gnome.org/GNOME/gtk/blob/main/examples/application9/exampleappwin.c)
+and updates the `lines` label. See the [full source](https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application9/exampleappwin.c)
 if you are interested in the details.
 
 This brings our example application to this appearance:

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

@@ -16,7 +16,6 @@ SYNOPSIS
 |   **gtk4-builder-tool** enumerate <FILE>
 |   **gtk4-builder-tool** simplify [OPTIONS...] <FILE>
 |   **gtk4-builder-tool** preview [OPTIONS...] <FILE>
-|   **gtk4-builder-tool** screenshot [OPTIONS...] <FILE>
 
 DESCRIPTION
 -----------
@@ -42,7 +41,7 @@ definition file.
 Preview
 ^^^^^^^
 
-The ``preview`` command displays the UI definition file.
+The ``preview`` command displays the UI dfinition file.
 
 This command accepts options to specify the ID of the toplevel object and a CSS
 file to use.
@@ -56,33 +55,6 @@ file to use.
 
   Load style information from the given CSS file.
 
-Screenshot
-^^^^^^^^^^
-
-The ``screenshot`` command saves a rendering of the UI definition file
-as a png image or node file. The name of the file to write can be specified as
-a second FILE argument.
-
-This command accepts options to specify the ID of the toplevel object and a CSS
-file to use.
-
-``--id=ID``
-
-  The ID of the object to preview. If not specified, gtk4-builder-tool will
-  choose a suitable object on its own.
-
-``--css=FILE``
-
-  Load style information from the given CSS file.
-
-``--node``
-
-  Write a serialized node file instead of a png image.
-
-``--force``
-
-  Overwrite an existing file.
-
 Simplification
 ^^^^^^^^^^^^^^
 

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

@@ -1,27 +0,0 @@
-.. _gtk4-node-editor(1):
-
-=================
-gtk4-node-editor
-=================
-
------------------
-Editor render nodes
------------------
-
-SYNOPSIS
---------
-
-|   **gtk4-node-editor** [OPTIONS...]
-
-DESCRIPTION
------------
-
-``gtk4-node-editor`` is a utility to show and edit render node files.
-Such render node files can be obtained e.g. from the GTK inspector.
-
-OPTIONS
--------
-
-``-h, --help``
-
-  Show the application help.

docs/reference/gtk/gtk4.toml.in

@@ -8,10 +8,24 @@ authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"
 description = "The GTK toolkit"
+dependencies = [ "GObject-2.0", "Graphene-1.0", "Pango-1.0", "Gdk-4.0", "Gsk-4.0" ]
 devhelp = true
 search_index = true
 
-dependencies = ["Gdk-4.0", "Gsk-4.0"]
+  [dependencies."GObject-2.0"]
+  name = "GObject"
+  description = "The base type system library"
+  docs_url = "https://docs.gtk.org/gobject/"
+
+  [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://docs.gtk.org/Pango/"
 
   [dependencies."Gdk-4.0"]
   name = "GDK"
@@ -23,35 +37,13 @@ dependencies = ["Gdk-4.0", "Gsk-4.0"]
   description = "The GTK rendering abstraction"
   docs_url = "https://docs.gtk.org/gsk4/"
 
-related = ["Pango-1.0", "Graphene-1.0", "GObject-2.0", "Gio-2.0"]
-
-  [related."GObject-2.0"]
-  name = "GObject"
-  description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
-
-  [related."Gio-2.0"]
-  name = "GIO"
-  description = "GObject Interfaces and Objects, Networking, IPC, and I/O"
-  docs_url = "https://docs.gtk.org/gio/"
-
-  [related."Graphene-1.0"]
-  name = "Graphene"
-  description = "A thin layer of mathematical types for 3D libraries"
-  docs_url = "https://ebassi.github.io/graphene/docs"
-
-  [related."Pango-1.0"]
-  name = "Pango"
-  description = "Text shaping and rendering"
-  docs_url = "https://docs.gtk.org/Pango/"
-
 [theme]
 name = "basic"
 show_index_summary = true
 show_class_hierarchy = true
 
 [source-location]
-base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"
+base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/master/"
 
 [extra]
 # The same order will be used when generating the index

docs/reference/gtk/images/aboutdialog.ui

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAboutDialog">
-    <property name="program-name">GTK Code Demos</property>
-    <property name="version">4.8.0</property>
-    <property name="copyright">© 1997-2022 The GTK Team</property>
-    <property name="comments">Program to demonstrate GTK functions</property>
-    <property name="logo">gtk-logo.png</property>
-    <property name="title">About GTK Code Demos</property>
-    <property name="authors">Peter Mattis
-Spencer Kimball
-Josh MacDonald
-and many more…
-</property>
-  </object>
-</interface>

docs/reference/gtk/images/action-bar.ui

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <child>
-              <object class="GtkTextView">
-                <property name="vexpand">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkActionBar">
-                <child>
-                  <object class="GtkButton">
-                    <property name="icon-name">object-select-symbolic</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="icon-name">call-start-symbolic</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/appchooserbutton.ui

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkAppChooserButton">
-                <property name="content-type">text/plain</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Application Button</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/appchooserdialog.ui

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAppChooserDialog">
-    <property name="content-type">image/png</property>
-    <property name="default-width">200</property>
-    <property name="default-height">300</property>
-  </object>
-</interface>

docs/reference/gtk/images/assistant.ui

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAssistant">
-    <property name="resizable">0</property>
-    <property name="default-width">300</property>
-    <property name="default-height">140</property>
-    <property name="title">Assistant</property>
-    <child>
-      <object class="GtkAssistantPage">
-        <property name="title">Assistant page</property>
-        <property name="complete">1</property>
-        <property name="child">
-          <object class="GtkLabel">
-            <property name="label">Assistant</property>
-          </object>
-        </property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAssistantPage">
-        <property name="page-type">confirm</property>
-        <property name="child">
-          <object class="GtkLabel">
-            <property name="label">You sure?</property>
-          </object>
-        </property>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/box.ui

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-      <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-            <property name="margin-start">10</property>
-            <property name="margin-end">10</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">horizontal</property>
-                <property name="homogeneous">1</property>
-
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">horizontal</property>
-                    <property name="spacing">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <child>
-                      <object class="GtkButton">
-                        <style><class name="small-button"/></style>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <style><class name="small-button"/></style>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">⋯</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <child>
-                      <object class="GtkButton">
-                        <style><class name="small-button"/></style>
-                        <property name="halign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <style><class name="small-button"/></style>
-                        <property name="halign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">⋮</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="justify">center</property>
-                <property name="label">Horizontal and Vertical Boxes</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/button.ui

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkButton">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="label">Button</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/calendar.ui

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="margin-start">10</property>
-            <property name="margin-end">10</property>
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-            <child>
-              <object class="GtkCalendar">
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Calendar</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/centerbox.ui

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-      <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="margin-top">10</property>
-            <property name="margin-bottom">10</property>
-            <property name="margin-start">20</property>
-            <property name="margin-end">20</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <child>
-              <object class="GtkCenterBox">
-                <property name="orientation">horizontal</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="halign">fill</property>
-                <child type="start">
-                  <object class="GtkButton">
-                    <style><class name="small-button"/></style>
-                    <property name="valign">center</property>
-                  </object>
-                </child>
-                <child type="center">
-                  <object class="GtkButton">
-                    <style><class name="small-button"/></style>
-                    <property name="valign">center</property>
-                  </object>
-                </child>
-                <child type="end">
-                  <object class="GtkButton">
-                    <style><class name="small-button"/></style>
-                    <property name="valign">center</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="justify">center</property>
-                <property name="label">Center Box</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/check-button.ui

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkCheckButton">
-                <property name="active">1</property>
-                <property name="label">Check Button</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton">
-                <property name="active">0</property>
-                <property name="label">Check Button</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/color-button.ui

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkColorButton">
-                <property name="rgba">#1e90ff</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Color Button</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/colorchooser.ui

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkColorChooserDialog">
-    <property name="title">Color Chooser Dialog</property>
-  </object>
-</interface>

docs/reference/gtk/images/combo-box-entry.ui

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkComboBox">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="has-entry">1</property>
-            <child internal-child="entry">
-              <object class="GtkEntry">
-                <property name="text">Combo Box Entry</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/combo-box-text.ui

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkComboBoxText">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <items>
-              <item>Combo Box Text</item>
-            </items>
-            <property name="active">0</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/combo-box.ui

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkComboBox">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="model">
-              <object class="GtkListStore">
-                <columns>
-                  <column type="gchararray"/>
-                </columns>
-                <data>
-                  <row>
-                    <col id="0">Combo Box</col>
-                  </row>
-                </data>
-              </object>
-            </property>
-            <child>
-              <object class="GtkCellRendererText">
-              </object>
-              <attributes>
-                <attribute name="text">0</attribute>
-              </attributes>
-            </child>
-            <property name="active">0</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

docs/reference/gtk/images/dialog.ui

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkDialog">
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <property name="title">Dialog</property>
-    <child type="action">
-      <object class="GtkButton" id="button_cancel">
-        <property name="label">Cancel</property>
-      </object>
-    </child>
-    <child type="action">
-      <object class="GtkButton" id="button_ok">
-        <property name="label">Accept</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkLabel">
-        <property name="label">Content</property>
-        <property name="hexpand">1</property>
-        <property name="halign">center</property>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="ok" default="true">button_ok</action-widget>
-      <action-widget response="cancel" default="true">button_cancel</action-widget>
-    </action-widgets>
-  </object>
-</interface>