stroke: Add support for dashes

... and hook it up in the node parser and for Cairo rendering.

.flake8

@@ -1,2 +0,0 @@
-[flake8]
-ignore = E501

.gitlab-ci.yml

@@ -26,7 +26,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v48"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v46"
 
 workflow:
   rules:
@@ -418,11 +418,10 @@ reference:
             --buildtype=release
             --force-fallback-for=gdk-pixbuf,pango
             -Dintrospection=enabled
-            -Ddocumentation=true
             -Dgtk_doc=true
             -Dgdk-pixbuf:gtk_doc=true
             -Dpango:gtk_doc=true
-            -Dbuild-demos=false
+            -Ddemos=false
             -Dbuild-examples=false
             -Dbuild-tests=false
             -Dbuild-testsuite=false

.gitlab-ci/fedora.Dockerfile

@@ -32,7 +32,6 @@ RUN dnf -y install \
     glib2-static \
     glibc-devel \
     glibc-headers \
-    glslc \
     gnupg2 \
     gobject-introspection-devel \
     graphene-devel \

.gitlab-ci/run-single-test.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/sh
-#
-builddir=$1
-suite=$2
-unit=$3
-
-echo "** builddir: ${builddir}"
-echo "**    suite: ${suite}"
-echo "**     unit: ${unit}"
-
-export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-compositor=$!
-
-export WAYLAND_DISPLAY=wayland-5
-
-meson test -C ${builddir} \
-            --print-errorlogs \
-            --setup=wayland \
-            --suite=${suite} \
-            --no-suite=failing \
-            --no-suite=flaky \
-            --no-suite=wayland_failing \
-            --no-suite=gsk-compare-broadway \
-            --verbose \
-            "${unit}"
-
-exit_code=$?
-kill ${compositor}
-
-exit ${exit_code}

.gitlab-ci/test-msys2.sh

@@ -32,8 +32,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-fribidi \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-python-gobject \
+    mingw-w64-$MSYS2_ARCH-python-gobject
-    mingw-w64-$MSYS2_ARCH-shaderc
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"

AUTHORS

@@ -7,7 +7,7 @@ Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>
 
-The team that build GTK 2 (in alphabetical order)
+The Team that build GTK 2 (in alphabetical order)
 -------------------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
 Jerome Bolliet    <bolliet@gtk.org>
@@ -28,8 +28,9 @@ Jay Painter       <jpaint@gtk.org>
 Manish Singh      <manish@gtk.org>
 Owen Taylor       <otaylor@gtk.org>
 
-The team that built GTK 3
+The current team (GTK 3 and 4)
--------------------------
+------------------------------
+
 Jonas Ådahl       <jadahl@gmail.com>
 Tim Bäder         <mail@baedert.org>
 Emmanuele Bassi   <ebassi@gnome.org>
@@ -39,16 +40,6 @@ Carlos Garnacho   <mrgarnacho@gmail.com>
 Alexander Larsson <alexl@redhat.com>
 Benjamin Otte     <otte@gnome.org>
 
-The current team (GTK 4)
-------------------------
-Jonas Ådahl       <jadahl@gmail.com>
-Emmanuele Bassi   <ebassi@gnome.org>
-Christian Hergert <chergert@gnome.org>
-Chun-wei Fan      <fanchunwei@src.gnome.org>
-Matthias Clasen   <mclasen@redhat.com>
-Carlos Garnacho   <mrgarnacho@gmail.com>
-Benjamin Otte     <otte@gnome.org>
-
 
 There are many others who have contributed patches; we thank them,
 GTK is much better because of them.
@@ -58,15 +49,35 @@ Over time, GTK has incorporated some pieces of software which
 started as independent projects. We list the original authors here:
 
 
+MS-Windows theme engine
+-----------------------
+Raymond Penners
+Dom Lachowicz
+
+
+Pixbuf theme engine
+-------------------
+Owen Taylor
+
+
 IME input method
 ----------------
 Takuro Ashie
 Kazuki IWAMOTO
 
-MacOS backend
+
--------------
+Mac OS X backend
+----------------
 Anders Carlsson
 
-GtkInspector (originally gtkparasite)
+
--------------------------------------
+DirectFB backend
+----------------
+Denis Oliver Kropp
+Sven Neumann
+Mike Emmel
+
+
+gtkparasite
+-----------
 Christian Hammond

NEWS

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

README.md

@@ -67,13 +67,6 @@ building for:
   - [Graphene](https://github.com/ebassi/graphene)
   - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
 
-If you are building the Wayland backend, you will also need:
-
-  - Wayland-client
-  - Wayland-protocols
-  - Wayland-cursor
-  - Wayland-EGL
-
 If you are building the X11 backend, you will also need:
 
   - Xlib, and the following X extensions:
@@ -86,24 +79,32 @@ If you are building the X11 backend, you will also need:
     - xdamage
     - xcomposite
 
+If you are building the Wayland backend, you will also need:
+
+  - Wayland-client
+  - Wayland-protocols
+  - Wayland-cursor
+  - Wayland-EGL
+
 Once you have all the necessary dependencies, you can build GTK by using
 Meson:
 
 ```sh
-$ meson setup _build
+$ meson _build .
-$ meson compile -C_build
+$ cd _build
+$ ninja
 ```
 
 You can run the test suite using:
 
 ```sh
-$ meson test -C_build
+$ meson test
 ```
 
 And, finally, you can install GTK using:
 
 ```
-$ sudo meson install -C_build
+$ sudo ninja install
 ```
 
 Complete information about installing GTK and related libraries

demos/constraint-editor/constraint-editor-window.c

@@ -483,8 +483,6 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
-  g_type_ensure (CONSTRAINT_VIEW_TYPE);
-
   object_class->dispose = constraint_editor_window_dispose;
 
   gtk_widget_class_set_template_from_resource (widget_class,

demos/constraint-editor/constraint-editor.c

@@ -20,7 +20,8 @@
 #include "config.h"
 
 #include "constraint-editor.h"
-#include "constraint-view.h"
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
 struct _ConstraintEditor
 {
@@ -65,7 +66,7 @@ static const char *
 get_target_name (GtkConstraintTarget *target)
 {
   if (target == NULL)
-    return "Super";
+    return "super";
   else if (GTK_IS_WIDGET (target))
     return gtk_widget_get_name (GTK_WIDGET (target));
   else if (GTK_IS_CONSTRAINT_GUIDE (target))
@@ -79,29 +80,62 @@ constraint_target_combo (GListModel *model,
                          GtkWidget  *combo,
                          gboolean    is_source)
 {
-  GtkStringList *targets;
   int i;
 
-  targets = gtk_string_list_new (NULL);
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "super", "Super");
-
-  gtk_string_list_append (targets, "Super");
 
   if (model)
     {
       for (i = 0; i < g_list_model_get_n_items (model); i++)
         {
           GObject *item = g_list_model_get_object (model, i);
+          const char *name;
 
           if (GTK_IS_CONSTRAINT (item))
             continue;
 
-          gtk_string_list_append (targets, get_target_name (GTK_CONSTRAINT_TARGET (item)));
+          name = get_target_name (GTK_CONSTRAINT_TARGET (item));
+
+          gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), name, name);
           g_object_unref (item);
         }
     }
+}
 
-  gtk_drop_down_set_model (GTK_DROP_DOWN (combo), G_LIST_MODEL (targets));
+static void
-  g_object_unref (targets);
+constraint_attribute_combo (GtkWidget *combo,
+                            gboolean is_source)
+{
+  if (is_source)
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "none", "None");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "left", "Left");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "right", "Right");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "top", "Top");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "bottom", "Bottom");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "start", "Start");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "end", "End");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "width", "Width");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "height", "Height");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-x", "Center X");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-y", "Center Y");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "baseline", "Baseline");
+}
+
+static void
+constraint_relation_combo (GtkWidget *combo)
+{
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "le", "≤");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "eq", "=");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "ge", "≥");
+}
+
+static void
+constraint_strength_combo (GtkWidget *combo)
+{
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
 }
 
 static gpointer
@@ -113,7 +147,7 @@ get_target (GListModel *model,
   if (id == NULL)
     return NULL;
 
-  if (strcmp ("Super", id) == 0)
+  if (strcmp ("super", id) == 0)
     return NULL;
 
   for (i = 0; i < g_list_model_get_n_items (model); i++)
@@ -137,65 +171,16 @@ get_target (GListModel *model,
   return NULL;
 }
 
-static void
-select_target (GtkDropDown *combo,
-               const char  *target_name)
-{
-  GListModel *model = gtk_drop_down_get_model (combo);
-
-  for (unsigned int i = 0; i < g_list_model_get_n_items (model); i++)
-    {
-      GtkStringObject *s = g_list_model_get_item (model, i);
-
-      g_object_unref (s);
-      if (strcmp (target_name, gtk_string_object_get_string (s)) == 0)
-        {
-          gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), i);
-          return;
-        }
-    }
-}
-
 static GtkConstraintAttribute
-get_attr (unsigned int id)
+get_target_attr (const char *id)
 {
-  switch (id)
+  GtkConstraintAttribute attr;
-    {
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
-    case 0: return GTK_CONSTRAINT_ATTRIBUTE_NONE;
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-    case 1: return GTK_CONSTRAINT_ATTRIBUTE_LEFT;
+  attr = value->value;
-    case 2: return GTK_CONSTRAINT_ATTRIBUTE_RIGHT;
+  g_type_class_unref (class);
-    case 3: return GTK_CONSTRAINT_ATTRIBUTE_TOP;
-    case 4: return GTK_CONSTRAINT_ATTRIBUTE_BOTTOM;
-    case 5: return GTK_CONSTRAINT_ATTRIBUTE_START;
-    case 6: return GTK_CONSTRAINT_ATTRIBUTE_END;
-    case 7: return GTK_CONSTRAINT_ATTRIBUTE_WIDTH;
-    case 8: return GTK_CONSTRAINT_ATTRIBUTE_HEIGHT;
-    case 9: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_X;
-    case 10: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y;
-    case 11: return GTK_CONSTRAINT_ATTRIBUTE_BASELINE;
-    default: g_assert_not_reached ();
-    }
-}
 
-static unsigned int
+  return attr;
-get_attr_id (GtkConstraintAttribute attr)
-{
-  switch (attr)
-    {
-    case GTK_CONSTRAINT_ATTRIBUTE_NONE: return 0;
-    case GTK_CONSTRAINT_ATTRIBUTE_LEFT: return 1;
-    case GTK_CONSTRAINT_ATTRIBUTE_RIGHT: return 2;
-    case GTK_CONSTRAINT_ATTRIBUTE_TOP: return 3;
-    case GTK_CONSTRAINT_ATTRIBUTE_BOTTOM: return 4;
-    case GTK_CONSTRAINT_ATTRIBUTE_START: return 5;
-    case GTK_CONSTRAINT_ATTRIBUTE_END: return 6;
-    case GTK_CONSTRAINT_ATTRIBUTE_WIDTH: return 7;
-    case GTK_CONSTRAINT_ATTRIBUTE_HEIGHT: return 8;
-    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_X: return 9;
-    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y: return 10;
-    case GTK_CONSTRAINT_ATTRIBUTE_BASELINE: return 11;
-    default: g_assert_not_reached ();
-    }
 }
 
 static const char *
@@ -210,27 +195,15 @@ get_attr_nick (GtkConstraintAttribute attr)
 }
 
 static GtkConstraintRelation
-get_relation (unsigned int id)
+get_relation (const char *id)
 {
-  switch (id)
+  GtkConstraintRelation relation;
-    {
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
-    case 0: return GTK_CONSTRAINT_RELATION_LE;
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-    case 1: return GTK_CONSTRAINT_RELATION_EQ;
+  relation = value->value;
-    case 2: return GTK_CONSTRAINT_RELATION_GE;
+  g_type_class_unref (class);
-    default: g_assert_not_reached ();
-    }
-}
 
-static unsigned int
+  return relation;
-get_relation_id (GtkConstraintRelation relation)
-{
-  switch (relation)
-    {
-    case GTK_CONSTRAINT_RELATION_LE: return 0;
-    case GTK_CONSTRAINT_RELATION_EQ: return 1;
-    case GTK_CONSTRAINT_RELATION_GE: return 2;
-    default: g_assert_not_reached ();
-    }
 }
 
 static const char *
@@ -261,29 +234,15 @@ get_relation_display_name (GtkConstraintRelation relation)
 }
 
 static GtkConstraintStrength
-get_strength (unsigned int id)
+get_strength (const char *id)
-{ 
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
-    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
-    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
-    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
-    default: g_assert_not_reached ();
-    }
-}
-
-static unsigned int
-get_strength_id (GtkConstraintStrength strength)
 {
-  switch (strength)
+  GtkConstraintStrength strength;
-    {
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
+  strength = value->value;
-    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
+  g_type_class_unref (class);
-    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
+
-    default: g_assert_not_reached ();
+  return strength;
-    }
 }
 
 static const char *
@@ -335,7 +294,7 @@ static void
 create_constraint (GtkButton        *button,
                    ConstraintEditor *editor)
 {
-  gpointer obj;
+  const char *id;
   gpointer target;
   GtkConstraintAttribute target_attr;
   gpointer source;
@@ -346,27 +305,25 @@ create_constraint (GtkButton        *button,
   int strength;
   GtkConstraint *constraint;
 
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  if (obj)
+  target = get_target (editor->model, id);
-    target = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
-  else
+  target_attr = get_target_attr (id);
-    target = NULL;
-  target_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->target_attr)));
 
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-  if (obj)
+  source = get_target (editor->model, id);
-    source = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  else
+  source_attr = get_target_attr (id);
-    source = NULL;
-  source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN(editor->source_attr)));
 
-  relation = get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->relation));
+  relation = get_relation (id);
 
   multiplier = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->multiplier)), NULL);
 
   constant = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->constant)), NULL);
 
-  strength = get_strength (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
+  strength = get_strength (id);
 
   constraint = gtk_constraint_new (target, target_attr,
                                    relation,
@@ -381,9 +338,12 @@ create_constraint (GtkButton        *button,
 static void
 source_attr_changed (ConstraintEditor *editor)
 {
-  if (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))) == GTK_CONSTRAINT_ATTRIBUTE_NONE)
+  const char *id;
+
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
+  if (strcmp (id, "none") == 0)
     {
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source), GTK_INVALID_LIST_POSITION);
+      gtk_combo_box_set_active (GTK_COMBO_BOX (editor->source), -1);
       gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "");
       gtk_widget_set_sensitive (editor->source, FALSE);
       gtk_widget_set_sensitive (editor->multiplier, FALSE);
@@ -449,7 +409,7 @@ update_preview (ConstraintEditor *editor)
   GString *str;
   const char *name;
   const char *attr;
-  const char *relation;
+  char *relation;
   const char *multiplier;
   const char *constant;
   double c, m;
@@ -459,22 +419,23 @@ update_preview (ConstraintEditor *editor)
 
   str = g_string_new ("");
 
-  name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target))));
+  name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected ((GTK_DROP_DOWN (editor->target_attr)))));
+  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
-  relation = get_relation_nick (get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation))));
+  relation = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (editor->relation));
 
   if (name == NULL)
     name = "[ ]";
 
   g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
+  g_free (relation);
 
   constant = gtk_editable_get_text (GTK_EDITABLE (editor->constant));
   c = g_ascii_strtod (constant, NULL);
 
-  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))));
+  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
   if (strcmp (attr, "none") != 0)
     {
-       name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source))));
+      name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
       multiplier = gtk_editable_get_text (GTK_EDITABLE (editor->multiplier));
       m = g_ascii_strtod (multiplier, NULL);
 
@@ -502,18 +463,12 @@ update_preview (ConstraintEditor *editor)
 static void
 update_button (ConstraintEditor *editor)
 {
-  gpointer obj;
+  const char *target = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  const char *target;
+  const char *source = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-  const char *source;
+  const char *source_attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  GtkConstraintAttribute source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr)));
 
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
+  if (target &&
-  target = obj ? gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
+      (source || (source_attr && get_target_attr (source_attr) == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
-
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
-  source = obj ?  gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
-
-  if (target && (source || (source_attr == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
     gtk_widget_set_sensitive (editor->button, TRUE);
   else
     gtk_widget_set_sensitive (editor->button, FALSE);
@@ -531,7 +486,12 @@ constraint_editor_constructed (GObject *object)
   ConstraintEditor *editor = CONSTRAINT_EDITOR (object);
 
   constraint_target_combo (editor->model, editor->target, FALSE);
+  constraint_attribute_combo (editor->target_attr, FALSE);
+  constraint_relation_combo (editor->relation);
   constraint_target_combo (editor->model, editor->source, TRUE);
+  constraint_attribute_combo (editor->source_attr, TRUE);
+
+  constraint_strength_combo (editor->strength);
 
   if (editor->constraint)
     {
@@ -539,24 +499,30 @@ constraint_editor_constructed (GObject *object)
       GtkConstraintAttribute attr;
       GtkConstraintRelation relation;
       GtkConstraintStrength strength;
+      const char *nick;
       char *val;
       double multiplier;
       double constant;
 
       target = gtk_constraint_get_target (editor->constraint);
-      select_target (GTK_DROP_DOWN (editor->target), get_target_name (target));
+      nick = get_target_name (target);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target), nick);
 
       attr = gtk_constraint_get_target_attribute (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (attr));
+      nick = get_attr_nick (attr);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), nick);
 
       target = gtk_constraint_get_source (editor->constraint);
-      select_target (GTK_DROP_DOWN (editor->source), get_target_name (target));
+      nick = get_target_name (target);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source), nick);
 
       attr = gtk_constraint_get_source_attribute (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (attr));
+      nick = get_attr_nick (attr);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), nick);
 
       relation = gtk_constraint_get_relation (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (relation));
+      nick = get_relation_nick (relation);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), nick);
 
       multiplier = gtk_constraint_get_multiplier (editor->constraint);
       val = g_strdup_printf ("%g", multiplier);
