Add a test for quick key events

2023-05-05 20:48:09 -04:00
171 changed files with 1363 additions and 6199 deletions
@@ -70,7 +70,6 @@ style-check-diff:
      - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
-      - "${CI_PROJECT_DIR}/_build/testsuite/headless/*/*.log"
      - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
  cache:
    key: "$CI_JOB_NAME"
@@ -1,4 +1,4 @@
-Overview of Changes in 4.11.2, 09-05-2023
+Overview of Changes in 4.11.2, xx-xx-xxxx
 =========================================

 * GtkGLArea:
@@ -7,12 +7,6 @@ Overview of Changes in 4.11.2, 09-05-2023
 * GtkListBox:
 - Fix a problem with gtk_list_box_remove_all

-* Add the GtkSectionModel interface, and implement it in most
-  of our list models
-
-* GtkListView:
- - Support displaying sections
-
 * GtkCenterBox:
 - Add a shrink-center-last property

@@ -29,9 +23,6 @@ Overview of Changes in 4.11.2, 09-05-2023
 - A few memory leak fixes
 - Handle webdav in the pathbar

-* GtkBox:
- - Support baselines in vertical orientation with GtkBox:baseline-child
-
 * Dialogs:
 - Destroy windows promptly when the async callback finishes
 - Detect absence of the OpenURI portal and fall back
@@ -42,22 +33,12 @@ Overview of Changes in 4.11.2, 09-05-2023

 * Accessibility:
 - Fix alert dialogs in the a11y tree
- - Improve accessibility of GtkShortcutsWindow

 * Layout:
 - Some fixes to baseline alignment
- - Separate GTK_ALIGN_BASELINE_CENTER and _FILL
-
-* CSS:
- - Fix a crash with color transitions
-
-* GSK:
- - Fix problems with negative scales
- - Improve scaling of offscreens for (cross-fades, masks, blends)

 * GL:
 - Add GdkGLTextureBuilder, a more flexible api for creating textures
- - Support setting update regions for GL textures
 - Ensure that we work with GLES 2

 * Vulkan:
@@ -68,37 +49,23 @@ Overview of Changes in 4.11.2, 09-05-2023
 - Don't destroy wl_surfaces on hide
 - Plug leaks of compositor-side resources

-* X11:
- - Fix artifacts in gnome-shell frame decorations
-
-* Windows:
- - Fix GL context initialization
-
 * Inspector:
 - Improve the action list
- - Improve the accessibility pane
 - Fix a crash

 * Tools:
 - gtk4-node-editor: Improve scaling
 - gtk4-node-editor: Preserve aspect ratio of textures
- - gtk4-node-editor: Add some smarter editing
 - gtk4-demo: Make the stylus demo work with mice

-* Deprecations:
- - gtk_widget_get_allocated_width/height/baseline
- - GTK_ALIGN_BASELINE
-
 * Translation updates
 Bulgarian
 Chinese (China)
- Friulian
 Galician
 Hebrew
- Persian
 Polish
 Portuguese
