jpeg: Set errors

We can just use gdk_texture_new_from_bytes here now.

Update affected test output.

.editorconfig

@@ -1,32 +0,0 @@
-# SPDX-FileCopyrightText: 2021 The GTK Authors
-# SPDX-License-Identifier: CC0-1.0
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-trim_trailing_whitespace = true
-
-[*.[ch]]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-# For the legacy tabs which still exist in the code:
-tab_width = 8
-
-[*.ui]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-
-[*.xml]
-indent_size = 2
-indent_style = space
-
-[meson.build]
-indent_size = 2
-indent_style = space
-
-[*.md]
-max_line_length = 80

.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:v35"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v33"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
 
 .only-default:
@@ -91,7 +91,6 @@ fedora-x86_64:
     - 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
     - .gitlab-ci/run-tests.sh _build broadway
 
 release-build:
@@ -221,11 +220,11 @@ vs2017-x64:
   extends: .flatpak-defaults
   when: manual
 
-# Only build Flatpak bundles automatically on main
-.flatpak-main:
+# Only build Flatpak bundles automatically on master
+.flatpak-master:
   extends: .flatpak-defaults
   only:
-    - main
+    - master
 
 flatpak-manual:demo:
   extends: .flatpak-manual
@@ -233,8 +232,8 @@ flatpak-manual:demo:
   variables:
     APPID: org.gtk.Demo4
 
-flatpak-main:demo:
-  extends: .flatpak-main
+flatpak-master:demo:
+  extends: .flatpak-master
   needs: []
   variables:
     APPID: org.gtk.Demo4
@@ -245,8 +244,8 @@ flatpak-manual:widget-factory:
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak-main:widget-factory:
-  extends: .flatpak-main
+flatpak-master:widget-factory:
+  extends: .flatpak-master
   needs: []
   variables:
     APPID: org.gtk.WidgetFactory4
@@ -257,8 +256,8 @@ flatpak-manual:icon-browser:
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak-main:icon-browser:
-  extends: .flatpak-main
+flatpak-master:icon-browser:
+  extends: .flatpak-master
   needs: []
   variables:
     APPID: org.gtk.IconBrowser4
@@ -268,18 +267,18 @@ flatpak-main:icon-browser:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
     extends: '.publish_nightly'
-    dependencies: ['flatpak-main:demo']
-    needs: ['flatpak-main:demo']
+    dependencies: ['flatpak-master:demo']
+    needs: ['flatpak-master:demo']
 
 nightly factory:
     extends: '.publish_nightly'
-    dependencies: ['flatpak-main:widget-factory']
-    needs: ['flatpak-main:widget-factory']
+    dependencies: ['flatpak-master:widget-factory']
+    needs: ['flatpak-master:widget-factory']
 
 nightly icon-browser:
     extends: '.publish_nightly'
-    dependencies: ['flatpak-main:icon-browser']
-    needs: ['flatpak-main:icon-browser']
+    dependencies: ['flatpak-master:icon-browser']
+    needs: ['flatpak-master:icon-browser']
 
 static-scan:
   image: $FEDORA_IMAGE
@@ -346,4 +345,4 @@ publish-docs:
     - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
   only:
     refs:
-      - main
+      - master

.gitlab-ci/fedora.Dockerfile

@@ -53,7 +53,6 @@ RUN dnf -y install \
     libpng-devel \
     librsvg2 \
     libselinux-devel \
-    libtiff-devel \
     libubsan \
     libXcomposite-devel \
     libXcursor-devel \
@@ -76,7 +75,6 @@ RUN dnf -y install \
     pcre-devel \
     pcre-static \
     python3 \
-    python3-docutils \
     python3-gobject \
     python3-jinja2 \
     python3-markdown \

.gitlab-ci/flatpak-build.sh

@@ -43,6 +43,6 @@ flatpak build-bundle \
         ${appid}
 
 # to be consumed by the nightly publish jobs
-if [[ $CI_COMMIT_BRANCH == main ]]; then
+if [[ $CI_COMMIT_BRANCH == master ]]; then
         tar cf repo.tar ${repodir}
 fi

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

@@ -268,7 +268,7 @@ aparser.add_argument('--job-id', metavar='ID',
                      default=None)
 aparser.add_argument('--branch', metavar='NAME',
                      help='Branch of the project being tested',
-                     default='main')
+                     default='master')
 aparser.add_argument('--output', metavar='FILE',
                      help='The output HTML file, stdout by default',
                      type=argparse.FileType('w', encoding='UTF-8'),

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

@@ -27,7 +27,7 @@ aparser.add_argument('--job-id', metavar='ID',
                      default='Unknown')
 aparser.add_argument('--branch', metavar='NAME',
                      help='Branch of the project being tested',
-                     default='main')
+                     default='master')
 aparser.add_argument('--output', metavar='FILE',
                      help='The output file, stdout by default',
                      type=argparse.FileType('w', encoding='UTF-8'),

.gitlab-ci/run-style-check-diff.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-# We need to add a new remote for the upstream main, since this script could
+# We need to add a new remote for the upstream master, since this script could
 # be running in a personal fork of the repository which has out of date branches.
 if [ "${CI_PROJECT_NAMESPACE}" != "GNOME" ]; then
     echo "Retrieving the current upstream repository from ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}..."
@@ -16,7 +16,7 @@ fi
 
 # Work out the newest common ancestor between the detached HEAD that this CI job
 # has checked out, and the upstream target branch (which will typically be
-# `upstream/main` or `upstream/gtk-3-24`).
+# `upstream/master` or `upstream/gtk-3-24`).
 #
 # `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
 # a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
@@ -36,7 +36,7 @@ exit_status=$?
 echo ""
 echo "Note that clang-format output is advisory and cannot always match the"
 echo "GTK coding style, documented at:"
-echo "   https://gitlab.gnome.org/GNOME/gtk/blob/main/docs/CODING-STYLE"
+echo "   https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
 echo "Warnings from this tool can be ignored in favour of the documented "
 echo "coding style, or in favour of matching the style of existing"
 echo "surrounding code."

.gitlab-ci/run-tests.sh

@@ -44,24 +44,6 @@ case "${backend}" in
     kill ${compositor}
     ;;
 
-  waylandgles)
-    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-    weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
-    compositor=$!
-    export WAYLAND_DISPLAY=wayland-6
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --no-suite=gsk-compare-broadway
-
-    exit_code=$?
-    kill ${compositor}
-    ;;
-
   broadway)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
@@ -80,12 +62,6 @@ case "${backend}" in
     exit_code=0
     kill ${server}
     ;;
-
-  *)
-    echo "Failed to add ${backend} to .gitlab-ci/run-tests.sh"
-    exit 1
-    ;;
-
 esac
 
 cd ${builddir}

.gitlab-ci/test-msys2.sh

@@ -48,7 +48,7 @@ if ! pkg-config --atleast-version=2.66.0 glib-2.0; then
 fi
 pkg-config --modversion glib-2.0
 
-if ! pkg-config --atleast-version=1.50.0 pango; then
+if ! pkg-config --atleast-version=1.49.1 pango; then
     git clone https://gitlab.gnome.org/GNOME/pango.git _pango
     meson setup _pango_build _pango
     meson compile -C _pango_build

.gitlab/issue_templates/Bug.md

@@ -1,7 +1,7 @@
 <!--
   Please, read the CONTRIBUTING.md guide on how to file a new issue.
 
-  https://gitlab.gnome.org/GNOME/gtk/-/blob/main/CONTRIBUTING.md
+  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
 -->
 ## Steps to reproduce
 <!--

.gitlab/issue_templates/Crash.md

@@ -1,7 +1,7 @@
 <!--
   Please, read the CONTRIBUTING.md guide on how to file a new issue.
 
-  https://gitlab.gnome.org/GNOME/gtk/-/blob/main/CONTRIBUTING.md
+  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
 -->
 
 ## Steps to reproduce

CONTRIBUTING.md

@@ -256,7 +256,7 @@ people committing to GTK to follow a few rules:
 0. Always write a meaningful commit message. Changes without a sufficient
    commit message will be reverted.
 
-0. Never push to the `main` branch, or any stable branches, directly; you
+0. Never push to the `master` branch, or any stable branches, directly; you
    should always go through a merge request, to ensure that the code is
    tested on the CI infrastructure at the very least. A merge request is
    also the proper place to get a comprehensive code review from the core

NEWS

@@ -1,132 +1,19 @@
 Overview of Changes
 ===================
 
-* Rename git `master` branch to `main`
-
-Overview of Changes in 4.5.0
-============================
-
 * gsk:
  - Drop the GL renderer in favor of NGL
- - Rename NGL to GL
- - Fix some coordinate overflow issues
- - Reimplement texture upload and download for better
-   support of image formats and color spaces
- - New api:
-   gsk_transform_skew
-   gsk_transform_to_2d_components
-
-* gdk:
- - Support HSL in gdk_rgba_parse
- - Use libpng, libjpeg and libtiff directly when loading
-   textures, and support more image formats (including 16bit
-   and float formats)
- - New apis:
-   gdk_texture_new_from_bytes
-   gdk_texture_new_from_filename
-   gdk_texture_download_float
-   gdk_texture_save_to_png_bytes
-   gdk_texture_save_to_tiff
-   gdk_texture_save_to_tiff_bytes
-   gdk_display_create_gl_context
- - Implement GIcon and GLoadableIcon in GdkTexture
- - Move EGL initialization to the frontend
- - Use configless EGL contexts, if supported
- - Use >8bit pixel formats, if supported and requested
 
 * css:
  - Add support for line-height
  - Add support for text-transform
 
-* theme:
- - Fixes for buttons in toolbars
-
-* input:
- - Update compose sequences from libX11 1.7.2
- - Accept replacement string longer than 20 characters
-
-* text:
- - Implement sloped caret drawing
- - Add a gtk-hint-font-metrics setting to switch
-   font rendering to be more similar to GTK3
-
 * GtkTextView:
  - Add support for line height
  - Add support for text transforms
- - Misc fixes for css->pango attribute translations
- - Invalidate pango contexts when font settings change
- - Improve undo grouping when overwriting
-
-* GtkListView:
- - Make tree indentation more flexible with
-   GtkTreeExpander:indent-for-icon
-
-* GtkMenuButton:
- - Support custom children
-
-* GtkFlowBox:
- - Add prepend and append
-
-* GtkCalendar:
- - Fix handling of weeks starting on Monday
-
-* GtkWindow:
- - Add a titlebar property
-
-* GtkDropDown:
- - Add a show-arrow property
-
-* GtkPopoverMenu:
- - Support a use-markup attribute in menu models
-
-* Add GtkSymbolicPaintable
-
-* Tools:
- - Support DND in gtk4-node-editor and the inspector's recorder
-
-* Demos:
- - Improve the font rendering demo
 
 * Build:
  - Require Pango 1.49
- - Require libpng, libtiff and libjpeg
- - Speed up handling of resources during build
-
-* X11:
- - Support touchpad gestures with XInput 2.4
-
-* Windows:
- - Fix DND coordinates
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Chinese (China)
- Croatian
- Czech
- Dutch
- Finnish
- French
- Galician
- German
- Hebrew
- Hungarian
- Icelandic
- Indonesian
- Kazakh
- Korean
- Latvian
- Lithuanian
- Persian
- Portuguese
- Romanian
- Serbian
- Slovak
- Spanish
- Swedish
- Turkish
- Ukrainian
 
 
 Overview of Changes in 4.4.0

README.md

@@ -1,7 +1,7 @@
 GTK — The GTK toolkit
 =====================
 