@@ -569,16 +535,17 @@ constraint_editor_constructed (GObject *object)
       g_free (val);
 
       strength = gtk_constraint_get_strength (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
+      nick = get_strength_nick (strength);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
     }
   else
     {
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), "left");
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), "left");
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (GTK_CONSTRAINT_RELATION_EQ));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), "eq");
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_REQUIRED));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "required");
 
       gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1.0");
       gtk_editable_set_text (GTK_EDITABLE (editor->constant), "0.0");

demos/constraint-editor/constraint-editor.ui

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

demos/constraint-editor/guide-editor.c

@@ -21,6 +21,8 @@
 
 #include "guide-editor.h"
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 struct _GuideEditor
 {
   GtkWidget parent_instance;
@@ -57,30 +59,25 @@ static guint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE(GuideEditor, guide_editor, GTK_TYPE_WIDGET);
 
-static GtkConstraintStrength
+static void
-get_strength (unsigned int id)
+guide_strength_combo (GtkWidget *combo)
 {
-  switch (id)
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
-    {
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
-    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
-    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
-    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
-    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
-    default: g_assert_not_reached ();
-    }
 }
 
-static unsigned int
+static GtkConstraintStrength
-get_strength_id (GtkConstraintStrength strength)
+get_strength (const char *id)
 {
-  switch (strength)
+  GtkConstraintStrength strength;
-    {
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
+  strength = value->value;
-    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
+  g_type_class_unref (class);
-    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
+
-    default: g_assert_not_reached ();
+  return strength;
-    }
 }
 
 static const char *
@@ -121,11 +118,11 @@ static void
 create_guide (GtkButton   *button,
               GuideEditor *editor)
 {
+  const char *id;
   int strength;
   const char *name;
   int w, h;
   GtkConstraintGuide *guide;
-  unsigned int id;
 
   if (editor->guide)
     guide = g_object_ref (editor->guide);
@@ -147,7 +144,7 @@ create_guide (GtkButton   *button,
   h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_height));
   gtk_constraint_guide_set_max_size (guide, w, h);
 
-  id = gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
   strength = get_strength (id);
   gtk_constraint_guide_set_strength (guide, strength);
 
@@ -194,9 +191,14 @@ guide_editor_constructed (GObject *object)
 {
   GuideEditor *editor = GUIDE_EDITOR (object);
 
+  guide_strength_combo (editor->strength);
+
   g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
+
   g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
+
   g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
+
   g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
 
   if (editor->guide)
@@ -222,7 +224,8 @@ guide_editor_constructed (GObject *object)
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), h);
 
       strength = gtk_constraint_guide_get_strength (editor->guide);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
+      nick = get_strength_nick (strength);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
     }
@@ -242,7 +245,7 @@ guide_editor_constructed (GObject *object)
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), G_MAXINT);
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), G_MAXINT);
 
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_MEDIUM));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "medium");
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
     }

demos/constraint-editor/guide-editor.ui

@@ -167,17 +167,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="strength">
+          <object class="GtkComboBoxText" id="strength">
-            <property name="model">
-              <object class="GtkStringList">
-                <items>
-                  <item>Weak</item>
-                  <item>Medium</item>
-                  <item>Strong</item>
-                  <item>Required</item>
-                </items>
-              </object>
-            </property>
             <layout>
               <property name="column">1</property>
               <property name="row">4</property>

demos/gtk-demo/application.c

@@ -2,6 +2,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
@@ -214,41 +216,6 @@ activate_quit (GSimpleAction *action,
     }
 }
 
-static void
-delete_messages (gpointer data)
-{
-  g_list_free_full ((GList *)data, g_free);
-}
-
-static void
-pop_message (GtkWidget *status)
-{
-  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
-
-  if (messages)
-    {
-      char *message = messages->data;
-      messages = g_list_remove (messages, message);
-
-      g_object_set_data_full (G_OBJECT (status), "messages",
-                              messages, delete_messages);
-
-      gtk_label_set_label (GTK_LABEL (status), message);
-    }
-}
-
-static void
-push_message (GtkWidget  *status,
-              const char *message)
-{
-  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
-
-  gtk_label_set_label (GTK_LABEL (status), message);
-  messages = g_list_prepend (messages, g_strdup (message));
-  g_object_set_data_full (G_OBJECT (status), "messages",
-                          messages, delete_messages);
-}
-
 static void
 update_statusbar (GtkTextBuffer         *buffer,
                   DemoApplicationWindow *window)
@@ -259,7 +226,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   GtkTextIter iter;
 
   /* clear any previous message, underflow is allowed */
-  pop_message (window->status);
+  gtk_statusbar_pop (GTK_STATUSBAR (window->status), 0);
 
   count = gtk_text_buffer_get_char_count (buffer);
 
@@ -273,7 +240,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
                          row, col, count);
 
-  push_message (window->status, msg);
+  gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, msg);
 
   g_free (msg);
 }

demos/gtk-demo/application.ui

@@ -76,13 +76,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkLabel" id="status">
+          <object class="GtkStatusbar" id="status">
             <property name="hexpand">1</property>
-            <property name="xalign">0</property>
-            <property name="margin-start">2</property>
-            <property name="margin-end">2</property>
-            <property name="margin-top">2</property>
-            <property name="margin-bottom">2</property>
             <layout>
               <property name="column">0</property>
               <property name="row">3</property>

demos/gtk-demo/builder.c

@@ -1,5 +1,5 @@
 /* Builder
- * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkShortcutController, toolbar
+ * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkStatusBar, GtkShortcutController, toolbar
  *
  * Demonstrates a traditional interface, loaded from a XML description,
  * and shows how to connect actions to the menu items and toolbar buttons.
@@ -37,34 +37,30 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-static int
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-pop_message (gpointer data)
+
+static gboolean
+pop_status (gpointer data)
 {
-  GtkWidget *status = data;
+  gtk_statusbar_pop (GTK_STATUSBAR (data), 0);
-
+  g_object_set_data (G_OBJECT (data), "timeout", NULL);
-  gtk_label_set_label (GTK_LABEL (status), "");
-  g_object_set_data (G_OBJECT (status), "timeout", GUINT_TO_POINTER (0));
-
   return G_SOURCE_REMOVE;
 }
 
 static void
-status_message (GtkWidget  *status,
+status_message (GtkStatusbar *status,
-                const char *text)
+                const char   *text)
 {
   guint id;
 
-  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (status), "timeout"));
+  gtk_statusbar_push (GTK_STATUSBAR (status), 0, text);
-  if (id)
+  id = g_timeout_add (5000, pop_status, status);
-    g_source_remove (id);
-
-  gtk_label_set_text (GTK_LABEL (status), text);
-
-  id = g_timeout_add (5000, pop_message, status);
 
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,
@@ -73,7 +69,7 @@ help_activate (GSimpleAction *action,
   GtkWidget *status;
 
   status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (status, "Help not available");
+  status_message (GTK_STATUSBAR (status), "Help not available");
 }
 
 static void
@@ -86,7 +82,7 @@ not_implemented (GSimpleAction *action,
 
   text = g_strdup_printf ("Action “%s” not implemented", g_action_get_name (G_ACTION (action)));
   status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (status, text);
+  status_message (GTK_STATUSBAR (status), text);
   g_free (text);
 }
 

demos/gtk-demo/css_basics.c

@@ -6,6 +6,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -47,23 +49,20 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 }
 
-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  GtkWidget *child;
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -82,7 +81,6 @@ do_css_basics (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       text = gtk_text_buffer_new (NULL);

demos/gtk-demo/css_basics.css

@@ -4,24 +4,23 @@
  * anymore. :)
  */
 
-/* This resets all properties to their defaults values
+/* This CSS resets all properties to their defaults values
- * and overrides all user settings and the theme in use
+ *    and overrides all user settings and the theme in use */
- */
+@import url("resource://css_basics/reset.css");
-@import url("resource://css_shadows/reset.css");
 
 /* Set a very futuristic style by default */
-.demo * {
+* {
   color: green;
   font-family: Monospace;
   border: 1px solid;
 }
 
-window.demo {
+window {
   background-color: white;
 }
 
 /* Make sure selections are visible */
-.demo selection {
+selection {
   background-color: darkGreen;
   color: black;
 }

demos/gtk-demo/css_multiplebgs.c

@@ -6,6 +6,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -48,23 +50,33 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 }
 
 static void
-clear_provider (gpointer data)
+drawing_area_draw (GtkDrawingArea *da,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
-  GtkStyleProvider *provider = data;
+  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (da));
 
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+  gtk_render_background (context, cr, 0, 0, width, height);
+  gtk_render_frame (context, cr, 0, 0, width, height);
 }
 
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  GtkWidget *child;
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -83,17 +95,16 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       overlay = gtk_overlay_new ();
       gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       child = gtk_drawing_area_new ();
-      /* Don't set a draw_func, since we are only interested in CSS drawing,
-       * which happens automatically.
-       */
       gtk_widget_set_name (child, "canvas");
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
+                                      drawing_area_draw,
+                                      NULL, NULL);
       gtk_overlay_set_child (GTK_OVERLAY (overlay), child);
 
       child = gtk_button_new ();

demos/gtk-demo/css_pixbufs.c

@@ -7,6 +7,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -49,23 +51,20 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 }
 
-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  GtkWidget *child;
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -84,7 +83,6 @@ do_css_pixbufs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);

demos/gtk-demo/css_pixbufs.css

@@ -50,7 +50,7 @@
     100% { background-size: 12px, 96px, 12px, 96px, 12px, 96px, 12px, 96px, auto; }
 }
 