- `Russian
+ Russian
 Turkish


@@ -1,201 +0,0 @@
-#!/usr/bin/env python3
-#
-# SPDX-FileCopyrightText: 2022 Collabora Inc.
-#                         2023 Emmanuele Bassi
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# Original author: Xavier Claessens <xclaesse@gmail.com>
-
-import argparse
-import textwrap
-from pathlib import Path
-
-
-# Disable line length warnings as wrapping the C code templates would be hard
-# flake8: noqa: E501
-
-
-def gen_versions_macros(args, current_major_version, current_minor_version, current_micro_version):
-    with args.out_path.open("w", encoding="utf-8") as ofile, args.in_path.open(
-        "r", encoding="utf-8"
-    ) as ifile:
-        for line in ifile.readlines():
-            if "@GDK_VERSIONS@" in line:
-                ofile.write(
-                    textwrap.dedent(
-                        f"""\
-                    /**
-                     * GDK_MAJOR_VERSION:
-                     *
-                     * The major version component of the library's version, e.g. "1" for "1.2.3".
-                     */
-                    #define GDK_MAJOR_VERSION ({current_major_version})
-
-                    /**
-                     * GDK_MINOR_VERSION:
-                     *
-                     * The minor version component of the library's version, e.g. "2" for "1.2.3".
-                     */
-                    #define GDK_MINOR_VERSION ({current_minor_version})
-
-                    /**
-                     * GDK_MICRO_VERSION:
-                     *
-                     * The micro version component of the library's version, e.g. "3" for "1.2.3".
-                     */
-                    #define GDK_MICRO_VERSION ({current_micro_version})
-                        """
-                        )
-                    )
-                for minor in range(0, current_minor_version + 2, 2):
-                    ofile.write(
-                        textwrap.dedent(
-                            f"""\
-                        /**
-                         * GDK_VERSION_{current_major_version}_{minor}:
-                         *
-                         * A macro that evaluates to the {current_major_version}.{minor} version of GTK, in a format
-                         * that can be used by the C pre-processor.
-                         *
-                         * Since: {current_major_version}.{minor}
-                         */
-                        #define GDK_VERSION_{current_major_version}_{minor} (G_ENCODE_VERSION ({current_major_version}, {minor}))
-                        """
-                        )
-                    )
-            else:
-                ofile.write(line)
-
-
-def gen_visibility_macros(args, current_major_version, current_minor_version, current_micro_version):
-    """
-    Generates a set of macros for each minor stable version of GTK
-
-    - GDK_DEPRECATED
-    - GDK_DEPRECATED_IN_…
-    - GDK_DEPRECATED_MACRO_IN_…
-    - GDK_DEPRECATED_ENUMERATOR_IN_…
-    - GDK_DEPRECATED_TYPE_IN_…
-
-    - GDK_AVAILABLE_IN_ALL
-    - GDK_AVAILABLE_IN_…
-    - GDK_AVAILABLE_STATIC_INLINE_IN_…
-    - GDK_AVAILABLE_MACRO_IN_…
-    - GDK_AVAILABLE_ENUMERATOR_IN_…
-    - GDK_AVAILABLE_TYPE_IN_…
-
-    - GDK_UNAVAILABLE(maj,min)
-    - GDK_UNAVAILABLE_STATIC_INLINE(maj,min)
-    """
-
-    ns = args.namespace
-    with args.out_path.open("w", encoding="utf-8") as f:
-        f.write(
-            textwrap.dedent(
-                f"""\
-            #pragma once
-
-            #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined({ns}_STATIC_COMPILATION)
-            #  define _{ns}_EXPORT __declspec(dllexport)
-            #  define _{ns}_IMPORT __declspec(dllimport)
-            #elif __GNUC__ >= 4
-            #  define _{ns}_EXPORT __attribute__((visibility("default")))
-            #  define _{ns}_IMPORT
-            #else
-            #  define _{ns}_EXPORT
-            #  define _{ns}_IMPORT
-            #endif
-            #ifdef GTK_COMPILATION
-            #  define _{ns}_API _{ns}_EXPORT
-            #else
-            #  define _{ns}_API _{ns}_IMPORT
-            #endif
-
-            #define _{ns}_EXTERN _{ns}_API extern
-
-            #define {ns}_VAR _{ns}_EXTERN
-            #define {ns}_AVAILABLE_IN_ALL _{ns}_EXTERN
-
-            #ifdef GDK_DISABLE_DEPRECATION_WARNINGS
-            #define {ns}_DEPRECATED _{ns}_EXTERN
-            #define {ns}_DEPRECATED_FOR(f) _{ns}_EXTERN
-            #define {ns}_UNAVAILABLE(maj,min) _{ns}_EXTERN
-            #define {ns}_UNAVAILABLE_STATIC_INLINE(maj,min)
-            #else
-            #define {ns}_DEPRECATED G_DEPRECATED _{ns}_EXTERN
-            #define {ns}_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _{ns}_EXTERN
-            #define {ns}_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _{ns}_EXTERN
-            #define {ns}_UNAVAILABLE_STATIC_INLINE(maj,min) G_UNAVAILABLE(maj,min)
-            #endif
-            """
-            )
-        )
-        for minor in range(0, current_minor_version + 2, 2):
-            f.write(
-                textwrap.dedent(
-                    f"""
-                #if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_{minor}
-                #define {ns}_DEPRECATED_IN_{current_major_version}_{minor} {ns}_DEPRECATED
-                #define {ns}_DEPRECATED_IN_{current_major_version}_{minor}_FOR(f) {ns}_DEPRECATED_FOR (f)
-                #define {ns}_DEPRECATED_MACRO_IN_{current_major_version}_{minor} GDK_DEPRECATED_MACRO
-                #define {ns}_DEPRECATED_MACRO_IN_{current_major_version}_{minor}_FOR(f) GDK_DEPRECATED_MACRO_FOR (f)
-                #define {ns}_DEPRECATED_ENUMERATOR_IN_{current_major_version}_{minor} GDK_DEPRECATED_ENUMERATOR
-                #define {ns}_DEPRECATED_ENUMERATOR_IN_{current_major_version}_{minor}_FOR(f) GDK_DEPRECATED_ENUMERATOR_FOR (f)
-                #define {ns}_DEPRECATED_TYPE_IN_{current_major_version}_{minor} GDK_DEPRECATED_TYPE
-                #define {ns}_DEPRECATED_TYPE_IN_{current_major_version}_{minor}_FOR(f) GDK_DEPRECATED_TYPE_FOR (f)
-                #else
-                #define {ns}_DEPRECATED_IN_{current_major_version}_{minor} _{ns}_EXTERN
-                #define {ns}_DEPRECATED_IN_{current_major_version}_{minor}_FOR(f) _{ns}_EXTERN
-                #define {ns}_DEPRECATED_MACRO_IN_{current_major_version}_{minor}
-                #define {ns}_DEPRECATED_MACRO_IN_{current_major_version}_{minor}_FOR(f)
-                #define {ns}_DEPRECATED_ENUMERATOR_IN_{current_major_version}_{minor}
-                #define {ns}_DEPRECATED_ENUMERATOR_IN_{current_major_version}_{minor}_FOR(f)
-                #define {ns}_DEPRECATED_TYPE_IN_{current_major_version}_{minor}
-                #define {ns}_DEPRECATED_TYPE_IN_{current_major_version}_{minor}_FOR(f)
-                #endif
-
-                #if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_{current_major_version}_{minor}
-                #define {ns}_AVAILABLE_IN_{current_major_version}_{minor} {ns}_UNAVAILABLE ({current_major_version}, {minor})
-                #define {ns}_AVAILABLE_STATIC_INLINE_IN_{current_major_version}_{minor} GDK_UNAVAILABLE_STATIC_INLINE ({current_major_version}, {minor})
-                #define {ns}_AVAILABLE_MACRO_IN_{current_major_version}_{minor} GDK_UNAVAILABLE_MACRO ({current_major_version}, {minor})
-                #define {ns}_AVAILABLE_ENUMERATOR_IN_{current_major_version}_{minor} GDK_UNAVAILABLE_ENUMERATOR ({current_major_version}, {minor})
-                #define {ns}_AVAILABLE_TYPE_IN_{current_major_version}_{minor} GDK_UNAVAILABLE_TYPE ({current_major_version}, {minor})
-                #else
-                #define {ns}_AVAILABLE_IN_{current_major_version}_{minor} _{ns}_EXTERN
-                #define {ns}_AVAILABLE_STATIC_INLINE_IN_{current_major_version}_{minor}
-                #define {ns}_AVAILABLE_MACRO_IN_{current_major_version}_{minor}
-                #define {ns}_AVAILABLE_ENUMERATOR_IN_{current_major_version}_{minor}
-                #define {ns}_AVAILABLE_TYPE_IN_{current_major_version}_{minor}
-                #endif
-                """
-                )
-            )
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("gtk_version", help="Current GLib version")
-    subparsers = parser.add_subparsers()
-
-    versions_parser = subparsers.add_parser(
-        "versions-macros", help="Generate versions macros"
-    )
-    versions_parser.add_argument("in_path", help="input file", type=Path)
-    versions_parser.add_argument("out_path", help="output file", type=Path)
-    versions_parser.set_defaults(func=gen_versions_macros)
-
-    visibility_parser = subparsers.add_parser(
-        "visibility-macros", help="Generate visibility macros"
-    )
-    visibility_parser.add_argument("namespace", help="Macro namespace")
-    visibility_parser.add_argument("out_path", help="output file", type=Path)
-    visibility_parser.set_defaults(func=gen_visibility_macros)
-
-    args = parser.parse_args()
-    version = [int(i) for i in args.gtk_version.split(".")]
-    args.func(args, version[0], version[1], version[2])
-
-
-if __name__ == "__main__":
-    main()
@@ -116,8 +116,7 @@ effective_align (GtkAlign         align,
      return direction == GTK_TEXT_DIR_RTL ? GTK_ALIGN_START : GTK_ALIGN_END;
    case GTK_ALIGN_FILL:
    case GTK_ALIGN_CENTER:
-    case GTK_ALIGN_BASELINE_FILL:
-    case GTK_ALIGN_BASELINE_CENTER:
+    case GTK_ALIGN_BASELINE:
    default:
      return align;
    }
@@ -259,8 +258,7 @@ blur_overlay_get_child_position (BlurOverlay    *overlay,
    case GTK_ALIGN_END:
      alloc->x += width - alloc->width;
      break;
-    case GTK_ALIGN_BASELINE_FILL:
-    case GTK_ALIGN_BASELINE_CENTER:
+    case GTK_ALIGN_BASELINE:
    default:
      g_assert_not_reached ();
      break;
@@ -283,8 +281,7 @@ blur_overlay_get_child_position (BlurOverlay    *overlay,
    case GTK_ALIGN_END:
      alloc->y += height - alloc->height;
      break;
-    case GTK_ALIGN_BASELINE_FILL:
-    case GTK_ALIGN_BASELINE_CENTER:
+    case GTK_ALIGN_BASELINE:
    default:
      g_assert_not_reached ();
      break;
@@ -51,11 +51,15 @@ struct _BlurOverlayClass
                                  GtkAllocation *allocation);
 };

+GDK_AVAILABLE_IN_ALL
 GType      blur_overlay_get_type    (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *blur_overlay_new         (void);
+GDK_AVAILABLE_IN_ALL
 void       blur_overlay_add_overlay (BlurOverlay *overlay,
                                     GtkWidget   *widget,
                                     double       blur);
+GDK_AVAILABLE_IN_ALL
 void       blur_overlay_set_child   (BlurOverlay *overlay,
                                     GtkWidget   *widget);

@@ -195,9 +195,6 @@
  <gresource prefix="/listview_settings">
    <file>listview_settings.ui</file>
  </gresource>
-  <gresource prefix="/listview_settings2">
-    <file>listview_settings2.ui</file>
-  </gresource>
  <gresource prefix="/listview_ucd_data/">
    <file>ucdnames.data</file>
  </gresource>
@@ -315,7 +312,6 @@
    <file>listview_minesweeper.c</file>
    <file>listview_selections.c</file>
    <file>listview_settings.c</file>
-    <file>listview_settings2.c</file>
    <file>listview_ucd.c</file>
    <file>listview_weather.c</file>
    <file>listview_words.c</file>
@@ -1294,18 +1294,18 @@ add_axis (hb_face_t             *hb_face,

  axis_label = gtk_label_new (name);
  gtk_widget_set_halign (axis_label, GTK_ALIGN_START);
-  gtk_widget_set_valign (axis_label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (axis_label, GTK_ALIGN_BASELINE);
  gtk_grid_attach (GTK_GRID (demo->variations_grid), axis_label, 0, i, 1, 1);
  adjustment = gtk_adjustment_new (value, ax->min_value, ax->max_value,
                                   1.0, 10.0, 0.0);
  axis_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
  gtk_scale_add_mark (GTK_SCALE (axis_scale), ax->default_value, GTK_POS_TOP, NULL);
-  gtk_widget_set_valign (axis_scale, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (axis_scale, GTK_ALIGN_BASELINE);
  gtk_widget_set_hexpand (axis_scale, TRUE);
  gtk_widget_set_size_request (axis_scale, 100, -1);
  gtk_grid_attach (GTK_GRID (demo->variations_grid), axis_scale, 1, i, 1, 1);
  axis_entry = gtk_entry_new ();
-  gtk_widget_set_valign (axis_entry, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (axis_entry, GTK_ALIGN_BASELINE);
  gtk_editable_set_width_chars (GTK_EDITABLE (axis_entry), 4);
  gtk_editable_set_max_width_chars (GTK_EDITABLE (axis_entry), 4);
  gtk_widget_set_hexpand (axis_entry, FALSE);
@@ -1562,14 +1562,14 @@ update_font_variations (void)
      label = gtk_label_new ("Instance");
      gtk_label_set_xalign (GTK_LABEL (label), 0);
      gtk_widget_set_halign (label, GTK_ALIGN_START);
-      gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+      gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
      gtk_grid_attach (GTK_GRID (demo->variations_grid), label, 0, -1, 1, 1);

      strings = gtk_string_list_new (NULL);
      combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);

      gtk_widget_set_halign (combo, GTK_ALIGN_START);
-      gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE_FILL);
+      gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE);

      gtk_string_list_append (strings, "");

@@ -27,17 +27,24 @@ G_BEGIN_DECLS

 #define GSK_TYPE_SHADER_PAINTABLE (gsk_shader_paintable_get_type ())

+GDK_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (GskShaderPaintable, gsk_shader_paintable, GSK, SHADER_PAINTABLE, GObject)

+GDK_AVAILABLE_IN_ALL
 GdkPaintable *   gsk_shader_paintable_new              (GskGLShader        *shader,
                                                        GBytes             *data);

+GDK_AVAILABLE_IN_ALL
 GskGLShader *    gsk_shader_paintable_get_shader       (GskShaderPaintable *self);
+GDK_AVAILABLE_IN_ALL
 void             gsk_shader_paintable_set_shader       (GskShaderPaintable *self,
                                                        GskGLShader        *shader);
+GDK_AVAILABLE_IN_ALL
 GBytes *         gsk_shader_paintable_get_args         (GskShaderPaintable *self);
+GDK_AVAILABLE_IN_ALL
 void             gsk_shader_paintable_set_args         (GskShaderPaintable *self,
                                                        GBytes             *data);
+GDK_AVAILABLE_IN_ALL
 void             gsk_shader_paintable_update_time      (GskShaderPaintable *self,
                                                        int                 time_idx,
                                                        gint64              frame_time);
@@ -370,7 +370,7 @@ do_iconscroll (GtkWidget *do_widget)
      set_widget_type (0);

      label = GTK_WIDGET (gtk_builder_get_object (builder, "fps_label"));
-      id = g_timeout_add_full (G_PRIORITY_HIGH, 500, update_fps, label, NULL);
+      id = g_timeout_add (500, update_fps, label);
      g_object_set_data_full (G_OBJECT (label), "timeout",
                              GUINT_TO_POINTER (id), remove_timeout);

@@ -14,7 +14,138 @@

 #include <gtk/gtk.h>

-#include "settings-key.h"
+#include <stdlib.h>
+
+/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
+typedef struct _SettingsKey SettingsKey;
+struct _SettingsKey
+{
+  GObject parent_instance;
+
+  GSettings *settings;
+  GSettingsSchemaKey *key;
+};
+
+enum {
+  PROP_0,
+  PROP_NAME,
+  PROP_SUMMARY,
+  PROP_DESCRIPTION,
+  PROP_VALUE,
+  PROP_TYPE,
+  PROP_DEFAULT_VALUE,
+
+  N_PROPS
+};
+
+#define SETTINGS_TYPE_KEY (settings_key_get_type ())
+G_DECLARE_FINAL_TYPE (SettingsKey, settings_key, SETTINGS, KEY, GObject);
+
+G_DEFINE_TYPE (SettingsKey, settings_key, G_TYPE_OBJECT);
+static GParamSpec *properties[N_PROPS] = { NULL, };
+
+static void
+settings_key_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  SettingsKey *self = SETTINGS_KEY (object);
+
+  switch (property_id)
+    {
+    case PROP_DESCRIPTION:
+      g_value_set_string (value, g_settings_schema_key_get_description (self->key));
+      break;
+
+    case PROP_NAME:
+      g_value_set_string (value, g_settings_schema_key_get_name (self->key));
+      break;
+
+    case PROP_SUMMARY:
+      g_value_set_string (value, g_settings_schema_key_get_summary (self->key));
+      break;
+
+    case PROP_VALUE:
+      {
+        GVariant *variant = g_settings_get_value (self->settings, g_settings_schema_key_get_name (self->key));
+        g_value_take_string (value, g_variant_print (variant, FALSE));
+        g_variant_unref (variant);
+      }
+      break;
+
+    case PROP_TYPE:
+      {
+        const GVariantType *type = g_settings_schema_key_get_value_type (self->key);
+        g_value_set_string (value, g_variant_type_peek_string (type));
+      }
+      break;
+
+    case PROP_DEFAULT_VALUE:
+      {
+        GVariant *variant = g_settings_schema_key_get_default_value (self->key);
+        g_value_take_string (value, g_variant_print (variant, FALSE));
+        g_variant_unref (variant);
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+settings_key_finalize (GObject *object)
+{
+  SettingsKey *self = SETTINGS_KEY (object);
+
+  g_object_unref (self->settings);
+  g_settings_schema_key_unref (self->key);
+
+  G_OBJECT_CLASS (settings_key_parent_class)->finalize (object);
+}
+
+static void
+settings_key_class_init (SettingsKeyClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = settings_key_finalize;
+  gobject_class->get_property = settings_key_get_property;
+
+  properties[PROP_DESCRIPTION] =
+    g_param_spec_string ("description", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_NAME] =
+    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_SUMMARY] =
+    g_param_spec_string ("summary", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_VALUE] =
+    g_param_spec_string ("value", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_TYPE] =
+    g_param_spec_string ("type", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_DEFAULT_VALUE] =
+    g_param_spec_string ("default-value", NULL, NULL, NULL, G_PARAM_READABLE);
+
+  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+}
+
+static void
+settings_key_init (SettingsKey *self)
+{
+}
+
+static SettingsKey *
+settings_key_new (GSettings          *settings,
+                  GSettingsSchemaKey *key)
+{
+  SettingsKey *result = g_object_new (SETTINGS_TYPE_KEY, NULL);
+
+  result->settings = g_object_ref (settings);
+  result->key = g_settings_schema_key_ref (key);
+
+  return result;
+}

 static void
 item_value_changed (GtkEditableLabel  *label,
@@ -22,7 +153,6 @@ item_value_changed (GtkEditableLabel  *label,
                    GtkColumnViewCell *cell)
 {
  SettingsKey *self;
-  GSettingsSchemaKey *key;
  const char *text;
  const GVariantType *type;
  GVariant *variant;
@@ -33,10 +163,9 @@ item_value_changed (GtkEditableLabel  *label,
  text = gtk_editable_get_text (GTK_EDITABLE (label));

  self = gtk_column_view_cell_get_item (cell);
-  key = settings_key_get_key (self);

-  type = g_settings_schema_key_get_value_type (key);
-  name = g_settings_schema_key_get_name (key);
+  type = g_settings_schema_key_get_value_type (self->key);
+  name = g_settings_schema_key_get_name (self->key);

  variant = g_variant_parse (type, text, NULL, NULL, &error);
  if (!variant)
@@ -46,13 +175,13 @@ item_value_changed (GtkEditableLabel  *label,
      goto revert;
    }

-  if (!g_settings_schema_key_range_check (key, variant))
+  if (!g_settings_schema_key_range_check (self->key, variant))
    {
      g_warning ("Not a valid value for %s", name);
      goto revert;
    }

-  g_settings_set_value (settings_key_get_settings (self), name, variant);
+  g_settings_set_value (self->settings, name, variant);
  g_variant_unref (variant);
  return;

@@ -1,230 +0,0 @@
-/* Lists/Settings v2
- * #Keywords: GtkListHeaderFactory, GtkSectionModel
- *
- * This demo shows a settings viewer for GSettings.
- *
- * It demonstrates how to implement support for sections with GtkListView.
- *
- * It also shows how to quickly flatten a large tree of items into a list
- * that can be filtered to find the itmes one is looking for.
- */
-
-#include <gtk/gtk.h>
-
-#include "settings-key.h"
-
-static void
-item_value_changed (GtkEditableLabel  *label,
-                    GParamSpec        *pspec,
-                    GtkColumnViewCell *cell)
-{
-  SettingsKey *self;
-  GSettingsSchemaKey *key;
-  const char *text;
-  const GVariantType *type;
-  GVariant *variant;
-  GError *error = NULL;
-  const char *name;
-  char *value;
-
-  text = gtk_editable_get_text (GTK_EDITABLE (label));
-
-  self = gtk_column_view_cell_get_item (cell);
-  key = settings_key_get_key (self);
-
-  type = g_settings_schema_key_get_value_type (key);
-  name = g_settings_schema_key_get_name (key);
-
-  variant = g_variant_parse (type, text, NULL, NULL, &error);
-  if (!variant)
-    {
-      g_warning ("%s", error->message);
-      g_clear_error (&error);
-      goto revert;
-    }
-
-  if (!g_settings_schema_key_range_check (key, variant))
-    {
-      g_warning ("Not a valid value for %s", name);
-      goto revert;
-    }
-
-  g_settings_set_value (settings_key_get_settings (self), name, variant);
-  g_variant_unref (variant);
-  return;
-
-revert:
-  gtk_widget_error_bell (GTK_WIDGET (label));
-
-  g_object_get (self, "value", &value, NULL);
-  gtk_editable_set_text (GTK_EDITABLE (label), value);
-  g_free (value);
-}
-
-static int
-strvcmp (gconstpointer p1,
-         gconstpointer p2)
-{
-  const char * const *s1 = p1;
-  const char * const *s2 = p2;
-
-  return strcmp (*s1, *s2);
-}
-
-static gpointer
-map_settings_to_keys (gpointer item,
-                      gpointer unused)
-{
-  GSettings *settings = item;
-  GSettingsSchema *schema;
-  GListStore *store;
-  char **keys;
-  guint i;
-
-  g_object_get (settings, "settings-schema", &schema, NULL);
-
-  store = g_list_store_new (SETTINGS_TYPE_KEY);
-
-  keys = g_settings_schema_list_keys (schema);
-
-  for (i = 0; keys[i] != NULL; i++)
-    {
-      GSettingsSchemaKey *almost_there = g_settings_schema_get_key (schema, keys[i]);
-      SettingsKey *finally = settings_key_new (settings, almost_there);
-      g_list_store_append (store, finally);
-      g_object_unref (finally);
-      g_settings_schema_key_unref (almost_there);
-    }
-
-  g_strfreev (keys);
-  g_settings_schema_unref (schema);
-  g_object_unref (settings);
-
-  return store;
-}
-
-static GListModel *
-create_settings_model (gpointer item,
-                       gpointer unused)
-{
-  GSettings *settings = item;
-  char **schemas;
-  GListStore *result;
-  guint i;
-
-  if (settings == NULL)
-    {
-      g_settings_schema_source_list_schemas (g_settings_schema_source_get_default (),
-                                             TRUE,
-                                             &schemas,
-                                             NULL);
-    }
-  else
-    {
-      schemas = g_settings_list_children (settings);
-    }
-
-  if (schemas == NULL || schemas[0] == NULL)
-    {
-      g_free (schemas);
-      return NULL;
-    }
-
-  qsort (schemas, g_strv_length (schemas), sizeof (char *), strvcmp);
-
-  result = g_list_store_new (G_TYPE_SETTINGS);
-  for (i = 0;  schemas[i] != NULL; i++)
-    {
-      GSettings *child;
-
-      if (settings == NULL)
-        child = g_settings_new (schemas[i]);
-      else
-        child = g_settings_get_child (settings, schemas[i]);
-
-      g_list_store_append (result, child);
-      g_object_unref (child);
-    }
-
-  g_strfreev (schemas);
-
-  return G_LIST_MODEL (result);
-}
-
-static void
-search_enabled (GtkSearchEntry *entry)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-}
-
-static void
-stop_search (GtkSearchEntry *entry,
-             gpointer data)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_settings2 (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkListView *listview;
-      GListModel *model;
-      GtkTreeListModel *treemodel;
-      GtkNoSelection *selection;
-      GtkBuilderScope *scope;
-      GtkBuilder *builder;
-      GError *error = NULL;
-      GtkFilter *filter;
-
-      g_type_ensure (SETTINGS_TYPE_KEY);
-
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, search_enabled);
-      gtk_builder_cscope_add_callback (scope, stop_search);
-      gtk_builder_cscope_add_callback (scope, settings_key_get_search_string);
-      gtk_builder_cscope_add_callback (scope, item_value_changed);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      g_object_unref (scope);
-
-      gtk_builder_add_from_resource (builder, "/listview_settings2/listview_settings2.ui", &error);
-      g_assert_no_error (error);
-
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      listview = GTK_LIST_VIEW (gtk_builder_get_object (builder, "listview"));
-      filter = GTK_FILTER (gtk_builder_get_object (builder, "filter"));
-
-      model = create_settings_model (NULL, NULL);
-      treemodel = gtk_tree_list_model_new (model,
-                                           TRUE,
-                                           TRUE,
-                                           create_settings_model,
-                                           NULL,
-                                           NULL);
-      model = G_LIST_MODEL (gtk_map_list_model_new (G_LIST_MODEL (treemodel), map_settings_to_keys, NULL, NULL));
-      model = G_LIST_MODEL (gtk_flatten_list_model_new (model));
-      model = G_LIST_MODEL (gtk_filter_list_model_new (model, g_object_ref (filter)));
-      selection = gtk_no_selection_new (model);
-
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), GTK_SELECTION_MODEL (selection));
-      g_object_unref (selection);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkStringFilter" id="filter">
-    <property name="expression">
-      <closure type="gchararray" function="settings_key_get_search_string" />
-    </property>
-    <property name="search" bind-source="entry" bind-property="text" />
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Settings</property>
-    <property name="default-width">640</property>
-    <property name="default-height">480</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <child type="end">
-          <object class="GtkToggleButton" id="search_button">
-            <property name="icon-name">system-search-symbolic</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkSearchBar">
-            <property name="search-mode-enabled" bind-source="search_button" bind-property="active" bind-flags="bidirectional"/>
-            <signal name="notify::search-mode-enabled" handler="search_enabled" object="entry"/>
-            <child>
-              <object class="GtkSearchEntry" id="entry">
-                <signal name="stop-search" handler="stop_search"/>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow">
-            <child>
-              <object class="GtkListView" id="listview">
-                <property name="vexpand">1</property>
-                <style>
-                  <class name="rich-list"/>
-                </style>
-                <property name="factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="xalign">0</property>
-                <binding name="label">
-                  <lookup name="name" type="SettingsKey">
-                    <lookup name="item">GtkListItem</lookup>
-                  </lookup>
-                </binding>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <style>
-                  <class name="dim-label"/>
-                </style>
-                <property name="xalign">0</property>
-                <property name="ellipsize">end</property>
-                <binding name="label">
-                  <lookup name="summary" type="SettingsKey">
-                    <lookup name="item">GtkListItem</lookup>
-                  </lookup>
-                </binding>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry">
-            <property name="hexpand">1</property>
-            <property name="halign">end</property>
-            <binding name="text">
-              <lookup name="value" type="SettingsKey">
-                <lookup name="item">GtkListItem</lookup>
-              </lookup>
-            </binding>
-            <signal name="notify::label" handler="item_value_changed"/>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-                    ]]></property>
-                  </object>
-                </property>
-                <property name="header-factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListHeader">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="schema" type="GSettings">
-            <lookup name="settings" type="SettingsKey">
-              <lookup name="item">GtkListHeader</lookup>
-            </lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                    ]]></property>
-                  </object>
-                </property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -57,7 +57,6 @@ demos = files([
  'listview_minesweeper.c',
  'listview_selections.c',
  'listview_settings.c',
-  'listview_settings2.c',
  'listview_ucd.c',
  'listview_weather.c',
  'listview_words.c',
@@ -132,7 +131,6 @@ extra_demo_sources = files([
  'demo4widget.c',
  'pixbufpaintable.c',
  'script-names.c',
-  'settings-key.c',
  'unicode-names.c',
  'suggestionentry.c',
  'language-names.c',
@@ -235,7 +233,8 @@ endif
 demo_cflags = []
 foreach flag: common_cflags
  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations']
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
    demo_cflags += flag
  endif
 endforeach
@@ -1,165 +0,0 @@
-#include "settings-key.h"
-
-/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
-struct _SettingsKey
-{
-  GObject parent_instance;
-
-  GSettings *settings;
-  GSettingsSchemaKey *key;
-};
-
-enum {
-  PROP_0,
-  PROP_NAME,
-  PROP_SETTINGS,
-  PROP_SUMMARY,
-  PROP_DESCRIPTION,
-  PROP_VALUE,
-  PROP_TYPE,
-  PROP_DEFAULT_VALUE,
-
-  N_PROPS
-};
-
-G_DEFINE_TYPE (SettingsKey, settings_key, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-settings_key_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  switch (property_id)
-    {
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, g_settings_schema_key_get_description (self->key));
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, g_settings_schema_key_get_name (self->key));
-      break;
-
-    case PROP_SUMMARY:
-      g_value_set_string (value, g_settings_schema_key_get_summary (self->key));
-      break;
-
-    case PROP_VALUE:
-      {
-        GVariant *variant = g_settings_get_value (self->settings, g_settings_schema_key_get_name (self->key));
-        g_value_take_string (value, g_variant_print (variant, FALSE));
-        g_variant_unref (variant);
-      }
-      break;
-
-    case PROP_TYPE:
-      {
-        const GVariantType *type = g_settings_schema_key_get_value_type (self->key);
-        g_value_set_string (value, g_variant_type_peek_string (type));
-      }
-      break;
-
-    case PROP_DEFAULT_VALUE:
-      {
-        GVariant *variant = g_settings_schema_key_get_default_value (self->key);
-        g_value_take_string (value, g_variant_print (variant, FALSE));
-        g_variant_unref (variant);
-      }
-      break;
-
-    case PROP_SETTINGS:
-      g_value_set_object (value, self->settings);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-settings_key_finalize (GObject *object)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  g_object_unref (self->settings);
-  g_settings_schema_key_unref (self->key);
-
-  G_OBJECT_CLASS (settings_key_parent_class)->finalize (object);
-}
-
-static void
-settings_key_class_init (SettingsKeyClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = settings_key_finalize;
-  gobject_class->get_property = settings_key_get_property;
-
-  properties[PROP_DESCRIPTION] =
-    g_param_spec_string ("description", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_NAME] =
-    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_SETTINGS] =
-    g_param_spec_object ("settings", NULL, NULL, G_TYPE_SETTINGS, G_PARAM_READABLE);
-  properties[PROP_SUMMARY] =
-    g_param_spec_string ("summary", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_VALUE] =
-    g_param_spec_string ("value", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_TYPE] =
-    g_param_spec_string ("type", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_DEFAULT_VALUE] =
-    g_param_spec_string ("default-value", NULL, NULL, NULL, G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-settings_key_init (SettingsKey *self)
-{
-}
-
-SettingsKey *
-settings_key_new (GSettings          *settings,
-                  GSettingsSchemaKey *key)
-{
-  SettingsKey *result = g_object_new (SETTINGS_TYPE_KEY, NULL);
-
-  result->settings = g_object_ref (settings);
-  result->key = g_settings_schema_key_ref (key);
-
-  return result;
-}
-
-GSettingsSchemaKey *
-settings_key_get_key (SettingsKey *self)
-{
-  return self->key;
-}
-
-GSettings *
-settings_key_get_settings (SettingsKey *self)
-{
-  return self->settings;
-}
-
-char *
-settings_key_get_search_string (SettingsKey *self)
-{
-  char *schema, *result;
-
-  g_object_get (self->settings, "schema-id", &schema, NULL);
-
-  result = g_strconcat (g_settings_schema_key_get_name (self->key), " ",
-                        g_settings_schema_key_get_summary (self->key), " ",
-                        schema,
-                        NULL);
-
-  g_free (schema);
-
-  return result;
-}
-
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#include <stdlib.h>
-
-/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
-typedef struct _SettingsKey SettingsKey;
-#define SETTINGS_TYPE_KEY (settings_key_get_type ())
-G_DECLARE_FINAL_TYPE (SettingsKey, settings_key, SETTINGS, KEY, GObject);
-
-SettingsKey *           settings_key_new                        (GSettings              *settings,
-                                                                 GSettingsSchemaKey     *key);
-
-GSettingsSchemaKey *    settings_key_get_key                    (SettingsKey            *self);
-GSettings *             settings_key_get_settings               (SettingsKey            *self);
-char *                  settings_key_get_search_string          (SettingsKey            *self);
@@ -28,14 +28,14 @@ add_row (GtkGrid      *table,

  label = gtk_label_new_with_mnemonic (label_text);
  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
  gtk_widget_set_hexpand (label, TRUE);
  gtk_grid_attach (table, label, 0, row, 1, 1);

  dropdown = gtk_drop_down_new_from_strings (options);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), dropdown);
  gtk_widget_set_halign (dropdown, GTK_ALIGN_END);
-  gtk_widget_set_valign (dropdown, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (dropdown, GTK_ALIGN_BASELINE);
  gtk_size_group_add_widget (size_group, dropdown);
  gtk_grid_attach (table, dropdown, 1, row, 1, 1);
 }
@@ -1190,362 +1190,11 @@ node_editor_window_unrealize (GtkWidget *widget)
  GTK_WIDGET_CLASS (node_editor_window_parent_class)->unrealize (widget);
 }

-typedef struct
-{
-  NodeEditorWindow *self;
-  GtkTextIter start, end;
-} Selection;
-
-static void
-color_cb (GObject *source,
-          GAsyncResult *result,
-          gpointer data)
-{
-  GtkColorDialog *dialog = GTK_COLOR_DIALOG (source);
-  Selection *selection = data;
-  NodeEditorWindow *self = selection->self;
-  GdkRGBA *color;
-  char *text;
-  GError *error = NULL;
-  GtkTextBuffer *buffer;
-
-  color = gtk_color_dialog_choose_rgba_finish (dialog, result, &error);
-  if (!color)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      g_free (selection);
-      return;
-    }
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-
-  text = gdk_rgba_to_string (color);
-  gtk_text_buffer_delete (buffer, &selection->start, &selection->end);
-  gtk_text_buffer_insert (buffer, &selection->start, text, -1);
-
-  g_free (text);
-  gdk_rgba_free (color);
-  g_free (selection);
-}
-
-static void
-font_cb (GObject *source,
-          GAsyncResult *result,
-          gpointer data)
-{
-  GtkFontDialog *dialog = GTK_FONT_DIALOG (source);
-  Selection *selection = data;
-  NodeEditorWindow *self = selection->self;
-  GError *error = NULL;
-  PangoFontDescription *desc;
-  GtkTextBuffer *buffer;
-  char *text;
-
-  desc = gtk_font_dialog_choose_font_finish (dialog, result, &error);
-  if (!desc)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      g_free (selection);
-      return;
-    }
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-
-  text = pango_font_description_to_string (desc);
-  gtk_text_buffer_delete (buffer, &selection->start, &selection->end);
-  gtk_text_buffer_insert (buffer, &selection->start, text, -1);
-
-  g_free (text);
-  pango_font_description_free (desc);
-  g_free (selection);
-}
-
-static void
-file_cb (GObject *source,
-          GAsyncResult *result,
-          gpointer data)
-{
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  Selection *selection = data;
-  NodeEditorWindow *self = selection->self;
-  GError *error = NULL;
-  GFile *file;
-  GtkTextBuffer *buffer;
-  char *text;
-
-  file = gtk_file_dialog_open_finish (dialog, result, &error);
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      g_free (selection);
-      return;
-    }
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-
-  text = g_file_get_uri (file);
-  gtk_text_buffer_delete (buffer, &selection->start, &selection->end);
-  gtk_text_buffer_insert (buffer, &selection->start, text, -1);
-
-  g_free (text);
-  g_object_unref (file);
-  g_free (selection);
-}
-
-static void
-key_pressed (GtkEventControllerKey *controller,
-             unsigned int keyval,
-             unsigned int keycode,
-             GdkModifierType state,
-             gpointer data)
-{
-  GtkWidget *dd = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (controller));
-  Selection *selection = data;
-  NodeEditorWindow *self = selection->self;
-  unsigned int selected;
-  GtkStringList *strings;
-  GtkTextBuffer *buffer;
-  const char *text;
-
-  if (keyval != GDK_KEY_Escape)
-    return;
-
-  strings = GTK_STRING_LIST (gtk_drop_down_get_model (GTK_DROP_DOWN (dd)));
-  selected = gtk_drop_down_get_selected (GTK_DROP_DOWN (dd));
-  text = gtk_string_list_get_string (strings, selected);
-
-  gtk_text_view_remove (GTK_TEXT_VIEW (self->text_view), dd);
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-  gtk_text_iter_backward_search (&selection->start, "mode:", 0, NULL, &selection->start, NULL);
-  gtk_text_iter_forward_search (&selection->start, ";", 0, &selection->end, NULL, NULL);
-  gtk_text_buffer_delete (buffer, &selection->start, &selection->end);
-  gtk_text_buffer_insert (buffer, &selection->start, " ", -1);
-  gtk_text_buffer_insert (buffer, &selection->start, text, -1);
-}
-
-static void
-node_editor_window_edit (NodeEditorWindow *self,
-                         GtkTextIter      *iter)
-{
-  GtkTextIter start, end;
-  GtkTextBuffer *buffer;
-  Selection *selection;
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-
-  gtk_text_iter_set_line_offset (iter, 0);
-
-  if (gtk_text_iter_forward_search (iter, ";", 0, &end, NULL, NULL) &&
-      gtk_text_iter_forward_search (iter, "color:", 0, NULL, &start, &end))
-    {
-      GtkColorDialog *dialog;
-      GdkRGBA color;
-      char *text;
-
-      while (g_unichar_isspace (gtk_text_iter_get_char (&start)))
-        gtk_text_iter_forward_char (&start);
-
-      gtk_text_buffer_select_range (buffer, &start, &end);
-      text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-      gdk_rgba_parse (&color, text);
-      g_free (text);
-
-      selection = g_new0 (Selection, 1);
-      selection->self = self;
-      selection->start = start;
-      selection->end = end;
-
-      dialog = gtk_color_dialog_new ();
-      gtk_color_dialog_choose_rgba (dialog, GTK_WINDOW (self), &color, NULL, color_cb, selection);
-    }
-  else if (gtk_text_iter_forward_search (iter, ";", 0, &end, NULL, NULL) &&
-           gtk_text_iter_forward_search (iter, "font:", 0, NULL, &start, &end))
-    {
-      GtkFontDialog *dialog;
-      PangoFontDescription *desc;
-      char *text;
-
-      while (g_unichar_isspace (gtk_text_iter_get_char (&start)))
-        gtk_text_iter_forward_char (&start);
-
-      /* Skip the quotes */
-      gtk_text_iter_forward_char (&start);
-      gtk_text_iter_backward_char (&end);
-
-      gtk_text_buffer_select_range (buffer, &start, &end);
-
-      text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-      desc = pango_font_description_from_string (text);
-      g_free (text);
-
-      selection = g_new0 (Selection, 1);
-      selection->self = self;
-      selection->start = start;
-      selection->end = end;
-
-      dialog = gtk_font_dialog_new ();
-      gtk_font_dialog_choose_font (dialog, GTK_WINDOW (self), desc, NULL, font_cb, selection);
-      pango_font_description_free (desc);
-    }
-  else if (gtk_text_iter_forward_search (iter, ";", 0, &end, NULL, NULL) &&
-           gtk_text_iter_forward_search (iter, "mode:", 0, NULL, &start, &end))
-    {
-      /* Assume we have a blend node, for now */
-      GEnumClass *class;
-      GtkStringList *strings;
-      GtkWidget *dd;
-      GtkTextChildAnchor *anchor;
-      unsigned int selected = 0;
-      GtkEventController *key_controller;
-      gboolean is_blend_mode = FALSE;
-      char *text;
-
-      while (g_unichar_isspace (gtk_text_iter_get_char (&start)))
-        gtk_text_iter_forward_char (&start);
-
-      text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-
-      strings = gtk_string_list_new (NULL);
-      class = g_type_class_ref (GSK_TYPE_BLEND_MODE);
-      for (unsigned int i = 0; i < class->n_values; i++)
-        {
-          if (strcmp (class->values[i].value_nick, text) == 0)
-            is_blend_mode = TRUE;
-        }
-      g_type_class_unref (class);
-
-      if (is_blend_mode)
-        class = g_type_class_ref (GSK_TYPE_BLEND_MODE);
-      else
-        class = g_type_class_ref (GSK_TYPE_MASK_MODE);
-
-       for (unsigned int i = 0; i < class->n_values; i++)
-         {
-           if (i == 0 && is_blend_mode)
-             gtk_string_list_append (strings, "normal");
-           else
-             gtk_string_list_append (strings, class->values[i].value_nick);
-
-           if (strcmp (class->values[i].value_nick, text) == 0)
-             selected = i;
-         }
-      g_type_class_unref (class);
-
-      gtk_text_buffer_delete (buffer, &start, &end);
-
-      anchor = gtk_text_buffer_create_child_anchor (buffer, &start);
-      dd = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (dd), selected);
-      gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (self->text_view), dd, anchor);
-
-      selection = g_new0 (Selection, 1);
-      selection->self = self;
-      selection->start = start;
-      selection->end = end;
-
-      key_controller = gtk_event_controller_key_new ();
-      g_signal_connect (key_controller, "key-pressed", G_CALLBACK (key_pressed), selection);
-      gtk_widget_add_controller (dd, key_controller);
-    }
-  else if (gtk_text_iter_forward_search (iter, ";", 0, &end, NULL, NULL) &&
-           gtk_text_iter_forward_search (iter, "texture:", 0, NULL, &start, &end))
-    {
-      GtkFileDialog *dialog;
-      GtkTextIter skip;
-      char *text;
-      GFile *file;
-
-      while (g_unichar_isspace (gtk_text_iter_get_char (&start)))
-        gtk_text_iter_forward_char (&start);
-
-      skip = start;
-      gtk_text_iter_forward_chars (&skip, strlen ("url(\""));
-      text = gtk_text_iter_get_text (&start, &skip);
-      if (strcmp (text, "url(\"") != 0)
-        {
-          g_free (text);
-          return;
-        }
-      g_free (text);
-      start = skip;
-
-      skip = end;
-      gtk_text_iter_backward_chars (&skip, strlen ("\")"));
-      text = gtk_text_iter_get_text (&skip, &end);
-      if (strcmp (text, "\")") != 0)
-        {
-          g_free (text);
-          return;
-        }
-      g_free (text);
-      end = skip;
-
-      gtk_text_buffer_select_range (buffer, &start, &end);
-
-      text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-      file = g_file_new_for_uri (text);
-      g_free (text);
-
-      selection = g_new0 (Selection, 1);
-      selection->self = self;
-      selection->start = start;
-      selection->end = end;
-
-      dialog = gtk_file_dialog_new ();
-      gtk_file_dialog_set_initial_file (dialog, file);
-      gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, file_cb, selection);
-      g_object_unref (file);
-    }
-}
-
-static void
-click_gesture_pressed (GtkGestureClick  *gesture,
-                       int               n_press,
-                       double            x,
-                       double            y,
-                       NodeEditorWindow *self)
-{
-  GtkTextIter iter;
-  int bx, by, trailing;
-  GdkModifierType state;
-
-  state = gtk_event_controller_get_current_event_state (GTK_EVENT_CONTROLLER (gesture));
-  if ((state & GDK_CONTROL_MASK) == 0)
-    return;
-
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (self->text_view), GTK_TEXT_WINDOW_TEXT, x, y, &bx, &by);
-  gtk_text_view_get_iter_at_position (GTK_TEXT_VIEW (self->text_view), &iter, &trailing, bx, by);
-
-  node_editor_window_edit (self, &iter);
-}
-
-static void
-edit_action_cb (GtkWidget  *widget,
-                const char *action_name,
-                GVariant   *parameter)
-{
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GtkTextBuffer *buffer;
-  GtkTextIter start, end;
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-  gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
-
-  node_editor_window_edit (self, &start);
-}
-
 static void
 node_editor_window_class_init (NodeEditorWindowClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-  GtkShortcutTrigger *trigger;
-  GtkShortcutAction *action;
-  GtkShortcut *shortcut;

  object_class->dispose = node_editor_window_dispose;
  object_class->finalize = node_editor_window_finalize;
@@ -1576,14 +1225,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  gtk_widget_class_bind_template_callback (widget_class, dark_mode_cb);
  gtk_widget_class_bind_template_callback (widget_class, on_picture_drag_prepare_cb);
  gtk_widget_class_bind_template_callback (widget_class, on_picture_drop_cb);
-  gtk_widget_class_bind_template_callback (widget_class, click_gesture_pressed);
-
-  gtk_widget_class_install_action (widget_class, "smart-edit", NULL, edit_action_cb);
-
-  trigger = gtk_keyval_trigger_new (GDK_KEY_e, GDK_CONTROL_MASK);
-  action = gtk_named_action_new ("smart-edit");
-  shortcut = gtk_shortcut_new (trigger, action);
-  gtk_widget_class_add_shortcut (widget_class, shortcut);
 }

 static GtkWidget *
@@ -16,14 +16,6 @@
      </item>
    </section>
  </menu>
-  <menu id="extra_menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Assisted _Edit</attribute>
-        <attribute name="action">smart-edit</attribute>
-      </item>
-    </section>
-  </menu>

  <object class="GtkPopover" id="testcase_popover">
    <child>
@@ -203,17 +195,10 @@
                <property name="right-margin">6</property>
                <property name="bottom-margin">6</property>
                <property name="has-tooltip">1</property>
-                <property name="extra-menu">extra_menu</property>
                <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/>
                <style>
                  <class name="editor" />
                </style>
-                <child>
-                  <object class="GtkGestureClick">
-                    <property name="button">1</property>
-                    <signal name="pressed" handler="click_gesture_pressed"/>
-                  </object>
-                </child>
              </object>
            </child>
          </object>
@@ -193,7 +193,7 @@ Creates a node like `gsk_linear_gradient_node_new()` with the given properties.
 | property | syntax           | default                | printed     |
 | -------- | ---------------- | ---------------------- | ----------- |
 | source   | `<node>`         | color { }              | always      |
-| mode     | `<mask-mode>`    | alpha                  | non-default |
+| mode     | `<blend-mode>`   | alpha                  | non-default |
 | mask     | `<node>`         | color { }              | always      |

 Creates a node like `gsk_mask_node_new()` with the given properties.
@@ -24,7 +24,7 @@

 #include "config.h"

-#include "version/gdkversionmacros.h"
+#include "gdkversionmacros.h"

 #include "gdkresources.h"

@@ -132,7 +132,6 @@ static const GdkDebugKey gdk_debug_keys[] = {
  { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer", TRUE },
  { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings", TRUE },
  { "high-depth",      GDK_DEBUG_HIGH_DEPTH, "Use high bit depth rendering if possible", TRUE },
-  { "no-vsync",        GDK_DEBUG_NO_VSYNC, "Repaint instantly (uses 100% CPU with animations)", TRUE },
 };


@@ -75,7 +75,7 @@
 #include <gdk/gdktoplevellayout.h>
 #include <gdk/gdktoplevelsize.h>
 #include <gdk/gdktypes.h>
-#include <gdk/version/gdkversionmacros.h>
+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdkvulkancontext.h>

 #undef __GDK_H_INSIDE__
@@ -24,6 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -1,5 +1,5 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 2005 Red Hat, Inc.
+ * Copyright (C) 2005 Red Hat, Inc. 
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -19,9 +19,6 @@

 #include "gdkcairoprivate.h"

-#include "gdkrgba.h"
-#include "gdktexture.h"
-
 #include <math.h>

 /**
@@ -1,5 +1,5 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 2005 Red Hat, Inc.
+ * Copyright (C) 2005 Red Hat, Inc. 
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

-#include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdkrgba.h>
 #include <gdk/gdkpixbuf.h>
 #include <pango/pangocairo.h>

@@ -24,8 +24,11 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

+#include <cairo.h>
+
 G_BEGIN_DECLS

 #define GDK_TYPE_CAIRO_CONTEXT             (gdk_cairo_context_get_type ())
@@ -22,7 +22,10 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
+#include <gio/gio.h>
+

 G_BEGIN_DECLS

@@ -21,6 +21,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+
+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -21,6 +21,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+
+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -22,8 +22,10 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

+
 G_BEGIN_DECLS

 #define GDK_TYPE_CONTENT_PROVIDER            (gdk_content_provider_get_type ())
@@ -22,6 +22,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -21,6 +21,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+
+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -28,6 +28,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -52,7 +52,6 @@ typedef enum {
  GDK_DEBUG_VULKAN_VALIDATE = 1 << 23,
  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 24,
  GDK_DEBUG_HIGH_DEPTH      = 1 << 25,
-  GDK_DEBUG_NO_VSYNC        = 1 << 26,
 } GdkDebugFlags;

 extern guint _gdk_debug_flags;
@@ -21,10 +21,12 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdevicetool.h>
 #include <gdk/gdkenums.h>

+
 G_BEGIN_DECLS

 #define GDK_TYPE_DEVICE         (gdk_device_get_type ())
@@ -23,6 +23,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -21,7 +21,10 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>
+

 G_BEGIN_DECLS

@@ -1,7 +1,7 @@
 /* GDK - The GIMP Drawing Kit
 * gdkdisplay.c
- *
- * Copyright 2001 Sun Microsystems Inc.
+ * 
+ * Copyright 2001 Sun Microsystems Inc. 
 *
 * Erwann Chenede <erwann.chenede@sun.com>
 *
@@ -31,11 +31,10 @@
 #include "gdkclipboardprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
+#include "gdkeventsprivate.h"
 #include "gdkglcontextprivate.h"
 #include "gdkmonitorprivate.h"
-#include "gdkrectangle.h"

 #ifdef HAVE_EGL
 #include <epoxy/egl.h>
@@ -176,7 +175,7 @@ gdk_display_default_rate_egl_config (GdkDisplay *display,

  return distance;
 }
-
+    
 static GdkSeat *
 gdk_display_real_get_default_seat (GdkDisplay *display)
 {
@@ -419,10 +418,10 @@ gdk_display_close (GdkDisplay *display)
  if (!display->closed)
    {
      display->closed = TRUE;
-
+      
      g_signal_emit (display, signals[CLOSED], 0, FALSE);
      g_object_run_dispose (G_OBJECT (display));
-
+      
      g_object_unref (display);
    }
 }
@@ -809,7 +808,7 @@ _gdk_display_end_device_grab (GdkDisplay *display,
      grab->implicit_ungrab = implicit;
      return l->next == NULL;
    }
-
+  
  return FALSE;
 }

@@ -1269,7 +1268,7 @@ gdk_display_init_gl (GdkDisplay *self)
 * Note that even if this function succeeds, creating a `GdkGLContext`
 * may still fail.
 *
- * This function is idempotent. Calling it multiple times will just
+ * This function is idempotent. Calling it multiple times will just 
 * return the same value or error.
 *
 * You never need to call this function, GDK will call it automatically
@@ -25,6 +25,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkseat.h>
@@ -28,9 +28,10 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

-#include <gdk/gdktypes.h>
 #include <gdk/gdkdevice.h>
+#include <gdk/gdkenums.h>
 #include <gdk/gdkevents.h>
+#include <gdk/gdktypes.h>

 G_BEGIN_DECLS

@@ -23,6 +23,7 @@
 #endif

 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -24,6 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -24,7 +24,9 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -345,3 +345,4 @@ typedef enum {
 } GdkMemoryFormat;

 G_END_DECLS
+
@@ -28,10 +28,12 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

-#include <gdk/gdktypes.h>
 #include <gdk/gdkdevice.h>
 #include <gdk/gdkdevicetool.h>
 #include <gdk/gdkdrag.h>
+#include <gdk/gdkenums.h>
+#include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -79,7 +79,7 @@ static guint signals[LAST_SIGNAL];

 static guint fps_counter;

-#define FRAME_HISTORY_MAX_LENGTH 128
+#define FRAME_HISTORY_MAX_LENGTH 16

 struct _GdkFrameClockPrivate
 {
@@ -275,80 +275,58 @@ gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock)
  return new_smoothed_time;
 }

-static inline gboolean
-gdk_frame_clock_idle_is_frozen (GdkFrameClockIdle *self)
-{
-  GdkFrameClockIdlePrivate *priv = self->priv;
-
-  if (GDK_DEBUG_CHECK (NO_VSYNC))
-    return FALSE;
-
-  return priv->freeze_count > 0;
-}
-
-static inline gboolean
-should_run_flush_idle (GdkFrameClockIdle *self)
-{
-  GdkFrameClockIdlePrivate *priv = self->priv;
-
-  return !gdk_frame_clock_idle_is_frozen (self) &&
-         (priv->requested & GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0;
-}
+#define RUN_FLUSH_IDLE(priv)                                            \
+  ((priv)->freeze_count == 0 &&                                         \
+   ((priv)->requested & GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0)

 /* The reason why we track updating_count separately here and don't
 * just add GDK_FRAME_CLOCK_PHASE_UPDATE into ->request on every frame
 * is so that we can avoid doing one more frame when an animation
 * is cancelled.
 */
-static inline gboolean
-should_run_paint_idle (GdkFrameClockIdle *self)
-{
-  GdkFrameClockIdlePrivate *priv = self->priv;
-
-  return !gdk_frame_clock_idle_is_frozen (self) &&
-         ((priv->requested & ~GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0 ||
-          priv->updating_count > 0);
-}
+#define RUN_PAINT_IDLE(priv)                                            \
+  ((priv)->freeze_count == 0 &&                                         \
+   (((priv)->requested & ~GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0 ||   \
+    (priv)->updating_count > 0))

 static void
-maybe_start_idle (GdkFrameClockIdle *self,
-                  gboolean           caused_by_thaw)
+maybe_start_idle (GdkFrameClockIdle *clock_idle,
+                  gboolean caused_by_thaw)
 {
-  GdkFrameClockIdlePrivate *priv = self->priv;
+  GdkFrameClockIdlePrivate *priv = clock_idle->priv;

-  if (should_run_flush_idle (self) || should_run_paint_idle (self))
+  if (RUN_FLUSH_IDLE (priv) || RUN_PAINT_IDLE (priv))
    {
      guint min_interval = 0;

-      if (priv->min_next_frame_time != 0 &&
-          !GDK_DEBUG_CHECK (NO_VSYNC))
+      if (priv->min_next_frame_time != 0)
        {
          gint64 now = g_get_monotonic_time ();
          gint64 min_interval_us = MAX (priv->min_next_frame_time, now) - now;
          min_interval = (min_interval_us + 500) / 1000;
        }

-      if (priv->flush_idle_id == 0 && should_run_flush_idle (self))
+      if (priv->flush_idle_id == 0 && RUN_FLUSH_IDLE (priv))
        {
          GSource *source;

          priv->flush_idle_id = g_timeout_add_full (GDK_PRIORITY_EVENTS + 1,
                                                    min_interval,
                                                    gdk_frame_clock_flush_idle,
-                                                    g_object_ref (self),
+                                                    g_object_ref (clock_idle),
                                                    (GDestroyNotify) g_object_unref);
          source = g_main_context_find_source_by_id (NULL, priv->flush_idle_id);
          g_source_set_static_name (source, "[gtk] gdk_frame_clock_flush_idle");
        }

      if (!priv->in_paint_idle &&
-	  priv->paint_idle_id == 0 && should_run_paint_idle (self))
+	  priv->paint_idle_id == 0 && RUN_PAINT_IDLE (priv))
        {
          priv->paint_is_thaw = caused_by_thaw;
          priv->paint_idle_id = g_timeout_add_full (GDK_PRIORITY_REDRAW,
                                                    min_interval,
                                                    gdk_frame_clock_paint_idle,
-                                                    g_object_ref (self),
+                                                    g_object_ref (clock_idle),
                                                    (GDestroyNotify) g_object_unref);
          gdk_source_set_static_name_by_id (priv->paint_idle_id, "[gtk] gdk_frame_clock_paint_idle");
        }
@@ -356,17 +334,17 @@ maybe_start_idle (GdkFrameClockIdle *self,
 }

 static void
-maybe_stop_idle (GdkFrameClockIdle *self)
+maybe_stop_idle (GdkFrameClockIdle *clock_idle)
 {
-  GdkFrameClockIdlePrivate *priv = self->priv;
+  GdkFrameClockIdlePrivate *priv = clock_idle->priv;

-  if (priv->flush_idle_id != 0 && !should_run_flush_idle (self))
+  if (priv->flush_idle_id != 0 && !RUN_FLUSH_IDLE (priv))
    {
      g_source_remove (priv->flush_idle_id);
      priv->flush_idle_id = 0;
    }

-  if (priv->paint_idle_id != 0 && !should_run_paint_idle (self))
+  if (priv->paint_idle_id != 0 && !RUN_PAINT_IDLE (priv))
    {
      g_source_remove (priv->paint_idle_id);
      priv->paint_idle_id = 0;
@@ -454,7 +432,7 @@ gdk_frame_clock_paint_idle (void *data)
          break;
        case GDK_FRAME_CLOCK_PHASE_NONE:
        case GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT:
-          if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+          if (priv->freeze_count == 0)
            {
              gint64 frame_interval = FRAME_INTERVAL;
              GdkFrameTimings *prev_timings = gdk_frame_clock_get_current_timings (clock);
@@ -570,7 +548,7 @@ gdk_frame_clock_paint_idle (void *data)
          G_GNUC_FALLTHROUGH;

        case GDK_FRAME_CLOCK_PHASE_UPDATE:
-          if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+          if (priv->freeze_count == 0)
            {
              if ((priv->requested & GDK_FRAME_CLOCK_PHASE_UPDATE) != 0 ||
                  priv->updating_count > 0)
@@ -582,7 +560,7 @@ gdk_frame_clock_paint_idle (void *data)
          G_GNUC_FALLTHROUGH;

        case GDK_FRAME_CLOCK_PHASE_LAYOUT:
-          if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+          if (priv->freeze_count == 0)
            {
 	      int iter;
 #ifdef G_ENABLE_DEBUG
@@ -602,8 +580,7 @@ gdk_frame_clock_paint_idle (void *data)
 	       */
 	      iter = 0;
              while ((priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT) &&
-                     !gdk_frame_clock_idle_is_frozen (clock_idle) &&
-		     iter++ < 4)
+		     priv->freeze_count == 0 && iter++ < 4)
                {
                  priv->requested &= ~GDK_FRAME_CLOCK_PHASE_LAYOUT;
                  _gdk_frame_clock_emit_layout (clock);
@@ -614,7 +591,7 @@ gdk_frame_clock_paint_idle (void *data)
          G_GNUC_FALLTHROUGH;

        case GDK_FRAME_CLOCK_PHASE_PAINT:
-          if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+          if (priv->freeze_count == 0)
            {
 #ifdef G_ENABLE_DEBUG
              if (GDK_DEBUG_CHECK (FRAMES))
@@ -635,7 +612,7 @@ gdk_frame_clock_paint_idle (void *data)
          G_GNUC_FALLTHROUGH;

        case GDK_FRAME_CLOCK_PHASE_AFTER_PAINT:
-          if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+          if (priv->freeze_count == 0)
            {
              priv->requested &= ~GDK_FRAME_CLOCK_PHASE_AFTER_PAINT;
              _gdk_frame_clock_emit_after_paint (clock);
@@ -664,7 +641,7 @@ gdk_frame_clock_paint_idle (void *data)
      _gdk_frame_clock_emit_resume_events (clock);
    }

-  if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+  if (priv->freeze_count == 0)
    priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;

  priv->in_paint_idle = FALSE;
@@ -673,7 +650,7 @@ gdk_frame_clock_paint_idle (void *data)
   * update as soon as the backend unthrottles (if there is work to do),
   * otherwise we need to figure when the next frame should be.
   */
-  if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+  if (priv->freeze_count == 0)
    {
      /*
       * If we don't receive "frame drawn" events, smooth_cycle_start will simply be advanced in constant increments of
@@ -691,7 +668,7 @@ gdk_frame_clock_paint_idle (void *data)
      maybe_start_idle (clock_idle, FALSE);
    }

-  if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+  if (priv->freeze_count == 0)
    priv->sleep_serial = get_sleep_serial ();

  gdk_profiler_end_mark (before, "frameclock cycle", NULL);
@@ -765,7 +742,7 @@ gdk_frame_clock_idle_freeze (GdkFrameClock *clock)
  GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
  GdkFrameClockIdlePrivate *priv = clock_idle->priv;

-  if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+  if (priv->freeze_count == 0)
    {
      if (GDK_PROFILER_IS_RUNNING)
        priv->freeze_time = g_get_monotonic_time ();
@@ -784,7 +761,7 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
  g_return_if_fail (priv->freeze_count > 0);

  priv->freeze_count--;
-  if (!gdk_frame_clock_idle_is_frozen (clock_idle))
+  if (priv->freeze_count == 0)
    {
      maybe_start_idle (clock_idle, TRUE);
      /* If nothing is requested so we didn't start an idle, we need
@@ -798,7 +775,7 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)

      if (GDK_PROFILER_IS_RUNNING)
        {
-          if (gdk_frame_clock_idle_is_frozen (clock_idle))
+          if (priv->freeze_time != 0)
            {
              gdk_profiler_end_mark (priv->freeze_time * 1000, "frameclock frozen", NULL);
              priv->freeze_time = 0;
@@ -21,7 +21,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

-#include <gdk/gdktypes.h>
+#include <glib-object.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -1,7 +1,7 @@
 /* GDK - The GIMP Drawing Kit
 *
 * gdkglcontext.h: GL context abstraction
- *
+ * 
 * Copyright © 2014  Emmanuele Bassi
 *
 * This library is free software; you can redistribute it and/or
@@ -24,7 +24,9 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -338,7 +338,6 @@ gdk_gl_texture_new_from_builder (GdkGLTextureBuilder *builder,
                                 gpointer             data)
 {
  GdkGLTexture *self;
-  GdkTexture *update_texture;

  self = g_object_new (GDK_TYPE_GL_TEXTURE,
                       "width", gdk_gl_texture_builder_get_width (builder),
@@ -354,22 +353,6 @@ gdk_gl_texture_new_from_builder (GdkGLTextureBuilder *builder,
  self->destroy = destroy;
  self->data = data;

-  update_texture = gdk_gl_texture_builder_get_update_texture (builder);
-  if (update_texture)
-    {
-      cairo_region_t *update_region = gdk_gl_texture_builder_get_update_region (builder);
-      if (update_region)
-        {
-          update_region = cairo_region_copy (update_region);
-          cairo_region_intersect_rectangle (update_region,
-                                            &(cairo_rectangle_int_t) {
-                                              0, 0,
-                                              update_texture->width, update_texture->height
-                                            });
-          gdk_texture_set_diff (GDK_TEXTURE (self), update_texture, update_region);
-        }
-    }
-
  return GDK_TEXTURE (self);
 }

@@ -22,7 +22,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

-#include <gdk/gdktypes.h>
 #include <gdk/gdkglcontext.h>
 #include <gdk/gdktexture.h>

@@ -25,8 +25,6 @@
 #include "gdkglcontext.h"
 #include "gdkgltextureprivate.h"

-#include <cairo-gobject.h>
-
 struct _GdkGLTextureBuilder
 {
  GObject parent_instance;
@@ -38,9 +36,6 @@ struct _GdkGLTextureBuilder
  GdkMemoryFormat format;
  gboolean has_mipmap;
  gpointer sync;
-
-  GdkTexture *update_texture;
-  cairo_region_t *update_region;
 };

 struct _GdkGLTextureBuilderClass
@@ -75,8 +70,6 @@ enum
  PROP_HEIGHT,
  PROP_ID,
  PROP_SYNC,
-  PROP_UPDATE_REGION,
-  PROP_UPDATE_TEXTURE,
  PROP_WIDTH,

  N_PROPS
@@ -93,9 +86,6 @@ gdk_gl_texture_builder_dispose (GObject *object)

  g_clear_object (&self->context);

-  g_clear_object (&self->update_texture);
-  g_clear_pointer (&self->update_region, cairo_region_destroy);
-
  G_OBJECT_CLASS (gdk_gl_texture_builder_parent_class)->dispose (object);
 }

@@ -133,14 +123,6 @@ gdk_gl_texture_builder_get_property (GObject    *object,
      g_value_set_pointer (value, self->sync);
      break;

-    case PROP_UPDATE_REGION:
-      g_value_set_boxed (value, self->update_region);
-      break;
-
-    case PROP_UPDATE_TEXTURE:
-      g_value_set_object (value, self->update_texture);
-      break;
-
    case PROP_WIDTH:
      g_value_set_int (value, self->width);
      break;
@@ -185,14 +167,6 @@ gdk_gl_texture_builder_set_property (GObject      *object,
      gdk_gl_texture_builder_set_sync (self, g_value_get_pointer (value));
      break;

-    case PROP_UPDATE_REGION:
-      gdk_gl_texture_builder_set_update_region (self, g_value_get_boxed (value));
-      break;
-
-    case PROP_UPDATE_TEXTURE:
-      gdk_gl_texture_builder_set_update_texture (self, g_value_get_object (value));
-      break;
-
    case PROP_WIDTH:
      gdk_gl_texture_builder_set_width (self, g_value_get_int (value));
      break;
@@ -286,30 +260,6 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    g_param_spec_pointer ("sync", NULL, NULL,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

-  /**
-   * GdkGLTextureBuilder:update-region: (attributes org.gdk.Property.get=gdk_gl_texture_builder_get_update_region org.gdk.Property.set=gdk_gl_texture_builder_set_update_region)
-   *
-   * The update region for [property@Gdk.GLTextureBuilder:update-texture].
-   *
-   * Since: 4.12
-   */
-  properties[PROP_UPDATE_REGION] =
-    g_param_spec_boxed ("update-region", NULL, NULL,
-                        CAIRO_GOBJECT_TYPE_REGION,
-                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  /**
-   * GdkGLTextureBuilder:update-texture: (attributes org.gdk.Property.get=gdk_gl_texture_builder_get_update_texture org.gdk.Property.set=gdk_gl_texture_builder_set_update_texture)
-   *
-   * The texture [property@Gdk.GLTextureBuilder:update-region] is an update for.
-   *
-   * Since: 4.12
-   */
-  properties[PROP_UPDATE_TEXTURE] =
-    g_param_spec_object ("update-texture", NULL, NULL,
-                         GDK_TYPE_TEXTURE,
-                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
  /**
   * GdkGLTextureBuilder:width: (attributes org.gdk.Property.get=gdk_gl_texture_builder_get_width org.gdk.Property.set=gdk_gl_texture_builder_set_width)
   *
@@ -321,7 +271,6 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    g_param_spec_int ("width", NULL, NULL,
                      G_MININT, G_MAXINT, 0,
                      G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
  g_object_class_install_properties (gobject_class, N_PROPS, properties);
 }

@@ -664,102 +613,6 @@ gdk_gl_texture_builder_set_format (GdkGLTextureBuilder *self,
  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_FORMAT]);
 }

-/**
- * gdk_gl_texture_builder_get_update_texture: (attributes org.gdk.Method.get_property=update_texture)
- * @self: a `GdkGLTextureBuilder`
- *
- * Gets the texture previously set via gdk_gl_texture_builder_set_update_texture() or
- * %NULL if none was set.
- *
- * Returns: (transfer none) (nullable): The texture 
- *
- * Since: 4.12
- */
-GdkTexture *
-gdk_gl_texture_builder_get_update_texture (GdkGLTextureBuilder *self)
-{
-  g_return_val_if_fail (GDK_IS_GL_TEXTURE_BUILDER (self), NULL);
-
-  return self->update_texture;
-}
-
-/**
- * gdk_gl_texture_builder_set_update_texture: (attributes org.gdk.Method.set_property=update_texture)
- * @self: a `GdkGLTextureBuilder`
- * @texture: (nullable): the texture to update
- *
- * Sets the texture to be updated by this texture. See
- * [method@Gdk.GLTextureBuilder.set_update_region] for an explanation.
- *
- * Since: 4.12
- */
-void
-gdk_gl_texture_builder_set_update_texture (GdkGLTextureBuilder *self,
-                                           GdkTexture          *texture)
-{
-  g_return_if_fail (GDK_IS_GL_TEXTURE_BUILDER (self));
-  g_return_if_fail (texture == NULL || GDK_IS_TEXTURE (texture));
-
-  if (!g_set_object (&self->update_texture, texture))
-    return;
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UPDATE_TEXTURE]);
-}
-
-/**
- * gdk_gl_texture_builder_get_update_region: (attributes org.gdk.Method.get_property=update_region)
- * @self: a `GdkGLTextureBuilder`
- *
- * Gets the region previously set via gdk_gl_texture_builder_set_update_region() or
- * %NULL if none was set.
- *
- * Returns: (transfer none) (nullable): The region 
- *
- * Since: 4.12
- */
-cairo_region_t *
-gdk_gl_texture_builder_get_update_region (GdkGLTextureBuilder *self)
-{
-  g_return_val_if_fail (GDK_IS_GL_TEXTURE_BUILDER (self), NULL);
-
-  return self->update_region;
-}
-
-/**
- * gdk_gl_texture_builder_set_update_region: (attributes org.gdk.Method.set_property=update_region)
- * @self: a `GdkGLTextureBuilder`
- * @region: (nullable): the region to update
- *
- * Sets the region to be updated by this texture. Together with
- * [property@Gdk.GLTextureBuilder:update-texture] this describes an
- * update of a previous texture.
- *
- * When rendering animations of large textures, it is possible that
- * consecutive textures are only updating contents in parts of the texture.
- * It is then possible to describe this update via these two properties,
- * so that GTK can avoid rerendering parts that did not change.
- *
- * An example would be a screen recording where only the mouse pointer moves.
- *
- * Since: 4.12
- */
-void
-gdk_gl_texture_builder_set_update_region (GdkGLTextureBuilder *self,
-                                         cairo_region_t      *region)
-{
-  g_return_if_fail (GDK_IS_GL_TEXTURE_BUILDER (self));
-
-  if (self->update_region == region)
-    return;
-
-  g_clear_pointer (&self->update_region, cairo_region_destroy);
-
-  if (region)
-    self->update_region = cairo_region_reference (region);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UPDATE_REGION]);
-}
-
 /**
 * gdk_gl_texture_builder_build:
 * @self: a `GdkGLTextureBuilder`
@@ -23,7 +23,9 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -76,18 +78,6 @@ GDK_AVAILABLE_IN_4_12
 void                    gdk_gl_texture_builder_set_sync         (GdkGLTextureBuilder    *self,
                                                                 gpointer                sync);

-GDK_AVAILABLE_IN_4_12
-GdkTexture *            gdk_gl_texture_builder_get_update_texture (GdkGLTextureBuilder  *self) G_GNUC_PURE;
-GDK_AVAILABLE_IN_4_12
-void                    gdk_gl_texture_builder_set_update_texture (GdkGLTextureBuilder  *self,
-                                                                 GdkTexture             *texture);
-
-GDK_AVAILABLE_IN_4_12
-cairo_region_t *        gdk_gl_texture_builder_get_update_region (GdkGLTextureBuilder   *self) G_GNUC_PURE;
-GDK_AVAILABLE_IN_4_12
-void                    gdk_gl_texture_builder_set_update_region (GdkGLTextureBuilder   *self,
-                                                                 cairo_region_t         *region);
-
 GDK_AVAILABLE_IN_4_12
 GdkTexture *            gdk_gl_texture_builder_build            (GdkGLTextureBuilder    *self,
                                                                 GDestroyNotify          destroy,
@@ -28,6 +28,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -23,7 +23,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

-#include <gdk/gdktypes.h>
+#include <gdk/gdkenums.h>
 #include <gdk/gdktexture.h>

 G_BEGIN_DECLS
@@ -24,7 +24,6 @@
 #include "gdkmonitorprivate.h"
 #include "gdkdisplay.h"
 #include "gdkenumtypes.h"
-#include "gdkrectangle.h"

 /**
 * GdkMonitor:
@@ -25,6 +25,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdkrectangle.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -24,6 +24,7 @@
 #endif

 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -1,5 +1,5 @@
 /* GDK - The GIMP Drawing Kit
- * Copyright (C) 2000 Red Hat, Inc.
+ * Copyright (C) 2000 Red Hat, Inc. 
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,7 @@
 #endif

 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -18,11 +18,14 @@

 #pragma once

-#include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>
+#include <gio/gio.h>

 G_BEGIN_DECLS

+
 GIOStream *             gdk_pipe_io_stream_new                          (void);

+
 G_END_DECLS

@@ -28,8 +28,12 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

-#include <gdk/gdktypes.h>
+#include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdktexture.h>
+

 G_BEGIN_DECLS

@@ -20,7 +20,6 @@

 #include "gdkpopuplayout.h"

-#include "gdkrectangle.h"
 #include "gdksurface.h"

 /**
@@ -22,7 +22,9 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -29,7 +29,7 @@
 #include <unistd.h>
 #endif

-#include "version/gdkversionmacros.h"
+#include "gdkversionmacros.h"
 #include "gdkframeclockprivate.h"


@@ -29,6 +29,7 @@
 #endif

 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -29,6 +29,7 @@
 #endif

 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -24,6 +24,7 @@
 #endif

 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -1530,9 +1530,6 @@ gdk_surface_freeze_updates (GdkSurface *surface)
 {
  g_return_if_fail (GDK_IS_SURFACE (surface));

-  if (GDK_DEBUG_CHECK (NO_VSYNC))
-    return;
-
  surface->update_freeze_count++;
  if (surface->update_freeze_count == 1)
    _gdk_frame_clock_uninhibit_freeze (surface->frame_clock);
@@ -1565,9 +1562,6 @@ gdk_surface_thaw_updates (GdkSurface *surface)
 {
  g_return_if_fail (GDK_IS_SURFACE (surface));

-  if (GDK_DEBUG_CHECK (NO_VSYNC))
-    return;
-
  g_return_if_fail (surface->update_freeze_count > 0);

  if (--surface->update_freeze_count == 0)
@@ -28,6 +28,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkframeclock.h>
@@ -282,8 +282,6 @@ gdk_texture_dispose (GObject *object)
 {
  GdkTexture *self = GDK_TEXTURE (object);

-  g_clear_pointer (&self->diff_to_previous, cairo_region_destroy);
-
  gdk_texture_clear_render_data (self);

  G_OBJECT_CLASS (gdk_texture_parent_class)->dispose (object);
@@ -673,47 +671,7 @@ gdk_texture_do_download (GdkTexture      *texture,
                         guchar          *data,
                         gsize            stride)
 {
-  GDK_TEXTURE_GET_CLASS (texture)->download (texture, format, data, stride);
-}
-
-void
-gdk_texture_diff (GdkTexture     *self,
-                  GdkTexture     *other,
-                  cairo_region_t *region)
-{
-  if (self == other)
-    return;
-
-  if (self->previous_texture == other &&
-      g_atomic_pointer_get (&other->next_texture) == self)
-    {
-      cairo_region_union (region, self->diff_to_previous);
-    }
-  else if (other->previous_texture == self &&
-           g_atomic_pointer_get (&self->next_texture) == other)
-    {
-      cairo_region_union (region, other->diff_to_previous);
-    }
-  else
-    {
-      cairo_region_union_rectangle (region,
-                                    &(cairo_rectangle_int_t) {
-                                      0,
-                                      0,
-                                      MAX (self->width, other->width),
-                                      MAX (self->height, other->height)
-                                    });
-    }
-}
-
-void
-gdk_texture_set_diff (GdkTexture     *self,
-                      GdkTexture     *previous,
-                      cairo_region_t *diff)
-{
-  self->previous_texture = previous;
-  self->diff_to_previous = diff;
-  g_atomic_pointer_set (&previous->next_texture, self);
+  GDK_TEXTURE_GET_CLASS (texture)->download (texture, format, data,stride);
 }

 cairo_surface_t *
@@ -22,6 +22,8 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

@@ -21,6 +21,9 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+
+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>

 G_BEGIN_DECLS
@@ -21,12 +21,6 @@ struct _GdkTexture
  gpointer render_key;
  gpointer render_data;
  GDestroyNotify render_notify;
-
-  /* for diffing swapchain-like textures.
-   * Links are only valid if both textures agree on them */
-  gpointer next_texture; /* atomic, no reference, may be invalid pointer */
-  gpointer previous_texture; /* no reference, may be invalid pointer */
-  cairo_region_t *diff_to_previous;
 };

 struct _GdkTextureClass {
@@ -48,14 +42,6 @@ void                    gdk_texture_do_download         (GdkTexture
                                                         GdkMemoryFormat         format,
                                                         guchar                 *data,
                                                         gsize                   stride);
-void                    gdk_texture_diff                (GdkTexture             *self,
-                                                         GdkTexture             *other,
-                                                         cairo_region_t         *region);
-
-void                    gdk_texture_set_diff            (GdkTexture             *self,
-                                                         GdkTexture             *previous,
-                                                         cairo_region_t         *diff);
-
 gboolean                gdk_texture_set_render_data     (GdkTexture             *self,
                                                         gpointer                key,
                                                         gpointer                data,
@@ -22,8 +22,9 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

-#include <gdk/gdktypes.h>
 #include <gdk/gdkmonitor.h>
+#include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -23,6 +23,7 @@
 #endif

 #include <gdk/gdktypes.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -42,8 +42,6 @@
 * (or GTK). One such setting is what windowing API backend is in use.
 */
 #include <gdk/gdkconfig.h>
-#include <gdk/gdkenums.h>
-#include <gdk/version/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -0,0 +1,324 @@
+/* gdkversionmacros.h - version boundaries checks
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * 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 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/>.
+ */
+
+#if !defined (__GDK_H_INSIDE__) && !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_COMPILATION) && !defined (GTK_CSS_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#ifndef __GDK_VERSION_MACROS_H__
+#define __GDK_VERSION_MACROS_H__
+
+#include <glib.h>
+
+/**
+ * GDK_MAJOR_VERSION:
+ *
+ * The major version component of the library's version, e.g. "1" for "1.2.3".
+ */
+#define GDK_MAJOR_VERSION (@GTK_MAJOR_VERSION@)
+
+/**
+ * GDK_MINOR_VERSION:
+ *
+ * The minor version component of the library's version, e.g. "2" for "1.2.3".
+ */
+#define GDK_MINOR_VERSION (@GTK_MINOR_VERSION@)
+
+/**
+ * GDK_MICRO_VERSION:
+ *
+ * The micro version component of the library's version, e.g. "3" for "1.2.3".
+ */
+#define GDK_MICRO_VERSION (@GTK_MICRO_VERSION@)
+
+#ifndef _GDK_EXTERN
+#define _GDK_EXTERN extern
+#endif
+
+/**
+ * GDK_DISABLE_DEPRECATION_WARNINGS:
+ *
+ * A macro that should be defined before including the `gdk.h` header.
+ *
+ * If this symbol is defined, no compiler warnings will be produced for
+ * uses of deprecated GDK and GTK APIs.
+ */
+
+#ifdef GDK_DISABLE_DEPRECATION_WARNINGS
+#define GDK_DEPRECATED _GDK_EXTERN
+#define GDK_DEPRECATED_FOR(f) _GDK_EXTERN
+#define GDK_UNAVAILABLE(maj,min) _GDK_EXTERN
+#else
+#define GDK_DEPRECATED G_DEPRECATED _GDK_EXTERN
+#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _GDK_EXTERN
+#define GDK_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _GDK_EXTERN
+#endif
+
+/* XXX: Every new stable minor release bump should add a macro here */
+
+/**
+ * GDK_VERSION_4_0:
+ *
+ * A macro that evaluates to the 4.0 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ */
+#define GDK_VERSION_4_0        (G_ENCODE_VERSION (4, 0))
+
+/**
+ * GDK_VERSION_4_2:
+ *
+ * A macro that evaluates to the 4.2 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 4.2
+ */
+#define GDK_VERSION_4_2        (G_ENCODE_VERSION (4, 2))
+
+/**
+ * GDK_VERSION_4_4:
+ *
+ * A macro that evaluates to the 4.4 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 4.4
+ */
+#define GDK_VERSION_4_4        (G_ENCODE_VERSION (4, 4))
+
+/**
+ * GDK_VERSION_4_6:
+ *
+ * A macro that evaluates to the 4.6 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 4.6
+ */
+#define GDK_VERSION_4_6        (G_ENCODE_VERSION (4, 6))
+
+/**
+ * GDK_VERSION_4_8:
+ *
+ * A macro that evaluates to the 4.8 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 4.8
+ */
+#define GDK_VERSION_4_8        (G_ENCODE_VERSION (4, 8))
+
+/**
+ * GDK_VERSION_4_10:
+ *
+ * A macro that evaluates to the 4.10 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 4.10
+ */
+#define GDK_VERSION_4_10        (G_ENCODE_VERSION (4, 10))
+
+/**
+ * GDK_VERSION_4_12:
+ *
+ * A macro that evaluates to the 4.12 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 4.12
+ */
+#define GDK_VERSION_4_12        (G_ENCODE_VERSION (4, 12))
+
+
+/* evaluates to the current stable version; for development cycles,
+ * this means the next stable target, with a hard backstop to the
+ * beginning of the stable series
+ */
+#if GDK_MAJOR_VERSION >= 4 && (GDK_MINOR_VERSION % 2)
+# define GDK_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION + 1))
+#elif G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION) > GDK_VERSION_4_0
+# define GDK_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION))
+#else
+# define GDK_VERSION_CUR_STABLE         GDK_VERSION_4_0
+#endif
+
+/* evaluates to the previous stable version, with a hard backstop
+ * to the beginning of the stable series
+ */
+#if GDK_MAJOR_VERSION >= 4 && (GDK_MINOR_VERSION % 2)
+# define GDK_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION - 1))
+#elif GDK_MAJOR_VERSION >= 4 && GDK_MINOR_VERSION > 2
+# define GDK_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION - 2))
+#else
+# define GDK_VERSION_PREV_STABLE        GDK_VERSION_4_0
+#endif
+
+/**
+ * GDK_VERSION_MIN_REQUIRED:
+ *
+ * A macro that should be defined by the user prior to including
+ * the `gdk.h` header.
+ *
+ * The definition should be one of the predefined GDK version
+ * macros: %GDK_VERSION_4_0, %GDK_VERSION_4_2,...
+ *
+ * This macro defines the lower bound for the GDK API to use.
+ *
+ * If a function has been deprecated in a newer version of GDK,
+ * it is possible to use this symbol to avoid the compiler warnings
+ * without disabling warning for every deprecated function.
+ */
+#ifndef GDK_VERSION_MIN_REQUIRED
+# define GDK_VERSION_MIN_REQUIRED      (GDK_VERSION_CUR_STABLE)
+#endif
+
+/**
+ * GDK_VERSION_MAX_ALLOWED:
+ *
+ * A macro that should be defined by the user prior to including
+ * the `gdk.h` header.
+ *
+ * The definition should be one of the predefined GDK version
+ * macros: %GDK_VERSION_4_0, %GDK_VERSION_4_2,...
+ *
+ * This macro defines the upper bound for the GDK API to use.
+ *
+ * If a function has been introduced in a newer version of GDK,
+ * it is possible to use this symbol to get compiler warnings when
+ * trying to use that function.
+ */
+#ifndef GDK_VERSION_MAX_ALLOWED
+# if GDK_VERSION_MIN_REQUIRED > GDK_VERSION_PREV_STABLE
+#  define GDK_VERSION_MAX_ALLOWED      GDK_VERSION_MIN_REQUIRED
+# else
+#  define GDK_VERSION_MAX_ALLOWED      GDK_VERSION_CUR_STABLE
+# endif
+#endif
+
+/* sanity checks */
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_MIN_REQUIRED
+# error "GDK_VERSION_MAX_ALLOWED must be >= GDK_VERSION_MIN_REQUIRED"
+#endif
+#if GDK_VERSION_MIN_REQUIRED < GDK_VERSION_4_0
+# error "GDK_VERSION_MIN_REQUIRED must be >= GDK_VERSION_4_0"
+#endif
+
+#define GDK_AVAILABLE_IN_ALL                  _GDK_EXTERN
+
+/* XXX: Every new stable minor release should add a set of macros here */
+
+/* This is not really necessary for 4.0, since there can't be an
+ * earlier version, and there are no deprecated symbols. We just
+ * include it for completeness, and because it's easier to copy
+ * this stanza every time a new development cycle starts.
+ */
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_0
+# define GDK_AVAILABLE_IN_4_0                   GDK_UNAVAILABLE(4, 0)
+#else
+# define GDK_AVAILABLE_IN_4_0                   _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_0
+# define GDK_DEPRECATED_IN_4_0                  GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_0_FOR(f)           GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_0                  _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_0_FOR(f)           _GDK_EXTERN
+#endif
+
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_2
+# define GDK_AVAILABLE_IN_4_2                   GDK_UNAVAILABLE(4, 2)
+#else
+# define GDK_AVAILABLE_IN_4_2                   _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_2
+# define GDK_DEPRECATED_IN_4_2                  GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_2_FOR(f)           GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_2                  _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_2_FOR(f)           _GDK_EXTERN
+#endif
+
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_4
+# define GDK_AVAILABLE_IN_4_4                   GDK_UNAVAILABLE(4, 4)
+#else
+# define GDK_AVAILABLE_IN_4_4                   _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_4
+# define GDK_DEPRECATED_IN_4_4                  GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_4_FOR(f)           GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_4                  _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_4_FOR(f)           _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_6
+# define GDK_AVAILABLE_IN_4_6                   GDK_UNAVAILABLE(4, 6)
+#else
+# define GDK_AVAILABLE_IN_4_6                   _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_6
+# define GDK_DEPRECATED_IN_4_6                  GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_6_FOR(f)           GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_6                  _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_6_FOR(f)           _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_8
+# define GDK_AVAILABLE_IN_4_8                   GDK_UNAVAILABLE(4, 8)
+#else
+# define GDK_AVAILABLE_IN_4_8                   _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_8
+# define GDK_DEPRECATED_IN_4_8                  GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_8_FOR(f)           GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_8                  _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_8_FOR(f)           _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_10
+# define GDK_AVAILABLE_IN_4_10                  GDK_UNAVAILABLE(4, 10)
+#else
+# define GDK_AVAILABLE_IN_4_10                  _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_10
+# define GDK_DEPRECATED_IN_4_10                 GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_10_FOR(f)          GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_10                 _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_10_FOR(f)          _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_12
+# define GDK_AVAILABLE_IN_4_12                  GDK_UNAVAILABLE(4, 12)
+#else
+# define GDK_AVAILABLE_IN_4_12                  _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_12
+# define GDK_DEPRECATED_IN_4_12                 GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_12_FOR(f)          GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_12                 _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_12_FOR(f)          _GDK_EXTERN
+#endif
+
+#endif  /* __GDK_VERSION_MACROS_H__ */
@@ -24,6 +24,7 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>

 #ifdef GDK_RENDERING_VULKAN
@@ -146,7 +146,7 @@ gdk_enums = gnome.mkenums_simple('gdkenumtypes',
  sources: gdk_public_headers,
  decorator: 'GDK_AVAILABLE_IN_ALL',
  body_prefix: '#include "config.h"',
-  header_prefix: '#include "version/gdkversionmacros.h"\n',
+  header_prefix: '#include "gdkversionmacros.h"',
  install_dir: gtk_includedir / 'gtk-4.0/gdk',
  install_header: true,
 )
@@ -183,6 +183,13 @@ gdkversion_cdata.set('GTK_MAJOR_VERSION', gtk_major_version)
 gdkversion_cdata.set('GTK_MINOR_VERSION', gtk_minor_version)
 gdkversion_cdata.set('GTK_MICRO_VERSION', gtk_micro_version)

+gdkversionmacros = configure_file(
+  input: 'gdkversionmacros.h.in',
+  output: 'gdkversionmacros.h',
+  configuration: gdkversion_cdata,
+  install_dir: gtk_includedir / 'gtk-4.0/gdk',
+)
+
 gdkinc = include_directories('.')
 gdkx11_inc = include_directories('x11')
 gdkwayland_inc = include_directories('wayland')
@@ -190,7 +197,7 @@ gdkwayland_inc = include_directories('wayland')
 wlinc = include_directories('.')
 win32rcinc = include_directories('win32/rc')

-gdk_gen_headers = [gdkenum_h, gdkmarshal_h, gdkconfig, gdkversionmacros_h, gdk_visibility_h]
+gdk_gen_headers = [gdkenum_h, gdkmarshal_h, gdkconfig, gdkversionmacros]

 gdk_deps = [
  libm,
@@ -224,8 +231,7 @@ gdk_sources += [
  gdk_enums,
  gdk_marshalers,
  gdkresources,
-  gdkversionmacros_h,
-  gdk_visibility_h,
+  gdkversionmacros,
  gdk_private_h_sources,
  gdk_public_headers
 ]
@@ -1,146 +0,0 @@
-/* gdkversionmacros.h - version boundaries checks
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * 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 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/>.
- */
-
-#if !defined (__GDK_H_INSIDE__) && !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_COMPILATION) && !defined (GTK_CSS_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#pragma once
-
-#include <glib.h>
-
-/* These macros are used to mark deprecated symbols in GLib headers,
- * and thus have to be exposed in installed headers. But please
- * do *not* use them in other projects. Instead define your own wrappers
- * around it.
- */
-
-#if !defined(GDK_DISABLE_DEPRECATION_WARNINGS) && \
-    (G_GNUC_CHECK_VERSION(4, 6) ||                 \
-     __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))
-#define _GDK_GNUC_DO_PRAGMA(x) _Pragma(G_STRINGIFY (x))
-#define GDK_DEPRECATED_MACRO _GDK_GNUC_DO_PRAGMA(GCC warning "Deprecated pre-processor symbol")
-#define GDK_DEPRECATED_MACRO_FOR(f) \
-  _GDK_GNUC_DO_PRAGMA(GCC warning G_STRINGIFY (Deprecated pre-processor symbol: replace with #f))
-#define GDK_UNAVAILABLE_MACRO(maj,min) \
-  _GDK_GNUC_DO_PRAGMA(GCC warning G_STRINGIFY (Not available before maj.min))
-#else
-#define GDK_DEPRECATED_MACRO
-#define GDK_DEPRECATED_MACRO_FOR(f)
-#define GDK_UNAVAILABLE_MACRO(maj,min)
-#endif
-
-#if !defined(GDK_DISABLE_DEPRECATION_WARNINGS) && \
-    (G_GNUC_CHECK_VERSION(6, 1) ||                 \
-     (defined (__clang_major__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 0))))
-#define GDK_DEPRECATED_ENUMERATOR G_DEPRECATED
-#define GDK_DEPRECATED_ENUMERATOR_FOR(f) G_DEPRECATED_FOR(f)
-#define GDK_UNAVAILABLE_ENUMERATOR(maj,min) G_UNAVAILABLE(maj,min)
-#else
-#define GDK_DEPRECATED_ENUMERATOR
-#define GDK_DEPRECATED_ENUMERATOR_FOR(f)
-#define GDK_UNAVAILABLE_ENUMERATOR(maj,min)
-#endif
-
-#if !defined(GDK_DISABLE_DEPRECATION_WARNINGS) && \
-    (G_GNUC_CHECK_VERSION(3, 1) ||                 \
-     (defined (__clang_major__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 0))))
-#define GDK_DEPRECATED_TYPE G_DEPRECATED
-#define GDK_DEPRECATED_TYPE_FOR(f) G_DEPRECATED_FOR(f)
-#define GDK_UNAVAILABLE_TYPE(maj,min) G_UNAVAILABLE(maj,min)
-#else
-#define GDK_DEPRECATED_TYPE
-#define GDK_DEPRECATED_TYPE_FOR(f)
-#define GDK_UNAVAILABLE_TYPE(maj,min)
-#endif
-
-@GDK_VERSIONS@
-
-/* evaluates to the current stable version; for development cycles,
- * this means the next stable target, with a hard backstop to the
- * beginning of the stable series
- */
-#if GDK_MAJOR_VERSION >= 4 && (GDK_MINOR_VERSION % 2)
-# define GDK_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION + 1))
-#elif G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION) > GDK_VERSION_4_0
-# define GDK_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION))
-#else
-# define GDK_VERSION_CUR_STABLE         GDK_VERSION_4_0
-#endif
-
-/* evaluates to the previous stable version, with a hard backstop
- * to the beginning of the stable series
- */
-#if GDK_MAJOR_VERSION >= 4 && (GDK_MINOR_VERSION % 2)
-# define GDK_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION - 1))
-#elif GDK_MAJOR_VERSION >= 4 && GDK_MINOR_VERSION > 2
-# define GDK_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION - 2))
-#else
-# define GDK_VERSION_PREV_STABLE        GDK_VERSION_4_0
-#endif
-
-/**
- * GDK_VERSION_MIN_REQUIRED:
- *
- * A macro that should be defined by the user prior to including
- * the `gdk.h` header.
- *
- * The definition should be one of the predefined GDK version
- * macros: %GDK_VERSION_4_0, %GDK_VERSION_4_2,...
- *
- * This macro defines the lower bound for the GDK API to use.
- *
- * If a function has been deprecated in a newer version of GDK,
- * it is possible to use this symbol to avoid the compiler warnings
- * without disabling warning for every deprecated function.
- */
-#ifndef GDK_VERSION_MIN_REQUIRED
-# define GDK_VERSION_MIN_REQUIRED      (GDK_VERSION_CUR_STABLE)
-#endif
-
-/**
- * GDK_VERSION_MAX_ALLOWED:
- *
- * A macro that should be defined by the user prior to including
- * the `gdk.h` header.
- *
- * The definition should be one of the predefined GDK version
- * macros: %GDK_VERSION_4_0, %GDK_VERSION_4_2,...
- *
- * This macro defines the upper bound for the GDK API to use.
- *
- * If a function has been introduced in a newer version of GDK,
- * it is possible to use this symbol to get compiler warnings when
- * trying to use that function.
- */
-#ifndef GDK_VERSION_MAX_ALLOWED
-# if GDK_VERSION_MIN_REQUIRED > GDK_VERSION_PREV_STABLE
-#  define GDK_VERSION_MAX_ALLOWED      GDK_VERSION_MIN_REQUIRED
-# else
-#  define GDK_VERSION_MAX_ALLOWED      GDK_VERSION_CUR_STABLE
-# endif
-#endif
-
-/* sanity checks */
-#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_MIN_REQUIRED
-# error "GDK_VERSION_MAX_ALLOWED must be >= GDK_VERSION_MIN_REQUIRED"
-#endif
-#if GDK_VERSION_MIN_REQUIRED < GDK_VERSION_4_0
-# error "GDK_VERSION_MIN_REQUIRED must be >= GDK_VERSION_4_0"
-#endif
-
-#include <gdk/version/gdk-visibility.h>
@@ -1,21 +0,0 @@
-
-
-gdkversionmacros_h = custom_target(
-  input: 'gdkversionmacros.h.in',
-  output: 'gdkversionmacros.h',
-  command: [gen_visibility_macros, meson.project_version(), 'versions-macros', '@INPUT@', '@OUTPUT@'],
-  install: true,
-  install_dir: gtk_includedir / 'gtk-4.0/gdk/version',
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
-)
-
-gdk_visibility_h = custom_target(
-  output: 'gdk-visibility.h',
-  command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GDK', '@OUTPUT@'],
-  install: true,
-  install_dir: gtk_includedir / 'gtk-4.0/gdk/version',
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
-)
-
@@ -370,8 +370,7 @@ gdk_wayland_surface_request_frame (GdkSurface *surface)
  GdkWaylandSurface *self = GDK_WAYLAND_SURFACE (surface);
  GdkFrameClock *clock;

-  if (self->frame_callback != NULL)
-    return;
+  g_assert (self->frame_callback == NULL);

  clock = gdk_surface_get_frame_clock (surface);

@@ -646,15 +646,15 @@ gdk_win32_display_dispose (GObject *object)
 {
  GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (object);

-  if (display_win32->dummy_context_wgl.hglrc != NULL)
-    {
-      wglMakeCurrent (NULL, NULL);
-      wglDeleteContext (display_win32->dummy_context_wgl.hglrc);
-      display_win32->dummy_context_wgl.hglrc = NULL;
-    }
-
  if (display_win32->hwnd != NULL)
    {
+      if (display_win32->dummy_context_wgl.hglrc != NULL)
+        {
+          wglMakeCurrent (NULL, NULL);
+          wglDeleteContext (display_win32->dummy_context_wgl.hglrc);
+          display_win32->dummy_context_wgl.hglrc = NULL;
+        }
+
      DestroyWindow (display_win32->hwnd);
      display_win32->hwnd = NULL;
    }
@@ -1129,6 +1129,7 @@ gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *display_win32,
        {
          if (GDK_WIN32_SURFACE (surface)->hdc == NULL)
            GDK_WIN32_SURFACE (surface)->hdc = GetDC (GDK_SURFACE_HWND (surface));
+
          hdc = GDK_WIN32_SURFACE (surface)->hdc;
        }
      else
@@ -1183,6 +1184,11 @@ gdk_win32_display_init_gl (GdkDisplay  *display,
  HDC init_gl_hdc = NULL;
  GdkGLContext *context;

+  if (display_win32->dummy_context_wgl.hdc == NULL)
+    display_win32->dummy_context_wgl.hdc = GetDC (display_win32->hwnd);
+
+  init_gl_hdc = display_win32->dummy_context_wgl.hdc;
+
  /*
   * No env vars set, do the regular GL initialization, first WGL and then EGL,
   * as WGL is the more tried-and-tested configuration.
@@ -1195,8 +1201,6 @@ gdk_win32_display_init_gl (GdkDisplay  *display,
   */
  if (gdk_display_get_debug_flags (display) & (GDK_DEBUG_GL_EGL|GDK_DEBUG_GL_GLES))
    {
-      init_gl_hdc = GetDC (display_win32->hwnd);
-
      if (gdk_display_init_egl (display,
                                EGL_PLATFORM_ANGLE_ANGLE,
                                init_gl_hdc,
@@ -1214,14 +1218,12 @@ gdk_win32_display_init_gl (GdkDisplay  *display,
 #endif

  context = gdk_win32_display_init_wgl (display, error);
-
  if (context)
    return context;

 #ifdef HAVE_EGL
  g_clear_error (error);

-  init_gl_hdc = GetDC (display_win32->hwnd);
  if (gdk_display_init_egl (display,
                            EGL_PLATFORM_ANGLE_ANGLE,
                            init_gl_hdc,
@@ -108,7 +108,6 @@ typedef enum {

 typedef struct
 {
-  HWND hwnd;
  HDC hdc;
  HGLRC hglrc;
 } GdkWin32GLDummyContextWGL;
@@ -134,6 +133,7 @@ struct _GdkWin32Display
  guint hasWglEXTSwapControl : 1;
  guint hasWglOMLSyncControl : 1;
  guint hasWglARBPixelFormat : 1;
+  guint hasWglARBmultisample : 1;

 #ifdef HAVE_EGL
  guint hasEglKHRCreateContext : 1;
@@ -140,8 +140,7 @@ get_wgl_pfd (HDC                    hdc,

  pfd->nSize = sizeof (PIXELFORMATDESCRIPTOR);

-  if (display_win32 != NULL &&
-      display_win32->hasWglARBPixelFormat)
+  if (display_win32 != NULL && display_win32->hasWglARBPixelFormat)
    {
      UINT num_formats;
      int colorbits = GetDeviceCaps (hdc, BITSPIXEL);
@@ -153,7 +152,7 @@ get_wgl_pfd (HDC                    hdc,
      HGLRC hglrc_current = wglGetCurrentContext ();

      /* Update PIXEL_ATTRIBUTES above if any groups are added here! */
-      pixelAttribs[i++] = WGL_DRAW_TO_WINDOW_ARB;
+      pixelAttribs[i] = WGL_DRAW_TO_WINDOW_ARB;
      pixelAttribs[i++] = GL_TRUE;

      pixelAttribs[i++] = WGL_SUPPORT_OPENGL_ARB;
@@ -171,13 +170,18 @@ get_wgl_pfd (HDC                    hdc,
      pixelAttribs[i++] = WGL_COLOR_BITS_ARB;
      pixelAttribs[i++] = colorbits;

-      pixelAttribs[i++] = WGL_ALPHA_BITS_ARB;
-      pixelAttribs[i++] = 8;
-
      /* end of "Update PIXEL_ATTRIBUTES above if any groups are added here!" */

+      if (display_win32->hasWglARBmultisample)
+        {
+          pixelAttribs[i++] = WGL_SAMPLE_BUFFERS_ARB;
+          pixelAttribs[i++] = 1;
+
+          pixelAttribs[i++] = WGL_SAMPLES_ARB;
+          pixelAttribs[i++] = 8;
+        }
+
      pixelAttribs[i++] = 0; /* end of pixelAttribs */
-      g_assert (i <= PIXEL_ATTRIBUTES);
      best_pf = gdk_init_dummy_wgl_context (display_win32);

      if (!wglMakeCurrent (display_win32->dummy_context_wgl.hdc,
@@ -191,8 +195,8 @@ get_wgl_pfd (HDC                    hdc,
                               pixelAttribs,
                               NULL,
                               1,
-                               &best_pf,
-                               &num_formats);
+                              &best_pf,
+                              &num_formats);

      /* Go back to the HDC that we were using, since we are done with the dummy HDC and GL Context */
      wglMakeCurrent (hdc_current, hglrc_current);
@@ -243,43 +247,6 @@ gdk_init_dummy_wgl_context (GdkWin32Display *display_win32)
  return best_idx;
 }

-/*
- * Use a dummy HWND to init GL, sadly we can't just use the
- * HWND that we use for notifications as we may only call
- * SetPixelFormat() on an HDC once, and that notification HWND
- * uses the CS_OWNDC style meaning that even if we were to call
- * DeleteDC() on it, we would get the exact same HDC when we call
- * GetDC() on it later, meaning SetPixelFormat() cannot be used
- * again on the HDC that we acquire from the notification HWND.
- */
-static HWND
-create_dummy_gl_window (void)
-{
-  WNDCLASS wclass = { 0, };
-  ATOM klass;
-  HWND hwnd;
-
-  wclass.lpszClassName = "GdkGLDummyWindow";
-  wclass.lpfnWndProc = DefWindowProc;
-  wclass.hInstance = _gdk_app_hmodule;
-  wclass.style = CS_OWNDC;
-
-  klass = RegisterClass (&wclass);
-  if (klass)
-    {
-      hwnd = CreateWindow (MAKEINTRESOURCE (klass),
-                           NULL, WS_POPUP,
-                           0, 0, 0, 0, NULL, NULL,
-                           _gdk_app_hmodule, NULL);
-      if (!hwnd)
-        {
-          UnregisterClass (MAKEINTRESOURCE (klass), _gdk_app_hmodule);
-        }
-    }
-
-  return hwnd;
-}
-
 GdkGLContext *
 gdk_win32_display_init_wgl (GdkDisplay  *display,
                            GError     **error)
@@ -296,15 +263,6 @@ gdk_win32_display_init_wgl (GdkDisplay  *display,
   * dummy GL Context, it is used to query functions
   * and used for other stuff as well
   */
-
-  if (display_win32->dummy_context_wgl.hdc == NULL)
-    {
-      display_win32->dummy_context_wgl.hwnd = create_dummy_gl_window ();
-
-      if (display_win32->dummy_context_wgl.hwnd != NULL)
-        display_win32->dummy_context_wgl.hdc = GetDC (display_win32->dummy_context_wgl.hwnd);
-    }
-
  best_idx = gdk_init_dummy_wgl_context (display_win32);
  hdc = display_win32->dummy_context_wgl.hdc;

@@ -329,6 +287,8 @@ gdk_win32_display_init_wgl (GdkDisplay  *display,
    epoxy_has_wgl_extension (hdc, "WGL_OML_sync_control");
  display_win32->hasWglARBPixelFormat =
    epoxy_has_wgl_extension (hdc, "WGL_ARB_pixel_format");
+  display_win32->hasWglARBmultisample =
+    epoxy_has_wgl_extension (hdc, "WGL_ARB_multisample");

  context = g_object_new (GDK_TYPE_WIN32_GL_CONTEXT_WGL,
                          "display", display,
@@ -349,13 +309,15 @@ gdk_win32_display_init_wgl (GdkDisplay  *display,
                         "\t* WGL_ARB_pixel_format: %s\n"
                         "\t* WGL_ARB_create_context: %s\n"
                         "\t* WGL_EXT_swap_control: %s\n"
-                         "\t* WGL_OML_sync_control: %s\n",
+                         "\t* WGL_OML_sync_control: %s\n"
+                         "\t* WGL_ARB_multisample: %s\n",
                         major, minor,
                         glGetString (GL_VENDOR),
                         display_win32->hasWglARBPixelFormat ? "yes" : "no",
                         display_win32->hasWglARBCreateContext ? "yes" : "no",
                         display_win32->hasWglEXTSwapControl ? "yes" : "no",
-                         display_win32->hasWglOMLSyncControl ? "yes" : "no"));
+                         display_win32->hasWglOMLSyncControl ? "yes" : "no",
+                         display_win32->hasWglARBmultisample ? "yes" : "no"));
  }
 #endif

@@ -421,6 +383,7 @@ ensure_legacy_wgl_context (HDC            hdc,

 static HGLRC
 create_wgl_context_with_attribs (HDC           hdc,
+                                 HGLRC         hglrc_base,
                                 GdkGLContext *share,
                                 int           flags,
                                 gboolean      is_legacy,
@@ -474,63 +437,36 @@ create_wgl_context_with_attribs (HDC           hdc,
 }

 static HGLRC
-create_base_wgl_context (GdkWin32Display *display_win32,
-                         HDC              hdc,
-                         gboolean         force_create_base_context,
-                         gboolean        *remove_base_context)
+create_wgl_context (GdkGLContext  *context,
+                    HDC            hdc,
+                    gboolean       hasWglARBCreateContext,
+                    GdkGLContext  *share,
+                    int            flags,
+                    gboolean       legacy,
+                    GError       **error)
 {
-  HGLRC hglrc_base = NULL;
-
-  if (force_create_base_context || display_win32->dummy_context_wgl.hglrc == NULL)
-    {
-      hglrc_base = wglCreateContext (hdc);
-
-      if (hglrc_base == NULL)
-        return NULL;
-
-      *remove_base_context = !force_create_base_context;
-    }
-  else
-    hglrc_base = display_win32->dummy_context_wgl.hglrc;
-
-  return hglrc_base;
-}
-
-static HGLRC
-create_wgl_context (GdkGLContext    *context,
-                    GdkWin32Display *display_win32,
-                    HDC              hdc,
-                    GdkGLContext    *share,
-                    int              flags,
-                    gboolean         legacy,
-                    GError         **error)
-{
-  /* We need a legacy context for *all* cases, if no WGL contexts are created */
+  /* We need a legacy context for *all* cases */
  HGLRC hglrc_base, hglrc;
  GdkGLVersion version;
-  gboolean remove_base_context = FALSE;
  /* Save up the HDC and HGLRC that we are currently using, to restore back to it when we are done here  */
  HDC hdc_current = wglGetCurrentDC ();
  HGLRC hglrc_current = wglGetCurrentContext ();

+  hglrc_base = wglCreateContext (hdc);
+  if (hglrc_base == NULL ||
+      !wglMakeCurrent (hdc, hglrc_base))
+    {
+      g_clear_pointer (&hglrc_base, wglDeleteContext);
+      g_set_error_literal (error, GDK_GL_ERROR,
+                           GDK_GL_ERROR_NOT_AVAILABLE,
+                           _("Unable to create a GL context"));
+      return 0;
+    }
+
  hglrc = NULL;

-  if (display_win32->hasWglARBCreateContext)
+  if (hasWglARBCreateContext)
    {
-      hglrc_base = create_base_wgl_context (display_win32,
-                                            hdc,
-                                            FALSE,
-                                           &remove_base_context);
-
-      if (hglrc_base == NULL || !wglMakeCurrent (hdc, hglrc_base))
-        {
-          g_clear_pointer (&hglrc_base, gdk_win32_private_wglDeleteContext);
-          g_set_error_literal (error, GDK_GL_ERROR,
-                               GDK_GL_ERROR_NOT_AVAILABLE,
-                               _("Unable to create a GL context"));
-          return 0;
-        }
-
      if (!legacy)
        {
          gdk_gl_context_get_matching_version (context,
@@ -538,6 +474,7 @@ create_wgl_context (GdkGLContext    *context,
                                               FALSE,
                                               &version);
          hglrc = create_wgl_context_with_attribs (hdc,
+                                                   hglrc_base,
                                                   share,
                                                   flags,
                                                   FALSE,
@@ -551,6 +488,7 @@ create_wgl_context (GdkGLContext    *context,
                                               TRUE,
                                               &version);
          hglrc = create_wgl_context_with_attribs (hdc,
+                                                   hglrc_base,
                                                   share,
                                                   flags,
                                                   TRUE,
@@ -561,20 +499,6 @@ create_wgl_context (GdkGLContext    *context,
  if (hglrc == NULL)
    {
      legacy = TRUE;
-      hglrc_base = create_base_wgl_context (display_win32,
-                                            hdc,
-                                            TRUE,
-                                           &remove_base_context);
-
-      if (hglrc_base == NULL || !wglMakeCurrent (hdc, hglrc_base))
-        {
-          g_clear_pointer (&hglrc_base, gdk_win32_private_wglDeleteContext);
-          g_set_error_literal (error, GDK_GL_ERROR,
-                               GDK_GL_ERROR_NOT_AVAILABLE,
-                               _("Unable to create a GL context"));
-          return 0;
-        }
-
      gdk_gl_context_get_matching_version (context,
                                           GDK_GL_API_GL,
                                           TRUE,
@@ -589,8 +513,7 @@ create_wgl_context (GdkGLContext    *context,
      gdk_gl_context_set_is_legacy (context, legacy);
    }

-  if (remove_base_context)
-    g_clear_pointer (&hglrc_base, gdk_win32_private_wglDeleteContext);
+  g_clear_pointer (&hglrc_base, wglDeleteContext);

  wglMakeCurrent (hdc_current, hglrc_current);

@@ -598,51 +521,34 @@ create_wgl_context (GdkGLContext    *context,
 }

 static gboolean
-set_wgl_pixformat_for_hdc (GdkWin32Display *display_win32,
-                           HDC             *hdc,
+set_wgl_pixformat_for_hdc (HDC              hdc,
                           int             *best_idx,
-                           gboolean        *recreate_dummy_context)
+                           GdkWin32Display *display_win32)
 {
-  gboolean skip_acquire = FALSE;
-  gboolean set_pixel_format_result = FALSE;
-  PIXELFORMATDESCRIPTOR pfd;
+  gboolean already_checked = TRUE;
+  *best_idx = GetPixelFormat (hdc);

  /* one is only allowed to call SetPixelFormat(), and so ChoosePixelFormat()
   * one single time per window HDC
   */
-  GDK_NOTE (OPENGL, g_print ("requesting pixel format...\n"));
-  *best_idx = get_wgl_pfd (*hdc, &pfd, display_win32);
-
-  if (display_win32->dummy_context_wgl.hwnd != NULL)
+  if (*best_idx == 0)
    {
-      /*
-       * Ditch the initial dummy HDC, HGLRC and HWND used to initialize WGL,
-       * we want to ensure that the HDC of the notification HWND that we will
-       * also use for our new dummy HDC will have the correct pixel format set
-       */
-      wglDeleteContext (display_win32->dummy_context_wgl.hglrc);
-      display_win32->dummy_context_wgl.hglrc = NULL;
-      display_win32->dummy_context_wgl.hdc = GetDC (display_win32->hwnd);
-      *hdc = display_win32->dummy_context_wgl.hdc;
-      *recreate_dummy_context = TRUE;
+      PIXELFORMATDESCRIPTOR pfd;
+      gboolean set_pixel_format_result = FALSE;

-      DestroyWindow (display_win32->dummy_context_wgl.hwnd);
-      display_win32->dummy_context_wgl.hwnd = NULL;
+      GDK_NOTE (OPENGL, g_print ("requesting pixel format...\n"));
+	  already_checked = FALSE;
+      *best_idx = get_wgl_pfd (hdc, &pfd, display_win32);
+
+      if (*best_idx != 0)
+        set_pixel_format_result = SetPixelFormat (hdc, *best_idx, &pfd);
+
+      /* ChoosePixelFormat() or SetPixelFormat() failed, bail out */
+      if (*best_idx == 0 || !set_pixel_format_result)
+        return FALSE;
    }

-  if (GetPixelFormat (*hdc) != 0)
-    {
-      skip_acquire = TRUE;
-      set_pixel_format_result = TRUE;
-    }
-  else if (*best_idx != 0)
-    set_pixel_format_result = SetPixelFormat (*hdc, *best_idx, &pfd);
-
-  /* ChoosePixelFormat() or SetPixelFormat() failed, bail out */
-  if (*best_idx == 0 || !set_pixel_format_result)
-    return FALSE;
-
-  GDK_NOTE (OPENGL, g_print ("%s""requested and set pixel format: %d\n", skip_acquire ? "already " : "", *best_idx));
+  GDK_NOTE (OPENGL, g_print ("%s""requested and set pixel format: %d\n", already_checked ? "already " : "", *best_idx));

  return TRUE;
 }
@@ -658,9 +564,8 @@ gdk_win32_gl_context_wgl_realize (GdkGLContext *context,
  /* request flags and specific versions for core (3.2+) WGL context */
  int flags = 0;
  HGLRC hglrc;
-  int pixel_format = 0;
+  int pixel_format;
  HDC hdc;
-  gboolean recreate_dummy_context = FALSE;

  GdkSurface *surface = gdk_gl_context_get_surface (context);
  GdkDisplay *display = gdk_gl_context_get_display (context);
@@ -686,10 +591,9 @@ gdk_win32_gl_context_wgl_realize (GdkGLContext *context,
  else
    hdc = display_win32->dummy_context_wgl.hdc;

-  if (!set_wgl_pixformat_for_hdc (display_win32,
-                                 &hdc,
+  if (!set_wgl_pixformat_for_hdc (hdc,
                                 &pixel_format,
-                                 &recreate_dummy_context))
+                                  display_win32))
    {
      g_set_error_literal (error, GDK_GL_ERROR,
                           GDK_GL_ERROR_UNSUPPORTED_FORMAT,
@@ -707,34 +611,12 @@ gdk_win32_gl_context_wgl_realize (GdkGLContext *context,
    flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;

  hglrc = create_wgl_context (context,
-                              display_win32,
                              hdc,
+                              display_win32->hasWglARBCreateContext,
                              share,
                              flags,
                              legacy_bit,
                              error);
-
-  if (recreate_dummy_context)
-    {
-      display_win32->dummy_context_wgl.hglrc =
-        create_wgl_context (context,
-                            display_win32,
-                            display_win32->dummy_context_wgl.hdc,
-                            NULL,
-                            flags,
-                            legacy_bit,
-                            error);
-
-      if (display_win32->dummy_context_wgl.hglrc == NULL)
-        {
-          if (hglrc != NULL)
-            {
-              wglDeleteContext (hglrc);
-              hglrc = NULL;
-            }
-        }
-    }
-
  if (hglrc == NULL)
    return 0;

@@ -506,7 +506,6 @@ extract_matrix_metadata (GskGLRenderModelview *modelview)
    }
 }

-/* takes ownership of transform */
 static void
 gsk_gl_render_job_set_modelview (GskGLRenderJob *job,
                                 GskTransform   *transform)
@@ -539,7 +538,6 @@ gsk_gl_render_job_set_modelview (GskGLRenderJob *job,
  job->current_modelview = modelview;
 }

-/* doesn't take ownership of transform */
 static void
 gsk_gl_render_job_push_modelview (GskGLRenderJob *job,
                                  GskTransform   *transform)
@@ -2125,6 +2123,7 @@ gsk_gl_render_job_visit_transform_node (GskGLRenderJob      *job,
                  scale = gsk_transform_translate (gsk_transform_scale (NULL, sx, sy), &GRAPHENE_POINT_INIT (tx, ty));
                  gsk_gl_render_job_push_modelview (job, scale);
                  transform = gsk_transform_transform (gsk_transform_invert (scale), transform);
+                  gsk_transform_unref (scale);
                }
            }

@@ -1650,28 +1650,12 @@ gsk_texture_node_diff (GskRenderNode  *node1,
 {
  GskTextureNode *self1 = (GskTextureNode *) node1;
  GskTextureNode *self2 = (GskTextureNode *) node2;
-  cairo_region_t *sub;

-  if (!graphene_rect_equal (&node1->bounds, &node2->bounds) ||
-      gdk_texture_get_width (self1->texture) != gdk_texture_get_width (self2->texture) ||
-      gdk_texture_get_height (self1->texture) != gdk_texture_get_height (self2->texture))
-    {
-      gsk_render_node_diff_impossible (node1, node2, region);
-      return;
-    }
-
-  if (self1->texture == self2->texture)
+  if (graphene_rect_equal (&node1->bounds, &node2->bounds) &&
+      self1->texture == self2->texture)
    return;

-  sub = cairo_region_create ();
-  gdk_texture_diff (self1->texture, self2->texture, sub);
-  region_union_region_affine (region,
-                              sub,
-                              node1->bounds.size.width / gdk_texture_get_width (self1->texture),
-                              node1->bounds.size.height / gdk_texture_get_height (self1->texture),
-                              node1->bounds.origin.x,
-                              node1->bounds.origin.y);
-  cairo_region_destroy (sub);
+  gsk_render_node_diff_impossible (node1, node2, region);
 }

 static void
@@ -1844,29 +1828,13 @@ gsk_texture_scale_node_diff (GskRenderNode  *node1,
 {
  GskTextureScaleNode *self1 = (GskTextureScaleNode *) node1;
  GskTextureScaleNode *self2 = (GskTextureScaleNode *) node2;
-  cairo_region_t *sub;

-  if (!graphene_rect_equal (&node1->bounds, &node2->bounds) ||
-      self1->filter != self2->filter ||
-      gdk_texture_get_width (self1->texture) != gdk_texture_get_width (self2->texture) ||
-      gdk_texture_get_height (self1->texture) != gdk_texture_get_height (self2->texture))
-    {
-      gsk_render_node_diff_impossible (node1, node2, region);
-      return;
-    }
-
-  if (self1->texture == self2->texture)
+  if (graphene_rect_equal (&node1->bounds, &node2->bounds) &&
+      self1->texture == self2->texture &&
+      self1->filter == self2->filter)
    return;

-  sub = cairo_region_create ();
-  gdk_texture_diff (self1->texture, self2->texture, sub);
-  region_union_region_affine (region,
-                              sub,
-                              node1->bounds.size.width / gdk_texture_get_width (self1->texture),
-                              node1->bounds.size.height / gdk_texture_get_height (self1->texture),
-                              node1->bounds.origin.x,
-                              node1->bounds.origin.y);
-  cairo_region_destroy (sub);
+  gsk_render_node_diff_impossible (node1, node2, region);
 }

 static void
@@ -1371,10 +1371,7 @@ parse_shader (GtkCssParser *parser,
  GskGLShader *shader;

  if (!parse_string (parser, context, &sourcecode))
-    {
-      gtk_css_parser_error_value (parser, "Not a string");
-      return FALSE;
-    }
+    return FALSE;

  bytes = g_bytes_new_take (sourcecode, strlen (sourcecode));
  shader = gsk_gl_shader_new_from_bytes (bytes);
@@ -1503,29 +1500,6 @@ parse_shader_args (GtkCssParser *parser,
  return TRUE;
 }

-static const char default_glsl[] =
-  "void\n"
-  "mainImage(out vec4 fragColor,\n"
-  "          in vec2 fragCoord,\n"
-  "          in vec2 resolution,\n"
-  "          in vec2 uv)\n"
-  "{\n"
-  "  fragColor = vec4(1.0, 105.0/255.0, 180.0/255.0, 1.0);\n"
-  "}";
-
-static GskGLShader *
-get_default_glshader (void)
-{
-  GBytes *bytes;
-  GskGLShader *shader;
-
-  bytes = g_bytes_new (default_glsl, strlen (default_glsl) + 1);
-  shader = gsk_gl_shader_new_from_bytes (bytes);
-  g_bytes_unref (bytes);
-
-  return shader;
-}
-
 static GskRenderNode *
 parse_glshader_node (GtkCssParser *parser,
                     Context      *context)
@@ -1546,7 +1520,6 @@ parse_glshader_node (GtkCssParser *parser,
    { "child4", parse_node, clear_node, &child[3] },
  };
  GskGLShader *shader;
-  GskShaderArgsBuilder *builder;
  GskRenderNode *node;
  GBytes *args = NULL;
  int len, i;
@@ -1559,17 +1532,8 @@ parse_glshader_node (GtkCssParser *parser,
        break;
    }

-  if (shader_info.shader)
-    shader = shader_info.shader;
-  else
-    shader = get_default_glshader ();
-
-  if (shader_info.args)
-    builder = shader_info.args;
-  else
-    builder = gsk_shader_args_builder_new (shader, NULL);
-
-  args = gsk_shader_args_builder_free_to_args (builder);
+  shader = shader_info.shader;
+  args = gsk_shader_args_builder_free_to_args (shader_info.args);

  node = gsk_gl_shader_node_new (shader, &bounds, args, child, len);

@@ -27,7 +27,7 @@
 #define __GTK_CSS_H_INSIDE__

 #include <glib.h>
-#include <gdk/version/gdkversionmacros.h>
+#include <gdk/gdkversionmacros.h>

 #include <gtk/css/gtkcssenums.h>
 #include <gtk/css/gtkcssenumtypes.h>
@@ -29,7 +29,7 @@
 #endif

 #include <glib.h>
-#include <gdk/version/gdkversionmacros.h>
+#include <gdk/gdkversionmacros.h>

 /**
 * GtkCssParserError:
@@ -7,7 +7,7 @@
 #endif

 #include <glib-object.h>
-#include <gdk/version/gdkversionmacros.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS
 /*** END file-header ***/
@@ -21,7 +21,7 @@
 #pragma once

 #include <glib.h>
-#include <gdk/version/gdkversionmacros.h>
+#include <gdk/gdkversionmacros.h>

 G_BEGIN_DECLS

@@ -22,7 +22,7 @@
 #endif

 #include <gio/gio.h>
-#include <gdk/version/gdkversionmacros.h>
+#include <gdk/gdkversionmacros.h>
 #include <gtk/css/gtkcsslocation.h>

 G_BEGIN_DECLS
@@ -41,8 +41,6 @@ libgtk_css = static_library('gtk_css',
    gtk_css_public_sources,
    gtk_css_private_sources,
    gtk_css_enums,
-    gdkversionmacros_h,
-    gdk_visibility_h,
  ],
  dependencies: gtk_css_deps,
  include_directories: [ confinc, ],
@@ -174,7 +174,6 @@
 #include <gtk/gtklistbase.h>
 #include <gtk/gtklinkbutton.h>
 #include <gtk/gtklistbox.h>
-#include <gtk/gtklistheader.h>
 #include <gtk/gtklistitem.h>
 #include <gtk/gtklistitemfactory.h>
 #include <gtk/deprecated/gtkliststore.h>
@@ -226,7 +225,6 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtksearchbar.h>
 #include <gtk/gtksearchentry.h>
-#include <gtk/gtksectionmodel.h>
 #include <gtk/gtkselectionfiltermodel.h>
 #include <gtk/gtkselectionmodel.h>
 #include <gtk/gtkseparator.h>
@@ -885,8 +885,7 @@ gtk_box_layout_allocate (GtkLayoutManager *layout_manager,
      sizes[i].natural_size = child_size;

      if (self->orientation == GTK_ORIENTATION_HORIZONTAL &&
-          (gtk_widget_get_valign (child) == GTK_ALIGN_BASELINE_FILL ||
-           gtk_widget_get_valign (child) == GTK_ALIGN_BASELINE_CENTER))
+          gtk_widget_get_valign (child) == GTK_ALIGN_BASELINE)
        {
          int child_allocation_width;
          int child_minimum_height, child_natural_height;
@@ -455,9 +455,7 @@ gtk_center_layout_allocate (GtkLayoutManager *layout_manager,

      for (i = 0; i < 3; i++)
        {
-          if (child[i] &&
-              (gtk_widget_get_valign (child[i]) == GTK_ALIGN_BASELINE_FILL ||
-               gtk_widget_get_valign (child[i]) == GTK_ALIGN_BASELINE_CENTER))
+          if (child[i] && gtk_widget_get_valign (child[i]) == GTK_ALIGN_BASELINE)
            {
              int child_min_height, child_nat_height;
              int child_min_baseline, child_nat_baseline;
@@ -119,7 +119,6 @@ gtk_column_view_column_dispose (GObject *object)
  g_clear_object (&self->sorter);
  g_clear_pointer (&self->title, g_free);
  g_clear_object (&self->menu);
-  g_clear_pointer (&self->id, g_free);

  G_OBJECT_CLASS (gtk_column_view_column_parent_class)->dispose (object);
 }
@@ -429,7 +429,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog,
  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);

  button = gtk_spin_button_new_with_range (0.0, 9999.0, 1);
-  gtk_widget_set_valign (button, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (button, GTK_ALIGN_BASELINE);
  if (unit == GTK_UNIT_INCH)
    gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 2);
  else
@@ -446,7 +446,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog,
    label = gtk_label_new (_("inch"));
  else
    label = gtk_label_new (_("mm"));
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);

  gtk_box_append (GTK_BOX (hbox), label);
  gtk_label_set_mnemonic_widget (GTK_LABEL (mnemonic_label), button);
@@ -913,7 +913,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  label = gtk_label_new_with_mnemonic (_("_Width:"));
  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
  gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);

  widget = new_unit_widget (dialog, user_units, label);
@@ -922,7 +922,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  label = gtk_label_new_with_mnemonic (_("_Height:"));
  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
  gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);

  widget = new_unit_widget (dialog, user_units, label);
@@ -938,7 +938,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  label = gtk_label_new_with_mnemonic (_("_Top:"));
  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
  gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);

  widget = new_unit_widget (dialog, user_units, label);
@@ -947,7 +947,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  label = gtk_label_new_with_mnemonic (_("_Bottom:"));
  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
  gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);

  widget = new_unit_widget (dialog, user_units, label);
@@ -956,7 +956,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  label = gtk_label_new_with_mnemonic (_("_Left:"));
  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
  gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);

  widget = new_unit_widget (dialog, user_units, label);
@@ -965,7 +965,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  label = gtk_label_new_with_mnemonic (_("_Right:"));
  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
  gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);

  widget = new_unit_widget (dialog, user_units, label);
@@ -1706,8 +1706,7 @@ gtk_entry_size_allocate (GtkWidget *widget,
  text_alloc.width = width;
  text_alloc.height = height;

-  if (gtk_widget_get_valign (widget) != GTK_ALIGN_BASELINE_FILL &&
-      gtk_widget_get_valign (widget) != GTK_ALIGN_BASELINE_CENTER)
+  if (gtk_widget_get_valign (widget)  != GTK_ALIGN_BASELINE)
    baseline = -1;

  for (i = 0; i < MAX_ICONS; i++)
@@ -29,7 +29,6 @@
 #endif

 #include <glib-object.h>
-#include <gdk/version/gdkversionmacros.h>


 G_BEGIN_DECLS
@@ -42,9 +41,7 @@ G_BEGIN_DECLS
 * @GTK_ALIGN_END: snap to right or bottom side, leaving space on left or top
 * @GTK_ALIGN_CENTER: center natural width of widget inside the allocation
 * @GTK_ALIGN_BASELINE: align the widget according to the baseline.
- *   See [class@Gtk.Widget]. Deprecated: 4.12: Use `GTK_ALIGN_BASELINE_FILL` instead
- * @GTK_ALIGN_BASELINE_FILL: a different name for `GTK_ALIGN_BASELINE`. Since 4.12
- * @GTK_ALIGN_BASELINE_CENTER: stretch to fill all space, but align the baseline. Since 4.12
+ *   See [class@Gtk.Widget].
 *
 * Controls how a widget deals with extra space in a single dimension.
 *
@@ -55,13 +52,14 @@ G_BEGIN_DECLS
 * could be scaled and stretched, it could be centered, or it could be
 * positioned to one side of the space.
 *
- * Note that in horizontal context `GTK_ALIGN_START` and `GTK_ALIGN_END`
+ * Note that in horizontal context %GTK_ALIGN_START and %GTK_ALIGN_END
 * are interpreted relative to text direction.
 *
- * Baseline support is optional for containers and widgets, and is only available
- * for vertical alignment. `GTK_ALIGN_BASELINE_CENTER and `GTK_ALIGN_BASELINE_FILL`
- * are treated similar to `GTK_ALIGN_CENTER` and `GTK_ALIGN_FILL`, except that it
- * positions the widget to line up the baselines, where that is supported.
+ * %GTK_ALIGN_BASELINE support is optional for containers and widgets, and
+ * it is only supported for vertical alignment.  Where it is supported, it is
+ * treated similar to %GTK_ALIGN_CENTER, except that it positions the widget
+ * to line up the baselines. When it's not supported by a child or a container,
+ * it is treated as %GTK_ALIGN_FILL.
 */
 typedef enum
 {
@@ -69,9 +67,7 @@ typedef enum
  GTK_ALIGN_START,
  GTK_ALIGN_END,
  GTK_ALIGN_CENTER,
-  GTK_ALIGN_BASELINE_FILL,
-  GTK_ALIGN_BASELINE GDK_DEPRECATED_ENUMERATOR_IN_4_12_FOR(GTK_ALIGN_BASELINE_FILL) = GTK_ALIGN_BASELINE_FILL,
-  GTK_ALIGN_BASELINE_CENTER,
+  GTK_ALIGN_BASELINE
 } GtkAlign;

 /**
--- a/Show More
+++ b/Show More