-[![Build status](https://gitlab.gnome.org/GNOME/gtk/badges/main/pipeline.svg)](https://gitlab.gnome.org/GNOME/gtk/-/commits/main)
+[![Build status](https://gitlab.gnome.org/GNOME/gtk/badges/master/pipeline.svg)](https://gitlab.gnome.org/GNOME/gtk/-/commits/master)
 
 General information
 -------------------
@@ -10,12 +10,10 @@ GTK is a multi-platform toolkit for creating graphical user interfaces.
 Offering a complete set of widgets, GTK is suitable for projects ranging
 from small one-off projects to complete application suites.
 
-GTK is a free and open-source software project. The licensing terms
-for GTK, the GNU LGPL, allow it to be used by all developers, including those
-developing proprietary software, without any license fees or royalties.
-
-GTK is hosted by the GNOME project (thanks!) and used by a wide variety
-of applications and projects.
+GTK is free software and part of the GNU Project. However, the
+licensing terms for GTK, the GNU LGPL, allow it to be used by all
+developers, including those developing proprietary software, without any
+license fees or royalties.
 
 The official download location
 
@@ -40,7 +38,7 @@ Nightly documentation can be found at
 
 Nightly flatpaks of our demos can be installed from the
 [GNOME Nightly](https://wiki.gnome.org/Apps/Nightly) repository:
-  - `flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo`
+  - `flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo` 
   - `flatpak install gnome-nightly org.gtk.Demo4`
   - `flatpak install gnome-nightly org.gtk.WidgetFactory4`
   - `flatpak install gnome-nightly org.gtk.IconBrowser4`
@@ -114,21 +112,7 @@ can be found in the file:
 docs/reference/gtk/html/gtk-building.html
 ```
 
-Or [online](https://docs.gtk.org/gtk4/building.html)
-
-Default branch renamed to `main`
---------------------------------
-
-The default development branch of GTK has been renamed to `main`.
-To update your local checkout, use:
-```sh
-git checkout master
-git branch -m master main
-git fetch
-git branch --unset-upstream
-git branch -u origin/main
-git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
-```
+Or [online](https://developer.gnome.org/gtk4/stable/gtk-building.html)
 
 How to report bugs
 ------------------
@@ -167,9 +151,6 @@ Contributing to GTK
 Please, follow the [contribution guide](./CONTRIBUTING.md) to know how to
 start contributing to GTK.
 
-If you want to support GTK financially, please consider donating to
-the GNOME project, which runs the infrastructure hosting GTK.
-
 Release notes
 -------------
 

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

@@ -164,21 +164,6 @@
                 }
             ]
         },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
         {
             "name" : "gtk",
             "buildsystem" : "meson",
@@ -192,8 +177,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
                 }
             ]
         }

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

@@ -93,21 +93,6 @@
                 }
             ]
         },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
         {
             "name" : "gtk",
             "buildsystem" : "meson",
@@ -121,8 +106,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
                 }
             ]
         }

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

@@ -93,21 +93,6 @@
                 }
             ]
         },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
         {
             "name" : "gtk",
             "buildsystem" : "meson",
@@ -121,8 +106,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
                 }
             ]
         }

demos/gtk-demo/cursors.c

@@ -24,7 +24,6 @@ do_cursors (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
@@ -35,7 +34,9 @@ do_cursors (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    {
+      gtk_window_destroy (GTK_WINDOW (window));
+    }
 
   return window;
 }

demos/gtk-demo/curve-editor.h

@@ -1,36 +0,0 @@
-#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

@@ -1,272 +0,0 @@
-/* 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

@@ -249,10 +249,6 @@
   <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>
@@ -270,7 +266,6 @@
     <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>
@@ -291,7 +286,6 @@
     <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>
@@ -330,9 +324,6 @@
     <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>
@@ -417,9 +408,6 @@
   <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/fontrendering.c

@@ -37,7 +37,7 @@ update_image (void)
   const char *text;
   PangoFontDescription *desc;
   PangoLayout *layout;
-  PangoRectangle ink, logical;
+  PangoRectangle ink, pink, logical;
   int baseline;
   cairo_surface_t *surface;
   cairo_t *cr;
@@ -59,18 +59,16 @@ update_image (void)
   fopt = cairo_font_options_copy (pango_cairo_context_get_font_options (context));
 
   hint = gtk_combo_box_get_active_id (GTK_COMBO_BOX (hinting));
-  hintstyle = CAIRO_HINT_STYLE_DEFAULT;
-  if (hint)
-    {
-      if (strcmp (hint, "none") == 0)
-        hintstyle = CAIRO_HINT_STYLE_NONE;
-      else if (strcmp (hint, "slight") == 0)
-        hintstyle = CAIRO_HINT_STYLE_SLIGHT;
-      else if (strcmp (hint, "medium") == 0)
-        hintstyle = CAIRO_HINT_STYLE_MEDIUM;
-      else if (strcmp (hint, "full") == 0)
-        hintstyle = CAIRO_HINT_STYLE_FULL;
-    }
+  if (strcmp (hint, "none") == 0)
+    hintstyle = CAIRO_HINT_STYLE_NONE;
+  else if (strcmp (hint, "slight") == 0)
+    hintstyle = CAIRO_HINT_STYLE_SLIGHT;
+  else if (strcmp (hint, "medium") == 0)
+    hintstyle = CAIRO_HINT_STYLE_MEDIUM;
+  else if (strcmp (hint, "full") == 0)
+    hintstyle = CAIRO_HINT_STYLE_FULL;
+  else
+    hintstyle = CAIRO_HINT_STYLE_DEFAULT;
   cairo_font_options_set_hint_style (fopt, hintstyle);
 
   if (gtk_check_button_get_active (GTK_CHECK_BUTTON (hint_metrics)))
@@ -96,6 +94,7 @@ update_image (void)
       pango_layout_set_font_description (layout, desc);
       pango_layout_set_text (layout, text, -1);
       pango_layout_get_extents (layout, &ink, &logical);
+      pink = ink;
       baseline = pango_layout_get_baseline (layout);
 
       pango_extents_to_pixels (&ink, NULL);
@@ -166,10 +165,10 @@ update_image (void)
           cairo_stroke (cr);
           cairo_set_source_rgb (cr, 1, 0, 0);
           cairo_rectangle (cr,
-                           scale * (10 + ink.x) - 0.5,
-                           scale * (10 + ink.y) - 0.5,
-                           scale * ink.width + 1,
-                           scale * ink.height + 1);
+                           scale * (10 + pango_units_to_double (pink.x)) + 0.5,
+                           scale * (10 + pango_units_to_double (pink.y)) + 0.5,
+                           scale * pango_units_to_double (pink.width) - 1,
+                           scale * pango_units_to_double (pink.height) - 1);
           cairo_stroke (cr);
         }
 
@@ -194,7 +193,7 @@ update_image (void)
             }
         }
 
-      cairo_set_source_rgba (cr, 0, 0, 0, outline_alpha);
+      cairo_set_source_rgba (cr, 0, 0, 1, outline_alpha);
       cairo_move_to (cr, scale * 20 - 0.5, scale * 20 - 0.5);
       cairo_append_path (cr, path);
       cairo_stroke (cr);

demos/gtk-demo/fontrendering.ui

@@ -177,8 +177,6 @@
             <child>
               <object class="GtkButton" id="up_button">
                 <property name="icon-name">list-add-symbolic</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
                 <style>
                   <class name="circular"/>
                 </style>
@@ -202,8 +200,6 @@
             <child>
               <object class="GtkButton" id="down_button">
                 <property name="icon-name">list-remove-symbolic</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
                 <style>
                   <class name="circular"/>
                 </style>

demos/gtk-demo/gtkgears.c

@@ -874,8 +874,8 @@ gtk_gears_tick (GtkWidget     *widget,
 {
   GtkGears *gears = GTK_GEARS (widget);
   GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-  GdkFrameTimings *previous_timings;
-  gint64 previous_frame_time;
+  GdkFrameTimings *timings, *previous_timings;
+  gint64 previous_frame_time = 0;
   gint64 frame_time;
   gint64 history_start, history_len;
   gint64 frame;
@@ -915,6 +915,12 @@ gtk_gears_tick (GtkWidget     *widget,
         }
     }
 
+  timings = gdk_frame_clock_get_current_timings (frame_clock);
+  previous_timings = gdk_frame_clock_get_timings (frame_clock,
+                                                  gdk_frame_timings_get_frame_counter (timings) - 1);
+  if (previous_timings != NULL)
+    previous_frame_time = gdk_frame_timings_get_frame_time (previous_timings);
+
   return G_SOURCE_CONTINUE;
 }
 

demos/gtk-demo/hypertext.c

@@ -7,8 +7,7 @@
  * shows.
  *
  * We also demonstrate adding other things to a text view, such as
- * clickable icons and widgets which can also replace a character
- * (try copying the ghost text).
+ * clickable icons.
  */
 
 #include <gtk/gtk.h>
@@ -95,12 +94,13 @@ show_page (GtkTextView *text_view,
       gtk_text_buffer_insert (buffer, &iter, " can easily be realized with ", -1);
       insert_link (buffer, &iter, "tags", 2);
       gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
-      gtk_text_buffer_insert (buffer, &iter, "Of course you can also embed Emoji 😋, ", -1);
-      gtk_text_buffer_insert (buffer, &iter, "icons ", -1);
+      gtk_text_buffer_insert (buffer, &iter,
+          "Of course you can also embed Emoji 😋, "
+          "icons ", -1);
 
       theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (text_view)));
       icon = gtk_icon_theme_lookup_icon (theme,
-                                         "eye-not-looking-symbolic",
+                                         "microphone-sensitivity-high-symbolic",
                                          NULL,
                                          16,
                                          1,
@@ -114,12 +114,7 @@ show_page (GtkTextView *text_view,
       gtk_level_bar_set_value (GTK_LEVEL_BAR (child), 50);
       gtk_widget_set_size_request (child, 100, -1);
       gtk_text_view_add_child_at_anchor (text_view, child, anchor);
-      gtk_text_buffer_insert (buffer, &iter, " and labels with ", -1);
-      anchor = gtk_text_child_anchor_new_with_replacement ("👻");
-      gtk_text_buffer_insert_child_anchor (buffer, &iter, anchor);
-      child = gtk_label_new ("ghost");
-      gtk_text_view_add_child_at_anchor (text_view, child, anchor);
-      gtk_text_buffer_insert (buffer, &iter, " text.", -1);
+      gtk_text_buffer_insert (buffer, &iter, ".", -1);
     }
   else if (page == 2)
     {

demos/gtk-demo/listbox.c

@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-static GdkTexture *avatar_texture_other;
+static GdkPixbuf *avatar_pixbuf_other;
 static GtkWidget *window = NULL;
 
 #define GTK_TYPE_MESSAGE		  (gtk_message_get_type ())
@@ -196,9 +196,12 @@ gtk_message_row_update (GtkMessageRow *row)
     gtk_button_set_label (GTK_BUTTON (priv->resent_by_button), priv->message->resent_by);
 
   if (strcmp (priv->message->sender_nick, "@GTKtoolkit") == 0)
-    gtk_image_set_from_icon_name (priv->avatar_image, "org.gtk.Demo4");
+    {
+      gtk_image_set_from_icon_name (priv->avatar_image, "org.gtk.Demo4");
+      gtk_image_set_icon_size (priv->avatar_image, GTK_ICON_SIZE_LARGE);
+    }
   else
-    gtk_image_set_from_paintable (priv->avatar_image, GDK_PAINTABLE (avatar_texture_other));
+    gtk_image_set_from_pixbuf (priv->avatar_image, avatar_pixbuf_other);
 
 }
 
@@ -341,7 +344,7 @@ do_listbox (GtkWidget *do_widget)
 
   if (!window)
     {
-      avatar_texture_other = gdk_texture_new_from_resource ("/listbox/apple-red.png");
+      avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE, NULL);
 
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),

demos/gtk-demo/listbox.ui

@@ -25,7 +25,6 @@
             <property name="margin-start">8</property>
             <property name="margin-end">8</property>
             <property name="icon-name">image-missing</property>
-            <property name="icon-size">large</property>
             <layout>
               <property name="column">0</property>
               <property name="row">0</property>

demos/gtk-demo/main.c

@@ -192,7 +192,7 @@ activate_about (GSimpleAction *action,
                           glib_micro_version);
   g_string_append_printf (s, "\tPango\t%s\n",
                           pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                           gtk_get_major_version (),
                           gtk_get_minor_version (),
                           gtk_get_micro_version ());
@@ -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);
 

demos/gtk-demo/meson.build

@@ -17,7 +17,6 @@ demos = files([
   'css_pixbufs.c',
   'css_shadows.c',
   'cursors.c',
-  'curve.c',
   'dialog.c',
   'drawingarea.c',
   'dnd.c',
@@ -35,7 +34,6 @@ demos = files([
   'gestures.c',
   'glarea.c',
   'gltransition.c',
-  'glyphs.c',
   'headerbar.c',
   'hypertext.c',
   'iconscroll.c',
@@ -72,9 +70,6 @@ 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',
@@ -133,7 +128,6 @@ extra_demo_sources = files([
   'script-names.c',
   'unicode-names.c',
   'suggestionentry.c',
-  'curve-editor.c',
 ])
 
 if harfbuzz_dep.found() and pangoft_dep.found()
@@ -146,7 +140,7 @@ if os_unix
   demos += files('pagesetup.c')
 endif
 
-librsvg_dep = dependency('librsvg-2.0', version: '>= 2.52.0', required: false)
+librsvg_dep = dependency('librsvg-2.0', version: '>= 2.46.0', required: false)
 
 if librsvg_dep.found()
   demos += files('paintable_svg.c')
@@ -162,81 +156,15 @@ demos_h = custom_target('gtk4 demo header',
   command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ],
 )
 
-objcopy_supports_add_symbol = false
-objcopy = find_program('objcopy', required : false)
-if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
-endif
-
-ld = find_program('ld', required : false)
-
-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
-  gtkdemo_gresource = custom_target('gtkdemo.gresource',
-      input : 'demo.gresource.xml',
-      output : 'gtkdemo.gresource',
-      depfile : 'gtkdemo.gresource.d',
-      command : [glib_compile_resources,
-                 '--generate',
-                 '--target=@OUTPUT@',
-                 '--dependency-file=@DEPFILE@',
-                 '--sourcedir=' + meson.current_source_dir(),
-                 '--sourcedir=' + meson.current_build_dir(),
-                 '@INPUT@'])
-
-  # Create resource data file
-  gtkdemo_resources_c = custom_target('gtkdemo_resources.c',
-      input : 'demo.gresource.xml',
-      output : 'gtkdemo_resources.c',
-      depfile : 'gtkdemo_resources.c.d',
-      command : [glib_compile_resources,
-                 '--generate-source',
-                 '--target=@OUTPUT@',
-                 '--dependency-file=@DEPFILE@',
-                 '--sourcedir=' + meson.current_source_dir(),
-                 '--sourcedir=' + meson.current_build_dir(),
-                 '--external-data',
-                 '--c-name', '_g_binary_gtkdemo',
-                 '@INPUT@'])
-
-  # Create object file containing resource data
-  gtkdemo_resources_binary = custom_target('gtkdemo_resources.o',
-      input : gtkdemo_gresource,
-      output : 'gtkdemo_resources.o',
-      command : [ld,
-                 '-r',
-                 '-b','binary',
-                 '@INPUT@',
-                 '-o','@OUTPUT@'])
-
-  # Rename symbol to match the one in the C file
-  gtkdemo_resources_o = custom_target('gtkdemo_resources2.o',
-    input : gtkdemo_resources_binary,
-    output : 'gtkdemo_resources2.o',
-    command : [objcopy,
-                 '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
-                 '@INPUT@',
-                 '@OUTPUT@'])
-
-  gtkdemo_resources = [
-      gtkdemo_resources_c,
-      gtkdemo_resources_o,
-    ]
-else
-  gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
-    'demo.gresource.xml',
-    source_dir: '.',
-  )
-endif
+gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
+  'demo.gresource.xml',
+  source_dir: '.',
+)
 
 # Use a subset of compiler flags
 demo_cflags = []
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations',
-                  '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
     demo_cflags += flag
   endif
 endforeach

demos/gtk-demo/org.gtk.Demo4.appdata.xml.in

@@ -33,7 +33,7 @@
   <developer_name>Matthias Clasen and others</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
       <description>
         <p>A new build of GTK.</p>
       </description>

demos/gtk-demo/path_fill.c

@@ -1,348 +0,0 @@
-/* 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

@@ -1,339 +0,0 @@
-/* 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

@@ -1,594 +0,0 @@
-/* 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

@@ -1,38 +0,0 @@
-<?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/gtk-demo/svgpaintable.c

@@ -47,24 +47,22 @@ static int
 svg_paintable_get_intrinsic_width (GdkPaintable *paintable)
 {
   SvgPaintable *self = SVG_PAINTABLE (paintable);
-  double width;
+  RsvgDimensionData data;
 
-  if (!rsvg_handle_get_intrinsic_size_in_pixels (self->handle, &width, NULL))
-    return 0;
+  rsvg_handle_get_dimensions (self->handle, &data);
 
-  return ceil (width);
+  return data.width;
 }
 
 static int
 svg_paintable_get_intrinsic_height (GdkPaintable *paintable)
 {
   SvgPaintable *self = SVG_PAINTABLE (paintable);
-  double height;
+  RsvgDimensionData data;
 
-  if (!rsvg_handle_get_intrinsic_size_in_pixels (self->handle, NULL, &height))
-    return 0;
+  rsvg_handle_get_dimensions (self->handle, &data);
 
-  return ceil (height);
+  return data.height;
 }
 
 static void

demos/gtk-demo/tabs.c

@@ -1,11 +1,6 @@
 /* Text View/Tabs
  *
  * GtkTextView can position text at fixed positions, using tabs.
- * Tabs can specify alignment, and also allow aligning numbers
- * on the decimal point.
- *
- * The example here has three tabs, with left, numeric and right
- * alignment.
  */
 
 #include <gtk/gtk.h>
@@ -27,7 +22,7 @@ do_tabs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Tabs");
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 330, 130);
+      gtk_window_set_default_size (GTK_WINDOW (window), 330, 330);
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
@@ -40,18 +35,17 @@ do_tabs (GtkWidget *do_widget)
 
       tabs = pango_tab_array_new (3, TRUE);
       pango_tab_array_set_tab (tabs, 0, PANGO_TAB_LEFT, 0);
-      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_DECIMAL, 150);
-      pango_tab_array_set_decimal_point (tabs, 1, '.');
-      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_RIGHT, 290);
+      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_LEFT, 100);
+      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_LEFT, 200);
       gtk_text_view_set_tabs (GTK_TEXT_VIEW (view), tabs);
       pango_tab_array_free (tabs);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_text (buffer, "one\t2.0\tthree\nfour\t5.555\tsix\nseven\t88.88\tnine", -1);
+      gtk_text_buffer_set_text (buffer, "one\ttwo\tthree\nfour\tfive\tsix\nseven\teight\tnine", -1);
 
       sw = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
       gtk_window_set_child (GTK_WINDOW (window), sw);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);

demos/icon-browser/iconbrowserapp.c

@@ -72,7 +72,7 @@ about_activated (GSimpleAction *action,
                           glib_micro_version);
   g_string_append_printf (s, "\tPango\t%s\n",
                           pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                           gtk_get_major_version (),
                           gtk_get_minor_version (),
                           gtk_get_micro_version ());

demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in

@@ -32,7 +32,7 @@
   <developer_name>Matthias Clasen and others</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
       <description>
         <p>A new build of GTK.</p>
       </description>

demos/meson.build

@@ -12,9 +12,19 @@ demo_conf_h = declare_dependency(
 )
 
 # appdata
+today = 'unknown'
+date = find_program('date',
+         required: false)
+if date.found()
+  r = run_command(date, '-I')
+  if r.returncode() == 0
+    today = r.stdout().strip()
+  endif
+endif
 
 appdata_config = configuration_data()
 appdata_config.set('BUILD_VERSION', meson.project_version())
+appdata_config.set('BUILD_DATE', today)
 
 subdir('constraint-editor')
 subdir('gtk-demo')

demos/node-editor/node-editor-application.c

@@ -79,7 +79,7 @@ activate_about (GSimpleAction *action,
                           glib_micro_version);
   g_string_append_printf (s, "\tPango\t%s\n",
                           pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                           gtk_get_major_version (),
                           gtk_get_minor_version (),
                           gtk_get_micro_version ());

demos/node-editor/node-editor-window.c

@@ -24,7 +24,7 @@
 #include "gtkrendererpaintableprivate.h"
 
 #include "gsk/gskrendernodeparserprivate.h"
-#include "gsk/gl/gskglrenderer.h"
+#include "gsk/ngl/gsknglrenderer.h"
 #ifdef GDK_WINDOWING_BROADWAY
 #include "gsk/broadway/gskbroadwayrenderer.h"
 #endif
@@ -336,39 +336,12 @@ text_view_query_tooltip_cb (GtkWidget        *widget,
     }
 }
 
-static gboolean
-load_bytes (NodeEditorWindow *self,
-            GBytes           *bytes);
-
-static void
-load_error (NodeEditorWindow *self,
-            const char        *error_message)
-{
-  PangoLayout *layout;
-  GtkSnapshot *snapshot;
-  GskRenderNode *node;
-  GBytes *bytes;
-
-  layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), error_message);
-  pango_layout_set_width (layout, 300 * PANGO_SCALE);
-  snapshot = gtk_snapshot_new ();
-  gtk_snapshot_append_layout (snapshot, layout, &(GdkRGBA) { 0.7, 0.13, 0.13, 1.0 });
-  node = gtk_snapshot_free_to_node (snapshot);
-  bytes = gsk_render_node_serialize (node);
-
-  load_bytes (self, bytes);
-
-  gsk_render_node_unref (node);
-  g_object_unref (layout);
-}
-
 static gboolean
 load_bytes (NodeEditorWindow *self,
             GBytes           *bytes)
 {
   if (!g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
     {
-      load_error (self, "Invalid UTF-8");
       g_bytes_unref (bytes);
       return FALSE;
     }
@@ -386,16 +359,11 @@ static gboolean
 load_file_contents (NodeEditorWindow *self,
                     GFile            *file)
 {
-  GError *error = NULL;
   GBytes *bytes;
 
-  bytes = g_file_load_bytes (file, NULL, NULL, &error);
+  bytes = g_file_load_bytes (file, NULL, NULL, NULL);
   if (bytes == NULL)
-    {
-      load_error (self, error->message);
-      g_clear_error (&error);
-      return FALSE;
-    }
+    return FALSE;
 
   return load_bytes (self, bytes);
 }
@@ -505,18 +473,17 @@ node_editor_window_load (NodeEditorWindow *self,
 {
   GError *error = NULL;
 
-  g_clear_object (&self->file_monitor);
-
   if (!load_file_contents (self, file))
     return FALSE;
 
+  g_clear_object (&self->file_monitor);
   self->file_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
 
+
   if (error)
     {
       g_warning ("couldn't monitor file: %s", error->message);
       g_error_free (error);
-      g_clear_object (&self->file_monitor);
     }
   else
     {
@@ -679,6 +646,7 @@ create_cairo_texture (NodeEditorWindow *self)
   GskRenderer *renderer;
   GskRenderNode *node;
   GdkTexture *texture;
+  GdkSurface *surface;
 
   paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture));
   if (paintable == NULL ||
@@ -691,8 +659,9 @@ create_cairo_texture (NodeEditorWindow *self)
   if (node == NULL)
     return NULL;
 
+  surface = gtk_native_get_surface (gtk_widget_get_native (GTK_WIDGET (self)));
   renderer = gsk_cairo_renderer_new ();
-  gsk_renderer_realize (renderer, NULL, NULL);
+  gsk_renderer_realize (renderer, surface, NULL);
 
   texture = gsk_renderer_render_texture (renderer, node, NULL);
   gsk_render_node_unref (node);
@@ -870,18 +839,16 @@ node_editor_window_add_renderer (NodeEditorWindow *self,
                                  GskRenderer      *renderer,
                                  const char       *description)
 {
+  GdkSurface *surface;
   GdkPaintable *paintable;
 
-  if (!gsk_renderer_realize (renderer, NULL, NULL))
-    {
-      GdkSurface *surface = gtk_native_get_surface (GTK_NATIVE (self));
-      g_assert (surface != NULL);
+  surface = gtk_native_get_surface (GTK_NATIVE (self));
+  g_assert (surface != NULL);
 
-      if (!gsk_renderer_realize (renderer, surface, NULL))
-        {
-          g_object_unref (renderer);
-          return;
-        }
+  if (renderer != NULL && !gsk_renderer_realize (renderer, surface, NULL))
+    {
+      g_object_unref (renderer);
+      return;
     }
 
   paintable = gtk_renderer_paintable_new (renderer, gtk_picture_get_paintable (GTK_PICTURE (self->picture)));
@@ -905,7 +872,7 @@ node_editor_window_realize (GtkWidget *widget)
                                    "Default");
 #endif
   node_editor_window_add_renderer (self,
-                                   gsk_gl_renderer_new (),
+                                   gsk_ngl_renderer_new (),
                                    "OpenGL");
 #ifdef GDK_RENDERING_VULKAN
   node_editor_window_add_renderer (self,

demos/node-editor/node-editor-window.ui

@@ -161,10 +161,9 @@
     </child>
     <child>
       <object class="GtkPaned">
-        <property name="shrink-start-child">false</property>
         <property name="shrink-end-child">false</property>
         <property name="position">400</property>
-        <property name="start-child">
+        <child>
           <object class="GtkScrolledWindow">
             <property name="hscrollbar-policy">never</property>
             <property name="hexpand">1</property>
@@ -185,8 +184,8 @@
               </object>
             </child>
           </object>
-        </property>
-        <property name="end-child">
+        </child>
+        <child>
           <object class="GtkBox">
             <child>
               <object class="GtkScrolledWindow">
@@ -199,7 +198,6 @@
                     <child>
                       <object class="GtkPicture" id="picture">
                         <property name="can-shrink">0</property>
-                        <property name="keep-aspect-ratio">1</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
                         <child>
@@ -232,7 +230,7 @@
               </object>
             </child>
           </object>
-        </property>
+        </child>
       </object>
     </child>
   </template>

demos/print-editor/print-editor.c

@@ -42,7 +42,7 @@ update_statusbar (void)
   const char *print_str;
 
   gtk_statusbar_pop (GTK_STATUSBAR (statusbar), 0);
-
+  
   gtk_text_buffer_get_iter_at_mark (buffer,
                                     &iter,
                                     gtk_text_buffer_get_insert (buffer));
@@ -56,7 +56,7 @@ update_statusbar (void)
       GtkPrintOperation *op = active_prints->data;
       print_str = gtk_print_operation_get_status_string (op);
     }
-
+  
   msg = g_strdup_printf ("%d, %d%s %s",
                          row, col,
 			 file_changed?" - Modified":"",
@@ -188,10 +188,10 @@ save_file (GFile *save_filename)
 					     "Error saving to file %s:\n%s",
 					     display_name,
 					     error->message);
-
+      
       g_signal_connect (error_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
       gtk_widget_show (error_dialog);
-
+      
       g_error_free (error);
       g_object_unref (info);
     }
@@ -229,7 +229,7 @@ begin_print (GtkPrintOperation *operation,
   pango_font_description_free (desc);
 
   pango_layout_set_width (print_data->layout, width * PANGO_SCALE);
-
+  
   pango_layout_set_text (print_data->layout, print_data->text, -1);
 
   num_lines = pango_layout_get_line_count (print_data->layout);
@@ -241,7 +241,7 @@ begin_print (GtkPrintOperation *operation,
     {
       PangoRectangle ink_rect, logical_rect;
       double line_height;
-
+      
       layout_line = pango_layout_get_line (print_data->layout, line);
       pango_layout_line_get_extents (layout_line, &ink_rect, &logical_rect);
 
@@ -258,7 +258,7 @@ begin_print (GtkPrintOperation *operation,
 
   page_breaks = g_list_reverse (page_breaks);
   gtk_print_operation_set_n_pages (operation, g_list_length (page_breaks) + 1);
-
+  
   print_data->page_breaks = page_breaks;
 }
 
@@ -287,11 +287,11 @@ draw_page (GtkPrintOperation *operation,
     end = pango_layout_get_line_count (print_data->layout);
   else
     end = GPOINTER_TO_INT (pagebreak->data);
-
+    
   cr = gtk_print_context_get_cairo_context (context);
 
   cairo_set_source_rgb (cr, 0, 0, 0);
-
+  
   i = 0;
   start_pos = 0;
   iter = pango_layout_get_iter (print_data->layout);
@@ -307,12 +307,12 @@ draw_page (GtkPrintOperation *operation,
 
 	  pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
 	  baseline = pango_layout_iter_get_baseline (iter);
-
+	  
 	  if (i == start)
 	    start_pos = logical_rect.y / 1024.0;
-
+	  
 	  cairo_move_to (cr, logical_rect.x / 1024.0, baseline / 1024.0 - start_pos);
-
+	  
 	  pango_cairo_show_layout_line  (cr, line);
 	}
       i++;
@@ -383,9 +383,9 @@ print_done (GtkPrintOperation *op,
     {
 
       GtkWidget *error_dialog;
-
+      
       gtk_print_operation_get_error (op, &error);
-
+      
       error_dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
 					     GTK_DIALOG_DESTROY_WITH_PARENT,
 					     GTK_MESSAGE_ERROR,
@@ -405,13 +405,13 @@ print_done (GtkPrintOperation *op,
   g_free (print_data->text);
   g_free (print_data->font);
   g_free (print_data);
-
+  
   if (!gtk_print_operation_is_finished (op))
     {
       g_object_ref (op);
       active_prints = g_list_append (active_prints, op);
       update_statusbar ();
-
+      
       /* This ref is unref:ed when we get the final state change */
       g_signal_connect (op, "status_changed",
 			G_CALLBACK (status_changed_cb), NULL);
@@ -628,7 +628,7 @@ activate_about (GSimpleAction *action,
                           glib_micro_version);
   g_string_append_printf (sysinfo, "\tPango\t%s\n",
                           pango_version_string ());
-  g_string_append_printf (sysinfo, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (sysinfo, "\tGTK\t%d.%d.%d\n",
                           gtk_get_major_version (),
                           gtk_get_minor_version (),
                           gtk_get_micro_version ());

demos/widget-factory/meson.build

@@ -1,73 +1,9 @@
 # demos/widget-factory
 
-objcopy_supports_add_symbol = false
-objcopy = find_program('objcopy', required : false)
-if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
-endif
-
-ld = find_program('ld', required : false)
-
-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
-  widgetfactory_gresource = custom_target('widgetfactory.gresource',
-      input : 'widget-factory.gresource.xml',
-      output : 'widgetfactory.gresource',
-      depfile: 'widgetfactory.gresource.d',
-      command : [glib_compile_resources,
-                 '--generate',
-                 '--target=@OUTPUT@',
-                 '--dependency-file=@DEPFILE@',
-                 '--sourcedir=' + meson.current_source_dir(),
-                 '--sourcedir=' + meson.current_build_dir(),
-                 '@INPUT@'])
-
-  # Create resource data file
-  widgetfactory_resources_c = custom_target('widgetfactory_resources.c',
-      input : 'widget-factory.gresource.xml',
-      output : 'widgetfactory_resources.c',
-      depfile: 'widgetfactory_resources.c.d',
-      command : [glib_compile_resources,
-                 '--generate-source',
-                 '--target=@OUTPUT@',
-                 '--dependency-file=@DEPFILE@',
-                 '--sourcedir=' + meson.current_source_dir(),
-                 '--sourcedir=' + meson.current_build_dir(),
-                 '--external-data',
-                 '--c-name', '_g_binary_widgetfactory',
-                 '@INPUT@'])
-
-  # Create object file containing resource data
-  widgetfactory_resources_binary = custom_target('widgetfactory_resources.o',
-      input : widgetfactory_gresource,
-      output : 'widgetfactory_resources.o',
-      command : [ld,
-                 '-r',
-                 '-b','binary',
-                 '@INPUT@',
-                 '-o','@OUTPUT@'])
-
-  # Rename symbol to match the one in the C file
-  widgetfactory_resources_o = custom_target('widgetfactory_resources2.o',
-    input : widgetfactory_resources_binary,
-    output : 'widgetfactory_resources2.o',
-    command : [objcopy,
-                 '--add-symbol','_g_binary_widgetfactory_resource_data=.data:0',
-                 '@INPUT@',
-                 '@OUTPUT@'])
-
-  widgetfactory_resources = [
-      widgetfactory_resources_c,
-      widgetfactory_resources_o,
-    ]
-else
-  widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
-    'widget-factory.gresource.xml',
-    source_dir: '.',
-  )
-endif
+widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
+  'widget-factory.gresource.xml',
+  source_dir: '.',
+)
 
 executable('gtk4-widget-factory',
   sources: ['widget-factory.c', widgetfactory_resources],

demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in

@@ -34,7 +34,7 @@
   <developer_name>Matthias Clasen and others</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
       <description>
         <p>A new build of GTK.</p>
       </description>

demos/widget-factory/widget-factory.c

@@ -78,21 +78,6 @@ change_theme_state (GSimpleAction *action,
                 NULL);
 }
 
-static void
-change_fullscreen (GSimpleAction *action,
-                   GVariant      *state,
-                   gpointer       user_data)
-{
-  GtkWindow *window = user_data;
-
-  if (g_variant_get_boolean (state))
-    gtk_window_fullscreen (window);
-  else
-    gtk_window_unfullscreen (window);
-
-  g_simple_action_set_state (action, state);
-}
-
 static GtkWidget *page_stack;
 
 static void
@@ -298,7 +283,7 @@ activate_about (GSimpleAction *action,
                           glib_micro_version);
   g_string_append_printf (s, "\tPango\t%s\n",
                           pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                           gtk_get_major_version (),
                           gtk_get_minor_version (),
                           gtk_get_micro_version ());
@@ -399,7 +384,7 @@ print_operation_done (GtkPrintOperation       *op,
       g_clear_error (&error);
       break;
     case GTK_PRINT_OPERATION_RESULT_APPLY:
-      break;
+      break; 
     case GTK_PRINT_OPERATION_RESULT_CANCEL:
       g_print ("Printing was canceled\n");
       break;
@@ -2027,12 +2012,11 @@ activate (GApplication *app)
   GMenuModel *model;
   static GActionEntry win_entries[] = {
     { "dark", NULL, NULL, "false", change_dark_state },
-    { "theme", NULL, "s", "'current'", change_theme_state },
+    { "theme", NULL, "s", "'current'", change_theme_state }, 
     { "transition", NULL, NULL, "true", change_transition_state },
     { "search", activate_search, NULL, NULL, NULL },
     { "delete", activate_delete, NULL, NULL, NULL },
     { "busy", get_busy, NULL, NULL, NULL },
-    { "fullscreen", NULL, NULL, "false", change_fullscreen },
     { "background", activate_background, NULL, NULL, NULL },
     { "open", activate_open, NULL, NULL, NULL },
     { "record", activate_record, NULL, NULL, NULL },
@@ -2198,7 +2182,7 @@ activate (GApplication *app)
   g_object_set_data (G_OBJECT (window), "searchbar", widget);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
-  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL);
+  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL); 
   g_object_set_data (G_OBJECT (window), "infobar", widget);
 
   dialog = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog");

docs/reference/gdk/gdk4.toml.in

@@ -3,7 +3,6 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
 repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
-docs_url = "https://docs.gtk.org/gdk4/"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"

docs/reference/gdk/macos.md

@@ -33,7 +33,7 @@ calls to different backends, and error out on unsupported windowing systems:
   else
 #endif
 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (display))
+  if (GTK_IS_WAYLAND_DISPLAY (display))
     {
       // make Wayland-specific calls here
     }

docs/reference/gdk/meson.build

@@ -16,10 +16,12 @@ if get_option('gtk_doc')
     command: [
       gidocgen,
       'generate',
-      gidocgen_common_args,
+      '--quiet',
+      '--fatal-warnings',
       '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
       '--config=@INPUT0@',
       '--output-dir=@OUTPUT@',
+      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT1@',
     ],
@@ -44,10 +46,12 @@ if get_option('gtk_doc')
       command: [
         gidocgen,
         'generate',
-        gidocgen_common_args,
+        '--quiet',
+        '--fatal-warnings',
         '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
         '--config=@INPUT0@',
         '--output-dir=@OUTPUT@',
+        '--no-namespace-dir',
         '--content-dir=@0@'.format(meson.current_source_dir()),
         '@INPUT1@',
       ],
@@ -74,10 +78,12 @@ if get_option('gtk_doc')
       command: [
         gidocgen,
         'generate',
-        gidocgen_common_args,
+        '--quiet',
+        '--fatal-warnings',
         '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
         '--config=@INPUT0@',
         '--output-dir=@OUTPUT@',
+        '--no-namespace-dir',
         '--content-dir=@0@'.format(meson.current_source_dir()),
         '@INPUT1@',
       ],

docs/reference/gdk/urlmap.js

@@ -13,5 +13,4 @@ baseURLs = [
     [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
     [ 'Pango', 'https://docs.gtk.org/Pango/' ],
     [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
-    [ 'GdkPixbuf', 'https://docs.gtk.org/gdk-pixbuf/' ],
 ]

docs/reference/gdk/wayland.md

@@ -23,7 +23,7 @@ calls to different backends, and error out on unsupported windowing systems:
 #endif
 
 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (display))
+  if (GTK_IS_WAYLAND_DISPLAY (display))
     {
       // make Wayland-specific calls here
     }

docs/reference/gdk/x11.md

@@ -29,7 +29,7 @@ calls to different backends, and error out on unsupported windowing systems:
   else
 #endif
 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (display))
+  if (GTK_IS_WAYLAND_DISPLAY (display))
     {
       // make Wayland-specific calls here
     }

docs/reference/gsk/gsk4.toml.in

@@ -3,7 +3,6 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
 repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
-docs_url = "https://docs.gtk.org/gsk4/"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"

docs/reference/gsk/meson.build

@@ -13,10 +13,12 @@ if get_option('gtk_doc')
     command: [
       gidocgen,
       'generate',
-      gidocgen_common_args,
+      '--quiet',
+      '--fatal-warnings',
       '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
       '--config=@INPUT0@',
       '--output-dir=@OUTPUT@',
+      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT1@',
     ],

docs/reference/gsk/urlmap.js

@@ -13,5 +13,4 @@ baseURLs = [
     [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
     [ 'Pango', 'https://docs.gtk.org/Pango/' ],
     [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
-    [ 'GdkPixbuf', 'https://docs.gtk.org/gdk-pixbuf/' ],
 ]

docs/reference/gtk/getting_started.md

@@ -3,13 +3,13 @@ Slug: gtk-getting-started
 
 GTK is a [widget toolkit](http://en.wikipedia.org/wiki/Widget_toolkit).
 Each user interface created by GTK consists of widgets. This is implemented
-in C using [class@GObject.Object], an object-oriented framework for C. Widgets
+in C using [GObject](#gobject), an object-oriented framework for C. Widgets
 are organized in a hierarchy. The window widget is the main container.
 The user interface is then built by adding buttons, drop-down menus, input
 fields, and other widgets to the window. If you are creating complex user
 interfaces it is recommended to use GtkBuilder and its GTK-specific markup
 description language, instead of assembling the interface manually. You can
-also use a visual user interface editor, like [Glade](https://glade.gnome.org/).
+also use a visual user interface editor, like [glade](https://glade.gnome.org/).
 
 GTK is event-driven. The toolkit listens for events such as a click
 on a button, and passes the event to your application.
@@ -17,7 +17,7 @@ on a button, and passes the event to your application.
 This chapter contains some tutorial information to get you started with
 GTK programming. It assumes that you have GTK, its dependencies and a C
 compiler installed and ready to use. If you need to build GTK itself first,
-refer to the [Compiling the GTK libraries](building.html) section in this
+refer to the [Compiling the GTK libraries](#gtk-compiling) section in this
 reference.
 
 ## Basics
@@ -68,7 +68,7 @@ gcc $( pkg-config --cflags gtk4 ) -o example-0 example-0.c $( pkg-config --libs
 ```
 
 For more information on how to compile a GTK application, please
-refer to the [Compiling GTK Applications](compiling.html)
+refer to the [Compiling GTK Applications](#gtk-compiling)
 section in this reference.
 
 All GTK applications will, of course, include `gtk/gtk.h`, which declares
@@ -106,16 +106,16 @@ The call to [ctor@Gtk.ApplicationWindow.new] will create a new
 window will have a frame, a title bar, and window controls depending on the
 platform.
 
-A window title is set using [`method@Gtk.Window.set_title`]. This function
+A window title is set using [method@Gtk.Window.set_title]. This function
 takes a `GtkWindow` pointer and a string as input. As our `window` pointer
 is a `GtkWidget` pointer, we need to cast it to `GtkWindow`; instead of
 casting `window` via a typical C cast like `(GtkWindow*)`, `window` can be
 cast using the macro `GTK_WINDOW()`. `GTK_WINDOW()` will check if the
 pointer is an instance of the `GtkWindow` class, before casting, and emit a
 warning if the check fails. More information about this convention can be
-found [in the GObject documentation](https://docs.gtk.org/gobject/concepts.html#conventions).
+found [here](https://developer.gnome.org/gobject/stable/gtype-conventions.html).
 
-Finally the window size is set using [`method@Gtk.Window.set_default_size`]
+Finally the window size is set using [method@Gtk.Window.set_default_size]
 and the window is then shown by GTK via [method@Gtk.Widget.show].
 
 When you close the window, by (for example) pressing the X button, the
@@ -161,24 +161,19 @@ activate (GtkApplication *app,
 {
   GtkWidget *window;
   GtkWidget *button;
-  GtkWidget *box;
 
   window = gtk_application_window_new (app);
   gtk_window_set_title (GTK_WINDOW (window), "Window");
   gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
 
-  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");
+  gtk_widget_set_halign (button, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
 
   g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);
   g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
 
-  gtk_box_append (GTK_BOX (box), button);
+  gtk_window_set_child (GTK_WINDOW (window), button);
 
   gtk_widget_show (window);
 }
@@ -217,10 +212,10 @@ The `GtkBox` widget is created with [ctor@Gtk.Box.new], which takes a
 this box will contain can either be laid out horizontally or vertically.
 This does not matter in this particular case, as we are dealing with only
 one button. After initializing box with the newly created `GtkBox`, the code
-adds the box widget to the window widget using [`method@Gtk.Window.set_child`].
+adds the box widget to the window widget using [method@Gtk.Window.set_child].
 
 Next the `button` variable is initialized in similar manner.
-[`ctor@Gtk.Button.new_with_label`] is called which returns a
+[ctor@Gtk.Button.new_with_label] is called which returns a
 [class@Gtk.Button] to be stored in `button`. Afterwards `button` is added to
 our `box`.
 
@@ -246,8 +241,8 @@ More information about creating buttons can be found
 [here](https://wiki.gnome.org/HowDoI/Buttons).
 
 The rest of the code in `example-1.c` is identical to `example-0.c`. The next
-section will elaborate further on how to add several [class@Gtk.Widget]s to your
-GTK application.
+section will elaborate further on how to add several GtkWidgets to your GTK
+application.
 
 ## Packing
 
@@ -256,18 +251,10 @@ a window. When you do so, it becomes important to control how each widget is
 positioned and sized. This is where packing comes in.
 
 GTK comes with a large variety of _layout containers_ whose purpose it
-is to control the layout of the child widgets that are added to them, like:
+is to control the layout of the child widgets that are added to them.
+See [Layout containers](#LayoutContainers) for an overview.
 
-- [class@Gtk.Box]
-- [class@Gtk.Grid]
-- [class@Gtk.Revealer]
-- [class@Gtk.Stack]
-- [class@Gtk.Overlay]
-- [class@Gtk.Paned]
-- [class@Gtk.Expander]
-- [class@Gtk.Fixed]
-
-The following example shows how the [class@Gtk.Grid] container lets you
+The following example shows how the GtkGrid container lets you
 arrange several buttons:
 
 ![Grid packing](grid-packing.png)
@@ -366,11 +353,11 @@ draw function.
 The contents of a widget often need to be partially or fully redrawn, e.g.
 when another window is moved and uncovers part of the widget, or when the
 window containing it is resized. It is also possible to explicitly cause a
-widget to be redrawn, by calling [`method@Gtk.Widget.queue_draw`]. GTK takes
+widget to be redrawn, by calling [method@Gtk.Widget.queue_draw]. GTK takes
 care of most of the details by providing a ready-to-use cairo context to the
 draw function.
 
-The following example shows how to use a draw function with [class@Gtk.DrawingArea].
+The following example shows how to use a draw function with GtkDrawingArea.
 It is a bit more complicated than the previous examples, since it also
 demonstrates input event handling with event controllers.
 
@@ -415,9 +402,9 @@ resize_cb (GtkWidget *widget,
   if (gtk_native_get_surface (gtk_widget_get_native (widget)))
     {
       surface = gdk_surface_create_similar_surface (gtk_native_get_surface (gtk_widget_get_native (widget)),
-                                                    CAIRO_CONTENT_COLOR,
-                                                    gtk_widget_get_width (widget),
-                                                    gtk_widget_get_height (widget));
+                                                   CAIRO_CONTENT_COLOR,
+                                                   gtk_widget_get_width (widget),
+                                                   gtk_widget_get_height (widget));
 
       /* Initialize the surface to white */
       clear_surface ();
@@ -703,16 +690,16 @@ gcc $( pkg-config --cflags gtk4 ) -o example-3 example-3.c $( pkg-config --libs
 
 Note that `GtkBuilder` can also be used to construct objects that are
 not widgets, such as tree models, adjustments, etc. That is the reason
-the method we use here is called [`method@Gtk.Builder.get_object`] and
-returns a `GObject` instead of a `GtkWidget`.
+the method we use here is called [method@Gtk.Builder.get_object] and returns
+a `GObject` instead of a `GtkWidget`.
 
-Normally, you would pass a full path to [`method@Gtk.Builder.add_from_file`] to
+Normally, you would pass a full path to [method@Gtk.Builder.add_from_file] to
 make the execution of your program independent of the current directory.
 A common location to install UI descriptions and similar data is
 `/usr/share/appname`.
 
 It is also possible to embed the UI description in the source code as a
-string and use [`method@Gtk.Builder.add_from_string`] to load it. But keeping the
+string and use [method@Gtk.Builder.add_from_string] to load it. But keeping the
 UI description in a separate file has several advantages: It is then possible
 to make minor adjustments to the UI without recompiling your program, and,
 more importantly, graphical UI editors such as [Glade](http://glade.gnome.org)
@@ -775,17 +762,17 @@ main (int argc, char *argv[])
 ```
 
 All the application logic is in the application class, which is a subclass of
-`GtkApplication`. Our example does not yet have any interesting functionality.
+GtkApplication. Our example does not yet have any interesting functionality.
 All it does is open a window when it is activated without arguments, and open
 the files it is given, if it is started with arguments.
 
-To handle these two cases, we override the `activate()` vfunc, which gets
+To handle these two cases, we override the activate() vfunc, which gets
 called when the application is launched without commandline arguments, and
 the `open()` virtual function, which gets called when the application is
 launched with commandline arguments.
 
 To learn more about `GApplication` entry points, consult the GIO
-[documentation](https://docs.gtk.org/gio/class.Application.html).
+[documentation](https://developer.gnome.org/gio/stable/GApplication.html#GApplication.description).
 
 ```c
 #include <gtk/gtk.h>
@@ -854,8 +841,8 @@ example_app_new (void)
 ```
 
 Another important class that is part of the application support in GTK is
-[class@Gtk.ApplicationWindow]. It is typically subclassed as well. Our
-subclass does not do anything yet, so we will just get an empty window.
+`GtkApplicationWindow`. It is typically subclassed as well. Our subclass does
+not do anything yet, so we will just get an empty window.
 
 ```c
 #include <gtk/gtk.h>
@@ -920,10 +907,10 @@ and it accepts files as commandline arguments.
 
 ### Populating the window
 
-In this step, we use a `GtkBuilder` template to associate a
-`GtkBuilder` ui file with our application window class.
+In this step, we use a GtkBuilder template to associate a
+GtkBuilder ui file with our application window class.
 
-Our simple ui file gives the window a title, and puts a `GtkStack`
+Our simple ui file gives the window a title, and puts a GtkStack
 widget as the main content.
 
 ```xml
@@ -947,9 +934,9 @@ widget as the main content.
 
 To make use of this file in our application, we revisit our
 `GtkApplicationWindow` subclass, and call
-[`method@Gtk.WidgetClass.set_template_from_resource`] from the class init
+`gtk_widget_class_set_template_from_resource()` from the class init
 function to set the ui file as template for this class. We also
-add a call to [`method@Gtk.Widget.init_template`] in the instance init
+add a call to `gtk_widget_init_template()` in the instance init
 function to instantiate the template for each instance of our
 class.
 
@@ -976,7 +963,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 
 You may have noticed that we used the `_from_resource()` variant of the function
 that sets a template. Now we need to use
-[GLib's resource functionality](https://docs.gtk.org/gio/struct.Resource.html)
+[GLib's resource functionality](https://developer.gnome.org/gio/stable/GResource.html)
 to include the ui file in the binary. This is commonly done by listing all resources
 in a `.gresource.xml` file, such as this:
 
@@ -998,7 +985,7 @@ glib-compile-resources exampleapp.gresource.xml --target=resources.c --generate-
 ```
 
 The gnome module of the [Meson build system](https://mesonbuild.com)
-provides the [`gnome.compile_resources()`](https://mesonbuild.com/Gnome-module.html#gnomecompile_resources)
+provides the [gnome.compile_resources()](https://mesonbuild.com/Gnome-module.html#gnomecompile_resources)
 method for this task.
 
 Our application now looks like this:
@@ -1014,7 +1001,7 @@ To this end, we add a member to the struct of our application window subclass
 and keep a reference to the `GtkStack` there. The first member of the struct
 should be the parent type from which the class is derived. Here,
 `ExampleAppWindow` is derived from `GtkApplicationWindow`. The
-[`func@Gtk.widget_class_bind_template_child`] function arranges things so that after
+`gtk_widget_class_bind_template_child()` function arranges things so that after
 instantiating the template, the `stack` member of the struct will point to the
 widget of the same name from the template.
 
@@ -1094,7 +1081,7 @@ tell it to display information about our stack.
 
 The stack switcher gets all its information it needs to display tabs from
 the stack that it belongs to. Here, we are passing the label to show for
-each file as the last argument to the [`method@Gtk.Stack.add_titled`]
+each file as the last argument to the [method@Gtk.Stack.add_titled]
 function.
 
 Our application is beginning to take shape:
@@ -1134,7 +1121,7 @@ resulting menu model with the menu button that we've added to the headerbar.
 Since menus work by activating GActions, we also have to add a suitable set
 of actions to our application.
 
-Adding the actions is best done in the `startup()` vfunc, which is guaranteed
+Adding the actions is best done in the startup() vfunc, which is guaranteed
 to be called once for each primary application instance:
 
 ```c
@@ -1192,7 +1179,7 @@ example_app_class_init (ExampleAppClass *class)
 
 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
-shortcut. The shortcut was added with [`method@Gtk.Application.set_accels_for_action`].
+shortcut. The shortcut was added with `gtk_application_set_accels_for_action()`.
 
 The application menu looks like this:
 
@@ -1204,7 +1191,7 @@ A typical application will have a some preferences that should be remembered
 from one run to the next. Even for our simple example application, we may
 want to change the font that is used for the content.
 
-We are going to use [class@Gio.Settings] to store our preferences. `GSettings` requires
+We are going to use `GSettings` to store our preferences. `GSettings` requires
 a schema that describes our settings:
 
 ```xml
@@ -1231,9 +1218,10 @@ a schema that describes our settings:
 ```
 
 Before we can make use of this schema in our application, we need to compile
-it into the binary form that GSettings expects. GIO provides macros to do
-this in Autotools-based projects, and the gnome module of the Meson build
-system provides the [`gnome.compile_schemas()`](https://mesonbuild.com/Gnome-module.html#gnomecompile_schemas)
+it into the binary form that GSettings expects. GIO provides
+[macros](https://developer.gnome.org/gio/2.36/ch31s06.html) to do this in
+autotools-based projects, and the gnome module of the Meson build system
+provides the [gnome.compile_schemas()](https://mesonbuild.com/Gnome-module.html#gnomecompile_schemas)
 method for this task.
 
 Next, we need to connect our settings to the widgets that they are supposed
@@ -1693,8 +1681,7 @@ What our application looks like now:
 Widgets and other objects have many useful properties.
 
 Here we show some ways to use them in new and flexible ways, by wrapping
-them in actions with [class@Gio.PropertyAction] or by binding them with
-[class@GObject.Binding].
+them in actions with `GPropertyAction` or by binding them with `GBinding`.
 
 To set this up, we add two labels to the header bar in our window template,
 named `lines_label` and `lines`, and bind them to struct members in the

docs/reference/gtk/gtk4-broadwayd.rst

@@ -1,57 +0,0 @@
-.. _gtk4-broadwayd(1):
-
-==============
-gtk4-broadwayd
-==============
-
----------------------------
-The Broadway display server
----------------------------
-
-SYNOPSIS
---------
-|   **gtk4-broadwayd** [OPTIONS...] <DISPLAY>
-|   **gtk4-broadwayd** --port=PORT --address=ADDRESS <DISPLAY>
-|   **gtk4-broadwayd** --unixaddress=ADDRESS <DISPLAY>
-
-
-DESCRIPTION
------------
-
-``gtk4-broadwayd`` is a display server for the Broadway GDK backend. It allows
-multiple GTK applications to display their windows in the same web browser, by
-connecting to gtk4-broadwayd.
-
-When using gtk4-broadwayd, specify the display number to use, prefixed with a
-colon, similar to X. The default display number is 0.
-
-::
-
-   gtk4-broadwayd :5
-
-
-Then point your web browser at ``http://127.0.0.1:8085``.
-
-Start your applications like this:
-
-::
-
-   GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
-
-
-OPTIONS
--------
-
-``--port PORT``
-
-  Use the given ``PORT`` for the HTTP connection, instead of the default ``8080 + (DISPLAY - 1)``.
-
-``--address ADDRESS``
-
-  Use the given ``address`` for the HTTP connection, instead of the default ``http://127.0.0.1``.
-
-``--unixsocket ADDRESS``
-
-  Use the given ``address`` as the unix domain socket address. This option
-  overrides ``--address`` and ``--port``, and it is available only on Unix-like
-  systems.

docs/reference/gtk/gtk4-broadwayd.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-broadwayd">
+
+<refentryinfo>
+  <title>gtk4-broadwayd</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Alexander</firstname>
+      <surname>Larsson</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-broadwayd</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-broadwayd</refname>
+  <refpurpose>Broadway display server</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-broadwayd</command>
+<arg choice="opt">--port <replaceable>PORT</replaceable></arg>
+<arg choice="opt">--address <replaceable>ADDRESS</replaceable></arg>
+<arg choice="opt">--unixsocket <replaceable>ADDRESS</replaceable></arg>
+<arg choice="opt"><replaceable>:DISPLAY</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-broadwayd</command> is a display server for the Broadway
+GDK backend. It allows multiple GTK applications to display their
+windows in the same web browser, by connecting to gtk4-broadwayd.
+</para>
+<para>
+When using gtk4-broadwayd, specify the display number to use, prefixed
+with a colon, similar to X. The default display number is 0.
+<programlisting>
+gtk4-broadwayd :5
+</programlisting>
+Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
+Start your applications like this:
+<programlisting>
+GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
+</programlisting>
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>--port</term>
+    <listitem><para>Use <replaceable>PORT</replaceable> as the HTTP
+      port, instead of the default 8080 + (<replaceable>DISPLAY</replaceable> - 1).
+      </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>--address</term>
+    <listitem><para>Use <replaceable>ADDRESS</replaceable> as the HTTP
+      address, instead of the default <literal>http://127.0.0.1:<replaceable>PORT</replaceable></literal>.
+      </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>--unixsocket</term>
+    <listitem><para>Use <replaceable>ADDRESS</replaceable> as the unix domain socket
+      address. This option overrides <literal>--address</literal> and <literal>--port</literal>.
+      It is available only on Unix-like systems.
+      </para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+</refentry>

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

@@ -1,85 +0,0 @@
-.. _gtk4-builder-tool(1):
-
-=================
-gtk4-builder-tool
-=================
-
------------------------
-GtkBuilder File Utility
------------------------
-
-SYNOPSIS
---------
-|   **gtk4-builder-tool** <COMMAND> [OPTIONS...] <FILE>
-|
-|   **gtk4-builder-tool** validate <FILE>
-|   **gtk4-builder-tool** enumerate <FILE>
-|   **gtk4-builder-tool** simplify [OPTIONS...] <FILE>
-|   **gtk4-builder-tool** preview [OPTIONS...] <FILE>
-
-DESCRIPTION
------------
-
-``gtk4-builder-tool`` can perform various operations on GtkBuilder UI definition
-files.
-
-COMMANDS
---------
-
-Validation
-^^^^^^^^^^
-
-The ``validate`` command validates the given UI definition file and reports
-errors to ``stderr``.
-
-Enumeration
-^^^^^^^^^^^
-
-The ``enumerate`` command lists all the named objects that are present in the UI
-definition file.
-
-Preview
-^^^^^^^
-
-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.
-
-``--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.
-
-Simplification
-^^^^^^^^^^^^^^
-
-The ``simplify`` command simplifies the UI definition file by removing
-properties that are set to their default values and writes the resulting XML to
-the standard output, or back to the input file.
-
-When the ``--3to4`` option is specified, the ``simplify`` command interprets the
-input as a GTK 3 UI definuition file and attempts to convert it to GTK 4
-equivalents. It performs various conversions, such as renaming properties,
-translating child properties to layout properties, rewriting the setup for
-GtkNotebook, GtkStack, GtkAssistant  or changing toolbars into boxes.
-
-You should always test the modified UI definition files produced by
-gtk4-builder-tool before using them in production.
-
-Note in particular that the conversion done with ``--3to4`` is meant as a
-starting point for a port from GTK 3 to GTK 4. It is expected that you will have
-to do manual fixups  after the initial conversion.
-
-``--replace``
-
-  Write the content back to the UI definition file instead of using the standard
-  output.
-
-``--3to4``
-
-  Transform a GTK 3 UI definition file to the equivalent GTK 4 definitions.

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

@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-builder-tool">
+
+<refentryinfo>
+  <title>gtk4-builder-tool</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-builder-tool</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-builder-tool</refname>
+  <refpurpose>GtkBuilder file utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-builder-tool</command>
+<arg choice="opt"><replaceable>COMMAND</replaceable></arg>
+<arg choice="opt" rep="repeat"><replaceable>OPTION</replaceable></arg>
+<arg choice="plain"><replaceable>FILE</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+  <command>gtk4-builder-tool</command> can perform various operations
+  on GtkBuilder .ui files.
+</para>
+<para>
+  The <option>validate</option> command validates the .ui file and reports
+  errors to stderr.
+</para>
+<para>
+  The <option>enumerate</option> command lists all the named objects that
+  are created in the .ui file.
+</para>
+<para>
+  The <option>preview</option> command displays the .ui file. This command
+  accepts options to specify the ID of the toplevel object and a .css file
+  to use.
+</para>
+<para>
+  The <option>simplify</option> command simplifies the .ui file by removing
+  properties that are set to their default values and writes the resulting XML
+  to stdout, or back to the input file.
+</para>
+<para>
+  When the <option>--3to4</option> is specified, <option>simplify</option>
+  interprets the input as a GTK 3 ui file and attempts to convert it to GTK 4
+  equivalents. It performs various conversions, such as renaming properties,
+  translating child properties to layout properties, rewriting the setup for
+  GtkNotebook, GtkStack, GtkAssistant  or changing toolbars into boxes.
+</para>
+<para>
+  You should always test the modified .ui files produced by gtk4-builder-tool
+  before using them in production.
+</para>
+<para>
+  Note in particular that the conversion
+  done with <option>--3to4</option> is meant as a starting point for a port
+  from GTK 3 to GTK 4. It is expected that you will have to do manual fixups
+  after the initial conversion.
+</para>
+</refsect1>
+
+<refsect1><title>Simplify Options</title>
+  <para>The <option>simplify</option> command accepts the following options:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>--replace</option></term>
+      <listitem><para>Write the content back to the .ui file instead of stdout.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+    <term><option>--3to4</option></term>
+      <listitem><para>Transform a GTK 3 ui file to GTK 4</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+<refsect1><title>Preview Options</title>
+  <para>The <option>preview</option> command accepts the following options:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>--id=<arg choice="plain">ID</arg></option></term>
+      <listitem><para>The ID of the object to preview. If not specified,
+                gtk4-builder-tool will choose a suitable object on its own.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+    <term><option>--css=<arg choice="plain">FILE</arg></option></term>
+      <listitem><para>Load style information from the given .css file.</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4-demo-application.rst

@@ -1,22 +0,0 @@
-.. _gtk4-demo-application(1):
-
-=====================
-gtk4-demo-application
-=====================
-
---------------------------
-Demonstrate GtkApplication
---------------------------
-
-
-SYNOPSIS
---------
-|   **gtk4-demo-application**
-
-
-DESCRIPTION
------------
-
-``gtk4-demo-application`` is an example application used by ``gtk4-demo``.
-
-There is no need to call it manually.

docs/reference/gtk/gtk4-demo-application.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-demo-application">
+
+<refentryinfo>
+  <title>gtk4-demo-application</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-demo-application</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-demo-application</refname>
+  <refpurpose>Demonstrate GtkApplication</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-demo-application</command>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-demo-application</command> is an example application
+used by <command>gtk4-demo</command>. There is no need to call it
+manually.
+</para>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4-demo.rst

@@ -1,48 +0,0 @@
-.. _gtk4-demo(1):
-
-=========
-gtk4-demo
-=========
-
------------------------
-Demonstrate GTK widgets
------------------------
-
-SYNOPSIS
---------
-
-|   **gtk4-demo** [OPTIONS...]
-
-DESCRIPTION
------------
-
-``gtk4-demo`` is a collection of examples.
-
-Its purpose is to demonstrate many GTK widgets in a form that is useful to
-application developers.
-
-The application shows the source code for each example, as well as other used
-resources, such as UI description files and image assets.
-
-OPTIONS
--------
-
-``-h, --help``
-
-  Show help options.
-
-``--version``
-
-  Show program version.
-
-``--list``
-
-  List available examples.
-
-``--run EXAMPLE``
-
-  Run the named example. Use ``--list`` to see the available examples.
-
-``--autoquit``
-
-  Quit after a short timeout. This is intended for use with ``--run``, e.g. when profiling.

docs/reference/gtk/gtk4-demo.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-demo">
+
+<refentryinfo>
+  <title>gtk4-demo</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-demo</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-demo</refname>
+  <refpurpose>Demonstrate GTK widgets</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-demo</command>
+<arg choice="opt">--help</arg>
+<arg choice="opt">--version</arg>
+<arg choice="opt">--list</arg>
+<arg choice="opt">--run <replaceable>EXAMPLE</replaceable></arg>
+<arg choice="opt">--autoquit</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-demo</command> is a collection of examples.
+Its purpose is to demonstrate many GTK widgets in a form
+that is useful to application developers.
+</para>
+<para>
+The application shows the source code for each example, as well as
+other used resources, such as ui files and icons.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+  <para>The following options are understood:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>-h</option>, <option>--help</option></term>
+      <listitem><para>Show help options</para></listitem>
+    </varlistentry>
+    <varlistentry>
+    <term><option>--version</option></term>
+      <listitem><para>Show program version</para></listitem>
+    </varlistentry>
+    <varlistentry>
+    <term><option>--list</option></term>
+      <listitem><para>List available examples.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+    <term><option>-run <replaceable>EXAMPLE</replaceable></option></term>
+      <listitem><para>Run the named example. Use <option>--list</option> to
+        see the available examples.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+    <term><option>--autoquit</option></term>
+      <listitem><para>Quit after a short timeout. This is intended for use
+        with <option>--run</option>, e.g. when profiling.</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4-encode-symbolic-svg.rst

@@ -1,40 +0,0 @@
-.. _gtk4-encode-symbolic-svg(1):
-
-========================
-gtk4-encode-symbolic-svg
-========================
-
---------------------------------
-Symbolic icon conversion utility
---------------------------------
-
-SYNOPSIS
---------
-
-|   **gtk4-encode-symbolic-svg** [OPTIONS...] <PATH> <WIDTH>x<HEIGHT>
-
-DESCRIPTION
------------
-
-``gtk4-encode-symbolic-svg`` converts symbolic SVG icons into specially prepared
-PNG files. GTK can load and recolor these PNGs, just like original SVGs, but
-loading them is much faster.
-
-``PATH`` is the name of a symbolic SVG file, ``WIDTH`` x ``HEIGHT`` are the
-desired dimensions for the generated PNG file.
-
-To distinguish them from ordinary PNGs, the generated files have the extension
-``.symbolic.png``.
-
-OPTIONS
--------
-
-``-o, --output DIRECTORY``
-
-  Write png files to ``DIRECTORY`` instead of the current working directory.
-
-``--debug``
-
-  Generate PNG files of the various channels during the conversion. If these
-  files are not monochrome green, they are often helpful in pinpointing the
-  problematic parts of the source SVG.

docs/reference/gtk/gtk4-encode-symbolic-svg.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-encode-symbolic-svg">
+
+<refentryinfo>
+  <title>gtk4-encode-symbolic-svg</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Alexander</firstname>
+      <surname>Larsson</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-encode-symbolic-svg</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-encode-symbolic-svg</refname>
+  <refpurpose>Symbolic icon conversion utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-encode-symbolic-svg</command>
+<arg choice="opt">OPTION...</arg>
+<arg choice="plain"><replaceable>PATH</replaceable></arg>
+<arg choice="plain"><replaceable>WIDTH</replaceable>x<replaceable>HEIGHT</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+  <command>gtk4-encode-symbolic-svg</command> converts symbolic svg icons into
+  specially prepared png files. GTK can load and recolor these pngs, just like
+  original svgs, but loading them is much faster.
+</para>
+<para>
+  <replaceable>PATH</replaceable> is the name of a symbolic svg file,
+  <replaceable>WIDTH</replaceable>x<replaceable>HEIGHT</replaceable> are the
+  desired dimensions for the generated png file.
+</para>
+<para>
+  To distinguish them from ordinary pngs, the generated files have the extension
+  <filename>.symbolic.png</filename>.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>-o <replaceable>DIRECTORY</replaceable></term>
+    <term>--output <replaceable>DIRECTORY</replaceable></term>
+    <listitem><para>Write png files to <replaceable>DIRECTORY</replaceable>
+         instead of the current working directory.</para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>--debug</term>
+    <listitem><para>Generate png files of the various channels during
+         the conversion. If these files are not monochrome green, they
+         are often helpful in pinpointing the problematic parts of
+         the source svg.</para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4-icon-browser.rst

@@ -1,28 +0,0 @@
-.. _gtk4-icon-browser(1):
-
-=================
-gtk4-icon-browser
-=================
-
------------------
-List themed icons
------------------
-
-SYNOPSIS
---------
-
-|   **gtk4-icon-browser** [OPTIONS...]
-
-DESCRIPTION
------------
-
-``gtk4-icon-browser`` is a utility to explore the icons in the current icon
-theme. It shows icons in various sizes, their symbolic variants where available,
-as well as a description of the icon and its context.
-
-OPTIONS
--------
-
-``-h, --help``
-
-  Show the application help.

docs/reference/gtk/gtk4-icon-browser.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-icon-browser">
+
+<refentryinfo>
+  <title>gtk4-icon-browser</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-icon-browser</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-icon-browser</refname>
+  <refpurpose>List themed icons</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-icon-browser</command>
+<arg choice="opt">--help</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-icon-browser</command> is a utility to explore the icons
+in the current icon theme. It shows icons in various sizes, their symbolic
+variants where available, as well as a description of the icon and its context.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+  <para>The following options are understood:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>-h</option>, <option>--help</option></term>
+      <listitem><para>Show help options</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4-launch.rst

@@ -1,50 +0,0 @@
-.. _gtk4-launch(1):
-
-===========
-gtk4-launch
-===========
-
----------------------
-Launch an application
----------------------
-
-SYNOPSIS
---------
-
-|   **gtk4-launch** [OPTIONS...] <APPLICATION> [URI...]
-
-DESCRIPTION
------------
-
-``gtk4-launch`` launches an application using the given name. The application is
-started with proper startup notification on a default display, unless specified
-otherwise.
-
-``gtk4-launch`` takes at least one argument, the name of the application to
-launch. The name should match application desktop file name, as residing in the
-applications subdirectories of the XDG data directories, with or without the
-``.desktop`` suffix.
-
-If called with more than one argument, the rest of them besides the application
-name are considered URI locations and are passed as arguments to the launched
-application.
-
-OPTIONS
--------
-
-``-?, -h, --help``
-
-  Print the command's help and exit.
-
-``--version``
-
-  Print the command's version and exit.
-
-ENVIRONMENT
------------
-
-Some environment variables affect the behavior of ``gtk4-launch``:
-
-``XDG_DATA_HOME, XDG_DATA_DIRS``
-
-  The environment variables specifying the XDG data directories.

docs/reference/gtk/gtk4-launch.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-launch">
+
+<refentryinfo>
+  <title>gtk4-launch</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Tomáš</firstname>
+      <surname>Bžatek</surname>
+      <email>tbzatek@redhat.com</email>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-launch</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-launch</refname>
+  <refpurpose>Launch an application</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-launch</command>
+<arg choice="opt" rep="repeat">OPTION</arg>
+<arg choice="plain">APPLICATION</arg>
+<arg choice="opt" rep="repeat">URI</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-launch</command> launches an application using the given name.
+The application is started with proper startup notification on a default
+display, unless specified otherwise.
+</para>
+<para>
+<command>gtk4-launch</command> takes at least one argument, the name of
+the application to launch. The name should match application desktop file name,
+as residing in the applications subdirectories of the XDG data directories, with
+or without the '.desktop' suffix.
+</para>
+<para>
+If called with more than one argument, the rest of them besides the application
+name are considered URI locations and are passed as arguments to the launched
+application.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+  <para>The following options are understood:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>-?</option>, <option>--help</option></term>
+      <listitem><para>Prints a short help text and exits.</para></listitem>
+    </varlistentry>
+  </variablelist>
+  <variablelist>
+    <varlistentry>
+    <term><option>--version</option></term>
+      <listitem><para>Prints the program version and exits.</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+<refsect1><title>Environment</title>
+  <para>Some environment variables affect the behavior of <command>gtk4-launch</command>.</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>XDG_DATA_HOME</option>, <option>XDG_DATA_DIRS</option></term>
+      <listitem><para>The environment variables specifying the XDG dta directories.</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4-query-settings.rst

@@ -1,21 +0,0 @@
-.. _gtk4-query-settings(1):
-
-===================
-gtk4-query-settings
-===================
-
-------------------------------------
-Print name and value of GTK settings
-------------------------------------
-
-SYNOPSIS
---------
-
-|   **gtk4-query-settings** [PATTERN]
-
-DESCRIPTION
------------
-
-``gtk4-query-settings`` prints both name and value of all properties available
-in the ``GtkSettings`` class. Optionally, you can filter which properties to
-list by specifying a ``PATTERN``.

docs/reference/gtk/gtk4-query-settings.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-query-settings">
+
+<refentryinfo>
+  <title>gtk4-query-settings</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Timm</firstname>
+      <surname>Bäder</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-query-settings</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-query-settings</refname>
+  <refpurpose>Utility to print name and value of all GtkSettings properties</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-query-settings</command>
+<arg choice="opt"><replaceable>PATTERN</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+  <command>gtk4-query-settings</command> prints both name and value of all properties
+  available in the GtkSettings class. Optionally, you can filter which properties
+  to list by specifying a PATTERN.
+</para>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4-update-icon-cache.rst

@@ -1,65 +0,0 @@
-.. _gtk4-update-icon-cache(1):
-
-======================
-gtk4-update-icon-cache
-======================
-
---------------------------
-Icon theme caching utility
---------------------------
-
-SYNOPSIS
---------
-
-|   **gtk4-update-icon-cache** [OPTIONS...] <PATH>
-
-DESCRIPTION
------------
-
-``gtk4-update-icon-cache`` creates ``mmap(2)``-able cache files for icon themes.
-
-It expects to be given the ``PATH`` to an icon theme directory containing an
-``index.theme``, e.g. ``/usr/share/icons/hicolor``, and writes a
-``icon-theme.cache`` containing cached information about the icons in the
-directory tree below the given directory.
-
-GTK can use the cache files created by ``gtk4-update-icon-cache`` to avoid a lot
-of system call and disk seek overhead when the application starts. Since the
-format of the cache files allows them to be shared across multiple processes,
-for instance using the POSIX ``mmap(2)`` system call, the overall memory
-consumption is reduced as well.
-
-OPTIONS
--------
-
-``-f, --force``
-
-  Overwrite an existing cache file even if it appears to be up-to-date.
-
-``-t, --ignore-theme-index``
-
-  Don't check for the existence of ``index.theme`` in the icon theme directory.
-  Without this option, ``gtk4-update-icon-cache`` refuses to create an icon
-  cache in a directory which does not appear to be the toplevel directory of an
-  icon theme.
-
-``-i, --index-only``
-
-  Don't include image data in the cache.
-
-``--include-image-data``
-
-  Include image data in the cache.
-
-``-c, --source <NAME>``
-
-  Output a C header file declaring a constant ``NAME`` with the contents of the
-  icon cache.
-
-``-q, --quiet``
-
-  Turn off verbose output.
-
-``-v, --validate``
-
-  Validate existing icon cache.

docs/reference/gtk/gtk4-update-icon-cache.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-update-icon-cache">
+
+<refentryinfo>
+  <title>gtk4-update-icon-cache</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-update-icon-cache</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-update-icon-cache</refname>
+  <refpurpose>Icon theme caching utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-update-icon-cache</command>
+<arg choice="opt">--force</arg>
+<arg choice="opt">--ignore-theme-index</arg>
+<group>
+  <arg choice="plain">--index-only</arg>
+  <arg choice="plain">--include-image-data</arg>
+</group>
+<arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
+<arg choice="opt">--quiet</arg>
+<arg choice="opt">--validate</arg>
+<arg choice="plain"><replaceable>PATH</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+  <command>gtk4-update-icon-cache</command> creates mmapable cache
+  files for icon themes.
+</para>
+<para>
+  It expects to be given the <replaceable>PATH</replaceable> to an icon theme
+  directory containing an <filename>index.theme</filename>, e.g.
+  <filename>/usr/share/icons/hicolor</filename>, and writes a
+  <filename>icon-theme.cache</filename> containing cached information about
+  the icons in the directory tree below the given directory.
+</para>
+<para>
+  GTK can use the cache files created by <command>gtk4-update-icon-cache</command>
+  to avoid a lot of system call and disk seek overhead when the application
+  starts. Since the format of the cache files allows them to be shared across
+  multiple processes, for instance using the POSIX <command>mmap()</command> system
+  call, the overall memory consumption is reduced as well.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>--force</term>
+    <term>-f</term>
+    <listitem><para>Overwrite an existing cache file even if it appears to be
+         up-to-date.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>--ignore-theme-index</term>
+    <term>-t</term>
+    <listitem><para>Don't check for the existence of <filename>index.theme</filename>
+     in the icon theme directory. Without this option, <command>gtk4-update-icon-cache</command>
+     refuses to create an icon cache in a directory which does not appear to
+     be the toplevel directory of an icon theme.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>--index-only</term>
+    <term>-i</term>
+    <listitem><para>Don't include image data in the cache.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>--include-image-data</term>
+    <listitem><para>Include image data in the cache.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>--source</term>
+    <term>-c</term>
+    <listitem><para>Output a C header file declaring a constant
+     <replaceable>NAME</replaceable> with the contents of the icon
+     cache.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>--quiet</term>
+    <term>-q</term>
+    <listitem><para>Turn off verbose output.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>--validate</term>
+    <term>-v</term>
+    <listitem><para>Validate existing icon cache.
+    </para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4-widget-factory.rst

@@ -1,34 +0,0 @@
-.. _gtk4-widget-factory(1):
-
-===================
-gtk4-widget-factory
-===================
-
--------------------------------
-Showcase GTK widgets and styles
--------------------------------
-
-SYNOPSIS
---------
-
-|   **gtk4-widget-factory** [OPTIONS...]
-
-DESCRIPTION
------------
-
-``gtk4-widget-factory`` is a collection of examples.
-
-Its purpose is to demonstrate many GTK widgets in a form that is useful to GTK theme developers.
-
-The application shows widgets in different, typical combinations and states.
-
-OPTIONS
--------
-
-``-h, --help``
-
-  Show the application help.
-
-``--version``
-
-  Show the application version.

docs/reference/gtk/gtk4-widget-factory.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-widget-factory">
+
+<refentryinfo>
+  <title>gtk4-widget-factory</title>
+  <productname>GTK</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-widget-factory</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-widget-factory</refname>
+  <refpurpose>Demonstrate GTK widgets</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-widget-factory</command>
+<arg choice="opt">--help</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-widget-factory</command> is a collection of examples.
+Its purpose is to demonstrate many GTK widgets in a form
+that is useful to GTK theme developers.
+</para>
+<para>
+The application shows widgets in different, typical combinations
+and states.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+  <para>The following options are understood:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>-h</option>, <option>--help</option></term>
+      <listitem><para>Show help options</para></listitem>
+    </varlistentry>
+    <varlistentry>
+    <term><option>--version</option></term>
+      <listitem><para>Show program version</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk4.toml.in

@@ -3,7 +3,6 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
 repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
-docs_url = "https://docs.gtk.org/gtk4/"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
 license = "LGPL-2.1-or-later"

docs/reference/gtk/meson.build

@@ -42,10 +42,12 @@ if get_option('gtk_doc')
     command: [
       gidocgen,
       'generate',
-      gidocgen_common_args,
+      '--quiet',
+      '--fatal-warnings',
       '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
       '--config=@INPUT0@',
       '--output-dir=@OUTPUT@',
+      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT1@',
     ],
@@ -57,15 +59,24 @@ if get_option('gtk_doc')
   )
 endif
 
-rst2man = find_program('rst2man', required: false)
-if get_option('man-pages') and not rst2man.found()
-  error('No rst2man found, but man pages were explicitly enabled')
+xsltproc = find_program('xsltproc', required: false)
+if get_option('man-pages') and not xsltproc.found()
+  error('No xsltproc found, but man pages were explicitly enabled')
 endif
 
-if get_option('man-pages') and rst2man.found()
-  rst_files = [
-    [ 'gtk4-broadwayd', '1' ],
-    [ 'gtk4-builder-tool', '1' ],
+if get_option('man-pages') and xsltproc.found()
+  xlstproc_flags = [
+    '--nonet',
+    '--stringparam', 'man.output.quietly', '1',
+    '--stringparam', 'funcsynopsis.style', 'ansi',
+    '--stringparam', 'man.th.extra1.suppress', '1',
+    '--stringparam', 'man.authors.section.enabled', '0',
+    '--stringparam', 'man.copyright.section.enabled', '0',
+  ]
+
+  man_files = [
+    [ 'gtk4-broadwayd', '1', ],
+    [ 'gtk4-builder-tool', '1', ],
     [ 'gtk4-encode-symbolic-svg', '1', ],
     [ 'gtk4-launch', '1', ],
     [ 'gtk4-query-settings', '1', ],
@@ -73,7 +84,7 @@ if get_option('man-pages') and rst2man.found()
   ]
 
   if get_option('demos')
-    rst_files += [
+    man_files += [
       [ 'gtk4-demo', '1', ],
       [ 'gtk4-demo-application', '1', ],
       [ 'gtk4-widget-factory', '1', ],
@@ -81,25 +92,21 @@ if get_option('man-pages') and rst2man.found()
     ]
   endif
 
-  rst2man_flags = [
-    '--syntax-highlight=none',
-  ]
-
-  foreach rst: rst_files
-    man_name = rst[0]
-    man_section = rst.get(1, '1')
-
-    custom_target('man-@0@'.format(man_name),
-      input: '@0@.rst'.format(man_name),
+  foreach man: man_files
+    man_name = man.get(0)
+    man_section = man.get(1, '1')
+    custom_target('@0@.@1@'.format(man_name, man_section),
+      input: '@0@.xml'.format(man_name),
       output: '@0@.@1@'.format(man_name, man_section),
       command: [
-        rst2man,
-        rst2man_flags,
+        xsltproc,
+        xlstproc_flags,
+        '-o', '@OUTPUT@',
+        'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
         '@INPUT@',
       ],
-      capture: true,
       install: true,
-      install_dir: get_option('mandir') / 'man@0@'.format(man_section),
+      install_dir: join_paths(get_option('mandir'), 'man@0@'.format(man_section)),
     )
   endforeach
 endif

docs/reference/gtk/migrating-3to4.md

@@ -315,7 +315,7 @@ have been added to `GdkDisplay`.
 
 The root window is an X11-centric concept that is no longer exposed in the
 backend-neutral GDK API. If you need to interact with the X11 root window,
-you can use [`method@GdkX11.Display.get_xrootwindow`] to get its XID.
+you can use [method@GdkX11.Display.get_xrootwindow] to get its XID.
 
 ### Stop using `GdkVisual`
 
@@ -333,9 +333,9 @@ had replacements in GTK 3 and were deprecated in favor of `GdkSeat`.
 
 In GTK 4, the two roles of a standalone toplevel window and of a popup that
 is placed relative to a parent window have been separated out into two
-interfaces, [iface@Gdk.Toplevel] and [iface@Gdk.Popup]. Surfaces
-implementing these interfaces are created with [`ctor@Gdk.Surface.new_toplevel`]
-and [`ctor@Gdk.Surface.new_popup`], respectively, and they are presented on
+interfaces, [class@Gdk.Toplevel] and [class@Gdk.Popup]. Surfaces
+implementing these interfaces are created with [ctor@Gdk.Surface.new_toplevel]
+and [ctor@Gdk.Surface.new_popup], respectively, and they are presented on
 screen using [method@Gdk.Toplevel.present] and [method@Gdk.Popup.present].
 The `present()` functions take parameters in the form of an auxiliary layout
 struct, [struct@Gdk.PopupLayout] or [struct@Gdk.ToplevelLayout].
@@ -362,9 +362,9 @@ windows, you you will have to use Xlib apis.
 
 A number of minor API cleanups have happened in `GdkSurface`
 as well. For example, `gdk_surface_input_shape_combine_region()`
-has been renamed to [`method@Gdk.Surface.set_input_region`], and
+has been renamed to [method@Gdk.Surface.set_input_region], and
 `gdk_surface_begin_resize_drag()` has been renamed to
-[`method@Gdk.Toplevel.begin_resize`].
+[method@Gdk.Toplevel.begin_resize].
 
 ### The "iconified" window state has been renamed to "minimized"
 
@@ -388,7 +388,7 @@ have accessors that you will have to use.
 
 Event compression is always enabled in GTK 4, for both motion and
 scroll events. If you need to see the uncoalesced motion or scroll
-history, use [`method@Gdk.Event.get_history`] on the latest event.
+history, use [method@Gdk.Event.get_history] on the latest event.
 
 ### Stop using grabs
 
@@ -410,8 +410,8 @@ have been removed. Update your code accordingly.
 Any APIs that deal with global (or root) coordinates have been
 removed in GTK 4, since not all backends support them. You should
 replace your use of such APIs with surface-relative equivalents.
-Examples of such removed APIs are `gdk_window_get_origin()`,
-`gdk_window_move()` or `gdk_event_get_root_coords()`.
+Examples of this are `gdk_surface_get_origin()`, `gdk_surface_move()`
+or `gdk_event_get_root_coords()`.
 
 ### Adapt to `GdkKeymap` API changes
 
@@ -668,21 +668,18 @@ box children as necessary.
 ### Adapt to `GtkWindow` API changes
 
 Following the `GdkSurface` changes, a number of `GtkWindow` APIs that were
-X11-specific have been removed. This includes `gtk_window_set_position()`,
-`gtk_window_set_geometry_hints()`, `gtk_window_set_gravity()`,
-`gtk_window_move()`, `gtk_window_parse_geometry()`,
+X11-specific have been removed. This includes `gtk_window_set_geometry_hints()`,
+`gtk_window_set_gravity()`, `gtk_window_move()`, `gtk_window_parse_geometry()`,
 `gtk_window_set_keep_above()`, `gtk_window_set_keep_below()`,
 `gtk_window_begin_resize_drag()`, `gtk_window_begin_move_drag()`.
 Most likely, you should just stop using them. In some cases, you can
 fall back to using the underlying `GdkToplevel` APIs (for example,
-[`method@Gdk.Toplevel.begin_resize`]); alternatively, you will need to get
-the native windowing system surface from the `GtkWindow` and call platform
-specific API.
+[method@Gdk.Toplevel.begin_resize]).
 
 The APIs for controlling `GtkWindow` size have changed to be better aligned
 with the way size changes are integrated in the frame cycle. `gtk_window_resize()`
 and `gtk_window_get_size()` have been removed. Instead, use
-[`method@Gtk.Window.set_default_size`] and [`method@Gtk.Window.get_default_size`].
+[method@Gtk.Window.set_default_size] and [method@Gtk.Window.get_default_size].
 
 ### Adapt to `GtkHeaderBar` and `GtkActionBar` API changes
 
@@ -1054,7 +1051,7 @@ Observing widget contents and widget size is now done by using the
 
 ### Monitor handling has changed
 
-Instead of a monitor number, [class@Gdk.Monitor] is now used throughout.
+Instead of a monitor number, [class@Gdk.Monitor] is now used throughout. 
 [method@Gdk.Display.get_monitors] returns the list of monitors that can be queried
 or observed for monitors to pass to APIs like [method@Gtk.Window.fullscreen_on_monitor].
 
@@ -1335,18 +1332,6 @@ pointer coordinates as inout arguments any more, but as normal in ones.
 
 See: [method@Gtk.TreeView.get_tooltip_context], [method@Gtk.IconView.get_tooltip_context]
 
-### Adapt to GtkPopover changes
-
-In GTK 3, a `GtkPopover` could be attached to any widget, using the `relative-to`
-property. This is no longer possible in GTK 4. The parent widget has to be aware
-of its popover children, and manage their size allocation. Therefore, only widgets
-with dedicated popover support can have them, such as [class@Gtk.MenuButton] or
-[class@Gtk.PopoverMenuBar].
-
-If you want to make a custom widget that has an attached popover, you need to call
-[method@Gtk.Popover.present] in your [vfunc@Gtk.Widget.size_allocate] vfunc, in order
-to update the positioning of the popover.
-
 ### Stop using GtkFileChooserButton
 
 The `GtkFileChooserButton` widget was removed, due to its shortcomings in

docs/reference/gtk/overview.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!DOCTYPE partintro PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+               ]>
+<partintro>
+<para>
+GTK is a library for creating graphical user interfaces. It
+works on many UNIX-like platforms, Windows, and OS X.
+GTK is released under the GNU Library General Public License
+(GNU LGPL), which allows for flexible licensing of client
+applications. GTK has a C-based object-oriented architecture that
+allows for maximum flexibility.  Bindings for many other languages have
+been written, including C++, Objective-C, Guile/Scheme, Perl, Python,
+TOM, Ada95, Free Pascal, and Eiffel.  The GTK library itself contains
+<firstterm>widgets</firstterm>, that is, GUI components such as GtkButton
+or GtkTextView.
+
+</para>
+<para>
+GTK depends on the following libraries:
+<variablelist>
+
+<varlistentry>
+<term>GLib</term>
+<listitem><para>
+A general-purpose utility library, not specific to graphical user interfaces.
+GLib provides many useful data types, macros, type conversions,
+string utilities, file utilities, a main loop abstraction, and so on.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GObject</term>
+<listitem><para>A library that provides a type system, a collection of
+fundamental types including an object type, a signal system.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GIO</term>
+<listitem><para>A modern, easy-to-use VFS API including abstractions for
+files, drives, volumes, stream IO, as well as network programming and
+DBus communication.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>cairo</term>
+<listitem><para>Cairo is a 2D graphics library with support for multiple
+output devices.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Pango</term>
+<listitem><para>
+Pango is a library for internationalized text handling. It centers
+around the PangoLayout object, representing a paragraph of text.
+Pango provides the engine for GtkTextView, GtkLabel, GtkEntry, and
+other widgets that display text.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GdkPixbuf</term>
+<listitem><para>
+This is a small library which allows you to create GdkPixbuf
+("pixel buffer") objects from image data or image files.
+Use a GdkPixbuf in combination with GtkImage to display images.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>graphene</term>
+<listitem><para>
+This is a small library which provides vector and matrix datatypes
+and operations. graphene provides optimized implementations using
+various SIMD instruction sets such as SSE.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GDK</term>
+<listitem><para>
+GDK is the abstraction layer that allows GTK to support multiple
+windowing systems. GDK provides window system facilities on Wayland,
+X11, Windows, and OS X.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GSK</term>
+<listitem><para>
+GSK is a library for creating a scene graph from render nodes,
+and rendering it using different rendering APIs. GSK provides renderers
+for OpenGL, Vulkan and cairo.
+</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+</partintro>

docs/reference/gtk/question_index.md

@@ -14,7 +14,7 @@ the question you have, this list is a good place to start.
     (most of it about GTK 2.x and 3.x, but still somewhat applicable). This
     reference manual also contains a introductory
     [Getting Started](#gtk-getting-started) part.
-
+    
     More documentation ranging from whitepapers to online books can be found at
     the [GNOME developer's site](https://developer.gnome.org). After studying these
     materials you should be well prepared to come back to this reference manual for details.
@@ -93,11 +93,11 @@ the question you have, this list is a good place to start.
 
     `gi18n.h` provides the following shorthand macros for convenience.
     Conventionally, people define macros as follows for convenience:
-
+    
         #define  _(x)     gettext (x)
         #define N_(x)     x
         #define C_(ctx,x) pgettext (ctx, x)
-
+        
     You use `N_()` (N stands for no-op) to mark a string for translation in
     a location where a function call to gettext() is not allowed, such as
     in an array initializer. You eventually have to call gettext() on the
@@ -205,14 +205,14 @@ the question you have, this list is a good place to start.
     Here is an example showing the three approaches using the copyright
     sign © which has Unicode and ISO-8859-1 codepoint 169 and is represented
     in UTF-8 by the two bytes 194, 169, or `"\302\251"` as a string literal:
-
+    
         g_print ("direct UTF-8: ©");
         g_print ("escaped UTF-8: \302\251");
         text = g_convert ("runtime conversion: ©", -1,
                           "ISO-8859-1", "UTF-8", NULL, NULL, NULL);
         g_print (text);
         g_free (text);
-
+        
     If you are using gettext() to localize your application, you need
     to call bind_textdomain_codeset() to ensure that translated strings
     are returned in UTF-8 encoding.
@@ -432,10 +432,10 @@ the question you have, this list is a good place to start.
 
 26. How do I associate some data with a row in the tree?
 
-    Remember that the [iface@Gtk.TreeModel] columns don't necessarily have to be
+    Remember that the [class@Gtk.TreeModel] columns don't necessarily have to be
     displayed. So you can put non-user-visible data in your model just
     like any other data, and retrieve it with [method@Gtk.TreeModel.get].
-    See the [tree widget overview](#TreeWidget).
+    See the [tree widget overview](#TreeWidget).        
 
 27. How do I put an image and some text in the same column?
 
@@ -447,7 +447,7 @@ the question you have, this list is a good place to start.
 28. I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
     [method@Gtk.ListStore.set] and [method@Gtk.TreeStore.set], but can't read it back?
 
-    Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [iface@Gtk.TreeModel]
+    Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [class@Gtk.TreeModel]
     interface. As a consequence, you can use any function this interface
     implements. The easiest way to read a set of data back is to use
     [method@Gtk.TreeModel.get].

docs/reference/gtk/section-text-widget.md

@@ -133,7 +133,7 @@ gtk_text_buffer_set_text (buffer, "Hello, this is some text", -1);
 provider = gtk_css_provider_new ();
 gtk_css_provider_load_from_data (provider,
                                  "textview {"
-                                 " font: 15px serif;"
+                                 " font: 15 serif;"
                                  "  color: green;"
                                  "}",
                                  -1);
@@ -149,9 +149,9 @@ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 30);
 tag = gtk_text_buffer_create_tag (buffer, "blue_foreground",
                                   "foreground", "blue",
                                   NULL);
-gtk_text_buffer_get_iter_at_offset (buffer, &start, 7);
-gtk_text_buffer_get_iter_at_offset (buffer, &end, 12);
-gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
+gtk_text_buffer_get_iter_at_offset (buffer, &start, 7);
+gtk_text_buffer_get_iter_at_offset (buffer, &end, 12);
+gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
 ```
 
 The `gtk4-demo` application that comes with

docs/reference/gtk/urlmap.js

@@ -13,5 +13,4 @@ baseURLs = [
     [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
     [ 'Pango', 'https://docs.gtk.org/Pango/' ],
     [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
-    [ 'GdkPixbuf', 'https://docs.gtk.org/gdk-pixbuf/' ],
 ]

docs/reference/meson.build

@@ -3,15 +3,6 @@ toml_conf.set('version', meson.project_version())
 
 gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
 
-gidocgen_common_args = [
-  '--quiet',
-  '--no-namespace-dir',
-]
-
-if get_option('werror')
-  gidocgen_common_args += ['--fatal-warnings']
-endif
-
 docs_dir = gtk_datadir / 'doc'
 
 if get_option('gtk_doc') and not build_gir

examples/bp/bloatpad.c

@@ -603,8 +603,8 @@ bloat_pad_startup (GApplication *application)
   g_object_unref (icon);
   g_bytes_unref (bytes);
 
-  icon = G_ICON (gdk_texture_new_from_resource ("/org/gtk/libgtk/icons/16x16/actions/folder-new.png"));
-  item = g_menu_item_new ("Texture", NULL);
+  icon = G_ICON (gdk_pixbuf_new_from_resource ("/org/gtk/libgtk/icons/16x16/actions/folder-new.png", NULL));
+  item = g_menu_item_new ("Pixbuf", NULL);
   g_menu_item_set_icon (item, icon);
   g_menu_append_item (menu, item);
   g_object_unref (item);

gdk/broadway/broadway-server.c

@@ -7,7 +7,7 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 #include "gdktypes.h"
-#include "gdkdeviceprivate.h"
+#include "gdkinternals.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>

gdk/broadway/gdkbroadway-server.c

@@ -609,46 +609,56 @@ open_shared_memory (void)
   return ret;
 }
 
+typedef struct {
+  int fd;
+  gsize size;
+} PngData;
+
+static cairo_status_t
+write_png_cb (void         *closure,
+              const guchar *data,
+              unsigned int  length)
+{
+  PngData *png_data = closure;
+  int fd = png_data->fd;
+
+  while (length)
+    {
+      gssize ret = write (fd, data, length);
+
+      if (ret <= 0)
+        return CAIRO_STATUS_WRITE_ERROR;
+
+      png_data->size += ret;
+      length -= ret;
+      data += ret;
+    }
+
+  return CAIRO_STATUS_SUCCESS;
+}
+
 guint32
 gdk_broadway_server_upload_texture (GdkBroadwayServer *server,
                                     GdkTexture        *texture)
 {
   guint32 id;
+  cairo_surface_t *surface = gdk_texture_download_surface (texture);
   BroadwayRequestUploadTexture msg;
-  GBytes *bytes;
-  const guchar *data;
-  gsize size;
-  int fd;
-
-  bytes = gdk_texture_save_to_png_bytes (texture);
-  fd = open_shared_memory ();
-  data = g_bytes_get_data (bytes, &size);
+  PngData data;
 
   id = server->next_texture_id++;
 
+  data.fd = open_shared_memory ();
+  data.size = 0;
+  cairo_surface_write_to_png_stream (surface, write_png_cb, &data);
+
   msg.id = id;
   msg.offset = 0;
-  msg.size = 0;
-
-  while (msg.size < size)
-    {
-      gssize ret = write (fd, data + msg.size, size - msg.size);
-
-      if (ret <= 0)
-        {
-          if (errno == EINTR)
-            continue;
-          break;
-        }
-
-      msg.size += ret;
-    }
-
-  g_bytes_unref (bytes);
+  msg.size = data.size;
 
   /* This passes ownership of fd */
   gdk_broadway_server_send_fd_message (server, msg,
-                                       BROADWAY_REQUEST_UPLOAD_TEXTURE, fd);
+                                       BROADWAY_REQUEST_UPLOAD_TEXTURE, data.fd);
 
   return id;
 }

gdk/broadway/gdkbroadway-server.h

@@ -2,10 +2,8 @@
 #define __GDK_BROADWAY_SERVER__
 
 #include <gdk/gdktypes.h>
-
-#include "gdkdeviceprivate.h"
-
 #include "broadway-protocol.h"
+#include "gdkinternals.h"
 
 typedef struct _GdkBroadwayServer GdkBroadwayServer;
 typedef struct _GdkBroadwayServerClass GdkBroadwayServerClass;

gdk/broadway/gdkcairocontext-broadway.c

@@ -34,7 +34,6 @@ gdk_broadway_cairo_context_dispose (GObject *object)
 
 static void
 gdk_broadway_cairo_context_begin_frame (GdkDrawContext *draw_context,
-                                        gboolean        prefers_high_depth,
                                         cairo_region_t *region)
 {
   GdkBroadwayCairoContext *self = GDK_BROADWAY_CAIRO_CONTEXT (draw_context);

gdk/broadway/gdkdisplay-broadway.c

@@ -30,6 +30,7 @@
 #include "gdkmonitor-broadway.h"
 #include "gdkseatdefaultprivate.h"
 #include "gdkdevice-broadway.h"
+#include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
 #include <gdk/gdktextureprivate.h>
 #include "gdk-private.h"
@@ -213,7 +214,7 @@ _gdk_broadway_display_open (const char *display_name)
   broadway_display->server = _gdk_broadway_server_new (display, display_name, &error);
   if (broadway_display->server == NULL)
     {
-      GDK_NOTE (MISC, g_message ("Unable to init Broadway server: %s\n", error->message));
+      g_printerr ("Unable to init Broadway server: %s\n", error->message);
       g_error_free (error);
       return NULL;
     }

gdk/broadway/gdkdisplay-broadway.h

@@ -27,6 +27,7 @@
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
 #include "gdksurface.h"
+#include "gdkinternals.h"
 #include "gdkbroadway-server.h"
 #include "gdkmonitorprivate.h"
 

gdk/broadway/gdkdnd-broadway.c

@@ -28,6 +28,7 @@
 
 #include "gdksurfaceprivate.h"
 #include "gdkprivate-broadway.h"
+#include "gdkinternals.h"
 #include "gdkdisplay-broadway.h"
 
 #include <string.h>

gdk/broadway/gdkdrawcontext-broadway.c

@@ -34,7 +34,6 @@ gdk_broadway_draw_context_dispose (GObject *object)
 
 static void
 gdk_broadway_draw_context_begin_frame (GdkDrawContext *draw_context,
-                                       gboolean        prefers_high_depth,
                                        cairo_region_t *region)
 {
   GdkBroadwayDrawContext *self = GDK_BROADWAY_DRAW_CONTEXT (draw_context);