-window.demo {
+window {
     background-image: url("resource://css_pixbufs/images/apple-red.png"),
                       url("resource://css_pixbufs/images/gnome-applets.png"),
                       url("resource://css_pixbufs/images/gnome-calendar.png"),
@@ -66,11 +66,11 @@ window.demo {
 }
 
 /* Make the text editor has a nice style */
-window.demo .view, scrollbar, separator {
+.view, scrollbar, separator {
   color: black;
   background-color: rgba(255,255,255,0.5);
 }
 
-window.demo .view:selected {
+.view:selected {
   background-color: rgba(127,127,255,0.5);
 }

demos/gtk-demo/css_shadows.c

@@ -5,6 +5,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -46,23 +48,20 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 }
 
-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  GtkWidget *child;
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 static GtkWidget *
@@ -102,7 +101,6 @@ do_css_shadows (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Shadows");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -144,7 +142,7 @@ do_css_shadows (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_set_visible (window, TRUE);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_shadows.css

@@ -5,13 +5,12 @@
  */
 
 /* This CSS resets all properties to their defaults values
- * and overrides all user settings and the theme in use
+ *    and overrides all user settings and the theme in use */
- */
 @import url("resource://css_shadows/reset.css");
 @import url("resource://css_shadows/cssview.css");
 
 /* Get a nice background for the window */
-window.demo.background {
+.background {
   background-color: #4870bc;
   background-image: linear-gradient(to left, transparent, rgba(255,255,255,.07) 50%, transparent 50%),
                     linear-gradient(to left, transparent, rgba(255,255,255,.13) 50%, transparent 50%),
@@ -20,7 +19,7 @@ window.demo.background {
   background-size: 29px, 59px, 73px, 109px;
 }
 
-window.demo button {
+button {
   color: black;
   padding: 10px;
   border-radius: 5px;
@@ -28,15 +27,18 @@ window.demo button {
   border: 1px transparent solid;
 }
 
-window.demo button:hover {
+button:hover {
   text-shadow: 3px 3px 5px alpha(black, 0.75);
   -gtk-icon-shadow: 3px 3px 5px alpha(black, 0.75);
   box-shadow: 3px 3px 5px alpha(black, 0.5) inset;
   border: solid 1px alpha(black, 0.75);
 }
 
-window.demo button:active {
+button:active {
   padding: 11px 9px 9px 11px;
   text-shadow: 1px 1px 2.5px alpha(black, 0.6);
   -gtk-icon-shadow: 1px 1px 2.5px alpha(black, 0.6);
 }
+
+
+

demos/gtk-demo/cssview.css

@@ -1,21 +1,21 @@
 /* Make the text editor has a nice style */
-window.demo .view {
+.view {
   color: #2e3436;
   font-family: Monospace;
   background-color: alpha(white, 0.30);
 }
 
-window.demo .view:selected {
+.view:selected {
   color: white;
   background-color: #4a90d9;
 }
 
-window.demo scrollbar trough,
+scrollbar trough,
 .scrollbars-junction {
   background-color: alpha(white, 0.80);
 }
 
-window.demo scrollbar slider {
+scrollbar slider {
   border-width: 3px;
   border-style: solid;
   border-radius: 10px;
@@ -24,11 +24,11 @@ window.demo scrollbar slider {
   background-color: #999;
 }
 
-window.demo scrollbar slider:hover {
+scrollbar slider:hover {
   background-color: #555;
 }
 
-window.demo paned separator {
+paned separator {
   background-color: alpha(white, 0.80);
   background-image: linear-gradient(transparent, transparent 1px, #999 1px, #999 4px, transparent 4px);
   background-size: 40px auto;
@@ -36,6 +36,6 @@ window.demo paned separator {
   background-position: center;
 }
 
-window.demo paned separator:hover {
+paned separator:hover {
   background-image: linear-gradient(transparent, transparent 1px, #555 1px, #555 4px, transparent 4px);
 }

demos/gtk-demo/demo.ui

@@ -208,13 +208,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkLabel" id="statusbar1">
+          <object class="GtkStatusbar" id="statusbar1"/>
-            <property name="xalign">0</property>
-            <property name="margin-start">2</property>
-            <property name="margin-end">2</property>
-            <property name="margin-top">2</property>
-            <property name="margin-bottom">2</property>
-          </object>
         </child>
       </object>
     </child>

demos/gtk-demo/dnd.c

@@ -760,7 +760,9 @@ do_dnd (GtkWidget *do_widget)
       GtkCssProvider *provider;
       GString *css;
 
-      button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+      button = gtk_color_button_new ();
+G_GNUC_END_IGNORE_DEPRECATIONS
       g_object_unref (g_object_ref_sink (button));
 
       provider = gtk_css_provider_new ();

demos/gtk-demo/expander.c

@@ -10,6 +10,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *window = NULL;
 
 static void
@@ -43,22 +45,21 @@ do_expander (GtkWidget *do_widget)
   if (!window)
     {
       toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
-      window = gtk_window_new ();
+      window = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
-      gtk_window_set_title (GTK_WINDOW (window), "Expander");
+                                                   0,
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (toplevel));
+                                                   GTK_MESSAGE_ERROR,
-      area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+                                                   GTK_BUTTONS_CLOSE,
-      gtk_widget_set_margin_start (area, 10);
+                                                   "<big><b>%s</b></big>",
-      gtk_widget_set_margin_end (area, 10);
+                                                   "Something went wrong");
-      gtk_widget_set_margin_top (area, 10);
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (window),
-      gtk_widget_set_margin_bottom (area, 10);
+                                                "Here are some more details "
-      gtk_window_set_child (GTK_WINDOW (window), area);
+                                                "but not the full story.");
-      label = gtk_label_new ("<big><b>Something went wrong</b></big>");
+
-      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
-      gtk_box_append (GTK_BOX (area), label);
+
-      label = gtk_label_new ("Here are some more details but not the full story");
+      label = gtk_widget_get_last_child (area);
       gtk_label_set_wrap (GTK_LABEL (label), FALSE);
       gtk_widget_set_vexpand (label, FALSE);
-      gtk_box_append (GTK_BOX (area), label);
 
       expander = gtk_expander_new ("Details:");
       gtk_widget_set_vexpand (expander, TRUE);
@@ -121,7 +122,7 @@ do_expander (GtkWidget *do_widget)
   }
 
   if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_set_visible (window, TRUE);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/fishbowl.c

@@ -68,18 +68,13 @@ create_blurred_button (void)
   return w;
 }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static GtkWidget *
 create_font_button (void)
 {
-  GtkFontDialog *dialog;
+  return gtk_font_button_new ();
-  GtkWidget *button;
-
-  dialog = gtk_font_dialog_new ();
-  button = gtk_font_dialog_button_new (dialog);
-  g_object_unref (dialog);
-
-  return button;
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 static GtkWidget *
 create_level_bar (void)
@@ -315,20 +310,11 @@ do_fishbowl (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
-      GtkBuilderScope *scope;
       GtkWidget *bowl;
 
       g_type_ensure (GTK_TYPE_FISHBOWL);
 
-      scope = gtk_builder_cscope_new ();
+      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_prev_button_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_next_button_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_changes_toggled_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), format_header_cb);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/fishbowl/fishbowl.ui", NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
@@ -340,7 +326,6 @@ do_fishbowl (GtkWidget *do_widget)
 
       gtk_widget_realize (window);
       g_object_unref (builder);
-      g_object_unref (scope);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/iconscroll.c

@@ -354,18 +354,10 @@ do_iconscroll (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
-      GtkBuilderScope *scope;
       GtkWidget *label;
       guint id;
 
-      scope = gtk_builder_cscope_new ();
+      builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), iconscroll_prev_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), iconscroll_next_clicked_cb);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-
-      gtk_builder_add_from_resource (builder, "/iconscroll/iconscroll.ui", NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
       gtk_window_set_display (GTK_WINDOW (window),
@@ -383,7 +375,6 @@ do_iconscroll (GtkWidget *do_widget)
                               GUINT_TO_POINTER (id), remove_timeout);
 
       g_object_unref (builder);
-      g_object_unref (scope);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/meson.build

@@ -153,6 +153,8 @@ if librsvg_dep.found()
   gtkdemo_deps += [ librsvg_dep ]
 endif
 
+gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]
+
 demos_h = custom_target('gtk4 demo header',
   output: 'demos.h',
   input: demos,
@@ -207,7 +209,6 @@ if can_use_objcopy_for_resources
     output : 'gtkdemo_resources2.o',
     command : [objcopy,
                  '--strip-all',
-                 '--set-section-alignment', '.data=8',
                  '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
                  '@INPUT@',
                  '@OUTPUT@'])
@@ -236,7 +237,7 @@ gtkdemo_deps += [ demo_conf_h ]
 
 executable('gtk4-demo',
   sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
-  c_args: demo_cflags,
+  c_args: gtkdemo_args + demo_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
   win_subsystem: 'windows',
@@ -246,7 +247,7 @@ executable('gtk4-demo',
 
 executable('gtk4-demo-application',
   sources: ['application.c', gtkdemo_resources],
-  c_args: common_cflags,
+  c_args: gtkdemo_args + common_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
   win_subsystem: 'windows',

demos/gtk-demo/paint.c

@@ -7,6 +7,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 enum {
   COLOR_SET,
   N_SIGNALS
@@ -122,16 +124,19 @@ drawing_area_unmap (GtkWidget *widget)
 
 static void
 drawing_area_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
+		       GtkSnapshot *snapshot)
 {
   DrawingArea *area = (DrawingArea *) widget;
-  int width, height;
+  GtkAllocation allocation;
   cairo_t *cr;
 
-  width = gtk_widget_get_width (widget);
+  gtk_widget_get_allocation (widget, &allocation);
-  height = gtk_widget_get_height (widget);
+  cr = gtk_snapshot_append_cairo (snapshot,
-
+                                  &GRAPHENE_RECT_INIT (
-  cr = gtk_snapshot_append_cairo (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
+                                    0, 0,
+				    allocation.width,
+				    allocation.height
+                                  ));
 
   cairo_set_source_rgb (cr, 1, 1, 1);
   cairo_paint (cr);
@@ -140,7 +145,7 @@ drawing_area_snapshot (GtkWidget   *widget,
   cairo_paint (cr);
 
   cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
-  cairo_rectangle (cr, 0, 0, width, height);
+  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
   cairo_stroke (cr);
 
   cairo_destroy (cr);

demos/gtk-demo/path_fill.c

@@ -60,7 +60,7 @@ gtk_path_paintable_snapshot (GdkPaintable *paintable,
 #if 0
   gtk_snapshot_push_fill (snapshot, self->path, GSK_FILL_RULE_WINDING);
 #else
-  GskStroke *stroke = gsk_stroke_new (2.0);
+  GskStroke *stroke = gsk_stroke_new (4.0);
   gtk_snapshot_push_stroke (snapshot, self->path, stroke);
   gsk_stroke_free (stroke);
 #endif
@@ -206,66 +206,33 @@ create_hexagon (GtkWidget *widget)
 static GskPath *
 create_path_from_text (GtkWidget *widget)
 {
+  cairo_surface_t *surface;
+  cairo_t *cr;
+  cairo_path_t *path;
   PangoLayout *layout;
   PangoFontDescription *desc;
-  GskPathBuilder *builder;
+  GskPath *result;
+
+  surface = cairo_recording_surface_create (CAIRO_CONTENT_COLOR_ALPHA, NULL);
+  cr = cairo_create (surface);
 
   layout = gtk_widget_create_pango_layout (widget, "Pango power!\nPango power!\nPango power!");
   desc = pango_font_description_from_string ("sans bold 36");
   pango_layout_set_font_description (layout, desc);
   pango_font_description_free (desc);
 
-  builder = gsk_path_builder_new ();
+  pango_cairo_layout_path (cr, layout);
+  path = cairo_copy_path_flat (cr);
+  result = gsk_path_new_from_cairo (path);
 
-  gsk_path_builder_add_layout (builder, layout);
+  cairo_path_destroy (path);
+  g_object_unref (layout);
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
 
-  return gsk_path_builder_free_to_path (builder);
+  return result;
 }
 
-static gboolean
-build_path (GskPathOperation        op,
-            const graphene_point_t *pts,
-            gsize                   n_pts,
-            float                   weight,
-            gpointer                user_data)
-{
-  GskPathBuilder *builder = user_data;
-
-  switch (op)
-  {
-    case GSK_PATH_MOVE:
-      gsk_path_builder_move_to (builder, pts[0].x, pts[0].y);
-      break;
-
-    case GSK_PATH_CLOSE:
-      gsk_path_builder_close (builder);
-      break;
-
-    case GSK_PATH_LINE:
-      gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
-      break;
-
-    case GSK_PATH_QUAD:
-      gsk_path_builder_quad_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y);
-      break;
-
-    case GSK_PATH_CUBIC:
-      gsk_path_builder_cubic_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y);
-      break;
-
-    case GSK_PATH_CONIC:
-      gsk_path_builder_conic_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, weight);
-      break;
-
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  return TRUE;
-}
-
-
 static gboolean
 update_path (GtkWidget     *widget,
              GdkFrameClock *frame_clock,
@@ -274,36 +241,28 @@ update_path (GtkWidget     *widget,
   float progress = gdk_frame_clock_get_frame_time (frame_clock) % (60 * G_USEC_PER_SEC) / (float) (30 * G_USEC_PER_SEC);
   GskPathBuilder *builder;
   GskPath *path;
-  GskPathPoint point;
   graphene_point_t pos;
   graphene_vec2_t tangent;
-  GskStroke *stroke;
 
-  path = gsk_path_measure_get_path (measure);
-
-  stroke = gsk_stroke_new (1);
-  gsk_stroke_set_dash (stroke, (float[2]) { 10, 5 }, 2);
-  gsk_stroke_set_dash_offset (stroke, - (gdk_frame_clock_get_frame_time (frame_clock) % G_USEC_PER_SEC) * 15. / G_USEC_PER_SEC);
   builder = gsk_path_builder_new ();
-  gsk_path_dash (path, stroke, 0.2, build_path, builder);
+  gsk_path_measure_add_segment (measure,
+                                builder,
+                                progress > 1 ? (progress - 1) * gsk_path_measure_get_length (measure) : 0.0,
+                                (progress < 1 ? progress : 1.0) * gsk_path_measure_get_length (measure));
 
-  if (gsk_path_measure_get_point (measure,
+  gsk_path_measure_get_point (measure,
-                                   (progress > 1 ? (progress - 1) : progress) * gsk_path_measure_get_length (measure), &point))
+                              (progress > 1 ? (progress - 1) : progress) * gsk_path_measure_get_length (measure),
-    {
+                              &pos,
-      gsk_path_point_get_position (&point, &pos);
+                              &tangent);
-      gsk_path_point_get_tangent (&point, GSK_PATH_END, &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);
 
-      gsk_path_builder_move_to (builder, pos.x + 5 * graphene_vec2_get_x (&tangent), pos.y + 5 * graphene_vec2_get_y (&tangent));
+  gtk_path_paintable_set_path (GTK_PATH_PAINTABLE (gtk_picture_get_paintable (GTK_PICTURE (widget))),
-      gsk_path_builder_line_to (builder, pos.x + 3 * graphene_vec2_get_y (&tangent), pos.y + 3 * graphene_vec2_get_x (&tangent));
+                               path);
-      gsk_path_builder_line_to (builder, pos.x - 3 * graphene_vec2_get_y (&tangent), pos.y - 3 * graphene_vec2_get_x (&tangent));
+  gsk_path_unref (path);
-      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;
 }

demos/gtk-demo/path_maze.c

@@ -137,22 +137,14 @@ pointer_motion (GtkEventControllerMotion *controller,
                 double                    y,
                 GtkMaze                  *self)
 {
-  GskPathPoint point;
-  graphene_point_t pos;
-
   if (!self->active)
     return;
 
-  if (gsk_path_get_closest_point (self->path, &GRAPHENE_POINT_INIT (x, y), INFINITY, &point))
+  if (gsk_path_measure_get_closest_point (self->measure, &GRAPHENE_POINT_INIT (x, y), NULL) <= MAZE_STROKE_SIZE_ACTIVE / 2.0f)
-    {
+    return;
-      gsk_path_point_get_position (&point, &pos);
 
-      if (graphene_point_distance (&pos, &GRAPHENE_POINT_INIT (x, y), NULL, NULL) <= MAZE_STROKE_SIZE_ACTIVE / 2.0f)
+  self->active = FALSE;
-        return;
+  gtk_widget_queue_draw (GTK_WIDGET (self));
-
-      self->active = FALSE;
-      gtk_widget_queue_draw (GTK_WIDGET (self));
-    }
 }
 
 static void

demos/gtk-demo/path_text.c

@@ -48,26 +48,32 @@ G_DEFINE_TYPE (GtkPathWidget, gtk_path_widget, GTK_TYPE_WIDGET)
 
 static GskPath *
 create_path_from_text (GtkWidget  *widget,
-                       const char *text,
+                       const char *text)
-                       graphene_point_t *out_offset)
 {
+  cairo_surface_t *surface;
+  cairo_t *cr;
+  cairo_path_t *path;
   PangoLayout *layout;
   PangoFontDescription *desc;
-  GskPathBuilder *builder;
   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);
 
-  builder = gsk_path_builder_new ();
+  cairo_move_to (cr, 0, - pango_layout_get_baseline (layout) / (double) PANGO_SCALE);
-  gsk_path_builder_add_layout (builder, layout);
+  pango_cairo_layout_path (cr, layout);
-  result = gsk_path_builder_free_to_path (builder);
+  path = cairo_copy_path_flat (cr);
+  result = gsk_path_new_from_cairo (path);
 
-  if (out_offset)
+  cairo_path_destroy (path);
-    graphene_point_init (out_offset, 0, - pango_layout_get_baseline (layout) / (double) PANGO_SCALE);
   g_object_unref (layout);
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
 
   return result;
 }
@@ -76,35 +82,27 @@ typedef struct
 {
   GskPathMeasure *measure;
   GskPathBuilder *builder;
-  graphene_point_t offset;
   double scale;
 } GtkPathTransform;
 
 static void
 gtk_path_transform_point (GskPathMeasure         *measure,
                           const graphene_point_t *pt,
-                          const graphene_point_t *offset,
                           float                   scale,
                           graphene_point_t       *res)
 {
   graphene_vec2_t tangent;
-  GskPathPoint point;
 
-  if (gsk_path_measure_get_point (measure, (pt->x + offset->x) * scale, &point))
+  gsk_path_measure_get_point (measure, pt->x * scale, res, &tangent);
-    {
-      gsk_path_point_get_position (&point, res);
-      gsk_path_point_get_tangent (&point, GSK_PATH_END, &tangent);
 
-      res->x -= (pt->y + offset->y) * scale * graphene_vec2_get_y (&tangent);
+  res->x -= pt->y * scale * graphene_vec2_get_y (&tangent);
-      res->y += (pt->y + offset->y) * scale * graphene_vec2_get_x (&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;
@@ -114,7 +112,7 @@ gtk_path_transform_op (GskPathOperation        op,
     case GSK_PATH_MOVE:
       {
         graphene_point_t res;
-        gtk_path_transform_point (transform->measure, &pts[0], &transform->offset, transform->scale, &res);
+        gtk_path_transform_point (transform->measure, &pts[0], transform->scale, &res);
         gsk_path_builder_move_to (transform->builder, res.x, res.y);
       }
       break;
@@ -122,36 +120,18 @@ gtk_path_transform_op (GskPathOperation        op,
     case GSK_PATH_LINE:
       {
         graphene_point_t res;
-        gtk_path_transform_point (transform->measure, &pts[1], &transform->offset, transform->scale, &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_QUAD:
+    case GSK_PATH_CURVE:
-      {
-        graphene_point_t res[2];
-        gtk_path_transform_point (transform->measure, &pts[1], &transform->offset, transform->scale, &res[0]);
-        gtk_path_transform_point (transform->measure, &pts[2], &transform->offset, transform->scale, &res[1]);
-        gsk_path_builder_quad_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y);
-      }
-      break;
-
-    case GSK_PATH_CUBIC:
       {
         graphene_point_t res[3];
-        gtk_path_transform_point (transform->measure, &pts[1], &transform->offset, transform->scale, &res[0]);
+        gtk_path_transform_point (transform->measure, &pts[1], transform->scale, &res[0]);
-        gtk_path_transform_point (transform->measure, &pts[2], &transform->offset, transform->scale, &res[1]);
+        gtk_path_transform_point (transform->measure, &pts[2], transform->scale, &res[1]);
-        gtk_path_transform_point (transform->measure, &pts[3], &transform->offset, transform->scale, &res[2]);
+        gtk_path_transform_point (transform->measure, &pts[3], transform->scale, &res[2]);
-        gsk_path_builder_cubic_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y, res[2].x, res[2].y);
+        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->offset, transform->scale, &res[0]);
-        gtk_path_transform_point (transform->measure, &pts[2], &transform->offset, transform->scale, &res[1]);
-        gsk_path_builder_conic_to (transform->builder, res[0].x, res[0].y, res[1].x, res[1].y, weight);
       }
       break;
 
@@ -168,11 +148,10 @@ gtk_path_transform_op (GskPathOperation        op,
 }
 
 static GskPath *
-gtk_path_transform (GskPathMeasure         *measure,
+gtk_path_transform (GskPathMeasure *measure,
-                    GskPath                *path,
+                    GskPath        *path)
-                    const graphene_point_t *offset)
 {
-  GtkPathTransform transform = { measure, gsk_path_builder_new (), *offset };
+  GtkPathTransform transform = { measure, gsk_path_builder_new () };
   graphene_rect_t bounds;
 
   gsk_path_get_bounds (path, &bounds);
@@ -181,7 +160,7 @@ gtk_path_transform (GskPathMeasure         *measure,
   else
     transform.scale = 1.0f;
 
-  gsk_path_foreach (path, -1, gtk_path_transform_op, &transform);
+  gsk_path_foreach (path, GSK_PATH_FOREACH_ALLOW_CURVES, gtk_path_transform_op, &transform);
 
   return gsk_path_builder_free_to_path (transform.builder);
 }
@@ -205,15 +184,14 @@ static void
 gtk_path_widget_create_text_path (GtkPathWidget *self)
 {
   GskPath *path;
-  graphene_point_t offset;
 
   gtk_path_widget_clear_text_path (self);
 
   if (self->line_measure == NULL)
     return;
 
-  path = create_path_from_text (GTK_WIDGET (self), self->text, &offset);
+  path = create_path_from_text (GTK_WIDGET (self), self->text);
-  self->text_path = gtk_path_transform (self->line_measure, path, &offset);
+  self->text_path = gtk_path_transform (self->line_measure, path);
 
   gsk_path_unref (path);
 }
@@ -233,7 +211,7 @@ gtk_path_widget_create_paths (GtkPathWidget *self)
   builder = gsk_path_builder_new ();
   gsk_path_builder_move_to (builder,
                             self->points[0].x * width, self->points[0].y * height);
-  gsk_path_builder_cubic_to (builder,
+  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);
@@ -326,22 +304,18 @@ gtk_path_widget_snapshot (GtkWidget   *widget,
   if (self->line_closest >= 0)
     {
       GskPathBuilder *builder;
-      GskPathPoint point;
       graphene_point_t closest;
 
       builder = gsk_path_builder_new ();
-      if (gsk_path_measure_get_point (self->line_measure, self->line_closest, &point))
+      gsk_path_measure_get_point (self->line_measure, self->line_closest, &closest, NULL);
-        {
+      gsk_path_builder_add_circle (builder, &closest, POINT_SIZE);
-          gsk_path_point_get_position (&point, &closest);
+      path = gsk_path_builder_free_to_path (builder);
-          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_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_append_color (snapshot, &(GdkRGBA) { 0, 0, 1, 1 }, &GRAPHENE_RECT_INIT (0, 0, width, height));
-          gtk_snapshot_pop (snapshot);
+      gtk_snapshot_pop (snapshot);
 
-          gsk_path_unref (path);
+      gsk_path_unref (path);
-        }
     }
 }
 
@@ -521,19 +495,13 @@ pointer_motion (GtkEventControllerMotion *controller,
                 double                    y,
                 GtkPathWidget            *self)
 {
-  GskPathPoint point;
+  gsk_path_measure_get_closest_point_full (self->line_measure,
-  graphene_point_t pos;
+                                           &GRAPHENE_POINT_INIT (x, y),
+                                           INFINITY,
+                                           &self->line_closest,
+                                           NULL, NULL, NULL);
 
-  if (gsk_path_get_closest_point (gsk_path_measure_get_path (self->line_measure),
+  gtk_widget_queue_draw (GTK_WIDGET (self));
-                                  &GRAPHENE_POINT_INIT (x, y),
-                                  INFINITY,
-                                  &point))
-    {
-      gsk_path_point_get_position (&point, &pos);
-      self->line_closest = graphene_point_distance (&pos, &GRAPHENE_POINT_INIT (x, y), NULL, NULL);
-    
-      gtk_widget_queue_draw (GTK_WIDGET (self));
-    }
 }
 
 static void

demos/gtk-demo/reset.css

@@ -6,6 +6,6 @@
  * Also, when adding new style properties, please add them here.
  */
 
-window.demo * {
+* {
   all: unset;
 }

demos/gtk-demo/spinbutton.c

@@ -188,20 +188,10 @@ do_spinbutton (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
-      GtkBuilderScope *scope;
       GtkAdjustment *adj;
       GtkWidget *label;
 
-      scope = gtk_builder_cscope_new ();
+      builder = gtk_builder_new_from_resource ("/spinbutton/spinbutton.ui");
-      builder = gtk_builder_new ();
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_hex_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_hex_spin_output);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_time_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_time_spin_output);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_month_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_month_spin_output);
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/spinbutton/spinbutton.ui", NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
@@ -243,7 +233,6 @@ do_spinbutton (GtkWidget *do_widget)
                                    NULL, NULL);
 
       g_object_unref (builder);
-      g_object_unref (scope);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/spinner.c

@@ -27,6 +27,7 @@ GtkWidget *
 do_spinner (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
+  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *button;
@@ -34,19 +35,28 @@ do_spinner (GtkWidget *do_widget)
 
   if (!window)
   {
-    window = gtk_window_new ();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-    gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
+    window = gtk_dialog_new_with_buttons ("Spinner",
-    gtk_window_set_title (GTK_WINDOW (window), "Spinner");
+                                          GTK_WINDOW (do_widget),
+                                          0,
+                                          _("_Close"),
+                                          GTK_RESPONSE_NONE,
+                                          NULL);
     gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+    g_signal_connect (window, "response",
+                      G_CALLBACK (gtk_window_destroy), NULL);
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-    gtk_widget_set_margin_top (vbox, 5);
+G_GNUC_END_IGNORE_DEPRECATIONS
-    gtk_widget_set_margin_bottom (vbox, 5);
+
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     gtk_widget_set_margin_start (vbox, 5);
     gtk_widget_set_margin_end (vbox, 5);
-
+    gtk_widget_set_margin_top (vbox, 5);
-    gtk_window_set_child (GTK_WINDOW (window), vbox);
+    gtk_widget_set_margin_bottom (vbox, 5);
+    gtk_box_append (GTK_BOX (content_area), vbox);
 
     /* Sensitive */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);

demos/gtk-demo/suggestionentry.c

@@ -801,7 +801,7 @@ suggestion_entry_key_pressed (GtkEventControllerKey *controller,
             selected = matches - 1;
         }
 
-      gtk_list_view_scroll_to (GTK_LIST_VIEW (self->list), selected, GTK_LIST_SCROLL_SELECT, NULL);
+      gtk_single_selection_set_selected (self->selection, selected);
       return TRUE;
     }
 

demos/print-editor/print-editor.c

@@ -6,6 +6,8 @@
 
 #include "demo_conf.h"
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;
@@ -41,7 +43,7 @@ update_statusbar (void)
   GtkTextIter iter;
   const char *print_str;
 
-  gtk_label_set_label (GTK_LABEL (statusbar), "");
+  gtk_statusbar_pop (GTK_STATUSBAR (statusbar), 0);
 
   gtk_text_buffer_get_iter_at_mark (buffer,
                                     &iter,
@@ -59,10 +61,10 @@ update_statusbar (void)
 
   msg = g_strdup_printf ("%d, %d%s %s",
                          row, col,
-                         file_changed?" - Modified":"",
+			 file_changed?" - Modified":"",
-                         print_str);
+			 print_str);
 
-  gtk_label_set_label (GTK_LABEL (statusbar), msg);
+  gtk_statusbar_push (GTK_STATUSBAR (statusbar), 0, msg);
 
   g_free (msg);
 }
@@ -825,12 +827,7 @@ activate (GApplication *app)
                      contents);
 
   /* Create statusbar */
-  statusbar = gtk_label_new ("");
+  statusbar = gtk_statusbar_new ();
-  gtk_label_set_xalign (GTK_LABEL (statusbar), 0);
-  gtk_widget_set_margin_start (statusbar, 2);
-  gtk_widget_set_margin_end (statusbar, 2);
-  gtk_widget_set_margin_top (statusbar, 2);
-  gtk_widget_set_margin_bottom (statusbar, 2);
   gtk_box_append (GTK_BOX (box), statusbar);
 
   /* Show text widget info in the statusbar */

docs/RELEASE-HOWTO.md

@@ -5,6 +5,16 @@ How to do a GTK release?
 
 Make sure you have suitable versions of Meson and Ninja.
 
+Also make sure you have the following packages installed with all their
+dependencies:
+
+  * gtk-doc
+  * docbook-utils
+
+Without those packages make distcheck will *not* pass.
+
+Make sure that gtk-doc is the latest released version.
+
 ## Release check list
 
   0. Save all your work, then move to the branch from which you want
@@ -18,8 +28,8 @@ $ git clean -dfx
   1. Build using the common sequence:
 
 ```sh
-$ meson setup _build
+$ meson _build .
-$ meson compile -C _build
+$ ninja -C _build
 ```
 
   2. Update NEWS based on the content of git log; follow the format of prior
@@ -30,10 +40,11 @@ $ meson compile -C _build
      writers, committers, etc. Anybody who is mentioned in the commit log
      gets a credit, but only real names, not email addresses or nicknames.
 
-  3. Update the pot file and commit the changes:
+  3. Update the pot files and commit the changes:
 
 ```sh
 $ ninja -C _build gtk40-pot
+$ ninja -C _build gtk40-properties-pot
 ```
 
   4. If this is a major, stable, release, verify that the release notes
@@ -61,7 +72,7 @@ $ ninja -C _build gtk40-pot
      Make sure that all new symbols have proper Since: tags, and that there
      is an index in the main `-docs.xml` for the next stable version.
 
-  8. Run `meson dist -C_build` to generate the tarball.
+  8. Run `ninja dist` to generate the tarball.
 
   9. Fix broken stuff found by 8), commit changes, repeat.
 
@@ -83,8 +94,7 @@ $ ninja -C _build gtk40-pot
 $ git tag -m "GTK 4.2.0" 4.2.0
 ```
 
-  13. Bump the version number in `meson.build`, and add a section for the next
+  13. Bump the version number in `meson.build` and commit the change.
-      release in NEWS and commit the change.
 
   14. Push the changes upstream, and push the tag as well. The git command for
     doing that is:
@@ -101,8 +111,7 @@ $ git push origin 4.2.0
 
 ```sh
 $ scp gtk-4.2.0.tar.xz matthiasc@master.gnome.org:
-$ ssh matthiasc@master.gnome.org
+$ ssh matthiasc@master.gnome.org ftpadmin install gtk-4.2.0.tar.xz
-$ ftpadmin install gtk-4.2.0.tar.xz
 ```
 
   16. Go to the gnome-announce list archives, find the last announce message,

docs/reference/gdk/meson.build

@@ -1,7 +1,7 @@
 expand_content_md_files = [
 ]
 
-if get_option('documentation')
+if get_option('gtk_doc')
   gdk4_toml = configure_file(
     input: 'gdk4.toml.in',
     output: 'gdk4.toml',

docs/reference/gsk/meson.build

@@ -1,4 +1,4 @@
-if get_option('documentation')
+if get_option('gtk_doc')
   gsk4_toml = configure_file(
     input: 'gsk4.toml.in',
     output: 'gsk4.toml',

docs/reference/gtk/building.md

@@ -268,7 +268,7 @@ support in the file chooser.
 This option controls whether GTK should use colord for color
 calibration support in the cups print backend.
 
-### `documentation`, `man-pages` and `screenshots`
+### `gtk_doc`, `man-pages` and `update_screenshots`
 
 The *gi-docgen* package is used to generate the reference documentation
 included with GTK. By default support for *gi-docgen* is disabled

docs/reference/gtk/getting_started.md

@@ -89,11 +89,11 @@ using `gtk_application_new()`.
 When creating a [class@Gtk.Application], you need to pick an application
 identifier (a name) and pass it to [ctor@Gtk.Application.new] as parameter. For
 this example `org.gtk.example` is used. For choosing an identifier for your
-application, see [this guide](https://developer.gnome.org/documentation/tutorials/application-id.html).
+application, see [this guide](https://wiki.gnome.org/HowDoI/ChooseApplicationID).
 Lastly, [ctor@Gtk.Application.new] takes `GApplicationFlags` as input
 for your application, if your application would have special needs.
 
-Next the [activate signal](https://developer.gnome.org/documentation/tutorials/application.html) is
+Next the [activate signal](https://wiki.gnome.org/HowDoI/GtkApplication) is
 connected to the activate() function above the `main()` function. The `activate`
 signal will be emitted when your application is launched with `g_application_run()`
 on the line below. The `g_application_run()` call also takes as arguments the

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

@@ -1,121 +0,0 @@
-.. _gtk4-path-tool(1):
-
-=================
-gtk4-path-tool
-=================
-
------------------------
-GskPath Utility
------------------------
-
-SYNOPSIS
---------
-|   **gtk4-path-tool** <COMMAND> [OPTIONS...] <PATH>
-|
-|   **gtk4-path-tool** decompose [OPTIONS...] <PATH>
-|   **gtk4-path-tool** restrict [OPTIONS...] <PATH>
-|   **gtk4-path-tool** show [OPTIONS...] <PATH>
-|   **gtk4-path-tool** render [OPTIONS...] <PATH>
-|   **gtk4-path-tool** info [OPTIONS...] <PATH>
-
-DESCRIPTION
------------
-
-``gtk4-path-tool`` can perform various tasks on paths. Paths are specified
-in SVG syntax, as strings like "M 100 100 C 100 200 200 200 200 100 Z".
-
-To read a path from a file, use a filename that starts with a '.' or a '/'.
-To read a path from stdin, use '-'.
-
-COMMANDS
---------
-
-Decomposing
-^^^^^^^^^^^
-
-The ``decompose`` command approximates the path by one with simpler elements.
-When used without options, the curves of the path are approximated by line
-segments.
-
-``--allow-curves``
-
-  Allow cubic Bézier curves to be used in the generated path.
-
-``--allow-conics``
-
-  Allow rational quadratic Bézier curves to be used in the generated path.
-
-Restricting
-^^^^^^^^^^^
-
-The ``restrict`` command creates a path that traces a segment of the original
-path. Note that the start and the end of the segment are specified as
-path length from the beginning of the path.
-
-``--start=LENGTH``
-
-  The distance from the beginning of the path where the segment begins. The
-  default values is 0.
-
-``--end=LENGTH``
-
-  The distance from the beginning of the path where the segment ends. The
-  default value is the length of path.
-
-Showing
-^^^^^^^
-
-The ``show`` command displays the given path in a window. The interior
-of the path is filled.
-
-``--fill-rule=VALUE``
-
-  The fill rule that is used to determine what areas are inside the path.
-  The possible values are ``winding`` or ``even-odd``. The default is ``winding``.
-
-``--fg-color=COLOR``
-
-  The color that is used to fill the interior of the path.
-  If not specified, black is used.
-
-``--bg-color=COLOR``
-
-  The color that is used to render the background behind the path.
-  If not specified, white is used.
-
-Rendering
-^^^^^^^^^
-
-The ``render`` command renders the given path as a PNG image.
-The interior of the path is filled.
-
-``--fill-rule=VALUE``
-
-  The fill rule that is used to determine what areas are inside the path.
-  The possible values are ``winding`` or ``even-odd``. The default is ``winding``.
-
-``--fg-color=COLOR``
-
-  The color that is used to fill the interior of the path.
-  If not specified, black is used.
-
-``--bg-color=COLOR``
-
-  The color that is used to render the background behind the path.
-  If not specified, white is used.
-
-``--output-file=FILE``
-
-  The file to save the PNG image to.
-  If not specified, "path.png" is used.
-
-Info
-^^^^
-
-The ``info`` command shows various information about the given path,
-such as its bounding box and and its length.
-
-REFERENCES
-----------
-
-- SVG Path Specification, https://www.w3.org/TR/SVG2/paths.html

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

@@ -1,47 +0,0 @@
-.. _gtk4-rendernode-tool(1):
-
-====================
-gtk4-rendernode-tool
-====================
-
------------------------
-GskRenderNode Utility
------------------------
-
-SYNOPSIS
---------
-|   **gtk4-rendernode-tool** <COMMAND> [OPTIONS...] <FILE>
-|
-|   **gtk4-rendernode-tool** info [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** show [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
-
-DESCRIPTION
------------
-
-``gtk4-rendernode-tool`` can perform various operations on serialized rendernodes.
-
-COMMANDS
---------
-
-Information
-^^^^^^^^^^^
-
-The ``info`` command shows general information about the rendernode, such
-as the number of nodes, and the depth of the tree.
-
-Showing
-^^^^^^^
-
-The ``show`` command displays the rendernode.
-
-Rendering
-^^^^^^^^^
-
-The ``render`` command saves a rendering of the rendernode as a png or tiff image.
-The name of the file to write can be specified as a second FILE argument.
-
-``--renderer=RENDERER``
-
-  Use the given renderer. Use ``--renderer=help`` to get a information
-  about poassible values for the ``RENDERER``.

docs/reference/gtk/images/meson.build

@@ -78,7 +78,7 @@ ui_files = [
 
 gtk_builder_tool = find_program('gtk4-builder-tool')
 
-if get_option('screenshots')
+if get_option('update_screenshots')
   foreach ui_file: ui_files
     png_file = ui_file.replace('.ui', '.png')
     gtk_images += custom_target('@0@ from @1@'.format(png_file, ui_file),

docs/reference/gtk/meson.build

@@ -32,7 +32,7 @@ gtk_images = []
 
 subdir('images')
 
-if get_option('documentation')
+if get_option('gtk_doc')
   gtk4_toml = configure_file(
     input: 'gtk4.toml.in',
     output: 'gtk4.toml',
@@ -75,9 +75,7 @@ if get_option('man-pages') and rst2man.found()
     [ 'gtk4-encode-symbolic-svg', '1', ],
     [ 'gtk4-launch', '1', ],
     [ 'gtk4-query-settings', '1', ],
-    [ 'gtk4-rendernode-tool', '1' ],
     [ 'gtk4-update-icon-cache', '1', ],
-    [ 'gtk4-path-tool', '1', ],
   ]
 
   if get_option('demos')

docs/reference/gtk/running.md

@@ -73,6 +73,9 @@ A number of keys are influencing behavior instead of just logging:
 `no-css-cache`
 : Bypass caching for CSS style properties
 
+`touchscreen`
+: Pretend the pointer is a touchscreen device
+
 `snapshot`
 : Include debug render nodes in the generated snapshots
 

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

@@ -30,12 +30,12 @@ Views display data from a **_model_**. Models implement the [`iface@Gio.ListMode
 interface and can be provided in a variety of ways:
 
  * List model implementations for many specific types of data already exist, for
-   example [`class@Gtk.DirectoryList`] or [`class@Gtk.StringList`].
+   example `GtkDirectoryList` or `GtkStringList`.
 
- * There are generic list model implementations like [`class@Gio.ListStore`] that allow building
+ * There are generic list model implementations like`GListStore` that allow building
    lists of arbitrary objects.
 
- * Wrapping list models like [`class@Gtk.FilterListModel`] or [`class@Gtk.SortListModel`]
+ * Wrapping list models like `GtkFilterListModel` or `GtkSortListModel`
    modify, adapt or combine other models.
 
  * Last but not least, developers are encouraged to create their own `GListModel`
@@ -133,8 +133,8 @@ tradeoffs of those and experiment with them.
 
 GTK offers a wide variety of wrapping models which change or supplement an
 existing model (or models) in some way. But when it comes to storing your
-actual data, there are only a few ready-made choices available:
+actual data, there are only a few ready-made choices available: [`class@Gio.ListStore`]
-[`class@Gio.ListStore`], [`class@Gtk.StringList`], and [`class@Gtk.DirectoryList`].
+and [`class@Gtk.StringList`].
 
 `GListStore` is backed by a balanced tree and has performance characteristics
 that are expected for that data structure. It works reasonably well for dataset
@@ -147,10 +147,6 @@ that are expected for that data structure. `GtkStringList` is a good fit for any
 place where you would otherwise use `char*[]` and works best if the dataset
 is not very dynamic.
 
-`GtkDirectoryList` is a list model that wraps [`method@Gio.File.enumerate_children_async`].
-It presents a `GListModel` and fills it asynchronously with the [`iface@Gio.File`]s
-returned from that function.
-
 If these models don't fit your use case or scalability requirements, you
 should make a custom `GListModel` implementation. It is a small interface and
 not very hard to implement.
@@ -203,7 +199,7 @@ the `.data-table` style class.
 ## Sections
 
 List models can optionally group their items into **_sections_**, by implementing
-the `GtkSectionModel` interface. `GtkListView` can
+the `GtkSectionModel` interface. Both `GtkListView` and `GtkGridView` can
 display headers for sections, by installing a separate **_header factory_**.
 
 Many GTK list models support section inherently, or they pass through the

docs/reference/meson.build

@@ -1,7 +1,7 @@
 toml_conf = configuration_data()
 toml_conf.set('version', meson.project_version())
 
-gidocgen = find_program('gi-docgen', required: get_option('documentation'), native: true)
+gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'), native: true)
 
 gidocgen_common_args = [
   '--quiet',
@@ -14,7 +14,7 @@ endif
 
 docs_dir = gtk_datadir / 'doc'
 
-if get_option('documentation') and not build_gir
+if get_option('gtk_doc') and not build_gir
   error('API reference requires introspection.')
 endif
 

examples/application6/exampleappprefs.c

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs
 
 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
   gtk_widget_init_template (GTK_WIDGET (prefs));
   prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind_with_mapping (prefs->settings, "font",
+  g_settings_bind (prefs->settings, "font",
-                                prefs->font, "font-desc",
+                   prefs->font, "font",
-                                G_SETTINGS_BIND_DEFAULT,
+                   G_SETTINGS_BIND_DEFAULT);
-                                string_to_font_desc,
+  g_settings_bind (prefs->settings, "transition",
-                                font_desc_to_string,
+                   prefs->transition, "active-id",
-                                NULL, NULL);
+                   G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
 }
 
 static void

examples/application6/prefs.ui

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

examples/application7/exampleappprefs.c

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs
 
 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
   gtk_widget_init_template (GTK_WIDGET (prefs));
   prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind_with_mapping (prefs->settings, "font",
+  g_settings_bind (prefs->settings, "font",
-                                prefs->font, "font-desc",
+                   prefs->font, "font",
-                                G_SETTINGS_BIND_DEFAULT,
+                   G_SETTINGS_BIND_DEFAULT);
-                                string_to_font_desc,
+  g_settings_bind (prefs->settings, "transition",
-                                font_desc_to_string,
+                   prefs->transition, "active-id",
-                                NULL, NULL);
+                   G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
 }
 
 static void

examples/application7/prefs.ui

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

examples/application8/exampleappprefs.c

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs
 
 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
   gtk_widget_init_template (GTK_WIDGET (prefs));
   prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind_with_mapping (prefs->settings, "font",
+  g_settings_bind (prefs->settings, "font",
-                                prefs->font, "font-desc",
+                   prefs->font, "font",
-                                G_SETTINGS_BIND_DEFAULT,
+                   G_SETTINGS_BIND_DEFAULT);
-                                string_to_font_desc,
+  g_settings_bind (prefs->settings, "transition",
-                                font_desc_to_string,
+                   prefs->transition, "active-id",
-                                NULL, NULL);
+                   G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
 }
 
 static void

examples/application8/prefs.ui

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

examples/application9/exampleappprefs.c

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs
 
 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
   gtk_widget_init_template (GTK_WIDGET (prefs));
   prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind_with_mapping (prefs->settings, "font",
+  g_settings_bind (prefs->settings, "font",
-                                prefs->font, "font-desc",
+                   prefs->font, "font",
-                                G_SETTINGS_BIND_DEFAULT,
+                   G_SETTINGS_BIND_DEFAULT);
-                                string_to_font_desc,
+  g_settings_bind (prefs->settings, "transition",
-                                font_desc_to_string,
+                   prefs->transition, "active-id",
-                                NULL, NULL);
+                   G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
 }
 
 static void

examples/application9/prefs.ui

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

examples/bp/bloatpad.c

@@ -1,6 +1,8 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 typedef struct
 {
   GtkApplication parent_instance;
@@ -354,8 +356,8 @@ combo_changed (GtkDropDown *combo,
                GParamSpec  *pspec,
                gpointer     user_data)
 {
+  GtkDialog *dialog = user_data;
   GtkEntry *entry = g_object_get_data (user_data, "entry");
-  GtkWidget *set_button = g_object_get_data (user_data, "set-button");
   const char *action;
   char **accels;
   char *str;
@@ -370,7 +372,7 @@ combo_changed (GtkDropDown *combo,
   g_strfreev (accels);
 
   gtk_editable_set_text (GTK_EDITABLE (entry), str);
-  gtk_widget_set_sensitive (set_button, FALSE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE);
 }
 
 static void
@@ -378,21 +380,15 @@ entry_changed (GtkEntry   *entry,
                GParamSpec *pspec,
                gpointer    user_data)
 {
-  GtkWidget *set_button = g_object_get_data (user_data, "set-button");
+  GtkDialog *dialog = user_data;
 
-  gtk_widget_set_sensitive (set_button, TRUE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, TRUE);
 }
 
 static void
-close_clicked (GtkButton *button,
+response (GtkDialog *dialog,
-               gpointer   user_data)
+          guint      response_id,
-{
+          gpointer   user_data)
-  gtk_window_destroy (GTK_WINDOW (user_data));
-}
-
-static void
-set_clicked (GtkButton *button,
-             gpointer   user_data)
 {
   GtkEntry *entry = g_object_get_data (user_data, "entry");
   GtkDropDown *combo = g_object_get_data (user_data, "combo");
@@ -400,6 +396,12 @@ set_clicked (GtkButton *button,
   const char *str;
   char **accels;
 
+  if (response_id == GTK_RESPONSE_CANCEL)
+    {
+      gtk_window_destroy (GTK_WINDOW (dialog));
+      return;
+    }
+
   action = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (combo)));
 
   if (!action)
@@ -411,7 +413,7 @@ set_clicked (GtkButton *button,
   gtk_application_set_accels_for_action (gtk_window_get_application (user_data), action, (const char **) accels);
   g_strfreev (accels);
 
-  gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE);
 }
 
 static void
@@ -422,45 +424,32 @@ edit_accels (GSimpleAction *action,
   GtkApplication *app = user_data;
   GtkWidget *combo;
   GtkWidget *entry;
-  GtkWidget *header;
-  GtkWidget *close_button;
-  GtkWidget *set_button;
-  GtkWidget *box;
   char **actions;
   GtkWidget *dialog;
   int i;
   GtkStringList *strings;
 
-  dialog = gtk_window_new ();
+  dialog = gtk_dialog_new_with_buttons ("Accelerators",
-  gtk_window_set_title (GTK_WINDOW (dialog), "Accelerators");
+                                        NULL,
+                                        GTK_DIALOG_USE_HEADER_BAR,
+                                        "Close", GTK_RESPONSE_CANCEL,
+                                        "Set", GTK_RESPONSE_APPLY,
+                                        NULL);
+
   gtk_window_set_application (GTK_WINDOW (dialog), app);
   actions = gtk_application_list_action_descriptions (app);
 
-  header = gtk_header_bar_new ();
+  strings = gtk_string_list_new (NULL);
-  gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
+  combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
-  close_button = gtk_button_new_with_label ("Close");
+  g_object_set (gtk_dialog_get_content_area (GTK_DIALOG (dialog)),
-  g_signal_connect (close_button, "clicked", G_CALLBACK (close_clicked), dialog);
-  gtk_header_bar_pack_start (GTK_HEADER_BAR (header), close_button);
-  set_button = gtk_button_new_with_label ("Set");
-  g_signal_connect (set_button, "clicked", G_CALLBACK (set_clicked), dialog);
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (header), set_button);
-
-  gtk_window_set_titlebar (GTK_WINDOW (dialog), header);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-  g_object_set (box,
                 "margin-top", 10,
                 "margin-bottom", 10,
                 "margin-start", 10,
                 "margin-end", 10,
+                "spacing", 10,
                 NULL);
-  gtk_window_set_child (GTK_WINDOW (dialog), box);
-
-  strings = gtk_string_list_new (NULL);
-  combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
-
-  gtk_box_append (GTK_BOX (box), combo);
 
+  gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), combo);
   for (i = 0; actions[i]; i++)
     gtk_string_list_append (strings, actions[i]);
   g_signal_connect (combo, "notify::selected", G_CALLBACK (combo_changed), dialog);
@@ -469,10 +458,10 @@ edit_accels (GSimpleAction *action,
   gtk_widget_set_hexpand (entry, TRUE);
   g_signal_connect (entry, "notify::text", G_CALLBACK (entry_changed), dialog);
 
-  gtk_box_append (GTK_BOX (box), entry);
+  gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), entry);
+  g_signal_connect (dialog, "response", G_CALLBACK (response), dialog);
   g_object_set_data (G_OBJECT (dialog), "combo", combo);
   g_object_set_data (G_OBJECT (dialog), "entry", entry);
-  g_object_set_data (G_OBJECT (dialog), "set-button", set_button);
 
   gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), 0);
 

examples/meson.build

@@ -13,6 +13,8 @@ foreach ex : examples
   example_name = ex == 'builder' ? 'builder_example' : ex
   executable(example_name, '@0@.c'.format(ex),
              c_args: [
+               '-DGDK_DISABLE_DEPRECATED',
+               '-DGTK_DISABLE_DEPRECATED',
                '-DGTK_SRCDIR="@0@"'.format(meson.current_source_dir()),
              ] + common_cflags,
              dependencies: libgtk_dep)

gdk/gdkdisplayprivate.h

@@ -104,7 +104,6 @@ struct _GdkDisplay
   gsize vk_pipeline_cache_size;
   char *vk_pipeline_cache_etag;
   guint vk_save_pipeline_cache_source;
-  GHashTable *vk_shader_modules;
 
   guint vulkan_refcount;
 #endif /* GDK_RENDERING_VULKAN */

gdk/gdkenums.h

@@ -364,8 +364,6 @@ typedef enum {
   GDK_MEMORY_G16 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
   GDK_MEMORY_A8 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
   GDK_MEMORY_A16 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_A16_FLOAT GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_A32_FLOAT GDK_AVAILABLE_ENUMERATOR_IN_4_12,
 
   GDK_MEMORY_N_FORMATS
 } GdkMemoryFormat;

gdk/gdkglcontext.c

@@ -1552,7 +1552,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
 
   priv->has_sync = gdk_gl_context_check_version (context, "3.2", "3.0") ||
                    epoxy_has_gl_extension ("GL_ARB_sync") ||
-                   epoxy_has_gl_extension ("GL_APPLE_sync");
+                   epoxy_has_gl_extension ("GK_APPLE_sync");
 
 #ifdef G_ENABLE_DEBUG
   {

gdk/gdkmemoryformat.c

@@ -69,9 +69,9 @@ name ## _to_float (float        *dest, \
   for (gsize i = 0; i < n; i++) \
     { \
       T *src = (T *) (src_data + i * bpp); \
-      if (A >= 0) dest[3] = (float) src[A] / scale; else dest[3] = 1.0; \
+      if (G >= 0) dest[0] = (float) src[G] / scale; else dest[0] = 1.0; \
-      if (G >= 0) dest[0] = (float) src[G] / scale; else dest[0] = dest[3]; \
       dest[1] = dest[2] = dest[0]; \
+      if (A >= 0) dest[3] = (float) src[A] / scale; else dest[3] = 1.0; \
       dest += 4; \
     } \
 } \
@@ -156,37 +156,6 @@ r16g16b16a16_float_from_float (guchar      *dest,
   float_to_half (src, (guint16 *) dest, 4 * n);
 }
 
-static void
-a16_float_to_float (float        *dest,
-                    const guchar *src_data,
-                    gsize         n)
-{
-  const guint16 *src = (const guint16 *) src_data;
-  for (gsize i = 0; i < n; i++)
-    {
-      half_to_float (src, dest, 1);
-      dest[1] = dest[0];
-      dest[2] = dest[0];
-      dest[3] = dest[0];
-      src++;
-      dest += 4;
-    }
-}
-
-static void
-a16_float_from_float (guchar      *dest_data,
-                      const float *src,
-                      gsize        n)
-{
-  guint16 *dest = (guint16 *) dest_data;
-  for (gsize i = 0; i < n; i++)
-    {
-      float_to_half (&src[3], dest, 1);
-      dest ++;
-      src += 4;
-    }
-}
-
 static void
 r32g32b32_float_to_float (float        *dest,
                           const guchar *src_data,
@@ -236,37 +205,6 @@ r32g32b32a32_float_from_float (guchar      *dest,
   memcpy (dest, src, sizeof (float) * n * 4);
 }
 
-static void
-a32_float_to_float (float        *dest,
-                    const guchar *src_data,
-                    gsize         n)
-{
-  const float *src = (const float *) src_data;
-  for (gsize i = 0; i < n; i++)
-    {
-      dest[0] = src[0];
-      dest[1] = src[0];
-      dest[2] = src[0];
-      dest[3] = src[0];
-      src++;
-      dest += 4;
-    }
-}
-
-static void
-a32_float_from_float (guchar      *dest_data,
-                      const float *src,
-                      gsize        n)
-{
-  float *dest = (float *) dest_data;
-  for (gsize i = 0; i < n; i++)
-    {
-      dest[0] = src[3];
-      dest ++;
-      src += 4;
-    }
-}
-
 #define PREMULTIPLY_FUNC(name, R1, G1, B1, A1, R2, G2, B2, A2) \
 static void \
 name (guchar *dest, \
@@ -346,7 +284,7 @@ struct _GdkMemoryFormatDescription
 #  error "Define the right GL flags here"
 #endif
 
-static const GdkMemoryFormatDescription memory_formats[] = {
+static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
   [GDK_MEMORY_B8G8R8A8_PREMULTIPLIED] = {
     GDK_MEMORY_ALPHA_PREMULTIPLIED,
     4,
@@ -588,50 +526,27 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     g16_from_float,
   },
   [GDK_MEMORY_A8] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
+    GDK_MEMORY_ALPHA_STRAIGHT,
     1,
     G_ALIGNOF (guchar),
     GDK_MEMORY_U8,
     { 0, 0, 3, 0 },
-    { GL_R8, GL_RED, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_RED } },
+    { GL_R8, GL_RED, GL_UNSIGNED_BYTE, { GL_ONE, GL_ONE, GL_ONE, GL_RED } },
     a8_to_float,
     a8_from_float,
   },
   [GDK_MEMORY_A16] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
+    GDK_MEMORY_ALPHA_STRAIGHT,
     2,
     G_ALIGNOF (guint16),
     GDK_MEMORY_U16,
     { 0, 0, 3, 0 },
-    { GL_R16, GL_RED, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_RED } },
+    { GL_R16, GL_RED, GL_UNSIGNED_SHORT, { GL_ONE, GL_ONE, GL_ONE, GL_RED } },
     a16_to_float,
     a16_from_float,
-  },
-  [GDK_MEMORY_A16_FLOAT] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    2,
-    G_ALIGNOF (guint16),
-    GDK_MEMORY_FLOAT16,
-    { 0, 0, 3, 0 },
-    { GL_R16F, GL_RED, GL_HALF_FLOAT, { GL_RED, GL_RED, GL_RED, GL_RED } },
-    a16_float_to_float,
-    a16_float_from_float,
-  },
-  [GDK_MEMORY_A32_FLOAT] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    4,
-    G_ALIGNOF (float),
-    GDK_MEMORY_FLOAT32,
-    { 0, 0, 3, 0 },
-    { GL_R32F, GL_RED, GL_FLOAT, { GL_RED, GL_RED, GL_RED, GL_RED } },
-    a32_float_to_float,
-    a32_float_from_float,
   }
 };
 
-/* if this fails, somebody forgot to add formats above */
-G_STATIC_ASSERT (G_N_ELEMENTS (memory_formats) == GDK_MEMORY_N_FORMATS);
-
 gsize
 gdk_memory_format_bytes_per_pixel (GdkMemoryFormat format)
 {
@@ -704,33 +619,6 @@ gdk_memory_depth_merge (GdkMemoryDepth depth1,
     }
 }
 
-/*
- * gdk_memory_depth_get_alpha_format:
- * @depth: the depth
- *
- * Gets the preferred format to use for rendering masks and other
- * alpha-only content.
- *
- * Returns: the format
- **/
-GdkMemoryFormat
-gdk_memory_depth_get_alpha_format (GdkMemoryDepth depth)
-{
-  switch (depth)
-    {
-      case GDK_MEMORY_U8:
-        return GDK_MEMORY_A8;
-      case GDK_MEMORY_U16:
-        return GDK_MEMORY_A16;
-      case GDK_MEMORY_FLOAT16:
-        return GDK_MEMORY_A16_FLOAT;
-      case GDK_MEMORY_FLOAT32:
-        return GDK_MEMORY_A32_FLOAT;
-      default:
-        g_return_val_if_reached (GDK_MEMORY_A8);
-    }
-}
-
 gboolean
 gdk_memory_format_gl_format (GdkMemoryFormat  format,
                              gboolean         gles,
@@ -812,26 +700,6 @@ gdk_memory_convert (guchar              *dest_data,
   g_assert (dest_format < GDK_MEMORY_N_FORMATS);
   g_assert (src_format < GDK_MEMORY_N_FORMATS);
 
-  if (src_format == dest_format)
-    {
-      gsize bytes_per_row = src_desc->bytes_per_pixel * width;
-
-      if (bytes_per_row == src_stride && bytes_per_row == dest_stride)
-        {
-          memcpy (dest_data, src_data, bytes_per_row * height);
-        }
-      else
-        {
-          for (y = 0; y < height; y++)
-            {
-              memcpy (dest_data, src_data, bytes_per_row);
-              src_data += src_stride;
-              dest_data += dest_stride;
-            }
-        }
-      return;
-    }
-
   if (src_format == GDK_MEMORY_R8G8B8A8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
     func = r8g8b8a8_to_r8g8b8a8_premultiplied;
   else if (src_format == GDK_MEMORY_B8G8R8A8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)

gdk/gdkmemoryformatprivate.h

@@ -44,7 +44,6 @@ gsize                   gdk_memory_format_bytes_per_pixel   (GdkMemoryFormat
 GdkMemoryDepth          gdk_memory_format_get_depth         (GdkMemoryFormat             format) G_GNUC_CONST;
 GdkMemoryDepth          gdk_memory_depth_merge              (GdkMemoryDepth              depth1,
                                                              GdkMemoryDepth              depth2) G_GNUC_CONST;
-GdkMemoryFormat         gdk_memory_depth_get_alpha_format   (GdkMemoryDepth              depth) G_GNUC_CONST;
 gboolean                gdk_memory_format_gl_format         (GdkMemoryFormat             format,
                                                              gboolean                    gles,
                                                              guint                       gl_major,

gdk/gdkmemorytexture.c

@@ -151,8 +151,6 @@ gdk_memory_texture_new (int              width,
   g_return_val_if_fail (height > 0, NULL);
   g_return_val_if_fail (bytes != NULL, NULL);
   g_return_val_if_fail (stride >= width * gdk_memory_format_bytes_per_pixel (format), NULL);
-  /* needs to be this complex to support subtexture of the bottom right part */
-  g_return_val_if_fail (g_bytes_get_size (bytes) >= stride * (height - 1) + width * gdk_memory_format_bytes_per_pixel (format), NULL);
 
   bytes = gdk_memory_sanitize (bytes, width, height, format, stride, &stride);
 

gdk/gdkprivate.h

@@ -21,3 +21,23 @@ void gdk_source_set_static_name_by_id (guint       tag,
 #ifndef I_
 #define I_(string) g_intern_static_string (string)
 #endif
+
+#if !GLIB_CHECK_VERSION (2, 75, 1)
+static inline gboolean
+g_set_str (char       **str_pointer,
+           const char  *new_str)
+{
+  char *copy;
+
+  if (*str_pointer == new_str ||
+      (*str_pointer && new_str && strcmp (*str_pointer, new_str) == 0))
+    return FALSE;
+
+  copy = g_strdup (new_str);
+  g_free (*str_pointer);
+  *str_pointer = copy;
+
+  return TRUE;
+}
+#endif
+

gdk/gdktexture.c

@@ -25,8 +25,7 @@
  * multiple frames, and will be used for a long time.
  *
  * There are various ways to create `GdkTexture` objects from a
- * [class@GdkPixbuf.Pixbuf], or from bytes stored in memory, a file, or a
+ * [class@GdkPixbuf.Pixbuf], or a Cairo surface, or other pixel data.
- * [struct@Gio.Resource].
  *
  * The ownership of the pixel data is transferred to the `GdkTexture`
  * instance; you can only make a copy of it, via [method@Gdk.Texture.download].

gdk/gdktoplevel.h

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

gdk/gdkvulkancontext.c

@@ -241,10 +241,6 @@ gdk_vulkan_strerror (VkResult result)
       return "Codec-specific parameters in a requested (VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR)";
     case VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR:
       return "The specified video Std header version is not supported. (VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR)";
-#endif
-#if VK_HEADER_VERSION >= 246
-    case VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT:
-      return "The provided binary shader code is not compatible with this device. (VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT)";
 #endif
     case VK_RESULT_MAX_ENUM:
     default:
@@ -387,13 +383,6 @@ gdk_vulkan_context_check_swapchain (GdkVulkanContext  *context,
 
   device = gdk_vulkan_context_get_device (context);
 
-  /*
-   * Wait for device to be idle because this function is also called in window resizes.
-   * And if we destroy old swapchain it also destroy the old VkImages, those images could
-   * be in use by a vulkan render.
-   */
-  vkDeviceWaitIdle (device);
-
   res = GDK_VK_CHECK (vkGetPhysicalDeviceSurfaceCapabilitiesKHR, gdk_vulkan_context_get_physical_device (context),
                                                                  priv->surface,
                                                                  &capabilities);
@@ -1009,7 +998,6 @@ gdk_display_load_pipeline_cache (GdkDisplay *display)
                                            &result) != VK_SUCCESS)
     result = VK_NULL_HANDLE;
 
-  g_object_unref (cache_file);
   g_free (data);
   g_free (display->vk_pipeline_cache_etag);
   display->vk_pipeline_cache_etag = etag;
@@ -1055,7 +1043,6 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
     {
       g_warning_once ("Failed to create pipeline cache directory");
       g_free (path);
-      g_free (data);
       return FALSE;
     }
   g_free (path);
@@ -1091,7 +1078,6 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
             }
           g_clear_error (&error);
           g_object_unref (file);
-          g_free (data);
 
           /* try again */
           return gdk_vulkan_save_pipeline_cache (display);
@@ -1100,12 +1086,10 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
       g_warning ("Failed to save pipeline cache: %s", error->message);
       g_clear_error (&error);
       g_object_unref (file);
-      g_free (data);
       return FALSE;
     }
 
   g_object_unref (file);
-  g_free (data);
   g_free (display->vk_pipeline_cache_etag);
   display->vk_pipeline_cache_etag = etag;
 
@@ -1141,15 +1125,12 @@ gdk_display_create_pipeline_cache (GdkDisplay *display)
 {
   display->vk_pipeline_cache = gdk_display_load_pipeline_cache (display);
 
-  if (display->vk_pipeline_cache == VK_NULL_HANDLE)
+  GDK_VK_CHECK (vkCreatePipelineCache, display->vk_device,
-    {
+                                       &(VkPipelineCacheCreateInfo) {
-      GDK_VK_CHECK (vkCreatePipelineCache, display->vk_device,
+                                         .sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
-                                           &(VkPipelineCacheCreateInfo) {
+                                       },
-                                             .sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
+                                       NULL,
-                                           },
+                                       &display->vk_pipeline_cache);
-                                           NULL,
-                                           &display->vk_pipeline_cache);
-    }
 }
 
 VkPipelineCache
@@ -1612,8 +1593,6 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
 
   gdk_display_create_pipeline_cache (display);
 
-  display->vk_shader_modules = g_hash_table_new (g_str_hash, g_str_equal);
-
   return TRUE;
 }
 
@@ -1635,9 +1614,6 @@ gdk_display_ref_vulkan (GdkDisplay *display,
 void
 gdk_display_unref_vulkan (GdkDisplay *display)
 {
-  GHashTableIter iter;
-  gpointer key, value;
-
   g_return_if_fail (GDK_IS_DISPLAY (display));
   g_return_if_fail (display->vulkan_refcount > 0);
 
@@ -1645,24 +1621,13 @@ gdk_display_unref_vulkan (GdkDisplay *display)
   if (display->vulkan_refcount > 0)
     return;
 
-  g_hash_table_iter_init (&iter, display->vk_shader_modules);
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      g_free (key);
-      vkDestroyShaderModule (display->vk_device,
-                             value,
-                             NULL);
-    }
-  g_hash_table_unref (display->vk_shader_modules);
-
   if (display->vk_save_pipeline_cache_source)
     {
-      g_clear_handle_id (&display->vk_save_pipeline_cache_source, g_source_remove);
       gdk_vulkan_save_pipeline_cache_cb (display);
       g_assert (display->vk_save_pipeline_cache_source == 0);
     }
   vkDestroyPipelineCache (display->vk_device, display->vk_pipeline_cache, NULL);
-  display->vk_pipeline_cache = VK_NULL_HANDLE;
+  display->vk_device = VK_NULL_HANDLE;
   g_clear_pointer (&display->vk_pipeline_cache_etag, g_free);
   display->vk_pipeline_cache_size = 0;
 
@@ -1682,47 +1647,6 @@ gdk_display_unref_vulkan (GdkDisplay *display)
   display->vk_instance = VK_NULL_HANDLE;
 }
 
-VkShaderModule
-gdk_display_get_vk_shader_module (GdkDisplay *self,
-                                  const char *resource_name)
-{
-  VkShaderModule shader;
-  GError *error = NULL;
-  GBytes *bytes;
-
-  shader = g_hash_table_lookup (self->vk_shader_modules, resource_name);
-  if (shader)
-    return shader;
-
-  bytes = g_resources_lookup_data (resource_name, 0, &error);
-  if (bytes == NULL)
-    {
-      GDK_DEBUG (VULKAN, "Error loading shader data: %s", error->message);
-      g_clear_error (&error);
-      return VK_NULL_HANDLE;
-    }
-
-  if (GDK_VK_CHECK (vkCreateShaderModule, self->vk_device,
-                                          &(VkShaderModuleCreateInfo) {
-                                              .sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,
-                                              .codeSize = g_bytes_get_size (bytes),
-                                              .pCode = (uint32_t *) g_bytes_get_data (bytes, NULL),
-                                          },
-                                          NULL,
-                                          &shader) == VK_SUCCESS)
-    {
-      g_hash_table_insert (self->vk_shader_modules, g_strdup (resource_name), shader);
-    }
-  else
-    {
-      shader = VK_NULL_HANDLE;
-    }
-
-  g_bytes_unref (bytes);
-
-  return shader;
-}
-
 #else /* GDK_RENDERING_VULKAN */
 
 static void

gdk/gdkvulkancontextprivate.h

@@ -73,9 +73,6 @@ gboolean                gdk_display_ref_vulkan                          (GdkDisp
                                                                          GError               **error);
 void                    gdk_display_unref_vulkan                        (GdkDisplay            *display);
 
-VkShaderModule          gdk_display_get_vk_shader_module                (GdkDisplay            *display,
-                                                                         const char            *resource_name);
-
 VkPipelineCache         gdk_vulkan_context_get_pipeline_cache           (GdkVulkanContext      *self);
 void                    gdk_vulkan_context_pipeline_cache_updated       (GdkVulkanContext      *self);
 

gdk/loaders/gdkpng.c

@@ -387,8 +387,6 @@ gdk_save_png (GdkTexture *texture)
     case GDK_MEMORY_G16A16_PREMULTIPLIED:
     case GDK_MEMORY_G16A16:
     case GDK_MEMORY_A16:
-    case GDK_MEMORY_A16_FLOAT:
-    case GDK_MEMORY_A32_FLOAT:
       format = GDK_MEMORY_G16A16;
       png_format = PNG_COLOR_TYPE_GRAY_ALPHA;
       depth = 16;

gdk/loaders/gdktiff.c

@@ -259,8 +259,6 @@ static const FormatData format_data[] = {
   [GDK_MEMORY_G16]                              = { GDK_MEMORY_G16,                              16, 1, SAMPLEFORMAT_UINT,   0,                      PHOTOMETRIC_MINISBLACK },
   [GDK_MEMORY_A8]                               = { GDK_MEMORY_G8A8,                              8, 2, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_MINISBLACK },
   [GDK_MEMORY_A16]                              = { GDK_MEMORY_G16A16,                           16, 2, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_MINISBLACK },
-  [GDK_MEMORY_A16_FLOAT]                        = { GDK_MEMORY_R16G16B16A16_FLOAT,               16, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_A32_FLOAT]                        = { GDK_MEMORY_R32G32B32A32_FLOAT,               32, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_RGB },
 };
 
 /* if this fails, somebody forgot to add formats above */

gdk/macos/GdkMacosWindow.c

@@ -73,10 +73,7 @@ typedef NSString *CALayerContentsGravity;
 
 -(void)windowDidMiniaturize:(NSNotification *)aNotification
 {
-  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface),
+  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface), 0, GDK_TOPLEVEL_STATE_MINIMIZED);
-                                0,
-                                GDK_TOPLEVEL_STATE_MINIMIZED |
-                                GDK_TOPLEVEL_STATE_SUSPENDED);
 }
 
 -(void)windowDidDeminiaturize:(NSNotification *)aNotification
@@ -86,10 +83,7 @@ typedef NSString *CALayerContentsGravity;
   else if (GDK_IS_MACOS_POPUP_SURFACE (gdk_surface))
     _gdk_macos_popup_surface_attach_to_parent (GDK_MACOS_POPUP_SURFACE (gdk_surface));
 
-  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface),
+  gdk_synthesize_surface_state (GDK_SURFACE (gdk_surface), GDK_TOPLEVEL_STATE_MINIMIZED, 0);
-                                GDK_TOPLEVEL_STATE_MINIMIZED |
-                                GDK_TOPLEVEL_STATE_SUSPENDED,
-                                0);
 }
 
 -(void)windowDidBecomeKey:(NSNotification *)aNotification

gdk/wayland/gdkdisplay-wayland.c

@@ -2185,9 +2185,8 @@ set_capability_setting (GdkDisplay                *display,
                         enum gtk_shell1_capability test)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-  int testbit = 1 << (test - 1);
 
-  g_value_set_boolean (value, (display_wayland->shell_capabilities & testbit) == testbit);
+  g_value_set_boolean (value, (display_wayland->shell_capabilities & test) == test);
 
   return TRUE;
 }

gdk/wayland/gdkseat-wayland.c

@@ -3064,9 +3064,9 @@ tablet_tool_handle_button (void                      *data,
   tablet->pointer_info.press_serial = serial;
 
   if (button == BTN_STYLUS)
-    n_button = GDK_BUTTON_MIDDLE;
-  else if (button == BTN_STYLUS2)
     n_button = GDK_BUTTON_SECONDARY;
+  else if (button == BTN_STYLUS2)
+    n_button = GDK_BUTTON_MIDDLE;
   else if (button == BTN_STYLUS3)
     n_button = 8; /* Back */
   else

gdk/wayland/gdktoplevel-wayland.c

@@ -620,11 +620,6 @@ xdg_toplevel_configure (void                *data,
           pending_state |= (GDK_TOPLEVEL_STATE_TILED |
                             GDK_TOPLEVEL_STATE_LEFT_TILED);
           break;
-#ifdef HAVE_TOPLEVEL_STATE_SUSPENDED
-        case XDG_TOPLEVEL_STATE_SUSPENDED:
-          pending_state |= GDK_TOPLEVEL_STATE_SUSPENDED;
-          break;
-#endif
         default:
           /* Unknown state */
           break;

gdk/win32/gdkevents-win32.c

@@ -139,6 +139,7 @@ static GSourceFuncs event_funcs = {
 
 static GdkSurface *mouse_window = NULL;
 static GdkSurface *mouse_window_ignored_leave = NULL;
+static int current_x, current_y;
 static int current_root_x, current_root_y;
 
 static UINT got_gdk_events_message;
@@ -1521,15 +1522,14 @@ generate_button_event (GdkEventType      type,
   GdkEvent *event;
   GdkDeviceManagerWin32 *device_manager;
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
-  double x, y;
 
   if (_gdk_input_ignore_core > 0)
     return;
 
   device_manager = GDK_DEVICE_MANAGER_WIN32 (_gdk_device_manager);
 
-  x = (double) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
+  current_x = (gint16) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
-  y = (double) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;
+  current_y = (gint16) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;
 
   _gdk_device_virtual_set_active (_gdk_device_manager->core_pointer,
                                   _gdk_device_manager->system_pointer);
@@ -1541,10 +1541,10 @@ generate_button_event (GdkEventType      type,
                                 _gdk_win32_get_next_tick (msg->time),
                                 build_pointer_event_state (msg),
                                 button,
-                                x,
+                                current_x,
-                                y,
+                                current_y,
                                 NULL);
-
+                                
   _gdk_win32_append_event (event);
 }
 
@@ -2350,19 +2350,19 @@ gdk_event_translate (MSG *msg,
        * sends WM_MOUSEMOVE messages after a new window is shown under
        * the mouse, even if the mouse hasn't moved. This disturbs gtk.
        */
-      if (msg->pt.x == current_root_x &&
+      if (msg->pt.x / impl->surface_scale == current_root_x &&
-          msg->pt.y == current_root_y)
+          msg->pt.y / impl->surface_scale == current_root_y)
         break;
 
-      current_root_x = msg->pt.x;
+      current_root_x = msg->pt.x / impl->surface_scale;
-      current_root_y = msg->pt.y;
+      current_root_y = msg->pt.y / impl->surface_scale;
 
       if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
-        gdk_win32_surface_do_move_resize_drag (window, msg->pt.x, msg->pt.y);
+        gdk_win32_surface_do_move_resize_drag (window, current_root_x, current_root_y);
       else if (_gdk_input_ignore_core == 0)
 	{
-          double x = (double) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
+	  current_x = (gint16) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
-          double y = (double) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;
+	  current_y = (gint16) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;
 
           _gdk_device_virtual_set_active (_gdk_device_manager->core_pointer,
                                           _gdk_device_manager->system_pointer);
@@ -2372,8 +2372,8 @@ gdk_event_translate (MSG *msg,
                                         NULL,
                                         _gdk_win32_get_next_tick (msg->time),
 	                                build_pointer_event_state (msg),
-                                        x,
+                                        current_x,
-                                        y,
+                                        current_y,
                                         NULL);
 
 	  _gdk_win32_append_event (event);
@@ -3014,11 +3014,9 @@ gdk_event_translate (MSG *msg,
 	  unset_bits = 0;
 
 	  if (IsIconic (msg->hwnd))
-	    set_bits |= (GDK_TOPLEVEL_STATE_MINIMIZED |
+	    set_bits |= GDK_TOPLEVEL_STATE_MINIMIZED;
-                         GDK_TOPLEVEL_STATE_SUSPENDED);
 	  else
-	    unset_bits |= (GDK_TOPLEVEL_STATE_MINIMIZED |
+	    unset_bits |= GDK_TOPLEVEL_STATE_MINIMIZED;
-                           GDK_TOPLEVEL_STATE_SUSPENDED);
 
 	  if (IsZoomed (msg->hwnd))
 	    set_bits |= GDK_TOPLEVEL_STATE_MAXIMIZED;

gdk/win32/gdkinput-winpointer.c

@@ -271,10 +271,9 @@ winpointer_make_event (GdkDeviceWinpointer *device,
   y /= impl->surface_scale;
 
   state = 0;
-  /* Note that info->dwKeyStates is not reliable, use GetKeyState() */
+  if (info->dwKeyStates & POINTER_MOD_CTRL)
-  if (GetKeyState (VK_CONTROL) < 0)
     state |= GDK_CONTROL_MASK;
-  if (GetKeyState (VK_SHIFT) < 0)
+  if (info->dwKeyStates & POINTER_MOD_SHIFT)
     state |= GDK_SHIFT_MASK;
   if (GetKeyState (VK_MENU) < 0)
     state |= GDK_ALT_MASK;

gdk/win32/gdkmain-win32.c

@@ -1,7 +1,6 @@
 /* GDK - The GIMP Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 1998-2002 Tor Lillqvist
- * Copyright (C) 2023 the GTK team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
 #include "config.h"
 
 #include <glib/gprintf.h>
@@ -39,6 +45,8 @@
 #include <wintab.h>
 #include <imm.h>
 
+static gboolean gdk_synchronize = FALSE;
+
 /* Whether GDK initialized COM */
 static gboolean co_initialized = FALSE;
 
@@ -48,6 +56,18 @@ static gboolean ole_initialized = FALSE;
 void
 _gdk_win32_surfaceing_init (void)
 {
+  GdkWin32Keymap *win32_keymap;
+
+  win32_keymap = GDK_WIN32_KEYMAP (_gdk_win32_display_get_keymap (_gdk_display));
+
+  if (gdk_synchronize)
+    GdiSetBatchLimit (1);
+
+  _gdk_input_locale = GetKeyboardLayout (0);
+  _gdk_win32_keymap_set_active_layout (win32_keymap, _gdk_input_locale);
+
+  GDK_NOTE (EVENTS, g_print ("input_locale: %p\n", _gdk_input_locale));
+
   _gdk_win32_clipdrop_init ();
 
   gdk_dmanipulation_initialize ();

gdk/win32/gdksurface-win32.c

@@ -194,6 +194,12 @@ gdk_surface_win32_finalize (GObject *object)
       surface->hicon_small = NULL;
     }
 
+  if (surface->cache_surface)
+    {
+      cairo_surface_destroy (surface->cache_surface);
+      surface->cache_surface = NULL;
+    }
+
   _gdk_win32_surface_unregister_dnd (GDK_SURFACE (surface));
 
   g_assert (surface->transient_owner == NULL);
@@ -3529,8 +3535,6 @@ setup_drag_move_resize_context (GdkSurface                  *surface,
   context->button = button;
   context->start_root_x = root_x;
   context->start_root_y = root_y;
-  context->current_root_x = root_x;
-  context->current_root_y = root_y;
   context->timestamp = timestamp;
   context->start_rect = rect;
 
@@ -3646,16 +3650,6 @@ gdk_win32_surface_do_move_resize_drag (GdkSurface *window,
   if (!_gdk_win32_get_window_rect (window, &rect))
     return;
 
-  x /= impl->surface_scale;
-  y /= impl->surface_scale;
-
-  if (context->current_root_x == x &&
-      context->current_root_y == y)
-    return;
-
-  context->current_root_x = x;
-  context->current_root_y = y;
-
   new_rect = context->start_rect;
   diffx = (x - context->start_root_x) * impl->surface_scale;
   diffy = (y - context->start_root_y) * impl->surface_scale;

gdk/win32/gdksurface-win32.h

@@ -1,6 +1,5 @@
 /* GDK - The GIMP Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 2023 the GTK team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -16,6 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
 #pragma once
 
 #include "gdk/win32/gdkprivate-win32.h"
@@ -131,12 +137,6 @@ struct _GdkW32DragMoveResizeContext
   int                start_root_x;
   int                start_root_y;
 
-  /* Last processed cursor position. Values are divided by the window
-   * scale.
-   */
-  int                current_root_x;
-  int                current_root_y;
-
   /* Initial window rectangle (position and size).
    * The window is resized/moved relative to this (see start_root_*).
    */
@@ -283,7 +283,23 @@ struct _GdkWin32Surface
    */
   guint maximizing : 1;
 
-  HDC hdc;
+  /* GDK does not keep window contents around, it just draws new
+   * stuff over the window where changes occurred.
+   * cache_surface retains old window contents, because
+   * UpdateLayeredWindow() doesn't do partial redraws.
+   */
+  cairo_surface_t *cache_surface;
+
+  /* Unlike window-backed surfaces, DIB-backed surface
+   * does not provide a way to query its size,
+   * so we have to remember it ourselves.
+   */
+  int              dib_width;
+  int              dib_height;
+
+  HDC              hdc;
+  int              hdc_count;
+  HBITMAP          saved_dc_bitmap; /* Original bitmap for dc */
 
   GdkW32DragMoveResizeContext drag_move_resize_context;
 

gdk/x11/gdkdisplay-x11.c

@@ -418,18 +418,12 @@ do_net_wm_state_changes (GdkSurface *surface)
   if (old_state & GDK_TOPLEVEL_STATE_MINIMIZED)
     {
       if (!toplevel->have_hidden)
-        {
+        unset |= GDK_TOPLEVEL_STATE_MINIMIZED;
-          unset |= (GDK_TOPLEVEL_STATE_MINIMIZED |
-                    GDK_TOPLEVEL_STATE_SUSPENDED);
-        }
     }
   else
     {
       if (toplevel->have_hidden)
-        {
+        set |= GDK_TOPLEVEL_STATE_MINIMIZED;
-          set |= (GDK_TOPLEVEL_STATE_MINIMIZED |
-                  GDK_TOPLEVEL_STATE_SUSPENDED);
-        }
     }
 
   /* Update edge constraints and tiling */
@@ -816,12 +810,9 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
                * the minimized bit off.
                */
               if (GDK_SURFACE_IS_MAPPED (surface))
-                {
+                gdk_synthesize_surface_state (surface,
-                  gdk_synthesize_surface_state (surface,
+                                              0,
-                                                0,
+                                              GDK_TOPLEVEL_STATE_MINIMIZED);
-                                                GDK_TOPLEVEL_STATE_MINIMIZED |
-                                                GDK_TOPLEVEL_STATE_SUSPENDED);
-                }
             }
 
           if (surface_impl->toplevel &&
@@ -850,12 +841,9 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
 	{
 	  /* Unset minimized if it was set */
 	  if (surface->state & GDK_TOPLEVEL_STATE_MINIMIZED)
-            {
+	    gdk_synthesize_surface_state (surface,
-              gdk_synthesize_surface_state (surface,
+				 	  GDK_TOPLEVEL_STATE_MINIMIZED,
-                                            GDK_TOPLEVEL_STATE_MINIMIZED |
+					  0);
-                                            GDK_TOPLEVEL_STATE_SUSPENDED,
-                                            0);
-            }
 
 	  if (toplevel)
 	    gdk_surface_thaw_updates (surface);

gdk/x11/gdksurface-x11.c

@@ -3270,10 +3270,7 @@ gdk_x11_surface_minimize (GdkSurface *surface)
   else
     {
       /* Flip our client side flag, the real work happens on map. */
-      gdk_synthesize_surface_state (surface,
+      gdk_synthesize_surface_state (surface, 0, GDK_TOPLEVEL_STATE_MINIMIZED);
-                                    0,
-                                    GDK_TOPLEVEL_STATE_MINIMIZED |
-                                    GDK_TOPLEVEL_STATE_SUSPENDED);
       gdk_wmspec_change_state (TRUE, surface,
                                "_NET_WM_STATE_HIDDEN",
                                NULL);
@@ -3296,10 +3293,7 @@ gdk_x11_surface_unminimize (GdkSurface *surface)
   else
     {
       /* Flip our client side flag, the real work happens on map. */
-      gdk_synthesize_surface_state (surface,
+      gdk_synthesize_surface_state (surface, GDK_TOPLEVEL_STATE_MINIMIZED, 0);
-                                    GDK_TOPLEVEL_STATE_MINIMIZED |
-                                    GDK_TOPLEVEL_STATE_SUSPENDED,
-                                    0);
       gdk_wmspec_change_state (FALSE, surface,
                                "_NET_WM_STATE_HIDDEN",
                                NULL);

gsk/gl/gskglglyphlibrary.c

@@ -28,8 +28,6 @@
 #include "gskgldriverprivate.h"
 #include "gskglglyphlibraryprivate.h"
 
-#include "gskdebugprivate.h"
-
 #define MAX_GLYPH_SIZE 128
 
 G_DEFINE_TYPE (GskGLGlyphLibrary, gsk_gl_glyph_library, GSK_TYPE_GL_TEXTURE_LIBRARY)
@@ -409,8 +407,6 @@ gsk_gl_glyph_library_add (GskGLGlyphLibrary      *self,
   width = (int) ceil (ink_rect.width * key->scale / 1024.0);
   height = (int) ceil (ink_rect.height * key->scale / 1024.0);
 
-  GSK_DEBUG (GLYPH_CACHE, "font %p glyph %u: %u x %u pixels", key->font, key->glyph, width, height);
-
   value = gsk_gl_texture_library_pack (tl,
                                        key,
                                        sizeof *value,

gsk/gl/gskglrenderjob.c

@@ -32,7 +32,6 @@
 #include <gdk/gdkmemorytextureprivate.h>
 #include <gsk/gsktransformprivate.h>
 #include <gsk/gskroundedrectprivate.h>
-#include <gsk/gskrectprivate.h>
 #include <math.h>
 #include <string.h>
 
@@ -358,6 +357,31 @@ color_matrix_modifies_alpha (const GskRenderNode *node)
   return !graphene_vec4_equal (graphene_vec4_w_axis (), &row3);
 }
 
+static inline gboolean G_GNUC_PURE
+rect_contains_rect (const graphene_rect_t *r1,
+                    const graphene_rect_t *r2)
+{
+  return r2->origin.x >= r1->origin.x &&
+         (r2->origin.x + r2->size.width) <= (r1->origin.x + r1->size.width) &&
+         r2->origin.y >= r1->origin.y &&
+         (r2->origin.y + r2->size.height) <= (r1->origin.y + r1->size.height);
+}
+
+static inline gboolean G_GNUC_PURE
+rect_intersects (const graphene_rect_t *r1,
+                 const graphene_rect_t *r2)
+{
+  /* Assume both rects are already normalized, as they usually are */
+  if (r1->origin.x > (r2->origin.x + r2->size.width) ||
+      (r1->origin.x + r1->size.width) < r2->origin.x)
+    return FALSE;
+  else if (r1->origin.y > (r2->origin.y + r2->size.height) ||
+      (r1->origin.y + r1->size.height) < r2->origin.y)
+    return FALSE;
+  else
+    return TRUE;
+}
+
 static inline void
 init_projection_matrix (graphene_matrix_t     *projection,
                         const graphene_rect_t *viewport)
@@ -893,7 +917,7 @@ gsk_gl_render_job_update_clip (GskGLRenderJob        *job,
 
   gsk_gl_render_job_transform_bounds (job, bounds, &transformed_bounds);
 
-  if (!gsk_rect_intersects (&job->current_clip->rect.bounds, &transformed_bounds))
+  if (!rect_intersects (&job->current_clip->rect.bounds, &transformed_bounds))
     {
       /* Completely clipped away */
       return FALSE;
@@ -901,7 +925,7 @@ gsk_gl_render_job_update_clip (GskGLRenderJob        *job,
 
   if (job->current_clip->is_rectilinear)
     {
-      if (gsk_rect_contains_rect (&job->current_clip->rect.bounds, &transformed_bounds))
+      if (rect_contains_rect (&job->current_clip->rect.bounds, &transformed_bounds))
         no_clip = TRUE;
       else
         rect_clip = TRUE;
@@ -3791,7 +3815,7 @@ gsk_gl_render_job_visit_texture_scale_node (GskGLRenderJob      *job,
               slice_bounds.size.width = slice->rect.width * scale_x;
               slice_bounds.size.height = slice->rect.height * scale_y;
 
-              if (!gsk_rect_intersects (&slice_bounds, &viewport))
+              if (!graphene_rect_intersection (&slice_bounds, &viewport, NULL))
                 continue;
 
               if (i > 0)
@@ -3869,7 +3893,7 @@ gsk_gl_render_job_visit_repeat_node (GskGLRenderJob      *job,
   /* If the size of the repeat node is smaller than the size of the
    * child node, we don't repeat at all and can just draw that part
    * of the child texture... */
-  if (gsk_rect_contains_rect (child_bounds, &node->bounds))
+  if (rect_contains_rect (child_bounds, &node->bounds))
     {
       gsk_gl_render_job_visit_clipped_child (job, child, &node->bounds);
       return;

gsk/gl/resources/mask.glsl

@@ -13,12 +13,6 @@ void main() {
 uniform int u_mode;
 uniform sampler2D u_mask;
 
-float
-luminance (vec3 color)
-{
-  return dot (vec3 (0.2126, 0.7152, 0.0722), color);
-}
-
 void main() {
   vec4 source = GskTexture(u_source, vUv);
   vec4 mask = GskTexture(u_mask, vUv);
@@ -29,9 +23,9 @@ void main() {
   else if (u_mode == 1)
     mask_value = 1.0 - mask.a;
   else if (u_mode == 2)
-    mask_value = luminance (mask.rgb);
+    mask_value = (0.2126 * mask.r + 0.7152 * mask.g + 0.0722 * mask.b) * mask.a;
   else if (u_mode == 3)
-    mask_value = mask.a - luminance (mask.rgb);
+    mask_value = 1.0 - (0.2126 * mask.r + 0.7152 * mask.g + 0.0722 * mask.b) * mask.a;
   else
     mask_value = 0.0;
 

gsk/gsk.h

@@ -20,16 +20,15 @@
 #define __GSK_H_INSIDE__
 
 #include <gsk/gskenums.h>
+#include <gsk/gskglshader.h>
 #include <gsk/gskpath.h>
 #include <gsk/gskpathbuilder.h>
 #include <gsk/gskpathmeasure.h>
-#include <gsk/gskpathpoint.h>
 #include <gsk/gskrenderer.h>
 #include <gsk/gskrendernode.h>
 #include <gsk/gskroundedrect.h>
 #include <gsk/gskstroke.h>
 #include <gsk/gsktransform.h>
-#include <gsk/gskglshader.h>
 
 #include <gsk/gskcairorenderer.h>
 

gsk/gskboundingboxprivate.h

@@ -1,100 +0,0 @@
-#pragma once
-
-#include <gsk/gsktypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GskBoundingBox GskBoundingBox;
-
-struct _GskBoundingBox {
-  graphene_point_t min;
-  graphene_point_t max;
-};
-
-static inline GskBoundingBox *
-gsk_bounding_box_init (GskBoundingBox         *self,
-                       const graphene_point_t *a,
-                       const graphene_point_t *b)
-{
-  self->min.x = MIN (a->x, b->x);
-  self->min.y = MIN (a->y, b->y);
-  self->max.x = MAX (a->x, b->x);
-  self->max.y = MAX (a->y, b->y);
-  return self;
-}
-
-static inline GskBoundingBox *
-gsk_bounding_box_init_copy (GskBoundingBox       *self,
-                            const GskBoundingBox *src)
-{
-  self->min = src->min;
-  self->max = src->max;
-  return self;
-}
-
-static inline GskBoundingBox *
-gsk_bounding_box_init_from_rect (GskBoundingBox        *self,
-                                 const graphene_rect_t *bounds)
-{
-  self->min = bounds->origin;
-  self->max.x = bounds->origin.x + bounds->size.width;
-  self->max.y = bounds->origin.y + bounds->size.height;
-  return self;
-}
-
-static inline void
-gsk_bounding_box_expand (GskBoundingBox         *self,
-                         const graphene_point_t *p)
-{
-  self->min.x = MIN (self->min.x, p->x);
-  self->min.y = MIN (self->min.y, p->y);
-  self->max.x = MAX (self->max.x, p->x);
-  self->max.y = MAX (self->max.y, p->y);
-}
-
-static inline graphene_rect_t *
-gsk_bounding_box_to_rect (const GskBoundingBox  *self,
-                          graphene_rect_t       *rect)
-{
-  rect->origin = self->min;
-  rect->size.width = self->max.x - self->min.x;
-  rect->size.height = self->max.y - self->min.y;
-  return rect;
-}
-
-static inline gboolean
-gsk_bounding_box_contains_point (const GskBoundingBox   *self,
-                                 const graphene_point_t *p)
-{
-  return self->min.x <= p->x && p->x <= self->max.x &&
-         self->min.y <= p->y && p->y <= self->max.y;
-}
-
-static inline gboolean
-gsk_bounding_box_contains_point_with_epsilon (const GskBoundingBox   *self,
-                                              const graphene_point_t *p,
-                                              float                   epsilon)
-{
-  return self->min.x - epsilon <= p->x && p->x <= self->max.x + epsilon &&
-         self->min.y - epsilon <= p->y && p->y <= self->max.y + epsilon;
-}
-
-static inline gboolean
-gsk_bounding_box_intersection (const GskBoundingBox *a,
-                               const GskBoundingBox *b,
-                               GskBoundingBox       *res)
-{
-  graphene_point_t min, max;
-
-  min.x = MAX (a->min.x, b->min.x);
-  min.y = MAX (a->min.y, b->min.y);
-  max.x = MIN (a->max.x, b->max.x);
-  max.y = MIN (a->max.y, b->max.y);
-
-  if (res)
-    gsk_bounding_box_init (res, &min, &max);
-
-  return min.x <= max.x && min.y <= max.y;
-}
-
-G_END_DECLS

gsk/gskcontourprivate.h

@@ -1,107 +0,0 @@
-/*
- * Copyright © 2020 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-
-#pragma once
-
-#include "gskpathprivate.h"
-#include "gskpathpointprivate.h"
-#include "gskpathopprivate.h"
-
-G_BEGIN_DECLS
-
-GskContour *            gsk_rect_contour_new                    (const graphene_rect_t  *rect);
-GskContour *            gsk_rounded_rect_contour_new            (const GskRoundedRect   *rounded_rect);
-GskContour *            gsk_circle_contour_new                  (const graphene_point_t *center,
-                                                                 float                   radius,
-                                                                 float                   start_angle,
-                                                                 float                   end_angle);
-GskContour *            gsk_standard_contour_new                (GskPathFlags            flags,
-                                                                 const graphene_point_t *points,
-                                                                 gsize                   n_points,
-                                                                 const gskpathop        *ops,
-                                                                 gsize                   n_ops,
-                                                                 gssize                  offset);
-
-void                    gsk_contour_copy                        (GskContour *            dest,
-                                                                 const GskContour       *src);
-GskContour *            gsk_contour_dup                         (const GskContour       *src);
-GskContour *            gsk_contour_reverse                     (const GskContour       *src);
-
-gsize                   gsk_contour_get_size                    (const GskContour       *self);
-GskPathFlags            gsk_contour_get_flags                   (const GskContour       *self);
-void                    gsk_contour_print                       (const GskContour       *self,
-                                                                 GString                *string);
-gboolean                gsk_contour_get_bounds                  (const GskContour       *self,
-                                                                 graphene_rect_t        *bounds);
-gboolean                gsk_contour_get_stroke_bounds           (const GskContour       *self,
-                                                                 const GskStroke        *stroke,
-                                                                 graphene_rect_t        *bounds);
-gboolean                gsk_contour_foreach                     (const GskContour       *self,
-                                                                 float                   tolerance,
-                                                                 GskPathForeachFunc      func,
-                                                                 gpointer                user_data);
-void                    gsk_contour_get_start_end               (const GskContour       *self,
-                                                                 graphene_point_t       *start,
-                                                                 graphene_point_t       *end);
-int                     gsk_contour_get_winding                 (const GskContour       *self,
-                                                                 const graphene_point_t *point);
-
-gboolean                gsk_contour_get_closest_point           (const GskContour       *self,
-                                                                 const graphene_point_t *point,
-                                                                 float                   threshold,
-                                                                 GskRealPathPoint       *result,
-                                                                 float                  *out_dist);
-
-void                    gsk_contour_get_position                (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
-                                                                 graphene_point_t       *pos);
-
-void                    gsk_contour_get_tangent                 (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
-                                                                 GskPathDirection        direction,
-                                                                 graphene_vec2_t        *tangent);
-float                   gsk_contour_get_curvature               (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
-                                                                 graphene_point_t       *center);
-gpointer                gsk_contour_init_measure                (const GskContour       *self,
-                                                                 float                   tolerance,
-                                                                 float                  *out_length);
-void                    gsk_contour_free_measure                (const GskContour       *self,
-                                                                 gpointer                data);
-void                    gsk_contour_add_segment                 (const GskContour       *self,
-                                                                 GskPathBuilder         *builder,
-                                                                 gpointer                measure_data,
-                                                                 gboolean                emit_move_to,
-                                                                 float                   start,
-                                                                 float                   end);
-void                    gsk_contour_get_point                   (const GskContour       *self,
-                                                                 gpointer                measure_data,
-                                                                 float                   offset,
-                                                                 GskRealPathPoint       *result);
-float                   gsk_contour_get_distance                (const GskContour       *self,
-                                                                 GskRealPathPoint       *point,
-                                                                 gpointer                measure_data);
-gboolean                gsk_contour_dash                        (const GskContour       *contour,
-                                                                 GskStroke              *stroke,
-                                                                 float                   tolerance,
-                                                                 GskPathForeachFunc      func,
-                                                                 gpointer                user_data);
-
-G_END_DECLS

gsk/gskcurveprivate.h

@@ -1,176 +0,0 @@
-/*
- * Copyright © 2020 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-
-#pragma once
-
-#include "gskpathopprivate.h"
-#include "gskpath.h"
-#include "gskboundingboxprivate.h"
-
-G_BEGIN_DECLS
-
-typedef gpointer gskpathop;
-
-typedef union _GskCurve GskCurve;
-
-typedef struct _GskLineCurve GskLineCurve;
-typedef struct _GskQuadCurve GskQuadCurve;
-typedef struct _GskCubicCurve GskCubicCurve;
-typedef struct _GskConicCurve GskConicCurve;
-
-struct _GskLineCurve
-{
-  GskPathOperation op;
-
-  gboolean padding;
-
-  graphene_point_t points[2];
-};
-
-struct _GskQuadCurve
-{
-  GskPathOperation op;
-
-  gboolean has_coefficients;
-
-  graphene_point_t points[3];
-
-  graphene_point_t coeffs[3];
-};
-
-struct _GskCubicCurve
-{
-  GskPathOperation op;
-
-  gboolean has_coefficients;
-
-  graphene_point_t points[4];
-
-  graphene_point_t coeffs[4];
-};
-
-struct _GskConicCurve
-{
-  GskPathOperation op;
-
-  gboolean has_coefficients;
-
-  /* points[0], points[1], points[3] are the control points,
-   * points[2].x is the weight
-   */
-  graphene_point_t points[4];
-
-  graphene_point_t num[3];
-  graphene_point_t denom[3];
-};
-
-union _GskCurve
-{
-  GskPathOperation op;
-  GskLineCurve line;
-  GskQuadCurve quad;
-  GskCubicCurve cubic;
-  GskConicCurve conic;
-};
-
-typedef enum {
-  GSK_CURVE_LINE_REASON_STRAIGHT,
-  GSK_CURVE_LINE_REASON_SHORT
-} GskCurveLineReason;
-
-typedef gboolean (* GskCurveAddLineFunc) (const graphene_point_t *from,
-                                          const graphene_point_t *to,
-                                          float                   from_progress,
-                                          float                   to_progress,
-                                          GskCurveLineReason      reason,
-                                          gpointer                user_data);
-
-typedef gboolean (* GskCurveAddCurveFunc) (GskPathOperation        op,
-                                           const graphene_point_t *pts,
-                                           gsize                   n_pts,
-                                           float                   weight,
-                                           gpointer                user_data);
-
-void                    gsk_curve_init                          (GskCurve               *curve,
-                                                                 gskpathop               op);
-void                    gsk_curve_init_foreach                  (GskCurve               *curve,
-                                                                 GskPathOperation        op,
-                                                                 const graphene_point_t *pts,
-                                                                 gsize                   n_pts,
-                                                                 float                   weight);
-
-void                    gsk_curve_print                         (const GskCurve         *curve,
-                                                                 GString                *string);
-
-char *                  gsk_curve_to_string                     (const GskCurve         *curve);
-
-gskpathop               gsk_curve_pathop                        (const GskCurve         *curve);
-const graphene_point_t *gsk_curve_get_start_point               (const GskCurve         *curve);
-const graphene_point_t *gsk_curve_get_end_point                 (const GskCurve         *curve);
-void                    gsk_curve_get_start_tangent             (const GskCurve         *curve,
-                                                                 graphene_vec2_t        *tangent);
-void                    gsk_curve_get_end_tangent               (const GskCurve         *curve,
-                                                                 graphene_vec2_t        *tangent);
-void                    gsk_curve_get_point                     (const GskCurve         *curve,
-                                                                 float                   progress,
-                                                                 graphene_point_t       *pos);
-void                    gsk_curve_get_tangent                   (const GskCurve         *curve,
-                                                                 float                   progress,
-                                                                 graphene_vec2_t        *tangent);
-void                    gsk_curve_reverse                       (const GskCurve         *curve,
-                                                                 GskCurve               *reverse);
-void                    gsk_curve_split                         (const GskCurve         *curve,
-                                                                 float                   progress,
-                                                                 GskCurve               *start,
-                                                                 GskCurve               *end);
-void                    gsk_curve_segment                       (const GskCurve         *curve,
-                                                                 float                   start,
-                                                                 float                   end,
-                                                                 GskCurve               *segment);
-gboolean                gsk_curve_decompose                     (const GskCurve         *curve,
-                                                                 float                   tolerance,
-                                                                 GskCurveAddLineFunc     add_line_func,
-                                                                 gpointer                user_data);
-gboolean                gsk_curve_decompose_curve               (const GskCurve         *curve,
-                                                                 GskPathForeachFlags     flags,
-                                                                 float                   tolerance,
-                                                                 GskCurveAddCurveFunc    add_curve_func,
-                                                                 gpointer                user_data);
-
-#define gsk_curve_builder_to(curve, builder) gsk_path_builder_pathop_to ((builder), gsk_curve_pathop (curve))
-
-float                   gsk_curve_get_curvature                 (const GskCurve         *curve,
-                                                                 float                   t,
-                                                                 graphene_point_t       *center);
-void                    gsk_curve_get_bounds                    (const GskCurve         *curve,
-                                                                 GskBoundingBox         *bounds);
-void                    gsk_curve_get_tight_bounds              (const GskCurve         *curve,
-                                                                 GskBoundingBox         *bounds);
-
-int                     gsk_curve_get_crossing                  (const GskCurve         *curve,
-                                                                 const graphene_point_t *point);
-gboolean                gsk_curve_get_closest_point             (const GskCurve         *curve,
-                                                                 const graphene_point_t *point,
-                                                                 float                   threshold,
-                                                                 float                  *out_dist,
-                                                                 float                  *out_t);
-
-G_END_DECLS
-

gsk/gskdebug.c

@@ -12,7 +12,6 @@ static const GdkDebugKey gsk_debug_keys[] = {
   { "surface", GSK_DEBUG_SURFACE, "Information about surfaces" },
   { "fallback", GSK_DEBUG_FALLBACK, "Information about fallbacks" },
   { "glyphcache", GSK_DEBUG_GLYPH_CACHE, "Information about glyph caching" },
-  { "verbose", GSK_DEBUG_VERBOSE, "Print verbose output while rendering" },
   { "geometry", GSK_DEBUG_GEOMETRY, "Show borders (when using cairo)" },
   { "full-redraw", GSK_DEBUG_FULL_REDRAW, "Force full redraws" },
   { "sync", GSK_DEBUG_SYNC, "Sync after each frame" },

gsk/gskdebugprivate.h

@@ -14,7 +14,6 @@ typedef enum {
   GSK_DEBUG_VULKAN                = 1 <<  5,
   GSK_DEBUG_FALLBACK              = 1 <<  6,
   GSK_DEBUG_GLYPH_CACHE           = 1 <<  7,
-  GSK_DEBUG_VERBOSE               = 1 <<  8,
   /* flags below may affect behavior */
   GSK_DEBUG_GEOMETRY              = 1 <<  9,
   GSK_DEBUG_FULL_REDRAW           = 1 << 10,

gsk/gskenums.h

@@ -186,21 +186,17 @@ typedef enum {
  *   the total number of intersections is odd, the point will be
  *   filled.
  *
- * `GskFillRule` is used to select how paths are filled.
+ * #GskFillRule is used to select how paths are filled, for example in
- *
+ * gsk_fill_node_new(). Whether or not a point is included in the fill is
- * Whether or not a point is included in the fill is determined by taking
+ * determined by taking a ray from that point to infinity and looking
- * a ray from that point to infinity and looking at intersections with the
+ * at intersections with the path. The ray can be in any direction,
- * path. The ray can be in any direction, as long as it doesn't pass through
+ * as long as it doesn't pass through the end point of a segment
- * the end point of a segment or have a tricky intersection such as
+ * or have a tricky intersection such as intersecting tangent to the path.
- * intersecting tangent to the path.
- *
  * (Note that filling is not actually implemented in this way. This
  * is just a description of the rule that is applied.)
  *
  * New entries may be added in future versions.
- *
+ **/
- * Since: 4.14
- */
 typedef enum {
   GSK_FILL_RULE_WINDING,
   GSK_FILL_RULE_EVEN_ODD
@@ -209,20 +205,16 @@ typedef enum {
 /**
  * GskLineCap:
  * @GSK_LINE_CAP_BUTT: Start and stop the line exactly at the start
- *   and end point
+ *     and end point
  * @GSK_LINE_CAP_ROUND: Use a round ending, the center of the circle
- *   is the start or end point
+ *     is the start or end point.
  * @GSK_LINE_CAP_SQUARE: use squared ending, the center of the square
- *   is the start or end point
+ *     is the start or end point.
  *
  * Specifies how to render the start and end points of contours or
  * dashes when stroking.
  *
- * The default line cap style is `GSK_LINE_CAP_BUTT`.
+ * The default line cap style is %GSK_LINE_CAP_BUTT.
- *
- * New entries may be added in future versions.
- *
- * Since: 4.14
  */
 typedef enum {
   GSK_LINE_CAP_BUTT,
@@ -232,78 +224,51 @@ typedef enum {
 
 /**
  * GskLineJoin:
- * @GSK_LINE_JOIN_MITER: Use a sharp angled corner
+ * @GSK_LINE_JOIN_MITER: Use a sharp, angled corner
  * @GSK_LINE_JOIN_MITER_CLIP: Use a sharp, angled corner, at a distance
  * @GSK_LINE_JOIN_ROUND: Use a round join, the center of the circle is
- *   the join point
+ *     the joint point
- * @GSK_LINE_JOIN_BEVEL: use a cut-off join, the join is cut off at half
+ * @GSK_LINE_JOIN_BEVEL: Use a cut-off join, the join is cut off at half
- *   the line width from the joint point
+ *     the line width from the joint point
  *
  * Specifies how to render the junction of two lines when stroking.
  *
- * See [method@Gsk.Stroke.set_miter_limit] for details on the difference
+ * See gsk_stroke_set_miter_limit() for details on the difference between
- * between `GSK_LINE_JOIN_MITER` and `GSK_LINE_JOIN_MITER_CLIP`.
+ * @GSK_LINE_JOIN_MITER and @GSK_LINE_JOIN_MITER_CLIP.
  *
- * The default line join style is `GSK_LINE_JOIN_MITER`.
+ * The default line join style is %GSK_LINE_JOIN_MITER.
- *
+ **/
- * New entries may be added in future versions.
- *
- * Since: 4.14
- */
 typedef enum {
   GSK_LINE_JOIN_MITER,
   GSK_LINE_JOIN_MITER_CLIP,
   GSK_LINE_JOIN_ROUND,
-  GSK_LINE_JOIN_BEVEL,
+  GSK_LINE_JOIN_BEVEL
 } GskLineJoin;
 
 /**
  * GskPathOperation:
- * @GSK_PATH_MOVE: A move-to operation, with 1 point describing the target point.
+ * @GSK_PATH_MOVE: A move-to operation, with 1 point describing the
- * @GSK_PATH_CLOSE: A close operation ending the current contour with a line back
+ *     target point.
- *   to the starting point. Two points describe the start and end of the line.
+ * @GSK_PATH_LINE: A line-to operation, with 2 points describing the
- * @GSK_PATH_LINE: A line-to operation, with 2 points describing the start and
+ *     start and end point of a straight line.
- *   end point of a straight line.
+ * @GSK_PATH_CLOSE: A close operation ending the current contour with
- * @GSK_PATH_QUAD: A curve-to operation describing a quadratic Bézier curve
+ *     a line back to the starting point. Two points describe the start
- *   with 3 points describing the start point, the control point and the end
+ *     and end of the line.
- *   point of the curve.
+ * @GSK_PATH_CURVE: A curve-to operation describing a cubic Bézier curve
- * @GSK_PATH_CUBIC: A curve-to operation describing a cubic Bézier curve with 4
+ *     with 4 points describing the start point, the two control points
- *   points describing the start point, the two control points and the end point
+ *     and the end point of the curve.
- *   of the curve.
- * @GSK_PATH_CONIC: A weighted quadratic Bézier curve with 3 points describing
- *   the start point, control point and end point of the curve. A weight for the
- *   curve will be passed, too.
  *
- * Path operations are used to described segments of a `GskPath`.
+ * Path operations can be used to approximate a #GskPath.
  *
  * More values may be added in the future.
- *
+ **/
- * Since: 4.14
- */
 typedef enum {
   GSK_PATH_MOVE,
   GSK_PATH_CLOSE,
   GSK_PATH_LINE,
-  GSK_PATH_QUAD,
+  GSK_PATH_CURVE,
-  GSK_PATH_CUBIC,
-  GSK_PATH_CONIC,
 } GskPathOperation;
 
-/**
- * GskPathDirection:
- * @GSK_PATH_START: The side that leads to the start of the path
- * @GSK_PATH_END: The side that leads to the end of the path
- *
- * The values of the `GskPathDirection` enum are used to pick one
- * of the two sides of the path that at a given point on the path.
- *
- * Since: 4.14
- */
-typedef enum {
-  GSK_PATH_START,
-  GSK_PATH_END
-} GskPathDirection;
-
 /**
  * GskSerializationError:
  * @GSK_SERIALIZATION_UNSUPPORTED_FORMAT: The format can not be identified
@@ -408,3 +373,4 @@ typedef enum
   GSK_MASK_MODE_LUMINANCE,
   GSK_MASK_MODE_INVERTED_LUMINANCE
 } GskMaskMode;
+

gsk/gskpath.h

@@ -17,7 +17,8 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#pragma once
+#ifndef __GSK_PATH_H__
+#define __GSK_PATH_H__
 
 #if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gsk/gsk.h> can be included directly."
@@ -30,22 +31,19 @@ G_BEGIN_DECLS
 
 /**
  * GskPathForeachFlags:
- * @GSK_PATH_FOREACH_ALLOW_QUAD: Allow emission of `GSK_PATH_QUAD` operations
+ * @GSK_PATH_FOREACH_ALLOW_CURVES: Allow emission of %GSK_PATH_CURVE
- * @GSK_PATH_FOREACH_ALLOW_CUBIC: Allow emission of `GSK_PATH_CUBIC` operations.
+ *     operations.
- * @GSK_PATH_FOREACH_ALLOW_CONIC: Allow emission of `GSK_PATH_CONIC` operations.
  *
  * Flags that can be passed to gsk_path_foreach() to enable additional
  * features.
  *
- * By default, [method@Gsk.Path.foreach] will only emit a path with all operations
+ * By default, gsk_path_foreach() will only emit a path with all operations
  * flattened to straight lines to allow for maximum compatibility. The only
- * operations emitted will be `GSK_PATH_MOVE`, `GSK_PATH_LINE` and `GSK_PATH_CLOSE`.
+ * operations emitted will be %GSK_PATH_MOVE, %GSK_PATH_LINE and %GSK_PATH_CLOSE.
  */
 typedef enum
 {
-  GSK_PATH_FOREACH_ALLOW_QUAD  = (1 << 0),
+  GSK_PATH_FOREACH_ALLOW_CURVES = (1 << 0)
-  GSK_PATH_FOREACH_ALLOW_CUBIC = (1 << 1),
-  GSK_PATH_FOREACH_ALLOW_CONIC = (1 << 2),
 } GskPathForeachFlags;
 
 /**
@@ -53,7 +51,6 @@ typedef enum
  * @op: The operation to perform
  * @pts: The points of the operation
  * @n_pts: The number of points
- * @weight: The weight for conic curves, or unused if not a conic curve.
  * @user_data: The user data provided with the function
  *
  * Prototype of the callback to iterate throught the operations of
@@ -65,66 +62,47 @@ typedef enum
 typedef gboolean (* GskPathForeachFunc) (GskPathOperation        op,
                                          const graphene_point_t *pts,
                                          gsize                   n_pts,
-                                         float                   weight,
                                          gpointer                user_data);
 
 #define GSK_TYPE_PATH (gsk_path_get_type ())
 
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GType                   gsk_path_get_type                       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
+GskPath *               gsk_path_new_from_cairo                 (const cairo_path_t     *path);
 
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPath *               gsk_path_ref                            (GskPath                *self);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_unref                          (GskPath                *self);
 
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_print                          (GskPath                *self,
                                                                  GString                *string);
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 char *                  gsk_path_to_string                      (GskPath                *self);
 
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 GskPath *               gsk_path_parse                          (const char             *string);
 
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 void                    gsk_path_to_cairo                       (GskPath                *self,
                                                                  cairo_t                *cr);
 
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
 gboolean                gsk_path_is_empty                       (GskPath                *self);
-
+GDK_AVAILABLE_IN_ALL
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_is_closed                      (GskPath                *self);
-
-GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_get_bounds                     (GskPath                *self,
                                                                  graphene_rect_t        *bounds);
 
-GDK_AVAILABLE_IN_4_14
+GDK_AVAILABLE_IN_ALL
-gboolean                gsk_path_in_fill                        (GskPath                *self,
-                                                                 const graphene_point_t *point,
-                                                                 GskFillRule             fill_rule);
-
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_get_closest_point              (GskPath                *self,
-                                                                 const graphene_point_t *point,
-                                                                 float                   threshold,
-                                                                 GskPathPoint           *result);
-
-GDK_AVAILABLE_IN_4_14
 gboolean                gsk_path_foreach                        (GskPath                *self,
                                                                  GskPathForeachFlags     flags,
                                                                  GskPathForeachFunc      func,
                                                                  gpointer                user_data);
 
-GDK_AVAILABLE_IN_4_14
-gboolean                gsk_path_dash                           (GskPath                *self,
-                                                                 GskStroke              *stroke,
-                                                                 float                   tolerance,
-                                                                 GskPathForeachFunc      func,
-                                                                 gpointer                user_data);
-
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskPath, gsk_path_unref)
 
 G_END_DECLS
+
+#endif /* __GSK_PATH_H__ */